Merge pull request #42747 from ravinperera00/issue_41530

Remove org.apache.commons.lang3 usage from Ballerina Runtime
ballerina-platform · Jun 4, 2024 · 13d9542 · 13d9542
2 parents e6639af + a9e2be7
commit 13d9542
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/StateMachine.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/StateMachine.java
@@ -18,10 +18,10 @@
 
 package io.ballerina.runtime.internal;
 
+import io.ballerina.identifier.Utils;
 import io.ballerina.runtime.api.creators.ErrorCreator;
 import io.ballerina.runtime.api.utils.StringUtils;
 import io.ballerina.runtime.api.values.BError;
-import org.apache.commons.lang3.StringEscapeUtils;
 
 import java.io.IOException;
 import java.io.Reader;
@@ -707,7 +707,7 @@ private void reset(StateMachine sm) {
         }
 
         private char extractUnicodeChar(StateMachine sm) {
-            return StringEscapeUtils.unescapeJava("\\u" + sm.hexBuilder).charAt(0);
+            return Utils.unescapeJava("\\u" + sm.hexBuilder).charAt(0);
         }
     }
 

diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/launch/LaunchUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/launch/LaunchUtils.java
@@ -32,7 +32,6 @@
 import io.ballerina.runtime.internal.diagnostics.RuntimeDiagnosticLog;
 import io.ballerina.runtime.internal.troubleshoot.StrandDump;
 import io.ballerina.runtime.internal.util.RuntimeUtils;
-import org.apache.commons.lang3.ArrayUtils;
 import sun.misc.Signal;
 
 import java.io.File;
@@ -96,11 +95,16 @@ public static void stopListeners(boolean isService) {
 
     public static void addModuleConfigData(Map<Module, VariableKey[]> configurationData, Module m,
                                            VariableKey[] variableKeys) {
-        VariableKey[] keys = configurationData.put(m, variableKeys);
-        if (keys == null) {
-            return;
+        VariableKey[] currKeys = configurationData.get(m);
+        VariableKey[] mergedKeyArray;
+        if (currKeys == null) {
+            mergedKeyArray = variableKeys;
+        } else {
+            mergedKeyArray = new VariableKey[currKeys.length + variableKeys.length];
+            System.arraycopy(currKeys, 0, mergedKeyArray, 0, currKeys.length);
+            System.arraycopy(variableKeys, 0, mergedKeyArray, currKeys.length, variableKeys.length);
         }
-        configurationData.put(m, ArrayUtils.addAll(keys, variableKeys));
+        configurationData.put(m, mergedKeyArray);
     }
 
     public static void initConfigurableVariables(Module rootModule, Map<Module, VariableKey[]> configurationData,

diff --git a/bvm/ballerina-runtime/src/main/java/module-info.java b/bvm/ballerina-runtime/src/main/java/module-info.java
@@ -15,7 +15,6 @@
     requires transactions.jta;
     requires java.transaction;
     requires java.naming;
-    requires org.apache.commons.lang3;
     requires io.ballerina.identifier;
     requires jdk.unsupported;