From d29b10ef4756977c78baa770829bbdd41f2048ee Mon Sep 17 00:00:00 2001 From: gabilang Date: Tue, 5 Mar 2024 12:07:00 +0530 Subject: [PATCH 1/2] Remove lang dependencies from langlibs --- .../util/BLangCompilerConstants.java | 25 ------------- .../src/main/java/module-info.java | 1 - .../langlib/internal/InvokeAsExternal.java | 3 +- .../lang.array/src/main/java/module-info.java | 1 - .../ballerinalang/langlib/array/Filter.java | 2 +- .../ballerinalang/langlib/array/ForEach.java | 2 +- .../org/ballerinalang/langlib/array/Map.java | 2 +- .../ballerinalang/langlib/array/Reduce.java | 2 +- .../langlib/array/utils/Constants.java | 30 ++++++++++++++++ .../src/main/java/module-info.java | 1 - .../src/main/java/module-info.java | 1 - .../lang.error/src/main/java/module-info.java | 1 - .../lang.float/src/main/java/module-info.java | 1 - .../src/main/java/module-info.java | 1 - .../src/main/java/module-info.java | 1 - .../lang.int/src/main/java/module-info.java | 1 - .../lang.map/src/main/java/module-info.java | 1 - .../org/ballerinalang/langlib/map/Filter.java | 2 +- .../ballerinalang/langlib/map/ForEach.java | 2 +- .../org/ballerinalang/langlib/map/Map.java | 2 +- .../org/ballerinalang/langlib/map/Reduce.java | 2 +- .../org/ballerinalang/langlib/map/Remove.java | 2 +- .../langlib/map/util/Constants.java | 31 ++++++++++++++++ .../lang.query/src/main/java/module-info.java | 1 - .../src/main/java/module-info.java | 1 - .../src/main/java/module-info.java | 1 - .../langlib/string/FromCodePointInt.java | 2 +- .../langlib/string/FromCodePointInts.java | 2 +- .../langlib/string/utils/Constants.java | 31 ++++++++++++++++ .../lang.table/src/main/java/module-info.java | 1 - .../ballerinalang/langlib/table/Filter.java | 3 +- .../ballerinalang/langlib/table/Foreach.java | 3 +- .../ballerinalang/langlib/table/GetKeys.java | 12 +++---- .../org/ballerinalang/langlib/table/Map.java | 2 +- .../ballerinalang/langlib/table/Reduce.java | 2 +- .../langlib/table/utils/Constants.java | 30 ++++++++++++++++ .../lang.test/src/main/java/module-info.java | 1 - .../lang.value/src/main/java/module-info.java | 1 - .../lang.xml/src/main/java/module-info.java | 1 - .../org/ballerinalang/langlib/xml/Filter.java | 2 +- .../ballerinalang/langlib/xml/ForEach.java | 2 +- .../org/ballerinalang/langlib/xml/Map.java | 2 +- .../langlib/xml/SelectDescendants.java | 2 +- .../langlib/xml/utils/Constants.java | 30 ++++++++++++++++ .../langlib/xml/utils/Lists.java | 36 +++++++++++++++++++ 45 files changed, 214 insertions(+), 71 deletions(-) create mode 100644 langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/utils/Constants.java create mode 100644 langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/util/Constants.java create mode 100644 langlib/lang.string/src/main/java/org/ballerinalang/langlib/string/utils/Constants.java create mode 100644 langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/utils/Constants.java create mode 100644 langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/utils/Constants.java create mode 100644 langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/utils/Lists.java diff --git a/compiler/ballerina-lang/src/main/java/org/ballerinalang/util/BLangCompilerConstants.java b/compiler/ballerina-lang/src/main/java/org/ballerinalang/util/BLangCompilerConstants.java index 83fb0200cd1f..58f229cd9574 100644 --- a/compiler/ballerina-lang/src/main/java/org/ballerinalang/util/BLangCompilerConstants.java +++ b/compiler/ballerina-lang/src/main/java/org/ballerinalang/util/BLangCompilerConstants.java @@ -33,31 +33,6 @@ public class BLangCompilerConstants { // java module version public static final String JAVA_VERSION = "0.9.0"; - // lang lib versions - public static final String INTERNAL_VERSION = "0.1.0"; - public static final String ANNOTATIONS_VERSION = "1.0.0"; - public static final String ARRAY_VERSION = "1.1.0"; - public static final String DECIMAL_VERSION = "1.0.0"; - public static final String ERROR_VERSION = "1.0.0"; - public static final String FLOAT_VERSION = "1.0.0"; - public static final String FUTURE_VERSION = "1.0.0"; - public static final String INT_VERSION = "1.1.0"; - public static final String MAP_VERSION = "1.1.0"; - public static final String OBJECT_VERSION = "1.0.0"; - public static final String STREAM_VERSION = "0.4.0"; - public static final String STRING_VERSION = "1.1.0"; - public static final String TABLE_VERSION = "0.4.0"; - public static final String TEST_VERSION = "1.0.0"; - public static final String TYPEDESC_VERSION = "1.0.0"; - public static final String VALUE_VERSION = "1.0.0"; - public static final String XML_VERSION = "0.8.0"; - public static final String BOOLEAN_VERSION = "1.0.0"; - public static final String QUERY_VERSION = "0.0.1"; - public static final String RUNTIME_VERSION = "0.0.1"; - public static final String TRANSACTION_VERSION = "0.0.1"; - public static final String TRANSACTION_INTERNAL_VERSION = "1.0.15"; - public static final String OBSERVE_INTERNAL_VERSION = "1.0.0"; - public static final String C2C_VERSION = "1.0.0"; private BLangCompilerConstants() { } diff --git a/langlib/lang.__internal/src/main/java/module-info.java b/langlib/lang.__internal/src/main/java/module-info.java index 340cc38698f5..b25b58b47fa1 100644 --- a/langlib/lang.__internal/src/main/java/module-info.java +++ b/langlib/lang.__internal/src/main/java/module-info.java @@ -1,5 +1,4 @@ module io.ballerina.lang.internal { exports org.ballerinalang.langlib.internal; - requires io.ballerina.lang; requires io.ballerina.runtime; } \ No newline at end of file diff --git a/langlib/lang.__internal/src/main/java/org/ballerinalang/langlib/internal/InvokeAsExternal.java b/langlib/lang.__internal/src/main/java/org/ballerinalang/langlib/internal/InvokeAsExternal.java index 17a4061fbb94..aa0d955fb6be 100644 --- a/langlib/lang.__internal/src/main/java/org/ballerinalang/langlib/internal/InvokeAsExternal.java +++ b/langlib/lang.__internal/src/main/java/org/ballerinalang/langlib/internal/InvokeAsExternal.java @@ -25,7 +25,6 @@ import java.util.List; import static io.ballerina.runtime.api.constants.RuntimeConstants.BALLERINA_BUILTIN_PKG_PREFIX; -import static org.ballerinalang.util.BLangCompilerConstants.INTERNAL_VERSION; /** * Native implementation of lang.internal:invokeAsExternal(func, args). @@ -35,7 +34,7 @@ public class InvokeAsExternal { private static final StrandMetadata METADATA = new StrandMetadata(BALLERINA_BUILTIN_PKG_PREFIX, "lang.internal", - INTERNAL_VERSION, "invokeAsExternal"); + "0.1.0", "invokeAsExternal"); public static Object invokeAsExternal(Object func, Object[] args) { diff --git a/langlib/lang.array/src/main/java/module-info.java b/langlib/lang.array/src/main/java/module-info.java index 77a72767eebf..af69b9ca16cb 100644 --- a/langlib/lang.array/src/main/java/module-info.java +++ b/langlib/lang.array/src/main/java/module-info.java @@ -1,5 +1,4 @@ module io.ballerina.lang.array { - requires io.ballerina.lang; requires io.ballerina.runtime; exports org.ballerinalang.langlib.array; } \ No newline at end of file diff --git a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Filter.java b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Filter.java index d411553a97de..0b9c0b6d8daf 100644 --- a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Filter.java +++ b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Filter.java @@ -35,7 +35,7 @@ import static io.ballerina.runtime.api.constants.RuntimeConstants.ARRAY_LANG_LIB; import static io.ballerina.runtime.api.constants.RuntimeConstants.BALLERINA_BUILTIN_PKG_PREFIX; import static org.ballerinalang.langlib.array.utils.ArrayUtils.createOpNotSupportedError; -import static org.ballerinalang.util.BLangCompilerConstants.ARRAY_VERSION; +import static org.ballerinalang.langlib.array.utils.Constants.ARRAY_VERSION; /** * Native implementation of lang.array:filter(Type[], function). diff --git a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/ForEach.java b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/ForEach.java index 7735d18880ea..31fe4996e12d 100644 --- a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/ForEach.java +++ b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/ForEach.java @@ -31,7 +31,7 @@ import static io.ballerina.runtime.api.constants.RuntimeConstants.ARRAY_LANG_LIB; import static io.ballerina.runtime.api.constants.RuntimeConstants.BALLERINA_BUILTIN_PKG_PREFIX; import static org.ballerinalang.langlib.array.utils.ArrayUtils.getElementAccessFunction; -import static org.ballerinalang.util.BLangCompilerConstants.ARRAY_VERSION; +import static org.ballerinalang.langlib.array.utils.Constants.ARRAY_VERSION; /** * Native implementation of lang.array:forEach(Type[]). diff --git a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Map.java b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Map.java index 1d68dac63660..525e39255711 100644 --- a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Map.java +++ b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Map.java @@ -37,7 +37,7 @@ import static io.ballerina.runtime.api.constants.RuntimeConstants.ARRAY_LANG_LIB; import static io.ballerina.runtime.api.constants.RuntimeConstants.BALLERINA_BUILTIN_PKG_PREFIX; import static org.ballerinalang.langlib.array.utils.ArrayUtils.createOpNotSupportedError; -import static org.ballerinalang.util.BLangCompilerConstants.ARRAY_VERSION; +import static org.ballerinalang.langlib.array.utils.Constants.ARRAY_VERSION; /** * Native implementation of lang.array:map(Type[]). diff --git a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Reduce.java b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Reduce.java index fe09d9568098..2873491660f4 100644 --- a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Reduce.java +++ b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Reduce.java @@ -32,7 +32,7 @@ import static io.ballerina.runtime.api.constants.RuntimeConstants.ARRAY_LANG_LIB; import static io.ballerina.runtime.api.constants.RuntimeConstants.BALLERINA_BUILTIN_PKG_PREFIX; import static org.ballerinalang.langlib.array.utils.ArrayUtils.getElementAccessFunction; -import static org.ballerinalang.util.BLangCompilerConstants.ARRAY_VERSION; +import static org.ballerinalang.langlib.array.utils.Constants.ARRAY_VERSION; /** * Native implementation of lang.array:reduce(Type[], function). diff --git a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/utils/Constants.java b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/utils/Constants.java new file mode 100644 index 000000000000..f63c76213192 --- /dev/null +++ b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/utils/Constants.java @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://wso2.com). + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ballerinalang.langlib.array.utils; + +/** + * Constants for the langlib array module. + * + * @since 2201.9.0 + */ +public class Constants { + + public static final String ARRAY_VERSION = "1.1.0"; + + private Constants() { + } +} diff --git a/langlib/lang.boolean/src/main/java/module-info.java b/langlib/lang.boolean/src/main/java/module-info.java index 5811c82c58ba..dcac92b23347 100644 --- a/langlib/lang.boolean/src/main/java/module-info.java +++ b/langlib/lang.boolean/src/main/java/module-info.java @@ -1,5 +1,4 @@ module io.ballerina.lang.bool { - requires io.ballerina.lang; requires io.ballerina.runtime; exports org.ballerinalang.langlib.bool; } \ No newline at end of file diff --git a/langlib/lang.decimal/src/main/java/module-info.java b/langlib/lang.decimal/src/main/java/module-info.java index 2fe03cbbd5be..e7f8e2adad48 100644 --- a/langlib/lang.decimal/src/main/java/module-info.java +++ b/langlib/lang.decimal/src/main/java/module-info.java @@ -1,5 +1,4 @@ module io.ballerina.lang.decimal { - requires io.ballerina.lang; requires io.ballerina.runtime; exports org.ballerinalang.langlib.decimal; } \ No newline at end of file diff --git a/langlib/lang.error/src/main/java/module-info.java b/langlib/lang.error/src/main/java/module-info.java index 5641c71301a4..b557cc8d110d 100644 --- a/langlib/lang.error/src/main/java/module-info.java +++ b/langlib/lang.error/src/main/java/module-info.java @@ -1,5 +1,4 @@ module io.ballerina.lang.error { - requires io.ballerina.lang; requires io.ballerina.runtime; requires io.ballerina.identifier; exports org.ballerinalang.langlib.error; diff --git a/langlib/lang.float/src/main/java/module-info.java b/langlib/lang.float/src/main/java/module-info.java index 5723f46428b7..5c45de0a9520 100644 --- a/langlib/lang.float/src/main/java/module-info.java +++ b/langlib/lang.float/src/main/java/module-info.java @@ -1,5 +1,4 @@ module io.ballerina.lang.floatingpoint { - requires io.ballerina.lang; requires io.ballerina.runtime; exports org.ballerinalang.langlib.floatingpoint; } \ No newline at end of file diff --git a/langlib/lang.function/src/main/java/module-info.java b/langlib/lang.function/src/main/java/module-info.java index 214b5c868c43..3bbe5f1df620 100644 --- a/langlib/lang.function/src/main/java/module-info.java +++ b/langlib/lang.function/src/main/java/module-info.java @@ -1,5 +1,4 @@ module io.ballerina.lang.function { - requires io.ballerina.lang; requires io.ballerina.runtime; exports org.ballerinalang.langlib.function; } diff --git a/langlib/lang.future/src/main/java/module-info.java b/langlib/lang.future/src/main/java/module-info.java index 9e5c6bf5e2f5..3bf5e5825217 100644 --- a/langlib/lang.future/src/main/java/module-info.java +++ b/langlib/lang.future/src/main/java/module-info.java @@ -1,5 +1,4 @@ module io.ballerina.lang.future { - requires io.ballerina.lang; requires io.ballerina.runtime; exports org.ballerinalang.langlib.future; } \ No newline at end of file diff --git a/langlib/lang.int/src/main/java/module-info.java b/langlib/lang.int/src/main/java/module-info.java index 3535db6c1c8c..6832ee31b844 100644 --- a/langlib/lang.int/src/main/java/module-info.java +++ b/langlib/lang.int/src/main/java/module-info.java @@ -1,5 +1,4 @@ module io.ballerina.lang.integer { - requires io.ballerina.lang; requires io.ballerina.runtime; exports org.ballerinalang.langlib.integer; } \ No newline at end of file diff --git a/langlib/lang.map/src/main/java/module-info.java b/langlib/lang.map/src/main/java/module-info.java index b3e2f710fdf8..a7fe67b16435 100644 --- a/langlib/lang.map/src/main/java/module-info.java +++ b/langlib/lang.map/src/main/java/module-info.java @@ -1,5 +1,4 @@ module io.ballerina.lang.map { - requires io.ballerina.lang; requires io.ballerina.runtime; exports org.ballerinalang.langlib.map; } \ No newline at end of file diff --git a/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Filter.java b/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Filter.java index 5b1255251e72..ecc520bd02a4 100644 --- a/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Filter.java +++ b/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Filter.java @@ -38,7 +38,7 @@ import static io.ballerina.runtime.api.constants.RuntimeConstants.BALLERINA_BUILTIN_PKG_PREFIX; import static io.ballerina.runtime.api.constants.RuntimeConstants.MAP_LANG_LIB; import static io.ballerina.runtime.internal.MapUtils.createOpNotSupportedError; -import static org.ballerinalang.util.BLangCompilerConstants.MAP_VERSION; +import static org.ballerinalang.langlib.map.util.Constants.MAP_VERSION; /** * Native implementation of lang.map:filter(map<Type>, function). diff --git a/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/ForEach.java b/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/ForEach.java index 0ec33532ca27..6b5f4876f8a9 100644 --- a/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/ForEach.java +++ b/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/ForEach.java @@ -28,7 +28,7 @@ import static io.ballerina.runtime.api.constants.RuntimeConstants.BALLERINA_BUILTIN_PKG_PREFIX; import static io.ballerina.runtime.api.constants.RuntimeConstants.MAP_LANG_LIB; -import static org.ballerinalang.util.BLangCompilerConstants.MAP_VERSION; +import static org.ballerinalang.langlib.map.util.Constants.MAP_VERSION; /** * Native implementation of lang.map:forEach(map<Type>, function). diff --git a/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Map.java b/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Map.java index f27683355e53..5d183c98197c 100644 --- a/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Map.java +++ b/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Map.java @@ -34,7 +34,7 @@ import static io.ballerina.runtime.api.constants.RuntimeConstants.BALLERINA_BUILTIN_PKG_PREFIX; import static io.ballerina.runtime.api.constants.RuntimeConstants.MAP_LANG_LIB; -import static org.ballerinalang.util.BLangCompilerConstants.MAP_VERSION; +import static org.ballerinalang.langlib.map.util.Constants.MAP_VERSION; /** * Native implementation of lang.map:map(map<Type>, function). diff --git a/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Reduce.java b/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Reduce.java index a9d04b44d41d..ea2c0d9522cf 100644 --- a/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Reduce.java +++ b/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Reduce.java @@ -29,7 +29,7 @@ import static io.ballerina.runtime.api.constants.RuntimeConstants.BALLERINA_BUILTIN_PKG_PREFIX; import static io.ballerina.runtime.api.constants.RuntimeConstants.MAP_LANG_LIB; -import static org.ballerinalang.util.BLangCompilerConstants.MAP_VERSION; +import static org.ballerinalang.langlib.map.util.Constants.MAP_VERSION; /** * Native implementation of lang.map:reduce(map<Type>, function, Type1). diff --git a/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Remove.java b/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Remove.java index 1547edc2a94d..afac130f12f5 100644 --- a/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Remove.java +++ b/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Remove.java @@ -30,8 +30,8 @@ import static io.ballerina.runtime.internal.MapUtils.checkIsMapOnlyOperation; import static io.ballerina.runtime.internal.errors.ErrorReasons.MAP_KEY_NOT_FOUND_ERROR; +import static org.ballerinalang.langlib.map.util.Constants.REMOVE; import static org.ballerinalang.langlib.map.util.MapLibUtils.validateRequiredFieldForRecord; -import static org.wso2.ballerinalang.compiler.util.Constants.REMOVE; /** * Extern function to remove element from the map. diff --git a/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/util/Constants.java b/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/util/Constants.java new file mode 100644 index 000000000000..a2a4ada9142b --- /dev/null +++ b/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/util/Constants.java @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://wso2.com). + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ballerinalang.langlib.map.util; + +/** + * Constants for the langlib map module. + * + * @since 2201.9.0 + */ +public class Constants { + + public static final String MAP_VERSION = "1.1.0"; + public static final String REMOVE = "remove()"; + + private Constants() { + } +} diff --git a/langlib/lang.query/src/main/java/module-info.java b/langlib/lang.query/src/main/java/module-info.java index b506e5eae445..bba36e913aee 100644 --- a/langlib/lang.query/src/main/java/module-info.java +++ b/langlib/lang.query/src/main/java/module-info.java @@ -1,5 +1,4 @@ module io.ballerina.lang.query { requires io.ballerina.runtime; - requires io.ballerina.lang; exports org.ballerinalang.langlib.query; } \ No newline at end of file diff --git a/langlib/lang.regexp/src/main/java/module-info.java b/langlib/lang.regexp/src/main/java/module-info.java index fe0036de74fe..0e4276a4f876 100644 --- a/langlib/lang.regexp/src/main/java/module-info.java +++ b/langlib/lang.regexp/src/main/java/module-info.java @@ -1,5 +1,4 @@ module io.ballerina.lang.regexp { requires io.ballerina.runtime; - requires io.ballerina.lang; exports org.ballerinalang.langlib.regexp; } \ No newline at end of file diff --git a/langlib/lang.string/src/main/java/module-info.java b/langlib/lang.string/src/main/java/module-info.java index 57257ab3661c..2e278a78dcc6 100644 --- a/langlib/lang.string/src/main/java/module-info.java +++ b/langlib/lang.string/src/main/java/module-info.java @@ -1,5 +1,4 @@ module io.ballerina.lang.string { - requires io.ballerina.lang; requires io.ballerina.runtime; exports org.ballerinalang.langlib.string; } \ No newline at end of file diff --git a/langlib/lang.string/src/main/java/org/ballerinalang/langlib/string/FromCodePointInt.java b/langlib/lang.string/src/main/java/org/ballerinalang/langlib/string/FromCodePointInt.java index a008bc6cf16c..a49743c94441 100644 --- a/langlib/lang.string/src/main/java/org/ballerinalang/langlib/string/FromCodePointInt.java +++ b/langlib/lang.string/src/main/java/org/ballerinalang/langlib/string/FromCodePointInt.java @@ -20,7 +20,7 @@ import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.utils.StringUtils; -import org.wso2.ballerinalang.compiler.util.Constants; +import org.ballerinalang.langlib.string.utils.Constants; /** * Extern function lang.string:fromCodePointInt(int). diff --git a/langlib/lang.string/src/main/java/org/ballerinalang/langlib/string/FromCodePointInts.java b/langlib/lang.string/src/main/java/org/ballerinalang/langlib/string/FromCodePointInts.java index b339f4659cbd..2f762f91768c 100644 --- a/langlib/lang.string/src/main/java/org/ballerinalang/langlib/string/FromCodePointInts.java +++ b/langlib/lang.string/src/main/java/org/ballerinalang/langlib/string/FromCodePointInts.java @@ -21,7 +21,7 @@ import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; -import org.wso2.ballerinalang.compiler.util.Constants; +import org.ballerinalang.langlib.string.utils.Constants; /** * Extern function lang.string:fromCodePointInts(int[]). diff --git a/langlib/lang.string/src/main/java/org/ballerinalang/langlib/string/utils/Constants.java b/langlib/lang.string/src/main/java/org/ballerinalang/langlib/string/utils/Constants.java new file mode 100644 index 000000000000..81b218f3b18b --- /dev/null +++ b/langlib/lang.string/src/main/java/org/ballerinalang/langlib/string/utils/Constants.java @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://wso2.com). + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ballerinalang.langlib.string.utils; + +/** + * Constants for the string langlib module. + * + * @since 2201.9.0 + */ +public class Constants { + + public static final int MIN_UNICODE = 0xD800; + public static final int MIDDLE_LIMIT_UNICODE = 0xDFFF; + + private Constants() { + } +} diff --git a/langlib/lang.table/src/main/java/module-info.java b/langlib/lang.table/src/main/java/module-info.java index b3d248bc7ea1..2e2c99504d1f 100644 --- a/langlib/lang.table/src/main/java/module-info.java +++ b/langlib/lang.table/src/main/java/module-info.java @@ -1,5 +1,4 @@ module io.ballerina.lang.table { requires io.ballerina.runtime; - requires io.ballerina.lang; exports org.ballerinalang.langlib.table; } \ No newline at end of file diff --git a/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Filter.java b/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Filter.java index beaedc65fc05..355e5e2377c7 100644 --- a/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Filter.java +++ b/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Filter.java @@ -32,7 +32,7 @@ import static io.ballerina.runtime.api.constants.RuntimeConstants.BALLERINA_BUILTIN_PKG_PREFIX; import static io.ballerina.runtime.api.constants.RuntimeConstants.TABLE_LANG_LIB; -import static org.ballerinalang.util.BLangCompilerConstants.TABLE_VERSION; +import static org.ballerinalang.langlib.table.utils.Constants.TABLE_VERSION; /** * Native implementation of lang.table:filter(table<Type>, function). @@ -69,5 +69,4 @@ public static BTable filter(BTable tbl, BFunctionPointer func) }, () -> newTable, Scheduler.getStrand().scheduler); return newTable; } - } diff --git a/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Foreach.java b/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Foreach.java index 406c04784904..137b6789f468 100644 --- a/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Foreach.java +++ b/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Foreach.java @@ -28,7 +28,7 @@ import static io.ballerina.runtime.api.constants.RuntimeConstants.BALLERINA_BUILTIN_PKG_PREFIX; import static io.ballerina.runtime.api.constants.RuntimeConstants.TABLE_LANG_LIB; -import static org.ballerinalang.util.BLangCompilerConstants.TABLE_VERSION; +import static org.ballerinalang.langlib.table.utils.Constants.TABLE_VERSION; /** * Native implementation of lang.table:forEach(table<Type>, function). @@ -53,5 +53,4 @@ public static void forEach(BTable tbl, BFunctionPointer func) { () -> new Object[]{values[index.incrementAndGet()], true}, result -> { }, () -> null, Scheduler.getStrand().scheduler); } - } diff --git a/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/GetKeys.java b/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/GetKeys.java index ecea7506f458..b91dabd3fbb1 100644 --- a/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/GetKeys.java +++ b/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/GetKeys.java @@ -18,13 +18,13 @@ package org.ballerinalang.langlib.table; +import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BTable; -import org.wso2.ballerinalang.compiler.util.TypeTags; /** * Extern function to get key arrays from the table. @@ -45,35 +45,35 @@ public static BArray keys(BTable tbl) { Type tableKeyType = tbl.getKeyType(); Object[] keys = tbl.getKeys(); switch (tableKeyType.getTag()) { - case TypeTags.BOOLEAN: + case TypeTags.BOOLEAN_TAG: boolean[] boolArr = new boolean[keys.length]; for (int i = 0; i < keys.length; i++) { Object key = keys[i]; boolArr[i] = (boolean) key; } return ValueCreator.createArrayValue(boolArr); - case TypeTags.INT: + case TypeTags.INT_TAG: long[] intArr = new long[keys.length]; for (int i = 0; i < keys.length; i++) { Object key = keys[i]; intArr[i] = (long) key; } return ValueCreator.createArrayValue(intArr); - case TypeTags.BYTE: + case TypeTags.BYTE_TAG: byte[] byteArr = new byte[keys.length]; for (int i = 0; i < keys.length; i++) { Object key = keys[i]; byteArr[i] = (byte) key; } return ValueCreator.createArrayValue(byteArr); - case TypeTags.FLOAT: + case TypeTags.FLOAT_TAG: double[] floatArr = new double[keys.length]; for (int i = 0; i < keys.length; i++) { Object key = keys[i]; floatArr[i] = (double) key; } return ValueCreator.createArrayValue(floatArr); - case TypeTags.STRING: + case TypeTags.STRING_TAG: BString[] stringArr = new BString[keys.length]; for (int i = 0; i < keys.length; i++) { Object key = keys[i]; diff --git a/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Map.java b/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Map.java index 7f568865adda..33cb5fcd4054 100644 --- a/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Map.java +++ b/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Map.java @@ -35,7 +35,7 @@ import static io.ballerina.runtime.api.constants.RuntimeConstants.BALLERINA_BUILTIN_PKG_PREFIX; import static io.ballerina.runtime.api.constants.RuntimeConstants.TABLE_LANG_LIB; -import static org.ballerinalang.util.BLangCompilerConstants.TABLE_VERSION; +import static org.ballerinalang.langlib.table.utils.Constants.TABLE_VERSION; /** * Native implementation of lang.table:map(table<Type>, function). diff --git a/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Reduce.java b/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Reduce.java index 0b58bea76845..69d98468a4a8 100644 --- a/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Reduce.java +++ b/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Reduce.java @@ -29,7 +29,7 @@ import static io.ballerina.runtime.api.constants.RuntimeConstants.BALLERINA_BUILTIN_PKG_PREFIX; import static io.ballerina.runtime.api.constants.RuntimeConstants.TABLE_LANG_LIB; -import static org.ballerinalang.util.BLangCompilerConstants.TABLE_VERSION; +import static org.ballerinalang.langlib.table.utils.Constants.TABLE_VERSION; /** * Native implementation of lang.table:reduce(table<Type>, function). diff --git a/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/utils/Constants.java b/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/utils/Constants.java new file mode 100644 index 000000000000..31375d17ce6f --- /dev/null +++ b/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/utils/Constants.java @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://wso2.com). + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ballerinalang.langlib.table.utils; + +/** + * Constants for the langlib table module. + * + * @since 2201.9.0 + */ +public class Constants { + + public static final String TABLE_VERSION = "0.4.0"; + + private Constants() { + } +} diff --git a/langlib/lang.test/src/main/java/module-info.java b/langlib/lang.test/src/main/java/module-info.java index 9c5cadb7ccdb..123dac5e6f8d 100644 --- a/langlib/lang.test/src/main/java/module-info.java +++ b/langlib/lang.test/src/main/java/module-info.java @@ -1,5 +1,4 @@ module io.ballerina.lang.test { - requires io.ballerina.lang; requires io.ballerina.runtime; exports org.ballerinalang.langlib.test; } \ No newline at end of file diff --git a/langlib/lang.value/src/main/java/module-info.java b/langlib/lang.value/src/main/java/module-info.java index 772c74c602ee..4dfd798f08f0 100644 --- a/langlib/lang.value/src/main/java/module-info.java +++ b/langlib/lang.value/src/main/java/module-info.java @@ -1,5 +1,4 @@ module io.ballerina.lang.value { - requires io.ballerina.lang; requires io.ballerina.runtime; exports org.ballerinalang.langlib.value; } \ No newline at end of file diff --git a/langlib/lang.xml/src/main/java/module-info.java b/langlib/lang.xml/src/main/java/module-info.java index b6b49f1d24aa..f3ab499b0460 100644 --- a/langlib/lang.xml/src/main/java/module-info.java +++ b/langlib/lang.xml/src/main/java/module-info.java @@ -1,5 +1,4 @@ module io.ballerina.lang.xml { - requires io.ballerina.lang; requires io.ballerina.runtime; requires org.slf4j; requires axiom.api; diff --git a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/Filter.java b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/Filter.java index adcd86794b97..100f81c291b6 100644 --- a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/Filter.java +++ b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/Filter.java @@ -31,7 +31,7 @@ import static io.ballerina.runtime.api.constants.RuntimeConstants.BALLERINA_BUILTIN_PKG_PREFIX; import static io.ballerina.runtime.api.constants.RuntimeConstants.XML_LANG_LIB; -import static org.ballerinalang.util.BLangCompilerConstants.XML_VERSION; +import static org.ballerinalang.langlib.xml.utils.Constants.XML_VERSION; /** * Native implementation of lang.xml:filter(map<Type>, function). diff --git a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/ForEach.java b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/ForEach.java index e80f1d5fa665..c5193c5ad539 100644 --- a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/ForEach.java +++ b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/ForEach.java @@ -28,7 +28,7 @@ import static io.ballerina.runtime.api.constants.RuntimeConstants.BALLERINA_BUILTIN_PKG_PREFIX; import static io.ballerina.runtime.api.constants.RuntimeConstants.XML_LANG_LIB; -import static org.ballerinalang.util.BLangCompilerConstants.XML_VERSION; +import static org.ballerinalang.langlib.xml.utils.Constants.XML_VERSION; /** * Native implementation of lang.xml:forEach(map<Type>, function). diff --git a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/Map.java b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/Map.java index 4498979abc50..f60a10aa3d51 100644 --- a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/Map.java +++ b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/Map.java @@ -31,7 +31,7 @@ import static io.ballerina.runtime.api.constants.RuntimeConstants.BALLERINA_BUILTIN_PKG_PREFIX; import static io.ballerina.runtime.api.constants.RuntimeConstants.XML_LANG_LIB; -import static org.ballerinalang.util.BLangCompilerConstants.XML_VERSION; +import static org.ballerinalang.langlib.xml.utils.Constants.XML_VERSION; /** * Native implementation of lang.xml:map(map<Type>, function). diff --git a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/SelectDescendants.java b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/SelectDescendants.java index bf3d5ba5a8f6..dd6f1931e8fa 100644 --- a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/SelectDescendants.java +++ b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/SelectDescendants.java @@ -22,7 +22,7 @@ import io.ballerina.runtime.api.values.BXml; import io.ballerina.runtime.internal.errors.ErrorHelper; import io.ballerina.runtime.internal.scheduling.Strand; -import org.wso2.ballerinalang.util.Lists; +import org.ballerinalang.langlib.xml.utils.Lists; /** * Searches in children recursively for elements matching the name and returns a sequence containing them all. diff --git a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/utils/Constants.java b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/utils/Constants.java new file mode 100644 index 000000000000..064a8632e8ac --- /dev/null +++ b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/utils/Constants.java @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://wso2.com). + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ballerinalang.langlib.xml.utils; + +/** + * Constants for the langlib xml module. + * + * @since 2201.9.0 + */ +public class Constants { + + public static final String XML_VERSION = "0.8.0"; + + private Constants() { + } +} diff --git a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/utils/Lists.java b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/utils/Lists.java new file mode 100644 index 000000000000..700d5e510169 --- /dev/null +++ b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/utils/Lists.java @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://wso2.com). + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ballerinalang.langlib.xml.utils; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * List util class for the langlib xml module. + * + * @since 2201.9.0 + */ +public class Lists { + + @SafeVarargs + public static List of(E... values) { + List list = new ArrayList<>(); + Collections.addAll(list, values); + return list; + } +} From f19697987e9dd11b762a53a3d6a82a40c1dc1b41 Mon Sep 17 00:00:00 2001 From: gabilang Date: Thu, 14 Mar 2024 09:33:57 +0530 Subject: [PATCH 2/2] Address reviews --- langlib/jballerina.java/src/main/java/module-info.java | 2 +- langlib/lang.__internal/src/main/java/module-info.java | 2 +- langlib/lang.array/src/main/java/module-info.java | 2 +- langlib/lang.boolean/src/main/java/module-info.java | 2 +- langlib/lang.decimal/src/main/java/module-info.java | 2 +- langlib/lang.error/src/main/java/module-info.java | 2 +- langlib/lang.float/src/main/java/module-info.java | 2 +- langlib/lang.future/src/main/java/module-info.java | 2 +- langlib/lang.int/src/main/java/module-info.java | 2 +- langlib/lang.map/src/main/java/module-info.java | 2 +- langlib/lang.query/src/main/java/module-info.java | 2 +- langlib/lang.regexp/src/main/java/module-info.java | 2 +- langlib/lang.string/src/main/java/module-info.java | 2 +- langlib/lang.table/src/main/java/module-info.java | 2 +- langlib/lang.test/src/main/java/module-info.java | 2 +- langlib/lang.transaction/src/main/java/module-info.java | 2 +- langlib/lang.typedesc/src/main/java/module-info.java | 2 +- langlib/lang.value/src/main/java/module-info.java | 2 +- langlib/lang.xml/src/main/java/module-info.java | 2 +- .../java/org/ballerinalang/langlib/xml/SelectDescendants.java | 4 ++-- .../langlib/xml/utils/{Lists.java => XmlUtils.java} | 4 ++-- 21 files changed, 23 insertions(+), 23 deletions(-) rename langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/utils/{Lists.java => XmlUtils.java} (92%) diff --git a/langlib/jballerina.java/src/main/java/module-info.java b/langlib/jballerina.java/src/main/java/module-info.java index cce4b0610844..d6a071b2dfae 100644 --- a/langlib/jballerina.java/src/main/java/module-info.java +++ b/langlib/jballerina.java/src/main/java/module-info.java @@ -1,4 +1,4 @@ module io.ballerina.java { requires io.ballerina.runtime; exports org.ballerinalang.langlib.java; -} \ No newline at end of file +} diff --git a/langlib/lang.__internal/src/main/java/module-info.java b/langlib/lang.__internal/src/main/java/module-info.java index b25b58b47fa1..46219b8cbdf8 100644 --- a/langlib/lang.__internal/src/main/java/module-info.java +++ b/langlib/lang.__internal/src/main/java/module-info.java @@ -1,4 +1,4 @@ module io.ballerina.lang.internal { exports org.ballerinalang.langlib.internal; requires io.ballerina.runtime; -} \ No newline at end of file +} diff --git a/langlib/lang.array/src/main/java/module-info.java b/langlib/lang.array/src/main/java/module-info.java index af69b9ca16cb..627916960435 100644 --- a/langlib/lang.array/src/main/java/module-info.java +++ b/langlib/lang.array/src/main/java/module-info.java @@ -1,4 +1,4 @@ module io.ballerina.lang.array { requires io.ballerina.runtime; exports org.ballerinalang.langlib.array; -} \ No newline at end of file +} diff --git a/langlib/lang.boolean/src/main/java/module-info.java b/langlib/lang.boolean/src/main/java/module-info.java index dcac92b23347..4c4eefca5f68 100644 --- a/langlib/lang.boolean/src/main/java/module-info.java +++ b/langlib/lang.boolean/src/main/java/module-info.java @@ -1,4 +1,4 @@ module io.ballerina.lang.bool { requires io.ballerina.runtime; exports org.ballerinalang.langlib.bool; -} \ No newline at end of file +} diff --git a/langlib/lang.decimal/src/main/java/module-info.java b/langlib/lang.decimal/src/main/java/module-info.java index e7f8e2adad48..fbe1367121f0 100644 --- a/langlib/lang.decimal/src/main/java/module-info.java +++ b/langlib/lang.decimal/src/main/java/module-info.java @@ -1,4 +1,4 @@ module io.ballerina.lang.decimal { requires io.ballerina.runtime; exports org.ballerinalang.langlib.decimal; -} \ No newline at end of file +} diff --git a/langlib/lang.error/src/main/java/module-info.java b/langlib/lang.error/src/main/java/module-info.java index b557cc8d110d..6708d4cb45dc 100644 --- a/langlib/lang.error/src/main/java/module-info.java +++ b/langlib/lang.error/src/main/java/module-info.java @@ -2,4 +2,4 @@ requires io.ballerina.runtime; requires io.ballerina.identifier; exports org.ballerinalang.langlib.error; -} \ No newline at end of file +} diff --git a/langlib/lang.float/src/main/java/module-info.java b/langlib/lang.float/src/main/java/module-info.java index 5c45de0a9520..f957d2df0042 100644 --- a/langlib/lang.float/src/main/java/module-info.java +++ b/langlib/lang.float/src/main/java/module-info.java @@ -1,4 +1,4 @@ module io.ballerina.lang.floatingpoint { requires io.ballerina.runtime; exports org.ballerinalang.langlib.floatingpoint; -} \ No newline at end of file +} diff --git a/langlib/lang.future/src/main/java/module-info.java b/langlib/lang.future/src/main/java/module-info.java index 3bf5e5825217..aa945a9a98c2 100644 --- a/langlib/lang.future/src/main/java/module-info.java +++ b/langlib/lang.future/src/main/java/module-info.java @@ -1,4 +1,4 @@ module io.ballerina.lang.future { requires io.ballerina.runtime; exports org.ballerinalang.langlib.future; -} \ No newline at end of file +} diff --git a/langlib/lang.int/src/main/java/module-info.java b/langlib/lang.int/src/main/java/module-info.java index 6832ee31b844..39ce83aa45bd 100644 --- a/langlib/lang.int/src/main/java/module-info.java +++ b/langlib/lang.int/src/main/java/module-info.java @@ -1,4 +1,4 @@ module io.ballerina.lang.integer { requires io.ballerina.runtime; exports org.ballerinalang.langlib.integer; -} \ No newline at end of file +} diff --git a/langlib/lang.map/src/main/java/module-info.java b/langlib/lang.map/src/main/java/module-info.java index a7fe67b16435..d8748c811b87 100644 --- a/langlib/lang.map/src/main/java/module-info.java +++ b/langlib/lang.map/src/main/java/module-info.java @@ -1,4 +1,4 @@ module io.ballerina.lang.map { requires io.ballerina.runtime; exports org.ballerinalang.langlib.map; -} \ No newline at end of file +} diff --git a/langlib/lang.query/src/main/java/module-info.java b/langlib/lang.query/src/main/java/module-info.java index bba36e913aee..2e1f8b759403 100644 --- a/langlib/lang.query/src/main/java/module-info.java +++ b/langlib/lang.query/src/main/java/module-info.java @@ -1,4 +1,4 @@ module io.ballerina.lang.query { requires io.ballerina.runtime; exports org.ballerinalang.langlib.query; -} \ No newline at end of file +} diff --git a/langlib/lang.regexp/src/main/java/module-info.java b/langlib/lang.regexp/src/main/java/module-info.java index 0e4276a4f876..70f694acb764 100644 --- a/langlib/lang.regexp/src/main/java/module-info.java +++ b/langlib/lang.regexp/src/main/java/module-info.java @@ -1,4 +1,4 @@ module io.ballerina.lang.regexp { requires io.ballerina.runtime; exports org.ballerinalang.langlib.regexp; -} \ No newline at end of file +} diff --git a/langlib/lang.string/src/main/java/module-info.java b/langlib/lang.string/src/main/java/module-info.java index 2e278a78dcc6..0770c2f5ec43 100644 --- a/langlib/lang.string/src/main/java/module-info.java +++ b/langlib/lang.string/src/main/java/module-info.java @@ -1,4 +1,4 @@ module io.ballerina.lang.string { requires io.ballerina.runtime; exports org.ballerinalang.langlib.string; -} \ No newline at end of file +} diff --git a/langlib/lang.table/src/main/java/module-info.java b/langlib/lang.table/src/main/java/module-info.java index 2e2c99504d1f..85230c4bf4b9 100644 --- a/langlib/lang.table/src/main/java/module-info.java +++ b/langlib/lang.table/src/main/java/module-info.java @@ -1,4 +1,4 @@ module io.ballerina.lang.table { requires io.ballerina.runtime; exports org.ballerinalang.langlib.table; -} \ No newline at end of file +} diff --git a/langlib/lang.test/src/main/java/module-info.java b/langlib/lang.test/src/main/java/module-info.java index 123dac5e6f8d..21609331717e 100644 --- a/langlib/lang.test/src/main/java/module-info.java +++ b/langlib/lang.test/src/main/java/module-info.java @@ -1,4 +1,4 @@ module io.ballerina.lang.test { requires io.ballerina.runtime; exports org.ballerinalang.langlib.test; -} \ No newline at end of file +} diff --git a/langlib/lang.transaction/src/main/java/module-info.java b/langlib/lang.transaction/src/main/java/module-info.java index 8ef96388f64d..1e8f54be21e6 100644 --- a/langlib/lang.transaction/src/main/java/module-info.java +++ b/langlib/lang.transaction/src/main/java/module-info.java @@ -1,4 +1,4 @@ module io.ballerina.lang.transaction { requires io.ballerina.runtime; exports org.ballerinalang.langlib.transaction; -} \ No newline at end of file +} diff --git a/langlib/lang.typedesc/src/main/java/module-info.java b/langlib/lang.typedesc/src/main/java/module-info.java index d0c0792c339f..7418233b8c75 100644 --- a/langlib/lang.typedesc/src/main/java/module-info.java +++ b/langlib/lang.typedesc/src/main/java/module-info.java @@ -1,4 +1,4 @@ module io.ballerina.lang.typedesc { requires io.ballerina.runtime; exports org.ballerinalang.langlib.typedesc; -} \ No newline at end of file +} diff --git a/langlib/lang.value/src/main/java/module-info.java b/langlib/lang.value/src/main/java/module-info.java index 4dfd798f08f0..dcae5b19eee9 100644 --- a/langlib/lang.value/src/main/java/module-info.java +++ b/langlib/lang.value/src/main/java/module-info.java @@ -1,4 +1,4 @@ module io.ballerina.lang.value { requires io.ballerina.runtime; exports org.ballerinalang.langlib.value; -} \ No newline at end of file +} diff --git a/langlib/lang.xml/src/main/java/module-info.java b/langlib/lang.xml/src/main/java/module-info.java index f3ab499b0460..57e2ace676fd 100644 --- a/langlib/lang.xml/src/main/java/module-info.java +++ b/langlib/lang.xml/src/main/java/module-info.java @@ -5,4 +5,4 @@ requires io.ballerina.lang.internal; requires java.xml; exports org.ballerinalang.langlib.xml; -} \ No newline at end of file +} diff --git a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/SelectDescendants.java b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/SelectDescendants.java index dd6f1931e8fa..de108ca4dfb8 100644 --- a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/SelectDescendants.java +++ b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/SelectDescendants.java @@ -22,7 +22,7 @@ import io.ballerina.runtime.api.values.BXml; import io.ballerina.runtime.internal.errors.ErrorHelper; import io.ballerina.runtime.internal.scheduling.Strand; -import org.ballerinalang.langlib.xml.utils.Lists; +import org.ballerinalang.langlib.xml.utils.XmlUtils; /** * Searches in children recursively for elements matching the name and returns a sequence containing them all. @@ -45,7 +45,7 @@ public static BXml selectDescendants(Strand strand, BXml xml, BArray qnames) { try { // todo: this need to support list of qnames. String qname = qnames.getString(0); - return (BXml) xml.descendants(Lists.of(qname)); + return (BXml) xml.descendants(XmlUtils.getList(qname)); } catch (Throwable e) { ErrorHelper.handleXMLException(OPERATION, e); } diff --git a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/utils/Lists.java b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/utils/XmlUtils.java similarity index 92% rename from langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/utils/Lists.java rename to langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/utils/XmlUtils.java index 700d5e510169..6cbbd7e4dfb4 100644 --- a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/utils/Lists.java +++ b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/utils/XmlUtils.java @@ -25,10 +25,10 @@ * * @since 2201.9.0 */ -public class Lists { +public class XmlUtils { @SafeVarargs - public static List of(E... values) { + public static List getList(E... values) { List list = new ArrayList<>(); Collections.addAll(list, values); return list;