Repository: lens Updated Branches: refs/heads/master be36b6303 -> 10dcebb92
LENS-824 Fix all javadoc warnings/errors Project: http://git-wip-us.apache.org/repos/asf/lens/repo Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/10dcebb9 Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/10dcebb9 Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/10dcebb9 Branch: refs/heads/master Commit: 10dcebb9247f605769dfd90e25be82aff3f79dbc Parents: be36b63 Author: Gabor Liptak <glip...@users.sourceforge.net> Authored: Mon Nov 16 11:40:06 2015 +0530 Committer: Rajat Khandelwal <rajatgupt...@gmail.com> Committed: Mon Nov 16 11:40:06 2015 +0530 ---------------------------------------------------------------------- .../lens/api/query/save/ParameterCollectionType.java | 2 +- .../org/apache/lens/api/result/PrettyPrintable.java | 2 +- .../java/org/apache/lens/api/util/PathValidator.java | 12 ++++++------ .../org/apache/lens/cli/commands/LensQueryCommands.java | 1 - .../lens/server/metastore/CubeMetastoreServiceImpl.java | 2 +- .../lens/server/query/QueryExecutionServiceImpl.java | 2 +- .../apache/lens/server/query/save/SavedQueryDao.java | 4 ++-- .../org/apache/lens/server/quota/QuotaServiceImpl.java | 2 +- .../server/scheduler/QuerySchedulerServiceImpl.java | 2 +- .../apache/lens/server/session/HiveSessionService.java | 2 +- pom.xml | 6 +++--- 11 files changed, 18 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lens/blob/10dcebb9/lens-api/src/main/java/org/apache/lens/api/query/save/ParameterCollectionType.java ---------------------------------------------------------------------- diff --git a/lens-api/src/main/java/org/apache/lens/api/query/save/ParameterCollectionType.java b/lens-api/src/main/java/org/apache/lens/api/query/save/ParameterCollectionType.java index 971e794..14637de 100644 --- a/lens-api/src/main/java/org/apache/lens/api/query/save/ParameterCollectionType.java +++ b/lens-api/src/main/java/org/apache/lens/api/query/save/ParameterCollectionType.java @@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlRootElement; * The enum ParameterCollectionType * Collection type of a parameter has to be chosen based on its context. * - If it is occurring next to an IN/NOT IN clause, its multiple - * - If it is found with EQ/NEQ..>,<,>=,<=,like etc, its single + * - If it is found with EQ/NEQ..>,<,>=,<=,like etc, its single */ @XmlRootElement public enum ParameterCollectionType { http://git-wip-us.apache.org/repos/asf/lens/blob/10dcebb9/lens-api/src/main/java/org/apache/lens/api/result/PrettyPrintable.java ---------------------------------------------------------------------- diff --git a/lens-api/src/main/java/org/apache/lens/api/result/PrettyPrintable.java b/lens-api/src/main/java/org/apache/lens/api/result/PrettyPrintable.java index e6152b8..5c45596 100644 --- a/lens-api/src/main/java/org/apache/lens/api/result/PrettyPrintable.java +++ b/lens-api/src/main/java/org/apache/lens/api/result/PrettyPrintable.java @@ -26,7 +26,7 @@ public interface PrettyPrintable { /** * Returns the contents of this object in the form of a pretty formatted string. * - * @return + * @return contents as formatted String */ String toPrettyString(); } http://git-wip-us.apache.org/repos/asf/lens/blob/10dcebb9/lens-api/src/main/java/org/apache/lens/api/util/PathValidator.java ---------------------------------------------------------------------- diff --git a/lens-api/src/main/java/org/apache/lens/api/util/PathValidator.java b/lens-api/src/main/java/org/apache/lens/api/util/PathValidator.java index 92a936a..45397d7 100644 --- a/lens-api/src/main/java/org/apache/lens/api/util/PathValidator.java +++ b/lens-api/src/main/java/org/apache/lens/api/util/PathValidator.java @@ -52,10 +52,10 @@ public class PathValidator { * Also removes erroneously appended prefix for URI's. * Takes additional properties for special URI handling. * - * @param path - * @param shouldBeDirectory - * @param shouldExist - * @return + * @param path input path + * @param shouldBeDirectory should be a directory + * @param shouldExist should exist + * @return converted path */ public String getValidPath(File path, boolean shouldBeDirectory, boolean shouldExist) { @@ -89,8 +89,8 @@ public class PathValidator { * * Any new URI's have to be handled appropriately * - * @param path - * @return + * @param path input path + * @return cleaned up path */ public String removePrefixBeforeURI(String path) { /** http://git-wip-us.apache.org/repos/asf/lens/blob/10dcebb9/lens-cli/src/main/java/org/apache/lens/cli/commands/LensQueryCommands.java ---------------------------------------------------------------------- diff --git a/lens-cli/src/main/java/org/apache/lens/cli/commands/LensQueryCommands.java b/lens-cli/src/main/java/org/apache/lens/cli/commands/LensQueryCommands.java index 096fd7a..83b919b 100644 --- a/lens-cli/src/main/java/org/apache/lens/cli/commands/LensQueryCommands.java +++ b/lens-cli/src/main/java/org/apache/lens/cli/commands/LensQueryCommands.java @@ -181,7 +181,6 @@ public class LensQueryCommands extends BaseLensCommand { * Explain query. * * @param sql the sql - * @param location the location * @return the string * @throws LensAPIException * @throws UnsupportedEncodingException the unsupported encoding exception http://git-wip-us.apache.org/repos/asf/lens/blob/10dcebb9/lens-server/src/main/java/org/apache/lens/server/metastore/CubeMetastoreServiceImpl.java ---------------------------------------------------------------------- diff --git a/lens-server/src/main/java/org/apache/lens/server/metastore/CubeMetastoreServiceImpl.java b/lens-server/src/main/java/org/apache/lens/server/metastore/CubeMetastoreServiceImpl.java index 4c8b525..ea913ad 100644 --- a/lens-server/src/main/java/org/apache/lens/server/metastore/CubeMetastoreServiceImpl.java +++ b/lens-server/src/main/java/org/apache/lens/server/metastore/CubeMetastoreServiceImpl.java @@ -1448,7 +1448,7 @@ public class CubeMetastoreServiceImpl extends BaseLensService implements CubeMet } /** - * @inheritDoc + * {@inheritDoc} */ @Override public HealthStatus getHealthStatus() { http://git-wip-us.apache.org/repos/asf/lens/blob/10dcebb9/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java ---------------------------------------------------------------------- diff --git a/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java b/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java index 4d8ae51..fdc8bfd 100644 --- a/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java +++ b/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java @@ -2417,7 +2417,7 @@ public class QueryExecutionServiceImpl extends BaseLensService implements QueryE } /** - * @inheritDoc + * {@inheritDoc} */ @Override public HealthStatus getHealthStatus() { http://git-wip-us.apache.org/repos/asf/lens/blob/10dcebb9/lens-server/src/main/java/org/apache/lens/server/query/save/SavedQueryDao.java ---------------------------------------------------------------------- diff --git a/lens-server/src/main/java/org/apache/lens/server/query/save/SavedQueryDao.java b/lens-server/src/main/java/org/apache/lens/server/query/save/SavedQueryDao.java index 9dfde0d..18d563d 100644 --- a/lens-server/src/main/java/org/apache/lens/server/query/save/SavedQueryDao.java +++ b/lens-server/src/main/java/org/apache/lens/server/query/save/SavedQueryDao.java @@ -76,7 +76,7 @@ public class SavedQueryDao { /** * Creates the saved query table * - * @throws LensException + * @throws LensException cannot create saved query table */ public void createSavedQueryTableIfNotExists() throws LensException { try { @@ -90,7 +90,7 @@ public class SavedQueryDao { * Saves the query passed * * @param savedQuery - * @return + * @return insert id * @throws LensException */ public long saveQuery(SavedQuery savedQuery) throws LensException { http://git-wip-us.apache.org/repos/asf/lens/blob/10dcebb9/lens-server/src/main/java/org/apache/lens/server/quota/QuotaServiceImpl.java ---------------------------------------------------------------------- diff --git a/lens-server/src/main/java/org/apache/lens/server/quota/QuotaServiceImpl.java b/lens-server/src/main/java/org/apache/lens/server/quota/QuotaServiceImpl.java index cc627cf..4b67295 100644 --- a/lens-server/src/main/java/org/apache/lens/server/quota/QuotaServiceImpl.java +++ b/lens-server/src/main/java/org/apache/lens/server/quota/QuotaServiceImpl.java @@ -44,7 +44,7 @@ public class QuotaServiceImpl extends BaseLensService implements QuotaService { } /** - * @inheritDoc + * {@inheritDoc} */ @Override public HealthStatus getHealthStatus() { http://git-wip-us.apache.org/repos/asf/lens/blob/10dcebb9/lens-server/src/main/java/org/apache/lens/server/scheduler/QuerySchedulerServiceImpl.java ---------------------------------------------------------------------- diff --git a/lens-server/src/main/java/org/apache/lens/server/scheduler/QuerySchedulerServiceImpl.java b/lens-server/src/main/java/org/apache/lens/server/scheduler/QuerySchedulerServiceImpl.java index 3ea7524..24949bd 100644 --- a/lens-server/src/main/java/org/apache/lens/server/scheduler/QuerySchedulerServiceImpl.java +++ b/lens-server/src/main/java/org/apache/lens/server/scheduler/QuerySchedulerServiceImpl.java @@ -44,7 +44,7 @@ public class QuerySchedulerServiceImpl extends BaseLensService implements QueryS } /** - * @inheritDoc + * {@inheritDoc} */ @Override public HealthStatus getHealthStatus() { http://git-wip-us.apache.org/repos/asf/lens/blob/10dcebb9/lens-server/src/main/java/org/apache/lens/server/session/HiveSessionService.java ---------------------------------------------------------------------- diff --git a/lens-server/src/main/java/org/apache/lens/server/session/HiveSessionService.java b/lens-server/src/main/java/org/apache/lens/server/session/HiveSessionService.java index 22497ca..2745b27 100644 --- a/lens-server/src/main/java/org/apache/lens/server/session/HiveSessionService.java +++ b/lens-server/src/main/java/org/apache/lens/server/session/HiveSessionService.java @@ -452,7 +452,7 @@ public class HiveSessionService extends BaseLensService implements SessionServic } /** - * @inheritDoc + * {@inheritDoc} */ @Override public HealthStatus getHealthStatus() { http://git-wip-us.apache.org/repos/asf/lens/blob/10dcebb9/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 49a9d50..9b417d9 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ <servlet.api.version>2.5</servlet.api.version> <jsp.api.version>2.0</jsp.api.version> <ws.rs.version>2.0</ws.rs.version> - <jaxb.api.version>2.1</jaxb.api.version> + <jaxb.api.version>2.2.11</jaxb.api.version> <javax.mail.version>1.4</javax.mail.version> <!-- hadoop stack --> @@ -90,8 +90,8 @@ <powermock.version>1.5.6</powermock.version> <!-- maven plugins --> - <jaxb2.plugin.version>0.12.3</jaxb2.plugin.version> - <jaxb2.basics.plugin.version>0.6.3</jaxb2.basics.plugin.version> + <jaxb2.plugin.version>0.13.0</jaxb2.plugin.version> + <jaxb2.basics.plugin.version>0.9.5</jaxb2.basics.plugin.version> <jetty.plugin.version>${jetty.version}</jetty.plugin.version> <exec.plugin.version>1.2.1</exec.plugin.version> <enunciate.plugin.version>1.28</enunciate.plugin.version>
