Michael Blow has submitted this change and it was merged. Change subject: [NO ISSUE] Reduce runtime dependencies on commons-lang ......................................................................
[NO ISSUE] Reduce runtime dependencies on commons-lang Change-Id: Iff6678efff502b566020896320ecdf170ade720a Reviewed-on: https://asterix-gerrit.ics.uci.edu/2576 Sonar-Qube: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Contrib: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Reviewed-by: Michael Blow <mb...@apache.org> Reviewed-by: Murtadha Hubail <mhub...@apache.org> --- M asterixdb/asterix-algebra/pom.xml M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SqlppExpressionToPlanTranslator.java M asterixdb/asterix-app/pom.xml M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestTupleGenerator.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java M asterixdb/asterix-lang-common/pom.xml M asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/AbstractAccessor.java M asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/OrderedListTypeDefinition.java M asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/TypeReferenceExpression.java M asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/DoubleLiteral.java M asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/FloatLiteral.java M asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/IntegerLiteral.java M asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/LongIntegerLiteral.java M asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/StringLiteral.java M asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/struct/Identifier.java M asterixdb/asterix-metadata/pom.xml M asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/LoadableDataSource.java M asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/RTreeResourceFactoryProvider.java M hyracks-fullstack/pom.xml 19 files changed, 39 insertions(+), 51 deletions(-) Approvals: Jenkins: Verified; No violations found; ; Verified Michael Blow: Looks good to me, but someone else must approve Murtadha Hubail: Looks good to me, approved diff --git a/asterixdb/asterix-algebra/pom.xml b/asterixdb/asterix-algebra/pom.xml index 5a61c96..6a6bb8d 100644 --- a/asterixdb/asterix-algebra/pom.xml +++ b/asterixdb/asterix-algebra/pom.xml @@ -176,10 +176,6 @@ <artifactId>commons-lang3</artifactId> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SqlppExpressionToPlanTranslator.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SqlppExpressionToPlanTranslator.java index 42e38f9..9e36ba9 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SqlppExpressionToPlanTranslator.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SqlppExpressionToPlanTranslator.java @@ -70,7 +70,7 @@ import org.apache.asterix.om.constants.AsterixConstantValue; import org.apache.asterix.om.functions.BuiltinFunctions; import org.apache.asterix.om.types.BuiltinType; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.commons.lang3.mutable.Mutable; import org.apache.commons.lang3.mutable.MutableObject; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml index b51d499..020bc6c 100644 --- a/asterixdb/asterix-app/pom.xml +++ b/asterixdb/asterix-app/pom.xml @@ -557,10 +557,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> @@ -596,6 +592,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> @@ -605,6 +602,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestTupleGenerator.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestTupleGenerator.java index 54bdb1b..2f326d8 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestTupleGenerator.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestTupleGenerator.java @@ -20,7 +20,7 @@ import java.util.Random; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.data.std.util.GrowableArray; import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference; diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java index 9da0e66..cd270cd 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java @@ -31,14 +31,13 @@ import java.util.Collection; import java.util.List; -import org.apache.asterix.common.config.NodeProperties; import org.apache.asterix.app.external.ExternalUDFLibrarian; import org.apache.asterix.common.library.ILibraryManager; import org.apache.asterix.common.utils.StorageConstants; import org.apache.asterix.test.common.TestExecutor; import org.apache.asterix.testframework.context.TestCaseContext; -import org.apache.commons.lang.SystemUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.SystemUtils; import org.apache.hyracks.api.io.IODeviceHandle; import org.apache.hyracks.control.nc.NodeControllerService; import org.apache.hyracks.util.ThreadDumpUtil; diff --git a/asterixdb/asterix-lang-common/pom.xml b/asterixdb/asterix-lang-common/pom.xml index 0fe7e6d..b20bd58 100644 --- a/asterixdb/asterix-lang-common/pom.xml +++ b/asterixdb/asterix-lang-common/pom.xml @@ -92,10 +92,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> </dependency> diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/AbstractAccessor.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/AbstractAccessor.java index eb35c9c..1cc2e50 100644 --- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/AbstractAccessor.java +++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/AbstractAccessor.java @@ -18,9 +18,10 @@ */ package org.apache.asterix.lang.common.expression; +import java.util.Objects; + import org.apache.asterix.lang.common.base.AbstractExpression; import org.apache.asterix.lang.common.base.Expression; -import org.apache.commons.lang.ObjectUtils; public abstract class AbstractAccessor extends AbstractExpression { protected Expression expr; @@ -40,7 +41,7 @@ @Override public int hashCode() { - return ObjectUtils.hashCode(expr); + return Objects.hashCode(expr); } @Override diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/OrderedListTypeDefinition.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/OrderedListTypeDefinition.java index 7b04c7f..58d3756 100644 --- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/OrderedListTypeDefinition.java +++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/OrderedListTypeDefinition.java @@ -18,9 +18,10 @@ */ package org.apache.asterix.lang.common.expression; +import java.util.Objects; + import org.apache.asterix.common.exceptions.CompilationException; import org.apache.asterix.lang.common.visitor.base.ILangVisitor; -import org.apache.commons.lang.ObjectUtils; public class OrderedListTypeDefinition implements TypeExpression { @@ -46,7 +47,7 @@ @Override public int hashCode() { - return ObjectUtils.hashCode(itemTypeExpression); + return Objects.hashCode(itemTypeExpression); } @Override @@ -58,6 +59,6 @@ return false; } OrderedListTypeDefinition target = (OrderedListTypeDefinition) object; - return ObjectUtils.equals(itemTypeExpression, target.itemTypeExpression); + return Objects.equals(itemTypeExpression, target.itemTypeExpression); } } diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/TypeReferenceExpression.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/TypeReferenceExpression.java index e87b2cc..8c1e5c6 100644 --- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/TypeReferenceExpression.java +++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/TypeReferenceExpression.java @@ -18,10 +18,11 @@ */ package org.apache.asterix.lang.common.expression; +import java.util.Objects; + import org.apache.asterix.common.exceptions.CompilationException; import org.apache.asterix.lang.common.struct.Identifier; import org.apache.asterix.lang.common.visitor.base.ILangVisitor; -import org.apache.commons.lang.ObjectUtils; import org.apache.hyracks.algebricks.common.utils.Pair; public class TypeReferenceExpression implements TypeExpression { @@ -48,7 +49,7 @@ @Override public int hashCode() { - return ObjectUtils.hashCode(ident); + return Objects.hashCode(ident); } @Override @@ -60,6 +61,6 @@ return false; } TypeReferenceExpression target = (TypeReferenceExpression) object; - return ObjectUtils.equals(ident, target.ident); + return Objects.equals(ident, target.ident); } } diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/DoubleLiteral.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/DoubleLiteral.java index 5812b19..93d2517 100644 --- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/DoubleLiteral.java +++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/DoubleLiteral.java @@ -18,8 +18,9 @@ */ package org.apache.asterix.lang.common.literal; +import java.util.Objects; + import org.apache.asterix.lang.common.base.Literal; -import org.apache.commons.lang.ObjectUtils; public class DoubleLiteral extends Literal { private static final long serialVersionUID = -5685491458356989250L; @@ -50,7 +51,7 @@ @Override public int hashCode() { - return ObjectUtils.hashCode(value); + return Objects.hashCode(value); } @Override @@ -62,7 +63,7 @@ return false; } DoubleLiteral target = (DoubleLiteral) object; - return ObjectUtils.equals(value, target.value); + return Objects.equals(value, target.value); } @Override diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/FloatLiteral.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/FloatLiteral.java index a3dfd6a..88dd4cd 100644 --- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/FloatLiteral.java +++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/FloatLiteral.java @@ -18,8 +18,9 @@ */ package org.apache.asterix.lang.common.literal; +import java.util.Objects; + import org.apache.asterix.lang.common.base.Literal; -import org.apache.commons.lang.ObjectUtils; public class FloatLiteral extends Literal { private static final long serialVersionUID = 3273563021227964396L; @@ -46,7 +47,7 @@ @Override public int hashCode() { - return ObjectUtils.hashCode(value); + return Objects.hashCode(value); } @Override @@ -58,7 +59,7 @@ return false; } FloatLiteral target = (FloatLiteral) object; - return ObjectUtils.equals(value, target.value); + return Objects.equals(value, target.value); } @Override diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/IntegerLiteral.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/IntegerLiteral.java index a46a736..35c7d17 100644 --- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/IntegerLiteral.java +++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/IntegerLiteral.java @@ -18,8 +18,9 @@ */ package org.apache.asterix.lang.common.literal; +import java.util.Objects; + import org.apache.asterix.lang.common.base.Literal; -import org.apache.commons.lang.ObjectUtils; public class IntegerLiteral extends Literal { private static final long serialVersionUID = -8633520244871361967L; @@ -46,7 +47,7 @@ @Override public int hashCode() { - return ObjectUtils.hashCode(value); + return Objects.hashCode(value); } @Override diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/LongIntegerLiteral.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/LongIntegerLiteral.java index 5e00cb8..c9e0b8c 100644 --- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/LongIntegerLiteral.java +++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/LongIntegerLiteral.java @@ -18,8 +18,9 @@ */ package org.apache.asterix.lang.common.literal; +import java.util.Objects; + import org.apache.asterix.lang.common.base.Literal; -import org.apache.commons.lang.ObjectUtils; public class LongIntegerLiteral extends Literal { private static final long serialVersionUID = -8633520244871361967L; @@ -50,7 +51,7 @@ @Override public int hashCode() { - return ObjectUtils.hashCode(value); + return Objects.hashCode(value); } @Override diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/StringLiteral.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/StringLiteral.java index 9caad3e..b5ab9ec 100644 --- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/StringLiteral.java +++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/StringLiteral.java @@ -18,8 +18,9 @@ */ package org.apache.asterix.lang.common.literal; +import java.util.Objects; + import org.apache.asterix.lang.common.base.Literal; -import org.apache.commons.lang.ObjectUtils; public class StringLiteral extends Literal { @@ -52,7 +53,7 @@ @Override public int hashCode() { - return ObjectUtils.hashCode(value); + return Objects.hashCode(value); } @Override @@ -64,7 +65,7 @@ return false; } StringLiteral target = (StringLiteral) object; - return ObjectUtils.equals(value, target.value); + return Objects.equals(value, target.value); } @Override diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/struct/Identifier.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/struct/Identifier.java index b77fd94..1443833 100644 --- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/struct/Identifier.java +++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/struct/Identifier.java @@ -18,7 +18,7 @@ */ package org.apache.asterix.lang.common.struct; -import org.apache.commons.lang.ObjectUtils; +import java.util.Objects; public class Identifier { protected String value; @@ -53,11 +53,11 @@ return false; } Identifier target = (Identifier) o; - return ObjectUtils.equals(value, target.value); + return Objects.equals(value, target.value); } @Override public int hashCode() { - return ObjectUtils.hashCode(value); + return Objects.hashCode(value); } } diff --git a/asterixdb/asterix-metadata/pom.xml b/asterixdb/asterix-metadata/pom.xml index 5f3df49..94c2668 100644 --- a/asterixdb/asterix-metadata/pom.xml +++ b/asterixdb/asterix-metadata/pom.xml @@ -104,10 +104,6 @@ <artifactId>algebricks-data</artifactId> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>algebricks-core</artifactId> </dependency> diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/LoadableDataSource.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/LoadableDataSource.java index 91030bf..8fdcbbc 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/LoadableDataSource.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/LoadableDataSource.java @@ -30,7 +30,7 @@ import org.apache.asterix.om.types.ARecordType; import org.apache.asterix.om.types.ATypeTag; import org.apache.asterix.om.types.IAType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.common.utils.Pair; diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/RTreeResourceFactoryProvider.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/RTreeResourceFactoryProvider.java index 5075adc..08f8b7d 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/RTreeResourceFactoryProvider.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/RTreeResourceFactoryProvider.java @@ -37,7 +37,7 @@ import org.apache.asterix.om.types.ATypeTag; import org.apache.asterix.om.types.IAType; import org.apache.asterix.om.utils.NonTaggedFormatUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.common.utils.Pair; import org.apache.hyracks.algebricks.data.IBinaryComparatorFactoryProvider; diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index 393119d..62407a4 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -128,11 +128,6 @@ <version>2.6</version> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.6</version> - </dependency> - <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> <version>2.8.4</version> -- To view, visit https://asterix-gerrit.ics.uci.edu/2576 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iff6678efff502b566020896320ecdf170ade720a Gerrit-PatchSet: 6 Gerrit-Project: asterixdb Gerrit-Branch: release-0.9.4-pre-rc Gerrit-Owner: Michael Blow <mb...@apache.org> Gerrit-Reviewer: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Gerrit-Reviewer: Michael Blow <mb...@apache.org> Gerrit-Reviewer: Murtadha Hubail <mhub...@apache.org> Gerrit-Reviewer: Till Westmann <ti...@apache.org>
