diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index bede1793..c5677d5f 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -204,7 +204,7 @@ - + diff --git a/spark-operator/src/test/java/org/apache/spark/k8s/operator/utils/TestUtils.java b/spark-operator/src/test/java/org/apache/spark/k8s/operator/utils/TestUtils.java index be06d091..2e0a4c3f 100644 --- a/spark-operator/src/test/java/org/apache/spark/k8s/operator/utils/TestUtils.java +++ b/spark-operator/src/test/java/org/apache/spark/k8s/operator/utils/TestUtils.java @@ -23,10 +23,10 @@ import static org.apache.spark.k8s.operator.Constants.API_VERSION; import java.io.File; +import java.lang.reflect.Field; import java.util.Map; import io.fabric8.kubernetes.api.model.ObjectMeta; -import org.apache.commons.lang3.reflect.FieldUtils; import org.apache.spark.k8s.operator.Constants; import org.apache.spark.k8s.operator.SparkApplication; @@ -66,9 +66,15 @@ public static long calculateElapsedTimeInMills(long startTime) { return System.currentTimeMillis() - startTime; } + @SuppressWarnings("PMD.AvoidAccessibilityAlteration") public static void setConfigKey(ConfigOption configKey, T newValue) { try { - FieldUtils.writeField(configKey, "defaultValue", newValue, true); + Class targetClass = configKey.getClass(); + Field field = targetClass.getDeclaredField("defaultValue"); + field.setAccessible(true); + field.set(configKey, newValue); + } catch (NoSuchFieldException e) { + throw new IllegalStateException(e); } catch (IllegalAccessException e) { throw new UnsupportedOperationException(e); } diff --git a/spark-submission-worker/src/test/java/org/apache/spark/k8s/operator/SparkAppDriverConfTest.java b/spark-submission-worker/src/test/java/org/apache/spark/k8s/operator/SparkAppDriverConfTest.java index 2070aed3..69405150 100644 --- a/spark-submission-worker/src/test/java/org/apache/spark/k8s/operator/SparkAppDriverConfTest.java +++ b/spark-submission-worker/src/test/java/org/apache/spark/k8s/operator/SparkAppDriverConfTest.java @@ -27,7 +27,6 @@ import scala.Option; -import org.apache.commons.lang3.RandomStringUtils; import org.junit.jupiter.api.Test; import org.apache.spark.SparkConf; @@ -63,7 +62,7 @@ void testConfigMapNameDriver() { SparkConf sparkConf = new SparkConf(); sparkConf.set("foo", "bar"); sparkConf.set("spark.executor.instances", "1"); - String appId = RandomStringUtils.randomAlphabetic(1000); + String appId = "a".repeat(1000); SparkAppDriverConf sparkAppDriverConf = SparkAppDriverConf.create( sparkConf, appId, mock(JavaMainAppResource.class), "foo", null, Option.empty()); diff --git a/spark-submission-worker/src/test/java/org/apache/spark/k8s/operator/SparkAppSubmissionWorkerTest.java b/spark-submission-worker/src/test/java/org/apache/spark/k8s/operator/SparkAppSubmissionWorkerTest.java index b678d94f..19c67870 100644 --- a/spark-submission-worker/src/test/java/org/apache/spark/k8s/operator/SparkAppSubmissionWorkerTest.java +++ b/spark-submission-worker/src/test/java/org/apache/spark/k8s/operator/SparkAppSubmissionWorkerTest.java @@ -36,7 +36,6 @@ import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; -import org.apache.commons.lang3.RandomStringUtils; import org.junit.jupiter.api.Test; import org.mockito.MockedConstruction; @@ -209,8 +208,8 @@ void sparkAppIdShouldBeDeterministicPerAppPerAttempt() { @Test void generatedSparkAppIdShouldComplyLengthLimit() { - String namespaceName = RandomStringUtils.randomAlphabetic(253); - String appName = RandomStringUtils.randomAlphabetic(253); + String namespaceName = "n".repeat(253); + String appName = "a".repeat(253); SparkApplication mockApp = mock(SparkApplication.class); ObjectMeta appMeta =