Michael Blow has submitted this change and it was merged. Change subject: [NO ISSUE] Prevent .* imports ......................................................................
[NO ISSUE] Prevent .* imports Change-Id: I00309aa789d2e10ccc7bbe79cb2c0bdfd6e2925c Reviewed-on: https://asterix-gerrit.ics.uci.edu/3296 Reviewed-by: Ali Alsuliman <[email protected]> Tested-by: Michael Blow <[email protected]> --- M asterixdb/asterix-hivecompat/src/main/java/org/apache/asterix/hivecompat/io/SchemaAwareCompressionInputStream.java M asterixdb/asterix-hivecompat/src/main/java/org/apache/asterix/hivecompat/io/SchemaAwareCompressionOutputStream.java M asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/java/org/apache/asterix/lexergenerator/NodeChainFactory.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/AbstractSerializableSingleVariableStatisticsAggregateFunction.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/AbstractSerializableSumAggregateFunction.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractSingleVarStatisticsAggregateFunction.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractSumAggregateFunction.java M asterixdb/pom.xml M hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/stats/impl/ClientCounterContext.java M hyracks-fullstack/pom.xml 10 files changed, 79 insertions(+), 16 deletions(-) Approvals: Anon. E. Moose #1000171: Ali Alsuliman: Looks good to me, approved Michael Blow: Verified diff --git a/asterixdb/asterix-hivecompat/src/main/java/org/apache/asterix/hivecompat/io/SchemaAwareCompressionInputStream.java b/asterixdb/asterix-hivecompat/src/main/java/org/apache/asterix/hivecompat/io/SchemaAwareCompressionInputStream.java index 7deb111..fdaa581 100644 --- a/asterixdb/asterix-hivecompat/src/main/java/org/apache/asterix/hivecompat/io/SchemaAwareCompressionInputStream.java +++ b/asterixdb/asterix-hivecompat/src/main/java/org/apache/asterix/hivecompat/io/SchemaAwareCompressionInputStream.java @@ -20,7 +20,7 @@ import java.io.InputStream; -import org.apache.hadoop.io.compress.*; +import org.apache.hadoop.io.compress.CompressionInputStream; /** * diff --git a/asterixdb/asterix-hivecompat/src/main/java/org/apache/asterix/hivecompat/io/SchemaAwareCompressionOutputStream.java b/asterixdb/asterix-hivecompat/src/main/java/org/apache/asterix/hivecompat/io/SchemaAwareCompressionOutputStream.java index 68f95a3..9bda8df 100644 --- a/asterixdb/asterix-hivecompat/src/main/java/org/apache/asterix/hivecompat/io/SchemaAwareCompressionOutputStream.java +++ b/asterixdb/asterix-hivecompat/src/main/java/org/apache/asterix/hivecompat/io/SchemaAwareCompressionOutputStream.java @@ -20,7 +20,7 @@ import java.io.OutputStream; -import org.apache.hadoop.io.compress.*; +import org.apache.hadoop.io.compress.CompressionOutputStream; /** * diff --git a/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/java/org/apache/asterix/lexergenerator/NodeChainFactory.java b/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/java/org/apache/asterix/lexergenerator/NodeChainFactory.java index f633f5c..0d6f893 100644 --- a/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/java/org/apache/asterix/lexergenerator/NodeChainFactory.java +++ b/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/java/org/apache/asterix/lexergenerator/NodeChainFactory.java @@ -20,7 +20,17 @@ import java.util.HashMap; -import org.apache.asterix.lexergenerator.rulegenerators.*; +import org.apache.asterix.lexergenerator.rulegenerators.RuleGenerator; +import org.apache.asterix.lexergenerator.rulegenerators.RuleGeneratorAnythingUntil; +import org.apache.asterix.lexergenerator.rulegenerators.RuleGeneratorCaseInsensitiveChar; +import org.apache.asterix.lexergenerator.rulegenerators.RuleGeneratorChar; +import org.apache.asterix.lexergenerator.rulegenerators.RuleGeneratorCharOrNothing; +import org.apache.asterix.lexergenerator.rulegenerators.RuleGeneratorDigitSequence; +import org.apache.asterix.lexergenerator.rulegenerators.RuleGeneratorNothing; +import org.apache.asterix.lexergenerator.rulegenerators.RuleGeneratorSign; +import org.apache.asterix.lexergenerator.rulegenerators.RuleGeneratorSignOrNothing; +import org.apache.asterix.lexergenerator.rulegenerators.RuleGeneratorString; +import org.apache.asterix.lexergenerator.rulegenerators.RuleGeneratorToken; public class NodeChainFactory { static private HashMap<String, RuleGenerator> ruleGenerators = new HashMap<String, RuleGenerator>(); diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/AbstractSerializableSingleVariableStatisticsAggregateFunction.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/AbstractSerializableSingleVariableStatisticsAggregateFunction.java index 6c25863..784b520 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/AbstractSerializableSingleVariableStatisticsAggregateFunction.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/AbstractSerializableSingleVariableStatisticsAggregateFunction.java @@ -23,10 +23,24 @@ import java.io.IOException; import org.apache.asterix.common.config.GlobalConfig; -import org.apache.asterix.dataflow.data.nontagged.serde.*; +import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AFloatSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AInt16SerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AInt8SerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.ARecordSerializerDeserializer; import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; -import org.apache.asterix.om.base.*; -import org.apache.asterix.om.types.*; +import org.apache.asterix.om.base.ADouble; +import org.apache.asterix.om.base.AInt64; +import org.apache.asterix.om.base.AMutableDouble; +import org.apache.asterix.om.base.AMutableInt64; +import org.apache.asterix.om.base.ANull; +import org.apache.asterix.om.types.ARecordType; +import org.apache.asterix.om.types.ATypeTag; +import org.apache.asterix.om.types.BuiltinType; +import org.apache.asterix.om.types.EnumDeserializer; +import org.apache.asterix.om.types.IAType; import org.apache.asterix.om.types.hierachy.ATypeHierarchy; import org.apache.asterix.runtime.aggregates.utils.SingleVarFunctionsUtil; import org.apache.asterix.runtime.evaluators.common.AccessibleByteArrayEval; diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/AbstractSerializableSumAggregateFunction.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/AbstractSerializableSumAggregateFunction.java index 71c3c0e..3baafcb 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/AbstractSerializableSumAggregateFunction.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/AbstractSerializableSumAggregateFunction.java @@ -22,7 +22,12 @@ import java.io.IOException; import org.apache.asterix.common.config.GlobalConfig; -import org.apache.asterix.dataflow.data.nontagged.serde.*; +import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AFloatSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AInt16SerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AInt8SerializerDeserializer; import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AMutableDouble; import org.apache.asterix.om.base.AMutableInt64; diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractSingleVarStatisticsAggregateFunction.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractSingleVarStatisticsAggregateFunction.java index e1f5b0f..8429e31 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractSingleVarStatisticsAggregateFunction.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractSingleVarStatisticsAggregateFunction.java @@ -23,10 +23,24 @@ import java.io.IOException; import org.apache.asterix.common.config.GlobalConfig; -import org.apache.asterix.dataflow.data.nontagged.serde.*; +import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AFloatSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AInt16SerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AInt8SerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.ARecordSerializerDeserializer; import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; -import org.apache.asterix.om.base.*; -import org.apache.asterix.om.types.*; +import org.apache.asterix.om.base.ADouble; +import org.apache.asterix.om.base.AInt64; +import org.apache.asterix.om.base.AMutableDouble; +import org.apache.asterix.om.base.AMutableInt64; +import org.apache.asterix.om.base.ANull; +import org.apache.asterix.om.types.ARecordType; +import org.apache.asterix.om.types.ATypeTag; +import org.apache.asterix.om.types.BuiltinType; +import org.apache.asterix.om.types.EnumDeserializer; +import org.apache.asterix.om.types.IAType; import org.apache.asterix.om.types.hierachy.ATypeHierarchy; import org.apache.asterix.runtime.aggregates.utils.SingleVarFunctionsUtil; import org.apache.asterix.runtime.evaluators.common.AccessibleByteArrayEval; diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractSumAggregateFunction.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractSumAggregateFunction.java index af1a939..eb6786e 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractSumAggregateFunction.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractSumAggregateFunction.java @@ -21,7 +21,12 @@ import java.io.IOException; import org.apache.asterix.common.config.GlobalConfig; -import org.apache.asterix.dataflow.data.nontagged.serde.*; +import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AFloatSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AInt16SerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AInt8SerializerDeserializer; import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AMutableDouble; import org.apache.asterix.om.base.AMutableInt64; diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 869d1ba..0e6e80d 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -228,11 +228,11 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.17</version> + <version>3.0.0</version> <executions> <execution> <id>verify-style</id> - <phase>process-classes</phase> + <phase>process-sources</phase> <goals> <goal>check</goal> </goals> @@ -245,6 +245,11 @@ <!-- Checks for whitespace --> <!-- See http://checkstyle.sf.net/config_whitespace.html --> <module name="FileTabCharacter" /> + <module name="TreeWalker"> + <module name="AvoidStarImport"> + <property name="allowStaticMemberImports" value="true"/> + </module> + </module> </module> </checkstyleRules> <includes>**/*.java,**/*.jj</includes> diff --git a/hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/stats/impl/ClientCounterContext.java b/hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/stats/impl/ClientCounterContext.java index 6ee3b86..0d3affc 100644 --- a/hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/stats/impl/ClientCounterContext.java +++ b/hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/stats/impl/ClientCounterContext.java @@ -23,7 +23,12 @@ import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import org.apache.hyracks.api.job.profiling.counters.ICounter; import org.apache.hyracks.client.stats.AggregateCounter; diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index 94f5749..565d29b 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -355,11 +355,11 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.17</version> + <version>3.0.0</version> <executions> <execution> <id>verify-style</id> - <phase>process-classes</phase> + <phase>process-sources</phase> <goals> <goal>check</goal> </goals> @@ -372,6 +372,11 @@ <!-- Checks for whitespace --> <!-- See http://checkstyle.sf.net/config_whitespace.html --> <module name="FileTabCharacter" /> + <module name="TreeWalker"> + <module name="AvoidStarImport"> + <property name="allowStaticMemberImports" value="true"/> + </module> + </module> </module> </checkstyleRules> <includes>**/*.java,**/*.jj</includes> -- To view, visit https://asterix-gerrit.ics.uci.edu/3296 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I00309aa789d2e10ccc7bbe79cb2c0bdfd6e2925c Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow <[email protected]> Gerrit-Reviewer: Ali Alsuliman <[email protected]> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-Reviewer: Murtadha Hubail <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]>
