Remove usage of the commons-lang 2.6

Signed-off-by: Andriy Redko <drreta@gmail.com>

Author: reta

CHANGELOG.md

@@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Bug Fixes
 * Fix issues handling documents without vector fields being populated [288] (https://github.com/opensearch-project/opensearch-jvector/issues/288)
 * The KNN1030Codec does not properly support delegation for non-default codec(s). [310] (https://github.com/opensearch-project/opensearch-jvector/pull/310)
+* Remove usage of the commons-lang 2.6 [317] (https://github.com/opensearch-project/opensearch-jvector/pull/317)
 ### Infrastructure
 * Upgrade Lucene to 10.4.0 [292] (https://github.com/opensearch-project/opensearch-jvector/pull/292)
 ### Documentation

build.gradle

@@ -313,7 +313,6 @@ dependencies {
     compileOnly "org.opensearch.plugin:opensearch-scripting-painless-spi:${versions.opensearch}"
     api group: 'com.google.guava', name: 'failureaccess', version:'1.0.1'
     api group: 'com.google.guava', name: 'guava', version:'32.1.3-jre'
-    api group: 'commons-lang', name: 'commons-lang', version: '2.6'
     api "org.apache.commons:commons-lang3:${versions.commonslang}"
     testFixturesImplementation "org.opensearch.test:framework:${opensearch_version}"
     // Add the high-level client dependency

src/main/java/org/opensearch/knn/index/engine/MethodComponentContext.java

@@ -8,7 +8,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang.math.NumberUtils;
+import org.apache.commons.lang3.math.NumberUtils;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.common.io.stream.Writeable;
@@ -23,8 +23,8 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import static org.opensearch.knn.common.KNNConstants.NAME;
 import static org.opensearch.knn.common.KNNConstants.PARAMETERS;

src/main/java/org/opensearch/knn/index/query/KNNQueryBuilder.java

@@ -10,7 +10,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.log4j.Log4j2;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.lucene.search.*;
 import org.opensearch.common.ValidationException;
 import org.opensearch.core.ParseField;

src/main/java/org/opensearch/knn/index/util/IndexUtil.java

@@ -7,7 +7,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.opensearch.Version;
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.cluster.metadata.MappingMetadata;

src/main/java/org/opensearch/knn/plugin/rest/RestKNNStatsHandler.java

@@ -6,7 +6,7 @@
 package org.opensearch.knn.plugin.rest;
 
 import lombok.AllArgsConstructor;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.opensearch.knn.plugin.JVectorKNNPlugin;
 import org.opensearch.knn.plugin.transport.KNNStatsAction;
 import org.opensearch.knn.plugin.transport.KNNStatsRequest;

src/test/java/org/opensearch/knn/index/engine/JVectorEngineIT.java

@@ -10,7 +10,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import lombok.SneakyThrows;
-import org.apache.commons.lang.math.RandomUtils;
+import org.apache.commons.lang3.RandomUtils;
 import org.apache.hc.core5.http.ParseException;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
 import org.junit.After;
@@ -287,7 +287,7 @@ public void testIndexReopening() throws Exception {
         }
 
         final float[] searchVector = TEST_QUERY_VECTORS[0];
-        final int k = 1 + RandomUtils.nextInt(TEST_INDEX_VECTORS.length);
+        final int k = 1 + RandomUtils.secure().randomInt(0, TEST_INDEX_VECTORS.length);
 
         final List<float[]> knnResultsBeforeIndexClosure = queryResults(searchVector, k);
 

src/test/java/org/opensearch/knn/index/engine/LuceneEngineIT.java

@@ -8,7 +8,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import lombok.SneakyThrows;
-import org.apache.commons.lang.math.RandomUtils;
+import org.apache.commons.lang3.RandomUtils;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
 import org.apache.lucene.util.VectorUtil;
 import org.junit.After;
@@ -457,7 +457,7 @@ public void testIndexReopening() throws Exception {
         }
 
         final float[] searchVector = TEST_QUERY_VECTORS[0];
-        final int k = 1 + RandomUtils.nextInt(TEST_INDEX_VECTORS.length);
+        final int k = 1 + RandomUtils.secure().randomInt(0, TEST_INDEX_VECTORS.length);
 
         final List<float[]> knnResultsBeforeIndexClosure = queryResults(searchVector, k);