diff --git a/platform/util/commons-lang-v2-shim/src/org/apache/commons/lang/Validate.java b/platform/util/commons-lang-v2-shim/src/org/apache/commons/lang/Validate.java index a1f57834367e..00b6422c6983 100644 --- a/platform/util/commons-lang-v2-shim/src/org/apache/commons/lang/Validate.java +++ b/platform/util/commons-lang-v2-shim/src/org/apache/commons/lang/Validate.java @@ -20,4 +20,9 @@ public class Validate extends org.apache.commons.lang3.Validate { throw new IllegalArgumentException("The validated string is empty"); } } + + @SuppressWarnings("MethodOverridesStaticMethodOfSuperclass") + public static T notNull(T object) { + return org.apache.commons.lang3.Validate.notNull(object); + } } diff --git a/platform/util/commons-lang-v2-shim/src/org/apache/commons/lang/builder/EqualsBuilder.java b/platform/util/commons-lang-v2-shim/src/org/apache/commons/lang/builder/EqualsBuilder.java index 2fd697868893..f6a0c0c337bb 100644 --- a/platform/util/commons-lang-v2-shim/src/org/apache/commons/lang/builder/EqualsBuilder.java +++ b/platform/util/commons-lang-v2-shim/src/org/apache/commons/lang/builder/EqualsBuilder.java @@ -8,4 +8,31 @@ package org.apache.commons.lang.builder; */ @Deprecated(forRemoval = true) public final class EqualsBuilder extends org.apache.commons.lang3.builder.EqualsBuilder { + @Override + public EqualsBuilder append(Object lhs, Object rhs) { + return (EqualsBuilder)super.append(lhs, rhs); + } + + @SuppressWarnings("MethodOverridesStaticMethodOfSuperclass") + public static boolean reflectionEquals(Object lhs, Object rhs) { + return org.apache.commons.lang3.builder.EqualsBuilder.reflectionEquals(lhs, rhs); + } + + @Override + public EqualsBuilder append(int lhs, int rhs) { + super.append(lhs, rhs); + return this; + } + + @Override + public EqualsBuilder append(boolean lhs, boolean rhs) { + super.append(lhs, rhs); + return this; + } + + @Override + public EqualsBuilder appendSuper(boolean superEquals) { + super.appendSuper(superEquals); + return this; + } } diff --git a/platform/util/commons-lang-v2-shim/src/org/apache/commons/lang/builder/HashCodeBuilder.java b/platform/util/commons-lang-v2-shim/src/org/apache/commons/lang/builder/HashCodeBuilder.java index c00bedee7fc6..db72e5a080fc 100644 --- a/platform/util/commons-lang-v2-shim/src/org/apache/commons/lang/builder/HashCodeBuilder.java +++ b/platform/util/commons-lang-v2-shim/src/org/apache/commons/lang/builder/HashCodeBuilder.java @@ -22,6 +22,24 @@ public final class HashCodeBuilder extends org.apache.commons.lang3.builder.Hash return this; } + @Override + public HashCodeBuilder append(int value) { + super.append(value); + return this; + } + + @Override + public HashCodeBuilder append(Object array) { + super.append(array); + return this; + } + + @Override + public HashCodeBuilder appendSuper(final int superHashCode) { + super.appendSuper(superHashCode); + return this; + } + public static int reflectionHashCode(Object object) { return reflectionHashCode(17, 37, object, false); } diff --git a/platform/util/commons-lang-v2-shim/src/org/apache/commons/lang/builder/ReflectionToStringBuilder.java b/platform/util/commons-lang-v2-shim/src/org/apache/commons/lang/builder/ReflectionToStringBuilder.java index 613602aad265..ce5e495d86a3 100644 --- a/platform/util/commons-lang-v2-shim/src/org/apache/commons/lang/builder/ReflectionToStringBuilder.java +++ b/platform/util/commons-lang-v2-shim/src/org/apache/commons/lang/builder/ReflectionToStringBuilder.java @@ -40,4 +40,9 @@ public final class ReflectionToStringBuilder extends org.apache.commons.lang3.bu boolean excludeNullValues) { super(object, style, buffer, reflectUpToClass, outputTransients, outputStatics, excludeNullValues); } + + @SuppressWarnings("MethodOverridesStaticMethodOfSuperclass") + public static String toString(Object object, ToStringStyle style) { + return org.apache.commons.lang3.builder.ReflectionToStringBuilder.toString(object, style); + } } diff --git a/platform/util/commons-lang-v2-shim/src/org/apache/commons/lang/text/StrBuilder.java b/platform/util/commons-lang-v2-shim/src/org/apache/commons/lang/text/StrBuilder.java index 25a98d1bed67..a8ae6711758f 100644 --- a/platform/util/commons-lang-v2-shim/src/org/apache/commons/lang/text/StrBuilder.java +++ b/platform/util/commons-lang-v2-shim/src/org/apache/commons/lang/text/StrBuilder.java @@ -18,4 +18,22 @@ public final class StrBuilder extends org.apache.commons.lang3.text.StrBuilder { public StrBuilder(String str) { super(str); } + + @Override + public StrBuilder append(String str) { + super.append(str); + return this; + } + + @Override + public StrBuilder append(int v) { + super.append(v); + return this; + } + + @Override + public StrBuilder appendNewLine() { + super.appendNewLine(); + return this; + } } diff --git a/platform/util/commons-lang-v2-shim/src/org/apache/commons/lang/time/DateUtils.java b/platform/util/commons-lang-v2-shim/src/org/apache/commons/lang/time/DateUtils.java index 2440b41f4e61..6913b09955dc 100644 --- a/platform/util/commons-lang-v2-shim/src/org/apache/commons/lang/time/DateUtils.java +++ b/platform/util/commons-lang-v2-shim/src/org/apache/commons/lang/time/DateUtils.java @@ -1,6 +1,9 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.apache.commons.lang.time; +import java.util.Calendar; +import java.util.Date; + /** * @deprecated To continue using the functionality offered by commons-lang2, * please consider migrating to either the commons-lang3 or commons-text libraries and bundling them with your plugin. @@ -8,4 +11,10 @@ package org.apache.commons.lang.time; */ @Deprecated(forRemoval = true) public class DateUtils extends org.apache.commons.lang3.time.DateUtils { + public static Date add(final Date date, final int calendarField, final int amount) { + final Calendar c = Calendar.getInstance(); + c.setTime(date); + c.add(calendarField, amount); + return c.getTime(); + } }