fix: commons-lang 2.6 dependency is obsolete and unsupported

ikysil · tglman · commit 36d6017bc6e6 · 2025-08-12T22:44:20.000+02:00
diff --git a/core/pom.xml b/core/pom.xml
@@ -356,9 +356,10 @@
             <version>1.8.0</version>
         </dependency>
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.18.0</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/OrientDBEmbedded.java b/core/src/main/java/com/orientechnologies/orient/core/db/OrientDBEmbedded.java
@@ -58,26 +58,14 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.Timer;
-import java.util.TimerTask;
+import java.util.*;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
-import org.apache.commons.lang.NullArgumentException;
 
 /** Created by tglman on 08/04/16. */
 public class OrientDBEmbedded implements OrientDBInternal {
@@ -1226,9 +1214,7 @@ public boolean isMemoryOnly() {
   }
 
   private void checkDatabaseName(String name) {
-    if (name == null) {
-      throw new NullArgumentException("database");
-    }
+    Objects.requireNonNull(name, "Database name is null");
     if (name.contains("/") || name.contains(":")) {
       throw new ODatabaseException(String.format("Invalid database name:'%s'", name));
     }
diff --git a/core/src/main/java/com/orientechnologies/orient/core/storage/index/nkbtree/normalizers/StringKeyNormalizer.java b/core/src/main/java/com/orientechnologies/orient/core/storage/index/nkbtree/normalizers/StringKeyNormalizer.java
@@ -1,10 +1,8 @@
 package com.orientechnologies.orient.core.storage.index.nkbtree.normalizers;
 
 import java.io.IOException;
-import java.nio.ByteBuffer;
 import java.text.CollationKey;
 import java.text.Collator;
-import org.apache.commons.lang.ArrayUtils;
 
 public class StringKeyNormalizer implements KeyNormalizers {
   private final Collator instance = Collator.getInstance();
@@ -13,8 +11,10 @@ public class StringKeyNormalizer implements KeyNormalizers {
   public byte[] execute(Object key, int decomposition) throws IOException {
     instance.setDecomposition(decomposition);
     final CollationKey collationKey = instance.getCollationKey((String) key);
-    final ByteBuffer bb = ByteBuffer.allocate(1);
-    bb.put((byte) 0);
-    return ArrayUtils.addAll(bb.array(), collationKey.toByteArray());
+    final byte[] ckArray = collationKey.toByteArray();
+    final byte[] result = new byte[ckArray.length + 1];
+    result[0] = 0;
+    System.arraycopy(ckArray, 0, result, 1, ckArray.length);
+    return result;
   }
 }
diff --git a/core/src/test/java/com/orientechnologies/orient/core/sql/executor/ConvertToResultInternalStepTest.java b/core/src/test/java/com/orientechnologies/orient/core/sql/executor/ConvertToResultInternalStepTest.java
@@ -7,7 +7,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/core/src/test/java/com/orientechnologies/orient/core/sql/executor/ConvertToUpdatableResultStepTest.java b/core/src/test/java/com/orientechnologies/orient/core/sql/executor/ConvertToUpdatableResultStepTest.java
@@ -7,7 +7,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/core/src/test/java/com/orientechnologies/orient/core/sql/executor/TestUtilsFixture.java b/core/src/test/java/com/orientechnologies/orient/core/sql/executor/TestUtilsFixture.java
@@ -3,7 +3,7 @@
 import com.orientechnologies.BaseMemoryDatabase;
 import com.orientechnologies.orient.core.metadata.schema.OClass;
 import com.orientechnologies.orient.core.metadata.schema.OSchema;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 
 /** Created by olena.kolesnyk on 28/07/2017. */
 public class TestUtilsFixture extends BaseMemoryDatabase {
diff --git a/pom.xml b/pom.xml
@@ -175,6 +175,17 @@
         <maven.central.plugin.version>0.8.0</maven.central.plugin.version>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>commons-lang</groupId>
+                <artifactId>commons-lang</artifactId>
+                <version>2.6</version>
+                <scope>runtime</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <pluginManagement>
             <plugins>
