merge with upstream/lens-1381
diff --git a/checkstyle/src/main/resources/suppressions.xml b/checkstyle/src/main/resources/checkstyle-suppressions.xml
similarity index 96%
rename from checkstyle/src/main/resources/suppressions.xml
rename to checkstyle/src/main/resources/checkstyle-suppressions.xml
index 06c49af..12e394c 100644
--- a/checkstyle/src/main/resources/suppressions.xml
+++ b/checkstyle/src/main/resources/checkstyle-suppressions.xml
@@ -29,4 +29,5 @@
<suppress checks="Indentation" files="Test*.java"/>
<suppress checks="VisibilityModifier" files="Test*.java"/>
<suppress checks="MagicNumberCheck" files="JavadocStyleCheck.java"/>
+ <suppress checks=".*" files="generated-sources"/>
</suppressions>
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>
diff --git a/lens-api/src/main/java/org/apache/lens/api/ToXMLString.java b/lens-api/src/main/java/org/apache/lens/api/ToXMLString.java
index 746a82b..0058f20 100644
--- a/lens-api/src/main/java/org/apache/lens/api/ToXMLString.java
+++ b/lens-api/src/main/java/org/apache/lens/api/ToXMLString.java
@@ -25,7 +25,6 @@
import javax.xml.bind.*;
import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
import javax.xml.namespace.QName;
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 @@
return this.errorCode;
}
- private LensCommonErrorCode(final int code) {
+ LensCommonErrorCode(final int code) {
this.errorCode = code;
}
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 @@
@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);
diff --git a/lens-api/src/main/java/org/apache/lens/api/metastore/SchemaTraverser.java b/lens-api/src/main/java/org/apache/lens/api/metastore/SchemaTraverser.java
index 157ad71..76cb8b9 100644
--- a/lens-api/src/main/java/org/apache/lens/api/metastore/SchemaTraverser.java
+++ b/lens-api/src/main/java/org/apache/lens/api/metastore/SchemaTraverser.java
@@ -1,15 +1,28 @@
+/*
+ * 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.
+ */
package org.apache.lens.api.metastore;
import java.io.File;
import java.io.FilenameFilter;
-import java.io.IOException;
import java.util.Map;
import java.util.function.BiConsumer;
-import javax.xml.bind.JAXBException;
-
-import org.apache.lens.api.jaxb.LensJAXBContext;
-
import com.google.common.collect.Maps;
/*
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 @@
* @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>();
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 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>());
}
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 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);
}
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..1e8621d 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
@@ -595,5 +595,4 @@
return MetastoreUtil.getFactKeyPrefix(factTableName) + "." + storageName + "." + updatePeriod;
}
-
}
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 @@
}
}
}
+ client = Hive.get();
+
List<Partition> partitionsAdded = client.createPartitions(addParts);
success = true;
return partitionsAdded;
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.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 @@
*/
class AliasReplacer implements ContextRewriter {
- public AliasReplacer(Configuration conf) {
- }
-
@Override
public void rewriteContext(CubeQueryContext cubeql) throws LensException {
Map<String, String> colToTableAlias = cubeql.getColToTableAlias();
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 21cdd26..8b47f86 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.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 @@
class ColumnResolver implements ContextRewriter {
- public ColumnResolver(Configuration conf) {
- }
-
@Override
public void rewriteContext(CubeQueryContext cubeql) throws LensException {
checkForAllColumnsSelected(cubeql);
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 5713069..300d134 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,10 +135,9 @@
*/
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));
-
+ rewriters.add(new AliasReplacer());
ExpressionResolver exprResolver = new ExpressionResolver();
DenormalizationResolver denormResolver = new DenormalizationResolver();
CandidateTableResolver candidateTblResolver = new CandidateTableResolver();
@@ -149,7 +148,7 @@
// Phase 1 of denormResolver: De-normalized columns resolved
rewriters.add(denormResolver);
// Resolve time ranges
- rewriters.add(new TimerangeResolver(conf));
+ rewriters.add(new TimerangeResolver());
// Phase 1 of candidateTblResolver: Resolve candidate storages and dimension tables for columns queried
rewriters.add(candidateTblResolver);
// Resolve aggregations and generate base select tree
@@ -158,7 +157,7 @@
//validate fields queryability (in case of derived cubes setup)
rewriters.add(new FieldValidator());
// Resolve joins and generate base join tree
- rewriters.add(new JoinResolver(conf));
+ rewriters.add(new JoinResolver());
// Do col life validation for the time range(s) queried
rewriters.add(new ColumnLifetimeChecker());
// Phase 1 of storageTableResolver: Validate and prune candidate storages
@@ -179,7 +178,7 @@
rewriters.add(exprResolver);
// Pick the least cost combination(s) (and prune others) out of a set of combinations produced
// by CandidateCoveringSetsResolver
- rewriters.add(new LightestFactResolver(conf));
+ rewriters.add(new LightestFactResolver());
}
// Phase 2 of storageTableResolver: resolve storage table partitions.
@@ -198,12 +197,12 @@
if (!lightFactFirst) {
// Pick the least cost combination(s) (and prune others) out of a set of combinations produced
// by CandidateCoveringSetsResolver
- rewriters.add(new LightestFactResolver(conf));
+ rewriters.add(new LightestFactResolver());
}
// if two combinations have the same least weight/cost, then the combination with least number of time partitions
// queried will be picked. Rest of the combinations will be pruned
- 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 {
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 aaa183b..97a9ef0 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
@@ -393,7 +393,7 @@
pickExpressionsForTable(cdim);
}
}
- log.info("Picked expressions: {}", pickedExpressions);
+ log.debug("Picked expressions: {}", pickedExpressions);
for (Set<PickedExpression> peSet : pickedExpressions.values()) {
for (PickedExpression pe : peSet) {
exprDims.addAll(pe.pickedCtx.exprDims);
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 c9dc7b2..1b30c0b 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
@@ -47,11 +47,12 @@
private final boolean selectPromotionEnabled;
private final boolean groupbyPromotionEnabled;
- public GroupbyResolver(Configuration conf) {
- selectPromotionEnabled = conf
- .getBoolean(CubeQueryConfUtil.ENABLE_SELECT_TO_GROUPBY, CubeQueryConfUtil.DEFAULT_ENABLE_SELECT_TO_GROUPBY);
- groupbyPromotionEnabled = conf
- .getBoolean(CubeQueryConfUtil.ENABLE_GROUP_BY_TO_SELECT, CubeQueryConfUtil.DEFAULT_ENABLE_GROUP_BY_TO_SELECT);
+ GroupbyResolver(Configuration conf) {
+ selectPromotionEnabled =
+ conf.getBoolean(CubeQueryConfUtil.ENABLE_SELECT_TO_GROUPBY, CubeQueryConfUtil.DEFAULT_ENABLE_SELECT_TO_GROUPBY);
+ groupbyPromotionEnabled =
+ conf.getBoolean(CubeQueryConfUtil.ENABLE_GROUP_BY_TO_SELECT,
+ CubeQueryConfUtil.DEFAULT_ENABLE_GROUP_BY_TO_SELECT);
}
private void promoteSelect(CubeQueryContext cubeql, List<SelectPhraseContext> selectExprs, List<String> groupByExprs)
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 0370964..02e3dc7 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.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.*;
@@ -48,9 +47,6 @@
*/
private HashMap<Dimension, List<JoinChain>> dimensionToJoinChainsMap = new HashMap<Dimension, List<JoinChain>>();
- public JoinResolver(Configuration conf) {
- }
-
@Override
public void rewriteContext(CubeQueryContext cubeql) throws LensException {
tableJoinTypeMap = new HashMap<AbstractCubeTable, JoinType>();
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 153df24..a9bd164 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
@@ -25,8 +25,6 @@
import org.apache.lens.server.api.error.LensException;
-import org.apache.hadoop.conf.Configuration;
-
import lombok.extern.slf4j.Slf4j;
/**
@@ -34,8 +32,6 @@
*/
@Slf4j
class LeastPartitionResolver implements ContextRewriter {
- public LeastPartitionResolver(Configuration conf) {
- }
@Override
public void rewriteContext(CubeQueryContext cubeql) throws LensException {
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.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 @@
@Slf4j
class LightestDimensionResolver implements ContextRewriter {
- public LightestDimensionResolver(Configuration conf) {
- }
-
@Override
public void rewriteContext(CubeQueryContext cubeql) throws LensException {
if (!cubeql.getCandidateDimTables().isEmpty()) {
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 077c0d2..dd25f3e 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 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 @@
*/
@Slf4j
public class LightestFactResolver implements ContextRewriter {
- public LightestFactResolver(Configuration conf) {
- }
@Override
public void rewriteContext(CubeQueryContext cubeql) throws LensException {
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 4f4e3ab..0a24460 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
@@ -39,7 +39,7 @@
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);
}
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 @@
private String finalAlias;
private String exprWithoutAlias;
- public SelectPhraseContext(ASTNode selectExpr) {
+ SelectPhraseContext(ASTNode selectExpr) {
super(selectExpr);
}
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.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 @@
*/
@Slf4j
class TimerangeResolver implements ContextRewriter {
- public TimerangeResolver(Configuration conf) {
- }
@Override
public void rewriteContext(CubeQueryContext cubeql) throws LensException {
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 @@
// 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) {
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 897891c..4331843 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
@@ -149,6 +149,7 @@
validateBetweenBoundTypes(whereClause, DAY_DB_FORMAT, testStartOffset, testEndOffset);
}
+
private void validateBetweenBoundTypes(String whereClause, DateFormat format, int testStartOffset, int testEndOffset) {
String expected = getBetweenClause("test", "dt", getDateWithOffset(DAILY, testStartOffset),
getDateWithOffset(DAILY, testEndOffset), ofNullable(format).orElseGet(DAILY::format));
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 bf1c151..6c9afdd 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
@@ -523,7 +523,7 @@
// 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') )";
@@ -532,7 +532,7 @@
//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));
@@ -540,7 +540,7 @@
//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));
@@ -548,7 +548,7 @@
//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));
@@ -556,7 +556,7 @@
//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));
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 @@
private static class CriteriaInfo {
final CriteriaType criteriaType;
- public CriteriaInfo(CriteriaType criteriaType) {
+ CriteriaInfo(CriteriaType criteriaType) {
this.criteriaType = criteriaType;
}
}
@@ -283,7 +283,7 @@
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 @@
final String predicateOp;
- public PredicateInfo(String operator, PredicateType predicateType) {
+ PredicateInfo(String operator, PredicateType predicateType) {
super(CriteriaType.PREDICATE);
this.predicateType = predicateType;
this.predicateOp = operator;
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 @@
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 @@
*/
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);
}
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 @@
}
private static class ESRewriteException extends RuntimeException {
- public ESRewriteException(Exception e) {
+ ESRewriteException(Exception e) {
super(e);
}
}
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 @@
* @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();
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 @@
prs.setFullyAccessed(true);
//Check Purge
- assertEquals(prs.canBePurged() , true);
+ assertEquals(prs.canBePurged(), true);
}
@Test
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 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 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 @@
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);
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 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 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 @@
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 @@
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>>(){});
}
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 @@
//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);
}
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 @@
/**
* Event type to know what kind of operations we want.
*/
- public static enum EventType {
+ public enum EventType {
SCHEDULE, EXPIRE
}
}
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 @@
/** 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 @@
}
/**
- * 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 @@
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
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 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 @@
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 @@
@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 @@
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 @@
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 @@
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;
}
}
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 @@
}
/**
- * The Enum RESOLVER_TYPE.
+ * The Enum ResolverType.
*/
- public enum RESOLVER_TYPE {
+ public enum ResolverType {
/** The fixed. */
FIXED,
@@ -94,7 +94,7 @@
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 @@
* @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);
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 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();
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.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 @@
*/
@Test
public void testReadOnlyMode() throws InterruptedException {
- testMode(SERVICE_MODE.READ_ONLY);
+ testMode(ServiceMode.READ_ONLY);
}
/**
@@ -102,7 +102,7 @@
*/
@Test
public void testMetastoreNoDropMode() throws InterruptedException {
- testMode(SERVICE_MODE.METASTORE_NODROP);
+ testMode(ServiceMode.METASTORE_NODROP);
}
/**
@@ -112,7 +112,7 @@
*/
@Test
public void testMetastoreReadOnlyMode() throws InterruptedException {
- testMode(SERVICE_MODE.METASTORE_READONLY);
+ testMode(ServiceMode.METASTORE_READONLY);
}
/**
@@ -122,7 +122,7 @@
*/
@Test
public void testOpenMode() throws InterruptedException {
- testMode(SERVICE_MODE.OPEN);
+ testMode(ServiceMode.OPEN);
}
/**
@@ -131,7 +131,7 @@
* @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 @@
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 @@
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 @@
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 @@
});
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 @@
// 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);
}
}
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 @@
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 @@
}
}
private static class DummyAsncEventListener extends AsyncEventListener<QuerySuccess> {
- public DummyAsncEventListener(){
+ DummyAsncEventListener(){
super(5); //core pool = 5
}
@Override
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 @@
}
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;
}
/*
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 @@
@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")
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 @@
@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 @@
}
private SessionService getSessionService() {
- return sessionService = LensServices.get().getService(SessionService.NAME);
+ return LensServices.get().getService(SessionService.NAME);
}
private LensSessionHandle getSession() throws LensException {
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 @@
*
* @param eventTime the event time
*/
- public MyLoggableLens(long eventTime) {
+ MyLoggableLens(long eventTime) {
super(eventTime);
}
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>
