Repository: lens Updated Branches: refs/heads/lens-1381 8868b0638 -> 72c20ff83
LENS-1396: Checkstyle failing with java8 syntax Project: http://git-wip-us.apache.org/repos/asf/lens/repo Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/186f03f7 Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/186f03f7 Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/186f03f7 Branch: refs/heads/lens-1381 Commit: 186f03f76a1b36ee68372c65f45a625afb5f6b89 Parents: d1b43d6 Author: Rajat Khandelwal <[email protected]> Authored: Wed Apr 12 15:10:11 2017 +0530 Committer: Rajat Khandelwal <[email protected]> Committed: Wed Apr 12 15:10:11 2017 +0530 ---------------------------------------------------------------------- .../main/resources/checkstyle-suppressions.xml | 33 ++++++++++++++++++++ checkstyle/src/main/resources/checkstyle.xml | 12 ++++--- checkstyle/src/main/resources/suppressions.xml | 32 ------------------- .../lens/api/error/LensCommonErrorCode.java | 2 +- .../apache/lens/api/error/LensHttpStatus.java | 2 +- .../apache/lens/doc/TestGenerateConfigDoc.java | 2 +- .../apache/lens/cube/metadata/CubeColumn.java | 2 +- .../apache/lens/cube/metadata/Dimension.java | 4 +-- .../lens/cube/metadata/MetastoreUtil.java | 2 +- .../org/apache/lens/cube/metadata/Storage.java | 2 ++ .../apache/lens/cube/parse/AliasReplacer.java | 4 --- .../lens/cube/parse/CandidateTableResolver.java | 4 --- .../apache/lens/cube/parse/ColumnResolver.java | 4 --- .../lens/cube/parse/CubeQueryRewriter.java | 20 ++++++------ .../lens/cube/parse/ExpressionResolver.java | 8 ++--- .../apache/lens/cube/parse/GroupbyResolver.java | 2 +- .../apache/lens/cube/parse/JoinResolver.java | 4 --- .../lens/cube/parse/LeastPartitionResolver.java | 4 --- .../cube/parse/LightestDimensionResolver.java | 5 --- .../lens/cube/parse/LightestFactResolver.java | 4 --- .../cube/parse/MaxCoveringFactResolver.java | 4 +-- .../lens/cube/parse/SelectPhraseContext.java | 2 +- .../lens/cube/parse/StorageTableResolver.java | 2 +- .../lens/cube/parse/TimerangeResolver.java | 3 -- .../cube/metadata/TestCubeMetastoreClient.java | 2 +- .../cube/parse/TestBetweenTimeRangeWriter.java | 4 +-- .../lens/cube/parse/TestCubeRewriter.java | 10 +++--- .../lens/driver/es/ASTTraverserForES.java | 6 ++-- .../client/jest/JestResultSetTransformer.java | 4 +-- .../lens/driver/es/translator/ESVisitor.java | 2 +- .../org/apache/lens/driver/hive/HiveDriver.java | 2 +- .../apache/lens/driver/jdbc/TestJdbcDriver.java | 2 +- .../core/helpers/SavedQueryResourceHelper.java | 6 ++-- .../core/helpers/ScheduleResourceHelper.java | 8 ++--- .../regression/client/ITSavedQueryTests.java | 2 +- .../server/api/events/SchedulerAlarmEvent.java | 2 +- .../org/apache/lens/server/LensServices.java | 8 ++--- .../lens/server/scheduler/ScheduleResource.java | 18 +++++------ .../server/user/UserConfigLoaderFactory.java | 8 ++--- .../apache/lens/server/LensServerTestUtil.java | 6 ++-- .../org/apache/lens/server/TestServerMode.java | 24 +++++++------- .../lens/server/query/TestEventService.java | 4 +-- .../TestQueryIndependenceFromSessionClose.java | 6 ++-- .../TotalQueryCostCeilingConstraintTest.java | 2 +- .../lens/server/query/retry/QueryRetryTest.java | 6 ++-- .../server/stats/TestLogStatisticsStore.java | 2 +- pom.xml | 21 ++++++++++++- 47 files changed, 153 insertions(+), 165 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/checkstyle/src/main/resources/checkstyle-suppressions.xml ---------------------------------------------------------------------- diff --git a/checkstyle/src/main/resources/checkstyle-suppressions.xml b/checkstyle/src/main/resources/checkstyle-suppressions.xml new file mode 100644 index 0000000..12e394c --- /dev/null +++ b/checkstyle/src/main/resources/checkstyle-suppressions.xml @@ -0,0 +1,33 @@ +<?xml version="1.0"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<!DOCTYPE suppressions PUBLIC +"-//Puppy Crawl//DTD Suppressions 1.1//EN" +"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd";> + +<suppressions> + <!-- Suppress javadoc, line length, visibility checks for test code --> + <suppress checks="JavadocStyleCheck" files="Test*.java"/> + <suppress checks="JavadocTypeCheck" files="Test*.java"/> + <suppress checks="LineLength" files="Test*.java"/> + <suppress checks="Indentation" files="Test*.java"/> + <suppress checks="VisibilityModifier" files="Test*.java"/> + <suppress checks="MagicNumberCheck" files="JavadocStyleCheck.java"/> + <suppress checks=".*" files="generated-sources"/> +</suppressions> http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/checkstyle/src/main/resources/checkstyle.xml ---------------------------------------------------------------------- diff --git a/checkstyle/src/main/resources/checkstyle.xml b/checkstyle/src/main/resources/checkstyle.xml index 634234d..e62cb80 100644 --- a/checkstyle/src/main/resources/checkstyle.xml +++ b/checkstyle/src/main/resources/checkstyle.xml @@ -145,7 +145,9 @@ <property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS"/> </module> - <module name="NoWhitespaceBefore"/> + <module name="NoWhitespaceBefore"> + <property name="allowLineBreaks" value="true"/> + </module> <module name="OperatorWrap"/> <module name="ParenPad"/> <module name="TypecastParenPad"/> @@ -162,7 +164,8 @@ <!-- Modifier Checks --> <!-- See http://checkstyle.sf.net/config_modifiers.html --> <module name="ModifierOrder"/> - <module name="RedundantModifier"/> + <!-- Commenting as workaround for https://github.com/checkstyle/checkstyle/issues/2508 --> + <!--<module name="RedundantModifier"/>--> <!-- Checks for blocks. You know, those {}'s --> @@ -188,7 +191,7 @@ <!-- Checks for common coding problems --> <!-- See http://checkstyle.sf.net/config_coding.html --> <!-- module name="AvoidInlineConditionals"/--> - <module name="DoubleCheckedLocking"/> + <!--<module name="DoubleCheckedLocking"/>--> <module name="EmptyStatement"/> <module name="EqualsHashCode"/> <module name="StringLiteralEquality"/> @@ -235,6 +238,7 @@ <module name="Indentation"> <property name="basicOffset" value="2"/> <property name="caseIndent" value="0"/> + <property name="lineWrappingIndentation" value="2"/> </module> <!-- module name="TodoComment"/ --> <module name="UpperEll"/> @@ -257,6 +261,6 @@ </module> <!--module name="SuppressionFilter"> - <property name="file" value="checkstyle/src/main/resources/suppressions.xml"/> + <property name="file" value="checkstyle/src/main/resourcheckstyle-suppressions.xml.xml"/> </module--> </module> http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/checkstyle/src/main/resources/suppressions.xml ---------------------------------------------------------------------- diff --git a/checkstyle/src/main/resources/suppressions.xml b/checkstyle/src/main/resources/suppressions.xml deleted file mode 100644 index 06c49af..0000000 --- a/checkstyle/src/main/resources/suppressions.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<!DOCTYPE suppressions PUBLIC -"-//Puppy Crawl//DTD Suppressions 1.1//EN" -"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd";> - -<suppressions> - <!-- Suppress javadoc, line length, visibility checks for test code --> - <suppress checks="JavadocStyleCheck" files="Test*.java"/> - <suppress checks="JavadocTypeCheck" files="Test*.java"/> - <suppress checks="LineLength" files="Test*.java"/> - <suppress checks="Indentation" files="Test*.java"/> - <suppress checks="VisibilityModifier" files="Test*.java"/> - <suppress checks="MagicNumberCheck" files="JavadocStyleCheck.java"/> -</suppressions> http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-api/src/main/java/org/apache/lens/api/error/LensCommonErrorCode.java ---------------------------------------------------------------------- diff --git a/lens-api/src/main/java/org/apache/lens/api/error/LensCommonErrorCode.java b/lens-api/src/main/java/org/apache/lens/api/error/LensCommonErrorCode.java index 9c5eaf5..4e3cfb3 100644 --- a/lens-api/src/main/java/org/apache/lens/api/error/LensCommonErrorCode.java +++ b/lens-api/src/main/java/org/apache/lens/api/error/LensCommonErrorCode.java @@ -40,7 +40,7 @@ public enum LensCommonErrorCode { return this.errorCode; } - private LensCommonErrorCode(final int code) { + LensCommonErrorCode(final int code) { this.errorCode = code; } http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-api/src/main/java/org/apache/lens/api/error/LensHttpStatus.java ---------------------------------------------------------------------- diff --git a/lens-api/src/main/java/org/apache/lens/api/error/LensHttpStatus.java b/lens-api/src/main/java/org/apache/lens/api/error/LensHttpStatus.java index 6da8e22..57c17a2 100644 --- a/lens-api/src/main/java/org/apache/lens/api/error/LensHttpStatus.java +++ b/lens-api/src/main/java/org/apache/lens/api/error/LensHttpStatus.java @@ -29,7 +29,7 @@ public enum LensHttpStatus implements Response.StatusType { @Getter private final String reasonPhrase; @Getter private final Response.Status.Family family; - private LensHttpStatus(int statusCode, String reasonPhrase) { + LensHttpStatus(int statusCode, String reasonPhrase) { this.statusCode = statusCode; this.reasonPhrase = reasonPhrase; this.family = LensHttpStatus.familyOf(statusCode); http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-api/src/test/java/org/apache/lens/doc/TestGenerateConfigDoc.java ---------------------------------------------------------------------- diff --git a/lens-api/src/test/java/org/apache/lens/doc/TestGenerateConfigDoc.java b/lens-api/src/test/java/org/apache/lens/doc/TestGenerateConfigDoc.java index 8025360..2d2bfa1 100644 --- a/lens-api/src/test/java/org/apache/lens/doc/TestGenerateConfigDoc.java +++ b/lens-api/src/test/java/org/apache/lens/doc/TestGenerateConfigDoc.java @@ -275,7 +275,7 @@ public class TestGenerateConfigDoc { * @param confFile the conf file * @param outputAPTFile the output apt file */ - public ConfigPrinter(String confFile, String outputAPTFile) { + ConfigPrinter(String confFile, String outputAPTFile) { configFile = confFile; this.outputAPTFile = outputAPTFile; entries = new ArrayList<ConfigEntry>(); http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-cube/src/main/java/org/apache/lens/cube/metadata/CubeColumn.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/main/java/org/apache/lens/cube/metadata/CubeColumn.java b/lens-cube/src/main/java/org/apache/lens/cube/metadata/CubeColumn.java index 62ce930..4fb49ae 100644 --- a/lens-cube/src/main/java/org/apache/lens/cube/metadata/CubeColumn.java +++ b/lens-cube/src/main/java/org/apache/lens/cube/metadata/CubeColumn.java @@ -53,7 +53,7 @@ public abstract class CubeColumn implements Named { } }; - public CubeColumn(String name , String description, String displayString, + public CubeColumn(String name, String description, String displayString, Date startTime, Date endTime, Double cost) { this(name, description, displayString, startTime, endTime, cost, new HashMap<String, String>()); } http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-cube/src/main/java/org/apache/lens/cube/metadata/Dimension.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/main/java/org/apache/lens/cube/metadata/Dimension.java b/lens-cube/src/main/java/org/apache/lens/cube/metadata/Dimension.java index 86eb6eb..0e9de10 100644 --- a/lens-cube/src/main/java/org/apache/lens/cube/metadata/Dimension.java +++ b/lens-cube/src/main/java/org/apache/lens/cube/metadata/Dimension.java @@ -66,8 +66,8 @@ public class Dimension extends AbstractBaseTable { } - public Dimension(final String name, final Set<CubeDimAttribute> attributes, final Set<ExprColumn> exprs, final - Map<String, String> dimProps, final long weight) { + public Dimension(final String name, final Set<CubeDimAttribute> attributes, final Set<ExprColumn> exprs, + final Map<String, String> dimProps, final long weight) { this(name, attributes, exprs, null, dimProps, weight); } http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-cube/src/main/java/org/apache/lens/cube/metadata/MetastoreUtil.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/main/java/org/apache/lens/cube/metadata/MetastoreUtil.java b/lens-cube/src/main/java/org/apache/lens/cube/metadata/MetastoreUtil.java index 57d4502..4e350c8 100644 --- a/lens-cube/src/main/java/org/apache/lens/cube/metadata/MetastoreUtil.java +++ b/lens-cube/src/main/java/org/apache/lens/cube/metadata/MetastoreUtil.java @@ -591,7 +591,7 @@ public class MetastoreUtil { return copy; } - public static String getUpdatePeriodStoragePrefixKey(String factTableName , String storageName, String updatePeriod) { + public static String getUpdatePeriodStoragePrefixKey(String factTableName, String storageName, String updatePeriod) { return MetastoreUtil.getFactKeyPrefix(factTableName) + "." + storageName + "." + updatePeriod; } http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-cube/src/main/java/org/apache/lens/cube/metadata/Storage.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/main/java/org/apache/lens/cube/metadata/Storage.java b/lens-cube/src/main/java/org/apache/lens/cube/metadata/Storage.java index 936add4..61bdf02 100644 --- a/lens-cube/src/main/java/org/apache/lens/cube/metadata/Storage.java +++ b/lens-cube/src/main/java/org/apache/lens/cube/metadata/Storage.java @@ -338,6 +338,8 @@ public abstract class Storage extends AbstractCubeTable implements PartitionMeta } } } + client = Hive.get(); + List<Partition> partitionsAdded = client.createPartitions(addParts); success = true; return partitionsAdded; http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-cube/src/main/java/org/apache/lens/cube/parse/AliasReplacer.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/main/java/org/apache/lens/cube/parse/AliasReplacer.java b/lens-cube/src/main/java/org/apache/lens/cube/parse/AliasReplacer.java index da34242..bbf8ab9 100644 --- a/lens-cube/src/main/java/org/apache/lens/cube/parse/AliasReplacer.java +++ b/lens-cube/src/main/java/org/apache/lens/cube/parse/AliasReplacer.java @@ -27,7 +27,6 @@ import org.apache.lens.cube.metadata.Dimension; import org.apache.lens.server.api.error.LensException; import org.apache.commons.lang.StringUtils; -import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.ql.parse.ASTNode; import org.apache.hadoop.hive.ql.parse.HiveParser; @@ -42,9 +41,6 @@ import org.antlr.runtime.CommonToken; */ class AliasReplacer implements ContextRewriter { - public AliasReplacer(Configuration conf) { - } - @Override public void rewriteContext(CubeQueryContext cubeql) throws LensException { Map<String, String> colToTableAlias = cubeql.getColToTableAlias(); http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-cube/src/main/java/org/apache/lens/cube/parse/CandidateTableResolver.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/main/java/org/apache/lens/cube/parse/CandidateTableResolver.java b/lens-cube/src/main/java/org/apache/lens/cube/parse/CandidateTableResolver.java index e9270ea..ed37bc5 100644 --- a/lens-cube/src/main/java/org/apache/lens/cube/parse/CandidateTableResolver.java +++ b/lens-cube/src/main/java/org/apache/lens/cube/parse/CandidateTableResolver.java @@ -30,7 +30,6 @@ import org.apache.lens.cube.parse.ExpressionResolver.ExpressionContext; import org.apache.lens.server.api.error.LensException; import org.apache.commons.lang.StringUtils; -import org.apache.hadoop.conf.Configuration; import com.google.common.collect.Sets; @@ -52,9 +51,6 @@ class CandidateTableResolver implements ContextRewriter { private boolean checkForQueriedColumns = true; - public CandidateTableResolver(Configuration ignored) { - } - @Override public void rewriteContext(CubeQueryContext cubeql) throws LensException { if (checkForQueriedColumns) { http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-cube/src/main/java/org/apache/lens/cube/parse/ColumnResolver.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/main/java/org/apache/lens/cube/parse/ColumnResolver.java b/lens-cube/src/main/java/org/apache/lens/cube/parse/ColumnResolver.java index 87e094a..4d8910a 100644 --- a/lens-cube/src/main/java/org/apache/lens/cube/parse/ColumnResolver.java +++ b/lens-cube/src/main/java/org/apache/lens/cube/parse/ColumnResolver.java @@ -29,7 +29,6 @@ import org.apache.lens.cube.parse.HQLParser.TreeNode; import org.apache.lens.server.api.error.LensException; import org.apache.commons.lang.StringUtils; -import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.ql.lib.Node; import org.apache.hadoop.hive.ql.parse.ASTNode; import org.apache.hadoop.hive.ql.parse.HiveParser; @@ -38,9 +37,6 @@ import com.google.common.base.Optional; class ColumnResolver implements ContextRewriter { - public ColumnResolver(Configuration conf) { - } - @Override public void rewriteContext(CubeQueryContext cubeql) throws LensException { checkForAllColumnsSelected(cubeql); http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-cube/src/main/java/org/apache/lens/cube/parse/CubeQueryRewriter.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/main/java/org/apache/lens/cube/parse/CubeQueryRewriter.java b/lens-cube/src/main/java/org/apache/lens/cube/parse/CubeQueryRewriter.java index b612173..ea2eb7e 100644 --- a/lens-cube/src/main/java/org/apache/lens/cube/parse/CubeQueryRewriter.java +++ b/lens-cube/src/main/java/org/apache/lens/cube/parse/CubeQueryRewriter.java @@ -135,18 +135,18 @@ public class CubeQueryRewriter { */ private void setupRewriters() { // Resolve columns - the column alias and table alias - rewriters.add(new ColumnResolver(conf)); + rewriters.add(new ColumnResolver()); // Rewrite base trees (groupby, having, orderby, limit) using aliases - rewriters.add(new AliasReplacer(conf)); - ExpressionResolver exprResolver = new ExpressionResolver(conf); + rewriters.add(new AliasReplacer()); + ExpressionResolver exprResolver = new ExpressionResolver(); DenormalizationResolver denormResolver = new DenormalizationResolver(conf); - CandidateTableResolver candidateTblResolver = new CandidateTableResolver(conf); + CandidateTableResolver candidateTblResolver = new CandidateTableResolver(); StorageTableResolver storageTableResolver = new StorageTableResolver(conf); rewriters.add(exprResolver); // De-normalized columns resolved rewriters.add(denormResolver); // Resolve time ranges - rewriters.add(new TimerangeResolver(conf)); + rewriters.add(new TimerangeResolver()); // Resolve candidate fact tables and dimension tables for columns queried rewriters.add(candidateTblResolver); // Resolve aggregations and generate base select tree @@ -154,7 +154,7 @@ public class CubeQueryRewriter { rewriters.add(new GroupbyResolver(conf)); rewriters.add(new FieldValidator()); // Resolve joins and generate base join tree - rewriters.add(new JoinResolver(conf)); + rewriters.add(new JoinResolver()); // Do col life validation rewriters.add(new TimeRangeChecker(conf)); // Resolve candidate fact tables and dimension tables for columns included @@ -168,7 +168,7 @@ public class CubeQueryRewriter { rewriters.add(denormResolver); // Prune candidate facts without any valid expressions rewriters.add(exprResolver); - rewriters.add(new LightestFactResolver(conf)); + rewriters.add(new LightestFactResolver()); } // Phase 2: resolve fact table partitions. rewriters.add(storageTableResolver); @@ -183,10 +183,10 @@ public class CubeQueryRewriter { // "if two facts have the same least weight, then the fact with least number of time partitions queried will be // picked". This will be useful, if users did not set fact weights. if (!lightFactFirst) { - rewriters.add(new LightestFactResolver(conf)); + rewriters.add(new LightestFactResolver()); } - rewriters.add(new LeastPartitionResolver(conf)); - rewriters.add(new LightestDimensionResolver(conf)); + rewriters.add(new LeastPartitionResolver()); + rewriters.add(new LightestDimensionResolver()); } public CubeQueryContext rewrite(ASTNode astnode) throws LensException { http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-cube/src/main/java/org/apache/lens/cube/parse/ExpressionResolver.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/main/java/org/apache/lens/cube/parse/ExpressionResolver.java b/lens-cube/src/main/java/org/apache/lens/cube/parse/ExpressionResolver.java index 0ea0b1c..c99fdf1 100644 --- a/lens-cube/src/main/java/org/apache/lens/cube/parse/ExpressionResolver.java +++ b/lens-cube/src/main/java/org/apache/lens/cube/parse/ExpressionResolver.java @@ -30,7 +30,6 @@ import org.apache.lens.cube.parse.HQLParser.ASTNodeVisitor; import org.apache.lens.cube.parse.HQLParser.TreeNode; import org.apache.lens.server.api.error.LensException; -import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.ql.parse.ASTNode; import org.apache.hadoop.hive.ql.parse.HiveParser; @@ -45,9 +44,6 @@ import lombok.extern.slf4j.Slf4j; @Slf4j class ExpressionResolver implements ContextRewriter { - public ExpressionResolver(Configuration conf) { - } - static class ExpressionContext { @Getter private final ExprColumn exprCol; @@ -212,13 +208,13 @@ class ExpressionResolver implements ContextRewriter { finalAST = replaceAlias(exprSpec.copyASTNode(), cubeql); exprSpecs.add(exprSpec); } - public ExprSpecContext(ExprSpecContext nested, ExprSpec current, ASTNode node, + ExprSpecContext(ExprSpecContext nested, ExprSpec current, ASTNode node, CubeQueryContext cubeql) throws LensException { exprSpecs.addAll(nested.exprSpecs); exprSpecs.add(current); finalAST = replaceAlias(node, cubeql); } - public void replaceAliasInAST(CubeQueryContext cubeql) + void replaceAliasInAST(CubeQueryContext cubeql) throws LensException { AliasReplacer.extractTabAliasForCol(cubeql, this); finalAST = AliasReplacer.replaceAliases(finalAST, 0, cubeql.getColToTableAlias()); http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-cube/src/main/java/org/apache/lens/cube/parse/GroupbyResolver.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/main/java/org/apache/lens/cube/parse/GroupbyResolver.java b/lens-cube/src/main/java/org/apache/lens/cube/parse/GroupbyResolver.java index 216ae52..052b87a 100644 --- a/lens-cube/src/main/java/org/apache/lens/cube/parse/GroupbyResolver.java +++ b/lens-cube/src/main/java/org/apache/lens/cube/parse/GroupbyResolver.java @@ -45,7 +45,7 @@ class GroupbyResolver implements ContextRewriter { private final boolean selectPromotionEnabled; private final boolean groupbyPromotionEnabled; - public GroupbyResolver(Configuration conf) { + GroupbyResolver(Configuration conf) { selectPromotionEnabled = conf.getBoolean(CubeQueryConfUtil.ENABLE_SELECT_TO_GROUPBY, CubeQueryConfUtil.DEFAULT_ENABLE_SELECT_TO_GROUPBY); groupbyPromotionEnabled = http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-cube/src/main/java/org/apache/lens/cube/parse/JoinResolver.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/main/java/org/apache/lens/cube/parse/JoinResolver.java b/lens-cube/src/main/java/org/apache/lens/cube/parse/JoinResolver.java index 7b865bf..fce1662 100644 --- a/lens-cube/src/main/java/org/apache/lens/cube/parse/JoinResolver.java +++ b/lens-cube/src/main/java/org/apache/lens/cube/parse/JoinResolver.java @@ -28,7 +28,6 @@ import org.apache.lens.cube.metadata.join.JoinPath; import org.apache.lens.cube.parse.join.AutoJoinContext; import org.apache.lens.server.api.error.LensException; -import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.parse.*; @@ -45,9 +44,6 @@ class JoinResolver implements ContextRewriter { private AbstractCubeTable target; private HashMap<Dimension, List<JoinChain>> dimensionInJoinChain = new HashMap<Dimension, List<JoinChain>>(); - public JoinResolver(Configuration conf) { - } - @Override public void rewriteContext(CubeQueryContext cubeql) throws LensException { tableJoinTypeMap = new HashMap<AbstractCubeTable, JoinType>(); http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-cube/src/main/java/org/apache/lens/cube/parse/LeastPartitionResolver.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/main/java/org/apache/lens/cube/parse/LeastPartitionResolver.java b/lens-cube/src/main/java/org/apache/lens/cube/parse/LeastPartitionResolver.java index a53e994..0bc7f82 100644 --- a/lens-cube/src/main/java/org/apache/lens/cube/parse/LeastPartitionResolver.java +++ b/lens-cube/src/main/java/org/apache/lens/cube/parse/LeastPartitionResolver.java @@ -23,8 +23,6 @@ import java.util.*; import org.apache.lens.cube.parse.CandidateTablePruneCause.CandidateTablePruneCode; import org.apache.lens.server.api.error.LensException; -import org.apache.hadoop.conf.Configuration; - import lombok.extern.slf4j.Slf4j; /** @@ -32,8 +30,6 @@ import lombok.extern.slf4j.Slf4j; */ @Slf4j class LeastPartitionResolver implements ContextRewriter { - public LeastPartitionResolver(Configuration conf) { - } @Override public void rewriteContext(CubeQueryContext cubeql) throws LensException { http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-cube/src/main/java/org/apache/lens/cube/parse/LightestDimensionResolver.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/main/java/org/apache/lens/cube/parse/LightestDimensionResolver.java b/lens-cube/src/main/java/org/apache/lens/cube/parse/LightestDimensionResolver.java index 82410d3..6b071b9 100644 --- a/lens-cube/src/main/java/org/apache/lens/cube/parse/LightestDimensionResolver.java +++ b/lens-cube/src/main/java/org/apache/lens/cube/parse/LightestDimensionResolver.java @@ -24,8 +24,6 @@ import org.apache.lens.cube.metadata.Dimension; import org.apache.lens.cube.parse.CandidateTablePruneCause.CandidateTablePruneCode; import org.apache.lens.server.api.error.LensException; -import org.apache.hadoop.conf.Configuration; - import lombok.extern.slf4j.Slf4j; /** @@ -34,9 +32,6 @@ import lombok.extern.slf4j.Slf4j; @Slf4j class LightestDimensionResolver implements ContextRewriter { - public LightestDimensionResolver(Configuration conf) { - } - @Override public void rewriteContext(CubeQueryContext cubeql) throws LensException { if (!cubeql.getCandidateDimTables().isEmpty()) { http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-cube/src/main/java/org/apache/lens/cube/parse/LightestFactResolver.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/main/java/org/apache/lens/cube/parse/LightestFactResolver.java b/lens-cube/src/main/java/org/apache/lens/cube/parse/LightestFactResolver.java index 97accbb..4356401 100644 --- a/lens-cube/src/main/java/org/apache/lens/cube/parse/LightestFactResolver.java +++ b/lens-cube/src/main/java/org/apache/lens/cube/parse/LightestFactResolver.java @@ -24,8 +24,6 @@ import java.util.*; import org.apache.lens.cube.parse.CandidateTablePruneCause.CandidateTablePruneCode; import org.apache.lens.server.api.error.LensException; -import org.apache.hadoop.conf.Configuration; - import lombok.extern.slf4j.Slf4j; /** @@ -33,8 +31,6 @@ import lombok.extern.slf4j.Slf4j; */ @Slf4j public class LightestFactResolver implements ContextRewriter { - public LightestFactResolver(Configuration conf) { - } @Override public void rewriteContext(CubeQueryContext cubeql) throws LensException { http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-cube/src/main/java/org/apache/lens/cube/parse/MaxCoveringFactResolver.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/main/java/org/apache/lens/cube/parse/MaxCoveringFactResolver.java b/lens-cube/src/main/java/org/apache/lens/cube/parse/MaxCoveringFactResolver.java index 45824fe..2822857 100644 --- a/lens-cube/src/main/java/org/apache/lens/cube/parse/MaxCoveringFactResolver.java +++ b/lens-cube/src/main/java/org/apache/lens/cube/parse/MaxCoveringFactResolver.java @@ -41,7 +41,7 @@ import lombok.extern.slf4j.Slf4j; class MaxCoveringFactResolver implements ContextRewriter { private final boolean failOnPartialData; - public MaxCoveringFactResolver(Configuration conf) { + MaxCoveringFactResolver(Configuration conf) { this.failOnPartialData = conf.getBoolean(CubeQueryConfUtil.FAIL_QUERY_ON_PARTIAL_DATA, false); } @@ -184,7 +184,7 @@ class MaxCoveringFactResolver implements ContextRewriter { private final long seconds; private final long milliseconds; - public TimeCovered(long ms) { + TimeCovered(long ms) { milliseconds = ms % (24 * 60 * 60 * 1000); long seconds = ms / (24 * 60 * 60 * 1000); this.seconds = seconds % (24 * 60 * 60); http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-cube/src/main/java/org/apache/lens/cube/parse/SelectPhraseContext.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/main/java/org/apache/lens/cube/parse/SelectPhraseContext.java b/lens-cube/src/main/java/org/apache/lens/cube/parse/SelectPhraseContext.java index b6702e5..a6c15b4 100644 --- a/lens-cube/src/main/java/org/apache/lens/cube/parse/SelectPhraseContext.java +++ b/lens-cube/src/main/java/org/apache/lens/cube/parse/SelectPhraseContext.java @@ -31,7 +31,7 @@ class SelectPhraseContext extends QueriedPhraseContext { private String finalAlias; private String exprWithoutAlias; - public SelectPhraseContext(ASTNode selectExpr) { + SelectPhraseContext(ASTNode selectExpr) { super(selectExpr); } http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-cube/src/main/java/org/apache/lens/cube/parse/StorageTableResolver.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/main/java/org/apache/lens/cube/parse/StorageTableResolver.java b/lens-cube/src/main/java/org/apache/lens/cube/parse/StorageTableResolver.java index cdf6812..2b63193 100644 --- a/lens-cube/src/main/java/org/apache/lens/cube/parse/StorageTableResolver.java +++ b/lens-cube/src/main/java/org/apache/lens/cube/parse/StorageTableResolver.java @@ -87,7 +87,7 @@ class StorageTableResolver implements ContextRewriter { } } - public StorageTableResolver(Configuration conf) { + StorageTableResolver(Configuration conf) { this.conf = conf; this.supportedStorages = getSupportedStorages(conf); this.allStoragesSupported = (supportedStorages == null); http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-cube/src/main/java/org/apache/lens/cube/parse/TimerangeResolver.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/main/java/org/apache/lens/cube/parse/TimerangeResolver.java b/lens-cube/src/main/java/org/apache/lens/cube/parse/TimerangeResolver.java index 8defdc3..760ce82 100644 --- a/lens-cube/src/main/java/org/apache/lens/cube/parse/TimerangeResolver.java +++ b/lens-cube/src/main/java/org/apache/lens/cube/parse/TimerangeResolver.java @@ -28,7 +28,6 @@ import org.apache.lens.server.api.LensConfConstants; import org.apache.lens.server.api.error.LensException; import org.apache.commons.lang.StringUtils; -import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.ql.parse.ASTNode; import org.apache.hadoop.hive.ql.plan.PlanUtils; @@ -39,8 +38,6 @@ import lombok.extern.slf4j.Slf4j; */ @Slf4j class TimerangeResolver implements ContextRewriter { - public TimerangeResolver(Configuration conf) { - } @Override public void rewriteContext(CubeQueryContext cubeql) throws LensException { http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-cube/src/test/java/org/apache/lens/cube/metadata/TestCubeMetastoreClient.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/test/java/org/apache/lens/cube/metadata/TestCubeMetastoreClient.java b/lens-cube/src/test/java/org/apache/lens/cube/metadata/TestCubeMetastoreClient.java index 950534c..3a17499 100644 --- a/lens-cube/src/test/java/org/apache/lens/cube/metadata/TestCubeMetastoreClient.java +++ b/lens-cube/src/test/java/org/apache/lens/cube/metadata/TestCubeMetastoreClient.java @@ -540,7 +540,7 @@ public class TestCubeMetastoreClient { // Assert expression validation try { - expr1 = new ExprSpec("contact(countrydim.name", null , null); + expr1 = new ExprSpec("contact(countrydim.name", null, null); stateCountryExpr.addExpression(expr1); fail("Expected add expression to fail because of syntax error"); } catch (LensException exc) { http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-cube/src/test/java/org/apache/lens/cube/parse/TestBetweenTimeRangeWriter.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestBetweenTimeRangeWriter.java b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestBetweenTimeRangeWriter.java index 450605b..cabb95e 100644 --- a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestBetweenTimeRangeWriter.java +++ b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestBetweenTimeRangeWriter.java @@ -163,8 +163,8 @@ public class TestBetweenTimeRangeWriter extends TestTimeRangeWriter { validateBetweenBoundTypes(whereClause, DAY_DB_FORMAT, testStartOffset, testEndOffset); } - private void validateBetweenBoundTypes(String whereClause, DateFormat format, int testStartOffset, int testEndOffset) - { + private void validateBetweenBoundTypes(String whereClause, DateFormat format, + int testStartOffset, int testEndOffset) { String expected = null; if (format == null) { expected = http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-cube/src/test/java/org/apache/lens/cube/parse/TestCubeRewriter.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestCubeRewriter.java b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestCubeRewriter.java index 98b021b..7e06a5c 100644 --- a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestCubeRewriter.java +++ b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestCubeRewriter.java @@ -521,7 +521,7 @@ public class TestCubeRewriter extends TestQueryRewrite { // filter with or hql = rewrite( "select cubecountry.name, msr2 from" + " testCube" + " where (cubecountry.region = 'asia' " - + "or cubecountry.region = 'europe') and " + TWO_DAYS_RANGE , conf); + + "or cubecountry.region = 'europe') and " + TWO_DAYS_RANGE, conf); filterSubquery = "testcube.countryid in ( select id from TestQueryRewrite.c3_countrytable_partitioned " + "cubecountry where (((cubecountry.region) = 'asia') or ((cubecountry.region) = 'europe')) " + "and (cubecountry.dt = 'latest') )"; @@ -530,7 +530,7 @@ public class TestCubeRewriter extends TestQueryRewrite { //filter with in hql = rewrite( "select cubecountry.name, msr2 from" + " testCube" + " where cubecountry.region in ('asia','europe') " - + "and " + TWO_DAYS_RANGE , conf); + + "and " + TWO_DAYS_RANGE, conf); filterSubquery = "testcube.countryid in ( select id from TestQueryRewrite.c3_countrytable_partitioned " + "cubecountry where (cubecountry.region) in ('asia' , 'europe') and (cubecountry.dt = 'latest') )"; assertTrue(hql.contains(filterSubquery)); @@ -538,7 +538,7 @@ public class TestCubeRewriter extends TestQueryRewrite { //filter with not in hql = rewrite( "select cubecountry.name, msr2 from" + " testCube" + " where cubecountry.region not in ('asia','europe') " - + "and " + TWO_DAYS_RANGE , conf); + + "and " + TWO_DAYS_RANGE, conf); filterSubquery = "testcube.countryid in ( select id from TestQueryRewrite.c3_countrytable_partitioned " + "cubecountry where (cubecountry.region) not in ('asia' , 'europe') and (cubecountry.dt = 'latest') )"; assertTrue(hql.contains(filterSubquery)); @@ -546,7 +546,7 @@ public class TestCubeRewriter extends TestQueryRewrite { //filter with != hql = rewrite( "select cubecountry.name, msr2 from" + " testCube" + " where cubecountry.region != 'asia' " - + "and " + TWO_DAYS_RANGE , conf); + + "and " + TWO_DAYS_RANGE, conf); filterSubquery = "testcube.countryid in ( select id from TestQueryRewrite.c3_countrytable_partitioned " + "cubecountry where ((cubecountry.region) != 'asia') and (cubecountry.dt = 'latest') )"; assertTrue(hql.contains(filterSubquery)); @@ -554,7 +554,7 @@ public class TestCubeRewriter extends TestQueryRewrite { //filter with cube alias hql = rewrite( "select cubecountry.name, msr2 from" + " testCube as t" + " where cubecountry.region = 'asia' " - + "and zipcode = 'x' and " + TWO_DAYS_RANGE , conf); + + "and zipcode = 'x' and " + TWO_DAYS_RANGE, conf); filterSubquery = "t.countryid in ( select id from TestQueryRewrite.c3_countrytable_partitioned " + "cubecountry where ((cubecountry.region) = 'asia') and (cubecountry.dt = 'latest') )"; assertTrue(hql.contains(filterSubquery)); http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-driver-es/src/main/java/org/apache/lens/driver/es/ASTTraverserForES.java ---------------------------------------------------------------------- diff --git a/lens-driver-es/src/main/java/org/apache/lens/driver/es/ASTTraverserForES.java b/lens-driver-es/src/main/java/org/apache/lens/driver/es/ASTTraverserForES.java index 07b157e..e3a1e16 100644 --- a/lens-driver-es/src/main/java/org/apache/lens/driver/es/ASTTraverserForES.java +++ b/lens-driver-es/src/main/java/org/apache/lens/driver/es/ASTTraverserForES.java @@ -275,7 +275,7 @@ public final class ASTTraverserForES { private static class CriteriaInfo { final CriteriaType criteriaType; - public CriteriaInfo(CriteriaType criteriaType) { + CriteriaInfo(CriteriaType criteriaType) { this.criteriaType = criteriaType; } } @@ -283,7 +283,7 @@ public final class ASTTraverserForES { final String logicalOperator; final LogicalOpType logicalOpType; - public LogicalOpInfo(String logicalOperator, LogicalOpType logicalOpType) { + LogicalOpInfo(String logicalOperator, LogicalOpType logicalOpType) { super(CriteriaType.LOGICAL); this.logicalOperator = logicalOperator; this.logicalOpType = logicalOpType; @@ -294,7 +294,7 @@ public final class ASTTraverserForES { final String predicateOp; - public PredicateInfo(String operator, PredicateType predicateType) { + PredicateInfo(String operator, PredicateType predicateType) { super(CriteriaType.PREDICATE); this.predicateType = predicateType; this.predicateOp = operator; http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-driver-es/src/main/java/org/apache/lens/driver/es/client/jest/JestResultSetTransformer.java ---------------------------------------------------------------------- diff --git a/lens-driver-es/src/main/java/org/apache/lens/driver/es/client/jest/JestResultSetTransformer.java b/lens-driver-es/src/main/java/org/apache/lens/driver/es/client/jest/JestResultSetTransformer.java index d8644ba..638f3d1 100644 --- a/lens-driver-es/src/main/java/org/apache/lens/driver/es/client/jest/JestResultSetTransformer.java +++ b/lens-driver-es/src/main/java/org/apache/lens/driver/es/client/jest/JestResultSetTransformer.java @@ -51,7 +51,7 @@ public abstract class JestResultSetTransformer { private List<ResultRow> rows = Lists.newArrayList(); - public AggregateTransformer(JsonObject result, List<String> schema, List<String> selectedColumns) { + AggregateTransformer(JsonObject result, List<String> schema, List<String> selectedColumns) { super(result, schema, selectedColumns); } @@ -131,7 +131,7 @@ public abstract class JestResultSetTransformer { */ static class TermTransformer extends JestResultSetTransformer { - public TermTransformer(JsonObject result, List<String> schema, List<String> selectedColumns) { + TermTransformer(JsonObject result, List<String> schema, List<String> selectedColumns) { super(result, schema, selectedColumns); } http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-driver-es/src/main/java/org/apache/lens/driver/es/translator/ESVisitor.java ---------------------------------------------------------------------- diff --git a/lens-driver-es/src/main/java/org/apache/lens/driver/es/translator/ESVisitor.java b/lens-driver-es/src/main/java/org/apache/lens/driver/es/translator/ESVisitor.java index 441f6d6..d237a24 100644 --- a/lens-driver-es/src/main/java/org/apache/lens/driver/es/translator/ESVisitor.java +++ b/lens-driver-es/src/main/java/org/apache/lens/driver/es/translator/ESVisitor.java @@ -170,7 +170,7 @@ public abstract class ESVisitor implements ASTVisitor { } private static class ESRewriteException extends RuntimeException { - public ESRewriteException(Exception e) { + ESRewriteException(Exception e) { super(e); } } http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-driver-hive/src/main/java/org/apache/lens/driver/hive/HiveDriver.java ---------------------------------------------------------------------- diff --git a/lens-driver-hive/src/main/java/org/apache/lens/driver/hive/HiveDriver.java b/lens-driver-hive/src/main/java/org/apache/lens/driver/hive/HiveDriver.java index f307ccc..0b4db9a 100644 --- a/lens-driver-hive/src/main/java/org/apache/lens/driver/hive/HiveDriver.java +++ b/lens-driver-hive/src/main/java/org/apache/lens/driver/hive/HiveDriver.java @@ -235,7 +235,7 @@ public class HiveDriver extends AbstractLensDriver { * @param conn the conn * @param timeout the timeout */ - public ExpirableConnection(ThriftConnection conn, long timeout) { + ExpirableConnection(ThriftConnection conn, long timeout) { this.conn = conn; this.timeout = timeout; connId = CONNECTION_COUNTER.incrementAndGet(); http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestJdbcDriver.java ---------------------------------------------------------------------- diff --git a/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestJdbcDriver.java b/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestJdbcDriver.java index 1147d82..446e759 100644 --- a/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestJdbcDriver.java +++ b/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestJdbcDriver.java @@ -537,7 +537,7 @@ public class TestJdbcDriver { prs.setFullyAccessed(true); //Check Purge - assertEquals(prs.canBePurged() , true); + assertEquals(prs.canBePurged(), true); } @Test http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/SavedQueryResourceHelper.java ---------------------------------------------------------------------- diff --git a/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/SavedQueryResourceHelper.java b/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/SavedQueryResourceHelper.java index 6a11f26..31b0d64 100644 --- a/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/SavedQueryResourceHelper.java +++ b/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/SavedQueryResourceHelper.java @@ -132,7 +132,7 @@ public class SavedQueryResourceHelper extends ServiceManagerHelper { public SavedQuery getSavedQuery(Long queryId, String sessionHandleString) throws JAXBException { MapBuilder query = new MapBuilder("sessionid", sessionHandleString, "id", Long.toString(queryId)); - Response response = this.exec("get", SAVED_QUERY_BASE_URL + "/" + queryId , servLens, null, query); + Response response = this.exec("get", SAVED_QUERY_BASE_URL + "/" + queryId, servLens, null, query); AssertUtil.assertSucceededResponse(response); return response.readEntity(SavedQuery.class); } @@ -143,7 +143,7 @@ public class SavedQueryResourceHelper extends ServiceManagerHelper { public ResourceModifiedResponse deleteSavedQuery(Long queryId, String sessionHandleString) throws JAXBException { MapBuilder query = new MapBuilder("sessionid", sessionHandleString, "id", Long.toString(queryId)); - Response response = this.exec("delete", SAVED_QUERY_BASE_URL + "/" + queryId , servLens, null, query); + Response response = this.exec("delete", SAVED_QUERY_BASE_URL + "/" + queryId, servLens, null, query); AssertUtil.assertSucceededResponse(response); return response.readEntity(ResourceModifiedResponse.class); } @@ -181,7 +181,7 @@ public class SavedQueryResourceHelper extends ServiceManagerHelper { formData.getForm().bodyPart(new FormDataBodyPart(FormDataContentDisposition.name("conf").fileName("conf") .build(), conf, MediaType.APPLICATION_XML_TYPE)); - Response response = this.exec("post", SAVED_QUERY_BASE_URL + "/" + queryId , servLens, null, map, + Response response = this.exec("post", SAVED_QUERY_BASE_URL + "/" + queryId, servLens, null, map, MediaType.MULTIPART_FORM_DATA_TYPE, MediaType.APPLICATION_XML, formData.getForm()); AssertUtil.assertSucceededResponse(response); http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/ScheduleResourceHelper.java ---------------------------------------------------------------------- diff --git a/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/ScheduleResourceHelper.java b/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/ScheduleResourceHelper.java index 97e1daf..a3c53b8 100644 --- a/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/ScheduleResourceHelper.java +++ b/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/ScheduleResourceHelper.java @@ -158,7 +158,7 @@ public class ScheduleResourceHelper extends ServiceManagerHelper { public LensAPIResult<XJob> getJobDefinition(String jobHandle, String sessionId, MediaType inputMedia, String outputMedia){ MapBuilder map = new MapBuilder("sessionid", sessionId); - Response response = this.exec("get", SCHEDULER_JOBS_URL + "/" + jobHandle , servLens, null, map, inputMedia, + Response response = this.exec("get", SCHEDULER_JOBS_URL + "/" + jobHandle, servLens, null, map, inputMedia, outputMedia); AssertUtil.assertSucceededResponse(response); return response.readEntity(new GenericType<LensAPIResult<XJob>>(){}); @@ -170,7 +170,7 @@ public class ScheduleResourceHelper extends ServiceManagerHelper { public LensAPIResult deleteJob(String jobHandle, String sessionId){ MapBuilder map = new MapBuilder("sessionid", sessionId); - Response response = this.exec("delete", SCHEDULER_JOBS_URL + "/" + jobHandle , servLens, null, map, null, + Response response = this.exec("delete", SCHEDULER_JOBS_URL + "/" + jobHandle, servLens, null, map, null, MediaType.APPLICATION_XML); AssertUtil.assertSucceededResponse(response); return response.readEntity(LensAPIResult.class); @@ -230,7 +230,7 @@ public class ScheduleResourceHelper extends ServiceManagerHelper { throws JAXBException, IOException, ParseException, DatatypeConfigurationException { MapBuilder map = new MapBuilder("sessionid", sessionId); - Response response = this.exec("get", SCHEDULER_INSTANCES_URL + "/" + instanceHandle , servLens, null, map); + Response response = this.exec("get", SCHEDULER_INSTANCES_URL + "/" + instanceHandle, servLens, null, map); AssertUtil.assertSucceededResponse(response); return response.readEntity(new GenericType<LensAPIResult<SchedulerJobInstanceInfo>>(){}); } @@ -239,7 +239,7 @@ public class ScheduleResourceHelper extends ServiceManagerHelper { throws JAXBException, IOException, ParseException, DatatypeConfigurationException { MapBuilder map = new MapBuilder("sessionid", sessionId, "action", action); - Response response = this.exec("post", SCHEDULER_INSTANCES_URL + "/" + instanceHandle , servLens, null, map); + Response response = this.exec("post", SCHEDULER_INSTANCES_URL + "/" + instanceHandle, servLens, null, map); AssertUtil.assertSucceededResponse(response); return response.readEntity(new GenericType<LensAPIResult<Boolean>>(){}); } http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-regression/src/test/java/org/apache/lens/regression/client/ITSavedQueryTests.java ---------------------------------------------------------------------- diff --git a/lens-regression/src/test/java/org/apache/lens/regression/client/ITSavedQueryTests.java b/lens-regression/src/test/java/org/apache/lens/regression/client/ITSavedQueryTests.java index ef467ef..ab3cfd9 100644 --- a/lens-regression/src/test/java/org/apache/lens/regression/client/ITSavedQueryTests.java +++ b/lens-regression/src/test/java/org/apache/lens/regression/client/ITSavedQueryTests.java @@ -196,7 +196,7 @@ public class ITSavedQueryTests extends BaseTestClass { //checking if the above deleted saved query is being deleted MapBuilder map = new MapBuilder("sessionid", sessionHandleString, "id", Long.toString(queryId)); - Response res = lens.exec("get", SavedQueryResourceHelper.SAVED_QUERY_BASE_URL + "/" + queryId , servLens, + Response res = lens.exec("get", SavedQueryResourceHelper.SAVED_QUERY_BASE_URL + "/" + queryId, servLens, null, map); AssertUtil.assertNotFound(res); } http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-server-api/src/main/java/org/apache/lens/server/api/events/SchedulerAlarmEvent.java ---------------------------------------------------------------------- diff --git a/lens-server-api/src/main/java/org/apache/lens/server/api/events/SchedulerAlarmEvent.java b/lens-server-api/src/main/java/org/apache/lens/server/api/events/SchedulerAlarmEvent.java index 7f4ec6b..9977b3f 100644 --- a/lens-server-api/src/main/java/org/apache/lens/server/api/events/SchedulerAlarmEvent.java +++ b/lens-server-api/src/main/java/org/apache/lens/server/api/events/SchedulerAlarmEvent.java @@ -61,7 +61,7 @@ public class SchedulerAlarmEvent extends LensEvent { /** * Event type to know what kind of operations we want. */ - public static enum EventType { + public enum EventType { SCHEDULE, EXPIRE } } http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-server/src/main/java/org/apache/lens/server/LensServices.java ---------------------------------------------------------------------- diff --git a/lens-server/src/main/java/org/apache/lens/server/LensServices.java b/lens-server/src/main/java/org/apache/lens/server/LensServices.java index a3e272a..903b19f 100644 --- a/lens-server/src/main/java/org/apache/lens/server/LensServices.java +++ b/lens-server/src/main/java/org/apache/lens/server/LensServices.java @@ -107,7 +107,7 @@ public class LensServices extends CompositeService implements ServiceProvider { /** The service mode. */ @Getter @Setter - private SERVICE_MODE serviceMode; + private ServiceMode serviceMode; /** Scheduled Executor which persists the server state periodically*/ private ScheduledExecutorService serverSnapshotScheduler; @@ -152,9 +152,9 @@ public class LensServices extends CompositeService implements ServiceProvider { } /** - * The Enum SERVICE_MODE. + * The Enum ServiceMode. */ - public enum SERVICE_MODE { + public enum ServiceMode { /** The read only. */ READ_ONLY, // All requests on sesssion resource and Only GET requests on all other resources @@ -197,7 +197,7 @@ public class LensServices extends CompositeService implements ServiceProvider { conf = hiveConf; conf.setVar(HiveConf.ConfVars.HIVE_SESSION_IMPL_CLASSNAME, LensSessionImpl.class.getCanonicalName()); serviceMode = conf.getEnum(SERVER_MODE, - SERVICE_MODE.valueOf(DEFAULT_SERVER_MODE)); + ServiceMode.valueOf(DEFAULT_SERVER_MODE)); cliService = new CLIService(null); UserConfigLoaderFactory.init(conf); // Add default services http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-server/src/main/java/org/apache/lens/server/scheduler/ScheduleResource.java ---------------------------------------------------------------------- diff --git a/lens-server/src/main/java/org/apache/lens/server/scheduler/ScheduleResource.java b/lens-server/src/main/java/org/apache/lens/server/scheduler/ScheduleResource.java index ee6e888..6c8b8ad 100644 --- a/lens-server/src/main/java/org/apache/lens/server/scheduler/ScheduleResource.java +++ b/lens-server/src/main/java/org/apache/lens/server/scheduler/ScheduleResource.java @@ -75,7 +75,7 @@ public class ScheduleResource { public LensAPIResult<SchedulerJobHandle> submitJob(@QueryParam("sessionid") LensSessionHandle sessionId, @QueryParam("action") String action, XJob job) throws LensException { validateSession(sessionId); - SUBMIT_ACTION op = UtilityMethods.checkAndGetOperation(action, SUBMIT_ACTION.class, SUBMIT_ACTION.values()); + SubmitAction op = UtilityMethods.checkAndGetOperation(action, SubmitAction.class, SubmitAction.values()); SchedulerJobHandle jobHandle; switch (op) { case SUBMIT: @@ -85,7 +85,7 @@ public class ScheduleResource { jobHandle = schedulerService.submitAndScheduleJob(sessionId, job); break; default: - throw new UnSupportedOpException(SUBMIT_ACTION.values()); + throw new UnSupportedOpException(SubmitAction.values()); } return LensAPIResult.composedOf(null, this.logSegregationContext.getLogSegragationId(), jobHandle); } @@ -206,7 +206,7 @@ public class ScheduleResource { @PathParam("jobHandle") SchedulerJobHandle jobHandle, @DefaultValue("schedule") @QueryParam("action") String action) throws LensException { validateSession(sessionId); - JOB_ACTION op = UtilityMethods.checkAndGetOperation(action, JOB_ACTION.class, JOB_ACTION.values()); + JobAction op = UtilityMethods.checkAndGetOperation(action, JobAction.class, JobAction.values()); switch (op) { case SCHEDULE: schedulerService.scheduleJob(sessionId, jobHandle); @@ -225,7 +225,7 @@ public class ScheduleResource { break; default: - throw new UnSupportedOpException(JOB_ACTION.values()); + throw new UnSupportedOpException(JobAction.values()); } return LensAPIResult.composedOf(null, this.logSegregationContext.getLogSegragationId(), null); } @@ -299,7 +299,7 @@ public class ScheduleResource { throws LensException { boolean res = true; validateSession(sessionId); - INSTANCE_ACTION op = UtilityMethods.checkAndGetOperation(action, INSTANCE_ACTION.class, INSTANCE_ACTION.values()); + InstanceAction op = UtilityMethods.checkAndGetOperation(action, InstanceAction.class, InstanceAction.values()); switch (op) { case KILL: res = schedulerService.killInstance(sessionId, instanceHandle); @@ -308,21 +308,21 @@ public class ScheduleResource { schedulerService.rerunInstance(sessionId, instanceHandle); break; default: - throw new UnSupportedOpException(INSTANCE_ACTION.values()); + throw new UnSupportedOpException(InstanceAction.values()); } final String requestId = this.logSegregationContext.getLogSegragationId(); return LensAPIResult.composedOf(null, requestId, res); } - private enum SUBMIT_ACTION { + private enum SubmitAction { SUBMIT, SUBMIT_AND_SCHEDULE; } - private enum INSTANCE_ACTION { + private enum InstanceAction { KILL, RERUN; } - private enum JOB_ACTION { + private enum JobAction { SCHEDULE, EXPIRE, SUSPEND, RESUME; } } http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-server/src/main/java/org/apache/lens/server/user/UserConfigLoaderFactory.java ---------------------------------------------------------------------- diff --git a/lens-server/src/main/java/org/apache/lens/server/user/UserConfigLoaderFactory.java b/lens-server/src/main/java/org/apache/lens/server/user/UserConfigLoaderFactory.java index eaf3848..f91110a 100644 --- a/lens-server/src/main/java/org/apache/lens/server/user/UserConfigLoaderFactory.java +++ b/lens-server/src/main/java/org/apache/lens/server/user/UserConfigLoaderFactory.java @@ -57,9 +57,9 @@ public final class UserConfigLoaderFactory { } /** - * The Enum RESOLVER_TYPE. + * The Enum ResolverType. */ - public enum RESOLVER_TYPE { + public enum ResolverType { /** The fixed. */ FIXED, @@ -94,7 +94,7 @@ public final class UserConfigLoaderFactory { if (resolverType == null || resolverType.length() == 0) { throw new UserConfigLoaderException("user resolver type not determined. value was not provided in conf"); } - for (RESOLVER_TYPE type : RESOLVER_TYPE.values()) { + for (ResolverType type : ResolverType.values()) { if (type.name().equals(resolverType)) { return createUserConfigLoader(type); } @@ -108,7 +108,7 @@ public final class UserConfigLoaderFactory { * @param resolverType the resolver type * @return the query user resolver */ - public static UserConfigLoader createUserConfigLoader(RESOLVER_TYPE resolverType) { + public static UserConfigLoader createUserConfigLoader(ResolverType resolverType) { switch (resolverType) { case PROPERTYBASED: return new PropertyBasedUserConfigLoader(conf); http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-server/src/test/java/org/apache/lens/server/LensServerTestUtil.java ---------------------------------------------------------------------- diff --git a/lens-server/src/test/java/org/apache/lens/server/LensServerTestUtil.java b/lens-server/src/test/java/org/apache/lens/server/LensServerTestUtil.java index 67cee57..1a2da4b 100644 --- a/lens-server/src/test/java/org/apache/lens/server/LensServerTestUtil.java +++ b/lens-server/src/test/java/org/apache/lens/server/LensServerTestUtil.java @@ -306,10 +306,8 @@ public final class LensServerTestUtil { } - public static LensSessionHandle openSession(WebTarget target, final String userName, final String passwd, final - LensConf - conf, MediaType - mt) { + public static LensSessionHandle openSession(WebTarget target, final String userName, final String passwd, + final LensConf conf, MediaType mt) { final WebTarget sessionTarget = target.path("session"); final FormDataMultiPart mp = new FormDataMultiPart(); http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-server/src/test/java/org/apache/lens/server/TestServerMode.java ---------------------------------------------------------------------- diff --git a/lens-server/src/test/java/org/apache/lens/server/TestServerMode.java b/lens-server/src/test/java/org/apache/lens/server/TestServerMode.java index bc3955d..2574932 100644 --- a/lens-server/src/test/java/org/apache/lens/server/TestServerMode.java +++ b/lens-server/src/test/java/org/apache/lens/server/TestServerMode.java @@ -36,7 +36,7 @@ import org.apache.lens.api.query.LensQuery; import org.apache.lens.api.query.QueryHandle; import org.apache.lens.api.query.QueryStatus; import org.apache.lens.api.result.LensAPIResult; -import org.apache.lens.server.LensServices.SERVICE_MODE; +import org.apache.lens.server.LensServices.ServiceMode; import org.apache.lens.server.common.RestAPITestUtil; import org.glassfish.jersey.media.multipart.FormDataBodyPart; @@ -92,7 +92,7 @@ public class TestServerMode extends LensAllApplicationJerseyTest { */ @Test public void testReadOnlyMode() throws InterruptedException { - testMode(SERVICE_MODE.READ_ONLY); + testMode(ServiceMode.READ_ONLY); } /** @@ -102,7 +102,7 @@ public class TestServerMode extends LensAllApplicationJerseyTest { */ @Test public void testMetastoreNoDropMode() throws InterruptedException { - testMode(SERVICE_MODE.METASTORE_NODROP); + testMode(ServiceMode.METASTORE_NODROP); } /** @@ -112,7 +112,7 @@ public class TestServerMode extends LensAllApplicationJerseyTest { */ @Test public void testMetastoreReadOnlyMode() throws InterruptedException { - testMode(SERVICE_MODE.METASTORE_READONLY); + testMode(ServiceMode.METASTORE_READONLY); } /** @@ -122,7 +122,7 @@ public class TestServerMode extends LensAllApplicationJerseyTest { */ @Test public void testOpenMode() throws InterruptedException { - testMode(SERVICE_MODE.OPEN); + testMode(ServiceMode.OPEN); } /** @@ -131,7 +131,7 @@ public class TestServerMode extends LensAllApplicationJerseyTest { * @param mode the mode * @throws InterruptedException the interrupted exception */ - private void testMode(SERVICE_MODE mode) throws InterruptedException { + private void testMode(ServiceMode mode) throws InterruptedException { LensServices.get().setServiceMode(mode); // open a session // should always pass @@ -156,7 +156,7 @@ public class TestServerMode extends LensAllApplicationJerseyTest { assertNotNull(result); assertEquals(result.getStatus(), APIResult.Status.SUCCEEDED); } catch (NotAllowedException nae) { - if (mode.equals(SERVICE_MODE.READ_ONLY) || mode.equals(SERVICE_MODE.METASTORE_READONLY)) { + if (mode.equals(ServiceMode.READ_ONLY) || mode.equals(ServiceMode.METASTORE_READONLY)) { // expected System.out.println("Create databse not allowed in mode:" + mode); } else { @@ -170,8 +170,8 @@ public class TestServerMode extends LensAllApplicationJerseyTest { assertNotNull(drop); assertEquals(drop.getStatus(), APIResult.Status.SUCCEEDED); } catch (NotAllowedException nae) { - if (mode.equals(SERVICE_MODE.READ_ONLY) || mode.equals(SERVICE_MODE.METASTORE_READONLY) - || mode.equals(SERVICE_MODE.METASTORE_NODROP)) { + if (mode.equals(ServiceMode.READ_ONLY) || mode.equals(LensServices.ServiceMode.METASTORE_READONLY) + || mode.equals(ServiceMode.METASTORE_NODROP)) { // expected System.out.println("Drop databse not allowed in mode:" + mode); } else { @@ -196,7 +196,7 @@ public class TestServerMode extends LensAllApplicationJerseyTest { qhandle = queryTarget.request().post(Entity.entity(query, MediaType.MULTIPART_FORM_DATA_TYPE), new GenericType<LensAPIResult<QueryHandle>>() {}).getData(); } catch (NotAllowedException nae) { - if (mode.equals(SERVICE_MODE.READ_ONLY)) { + if (mode.equals(ServiceMode.READ_ONLY)) { // expected System.out.println("Launching query not allowed in mode:" + mode); } else { @@ -210,7 +210,7 @@ public class TestServerMode extends LensAllApplicationJerseyTest { }); Assert.assertTrue(allQueriesXML.size() >= 1); - if (!mode.equals(SERVICE_MODE.READ_ONLY)) { + if (!mode.equals(ServiceMode.READ_ONLY)) { assertNotNull(qhandle); // wait for query completion if mode is not read only LensQuery ctx = queryTarget.path(qhandle.toString()).queryParam("sessionid", lensSessionId).request() @@ -230,6 +230,6 @@ public class TestServerMode extends LensAllApplicationJerseyTest { // close the session APIResult sessionclose = target.queryParam("sessionid", lensSessionId).request().delete(APIResult.class); Assert.assertEquals(sessionclose.getStatus(), APIResult.Status.SUCCEEDED); - LensServices.get().setServiceMode(SERVICE_MODE.OPEN); + LensServices.get().setServiceMode(LensServices.ServiceMode.OPEN); } } http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-server/src/test/java/org/apache/lens/server/query/TestEventService.java ---------------------------------------------------------------------- diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestEventService.java b/lens-server/src/test/java/org/apache/lens/server/query/TestEventService.java index b906776..662dd0f 100644 --- a/lens-server/src/test/java/org/apache/lens/server/query/TestEventService.java +++ b/lens-server/src/test/java/org/apache/lens/server/query/TestEventService.java @@ -558,7 +558,7 @@ public class TestEventService { private static class TestEvent extends LensEvent{ String id; boolean processed = false; - public TestEvent(String id) { + TestEvent(String id) { super(System.currentTimeMillis()); this.id = id; } @@ -576,7 +576,7 @@ public class TestEventService { } } private static class DummyAsncEventListener extends AsyncEventListener<QuerySuccess> { - public DummyAsncEventListener(){ + DummyAsncEventListener(){ super(5); //core pool = 5 } @Override http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-server/src/test/java/org/apache/lens/server/query/TestQueryIndependenceFromSessionClose.java ---------------------------------------------------------------------- diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryIndependenceFromSessionClose.java b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryIndependenceFromSessionClose.java index 017584c..068d46c 100644 --- a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryIndependenceFromSessionClose.java +++ b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryIndependenceFromSessionClose.java @@ -90,11 +90,13 @@ public class TestQueryIndependenceFromSessionClose extends LensJerseyTest { } private QueryExecutionServiceImpl getQueryService() { - return queryService = LensServices.get().getService(QueryExecutionService.NAME); + queryService = LensServices.get().getService(QueryExecutionService.NAME); + return queryService; } private SessionService getSessionService() { - return sessionService = LensServices.get().getService(SessionService.NAME); + sessionService = LensServices.get().getService(SessionService.NAME); + return sessionService; } /* http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-server/src/test/java/org/apache/lens/server/query/constraint/TotalQueryCostCeilingConstraintTest.java ---------------------------------------------------------------------- diff --git a/lens-server/src/test/java/org/apache/lens/server/query/constraint/TotalQueryCostCeilingConstraintTest.java b/lens-server/src/test/java/org/apache/lens/server/query/constraint/TotalQueryCostCeilingConstraintTest.java index 80229e8..f998ab5 100644 --- a/lens-server/src/test/java/org/apache/lens/server/query/constraint/TotalQueryCostCeilingConstraintTest.java +++ b/lens-server/src/test/java/org/apache/lens/server/query/constraint/TotalQueryCostCeilingConstraintTest.java @@ -39,7 +39,7 @@ public class TotalQueryCostCeilingConstraintTest { @DataProvider public Object[][] dpTestAllowsLaunchOfQuery() { - return new Object[][] { {7.0, true} , {90.0, true}, {91.0, false}}; + return new Object[][] { {7.0, true}, {90.0, true}, {91.0, false}}; } @Test(dataProvider = "dpTestAllowsLaunchOfQuery") http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-server/src/test/java/org/apache/lens/server/query/retry/QueryRetryTest.java ---------------------------------------------------------------------- diff --git a/lens-server/src/test/java/org/apache/lens/server/query/retry/QueryRetryTest.java b/lens-server/src/test/java/org/apache/lens/server/query/retry/QueryRetryTest.java index b90b043..01b4aa9 100644 --- a/lens-server/src/test/java/org/apache/lens/server/query/retry/QueryRetryTest.java +++ b/lens-server/src/test/java/org/apache/lens/server/query/retry/QueryRetryTest.java @@ -55,12 +55,10 @@ import org.testng.annotations.Test; @Test(groups = "post-restart", dependsOnGroups = "restart-test") public class QueryRetryTest extends LensJerseyTest { - private QueryExecutionServiceImpl queryService; - private SessionService sessionService; private LensSessionHandle session; private QueryExecutionServiceImpl getQueryService() { - return queryService = LensServices.get().getService(QueryExecutionService.NAME); + return LensServices.get().getService(QueryExecutionService.NAME); } @Override @@ -71,7 +69,7 @@ public class QueryRetryTest extends LensJerseyTest { } private SessionService getSessionService() { - return sessionService = LensServices.get().getService(SessionService.NAME); + return LensServices.get().getService(SessionService.NAME); } private LensSessionHandle getSession() throws LensException { http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/lens-server/src/test/java/org/apache/lens/server/stats/TestLogStatisticsStore.java ---------------------------------------------------------------------- diff --git a/lens-server/src/test/java/org/apache/lens/server/stats/TestLogStatisticsStore.java b/lens-server/src/test/java/org/apache/lens/server/stats/TestLogStatisticsStore.java index b72c933..8e505a2 100644 --- a/lens-server/src/test/java/org/apache/lens/server/stats/TestLogStatisticsStore.java +++ b/lens-server/src/test/java/org/apache/lens/server/stats/TestLogStatisticsStore.java @@ -54,7 +54,7 @@ public class TestLogStatisticsStore { * * @param eventTime the event time */ - public MyLoggableLens(long eventTime) { + MyLoggableLens(long eventTime) { super(eventTime); } http://git-wip-us.apache.org/repos/asf/lens/blob/186f03f7/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 12cd9cc..f1b72a0 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ <javadoc.plugin.version>2.10.3</javadoc.plugin.version> <surefire.plugin.version>2.15</surefire.plugin.version> <jdeb.plugin.version>1.0.1</jdeb.plugin.version> - <checkstyle.plugin.version>2.9.1</checkstyle.plugin.version> + <checkstyle.plugin.version>2.17</checkstyle.plugin.version> <war.plugin.version>2.1.1</war.plugin.version> <license.plugin.version>2.6</license.plugin.version> <buildnumber.plugin.version>1.0</buildnumber.plugin.version> @@ -619,6 +619,11 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>3.0.1</version> + </plugin> </plugins> </pluginManagement> <plugins> @@ -734,6 +739,7 @@ <consoleOutput>true</consoleOutput> <includeTestSourceDirectory>true</includeTestSourceDirectory> <configLocation>checkstyle.xml</configLocation> + <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> <headerLocation>checkstyle-java-header.txt</headerLocation> <failOnViolation>true</failOnViolation> </configuration> @@ -761,6 +767,19 @@ </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <phase>verify</phase> + <goals> + <goal>jar-no-fork</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>com.webcohesion.enunciate</groupId> <artifactId>enunciate-maven-plugin</artifactId> <version>${enunciate.plugin.version}</version>
