Fix native code path structure

ballerina-platform · Dec 21, 2023 · e7a9b64 · e7a9b64
1 parent ce72f33
commit e7a9b64
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 35 deletions.
diff --git a/ballerina/init.bal b/ballerina/init.bal
@@ -21,5 +21,5 @@ isolated function init() {
 }
 
 isolated function setModule() = @java:Method {
-    'class: "io.ballerina.stdlib.data.utils.ModuleUtils"
+    'class: "io.ballerina.stdlib.data.xmldata.utils.ModuleUtils"
 } external;
diff --git a/ballerina/xml_api.bal b/ballerina/xml_api.bal
@@ -72,7 +72,7 @@ public type Error distinct error;
 # + t - Target type to be used for filtering in the projection
 # + return - On success, returns the given target type value, else returns an `xmldata:Error`
 public isolated function fromXmlWithType(xml v, Options options = {}, typedesc<record {}> t = <>)
-        returns t|Error = @java:Method {'class: "io.ballerina.stdlib.data.xml.Native"} external;
+        returns t|Error = @java:Method {'class: "io.ballerina.stdlib.data.xmldata.xml.Native"} external;
 
 # Converts XML string, byte[] or byte-stream to record type with projection
 #
@@ -81,7 +81,7 @@ public isolated function fromXmlWithType(xml v, Options options = {}, typedesc<r
 # + t - Target type to be used for filtering in the projection
 # + return - On success, returns the given target type value, else returns an `xmldata:Error`
 public isolated function fromXmlStringWithType(string|byte[]|stream<byte[], error?> s, Options options = {}, typedesc<record {}> t = <>)
-        returns t|Error = @java:Method {'class: "io.ballerina.stdlib.data.xml.Native"} external;
+        returns t|Error = @java:Method {'class: "io.ballerina.stdlib.data.xmldata.xml.Native"} external;
 
 
 # Converts a `Map` or `Record` representation to its XML representation.
@@ -120,7 +120,7 @@ isolated function convertMapXml(map<xml>|map<xml[]> mapValue) returns xml {
 }
 
 isolated function getModifiedRecord(map<anydata> mapValue, typedesc<(map<anydata>|json)> inputType) 
-    returns json|record{}|Error = @java:Method {'class: "io.ballerina.stdlib.data.utils.DataUtils"} external;
+    returns json|record{}|Error = @java:Method {'class: "io.ballerina.stdlib.data.xmldata.utils.DataUtils"} external;
 
 # Provides configurations for converting JSON to XML.
 #

diff --git a/.../io/ballerina/stdlib/data/FromString.java → ...erina/stdlib/data/xmldata/FromString.java b/.../io/ballerina/stdlib/data/FromString.java → ...erina/stdlib/data/xmldata/FromString.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.ballerina.stdlib.data;
+package io.ballerina.stdlib.data.xmldata;
 
 import io.ballerina.runtime.api.PredefinedTypes;
 import io.ballerina.runtime.api.TypeTags;
@@ -28,8 +28,8 @@
 import io.ballerina.runtime.api.values.BError;
 import io.ballerina.runtime.api.values.BString;
 import io.ballerina.runtime.api.values.BTypedesc;
-import io.ballerina.stdlib.data.utils.DiagnosticErrorCode;
-import io.ballerina.stdlib.data.utils.DiagnosticLog;
+import io.ballerina.stdlib.data.xmldata.utils.DiagnosticErrorCode;
+import io.ballerina.stdlib.data.xmldata.utils.DiagnosticLog;
 
 import java.util.Comparator;
 import java.util.List;

diff --git a/...allerina/stdlib/data/utils/Constants.java → .../stdlib/data/xmldata/utils/Constants.java b/...allerina/stdlib/data/utils/Constants.java → .../stdlib/data/xmldata/utils/Constants.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.ballerina.stdlib.data.utils;
+package io.ballerina.stdlib.data.xmldata.utils;
 
 import io.ballerina.runtime.api.PredefinedTypes;
 import io.ballerina.runtime.api.creators.TypeCreator;
@@ -25,7 +25,7 @@
 import io.ballerina.runtime.api.utils.StringUtils;
 import io.ballerina.runtime.api.values.BString;
 import io.ballerina.runtime.api.values.BXmlItem;
-import io.ballerina.stdlib.data.xml.QualifiedName;
+import io.ballerina.stdlib.data.xmldata.xml.QualifiedName;
 
 /**
  * Constants used in Ballerina XmlData library.

diff --git a/...allerina/stdlib/data/utils/DataUtils.java → .../stdlib/data/xmldata/utils/DataUtils.java b/...allerina/stdlib/data/utils/DataUtils.java → .../stdlib/data/xmldata/utils/DataUtils.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.ballerina.stdlib.data.utils;
+package io.ballerina.stdlib.data.xmldata.utils;
 
 import io.ballerina.runtime.api.PredefinedTypes;
 import io.ballerina.runtime.api.TypeTags;
@@ -36,8 +36,8 @@
 import io.ballerina.runtime.api.values.BMap;
 import io.ballerina.runtime.api.values.BString;
 import io.ballerina.runtime.api.values.BTypedesc;
-import io.ballerina.stdlib.data.FromString;
-import io.ballerina.stdlib.data.xml.QualifiedName;
+import io.ballerina.stdlib.data.xmldata.FromString;
+import io.ballerina.stdlib.data.xmldata.xml.QualifiedName;
 
 import java.util.ArrayList;
 import java.util.HashMap;

diff --git a/...tdlib/data/utils/DiagnosticErrorCode.java → ...ta/xmldata/utils/DiagnosticErrorCode.java b/...tdlib/data/utils/DiagnosticErrorCode.java → ...ta/xmldata/utils/DiagnosticErrorCode.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.ballerina.stdlib.data.utils;
+package io.ballerina.stdlib.data.xmldata.utils;
 
 /**
  * Represents a diagnostic error code.

diff --git a/...rina/stdlib/data/utils/DiagnosticLog.java → ...lib/data/xmldata/utils/DiagnosticLog.java b/...rina/stdlib/data/utils/DiagnosticLog.java → ...lib/data/xmldata/utils/DiagnosticLog.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.ballerina.stdlib.data.utils;
+package io.ballerina.stdlib.data.xmldata.utils;
 
 import io.ballerina.runtime.api.creators.ErrorCreator;
 import io.ballerina.runtime.api.utils.StringUtils;

diff --git a/...lerina/stdlib/data/utils/ModuleUtils.java → ...tdlib/data/xmldata/utils/ModuleUtils.java b/...lerina/stdlib/data/utils/ModuleUtils.java → ...tdlib/data/xmldata/utils/ModuleUtils.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.ballerina.stdlib.data.utils;
+package io.ballerina.stdlib.data.xmldata.utils;
 
 import io.ballerina.runtime.api.Environment;
 import io.ballerina.runtime.api.Module;

diff --git a/...ta/xml/BallerinaByteBlockInputStream.java → ...ta/xml/BallerinaByteBlockInputStream.java b/...ta/xml/BallerinaByteBlockInputStream.java → ...ta/xml/BallerinaByteBlockInputStream.java
@@ -16,7 +16,7 @@
  *  under the License.
  */
 
-package io.ballerina.stdlib.data.xml;
+package io.ballerina.stdlib.data.xmldata.xml;
 
 import io.ballerina.runtime.api.Environment;
 import io.ballerina.runtime.api.async.Callback;
@@ -28,8 +28,8 @@
 import io.ballerina.runtime.api.values.BMap;
 import io.ballerina.runtime.api.values.BObject;
 import io.ballerina.runtime.api.values.BString;
-import io.ballerina.stdlib.data.utils.DiagnosticErrorCode;
-import io.ballerina.stdlib.data.utils.DiagnosticLog;
+import io.ballerina.stdlib.data.xmldata.utils.DiagnosticErrorCode;
+import io.ballerina.stdlib.data.xmldata.utils.DiagnosticLog;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/.../io/ballerina/stdlib/data/xml/Native.java → ...erina/stdlib/data/xmldata/xml/Native.java b/.../io/ballerina/stdlib/data/xml/Native.java → ...erina/stdlib/data/xmldata/xml/Native.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.ballerina.stdlib.data.xml;
+package io.ballerina.stdlib.data.xmldata.xml;
 
 import io.ballerina.runtime.api.Environment;
 import io.ballerina.runtime.api.Future;
@@ -30,8 +30,8 @@
 import io.ballerina.runtime.api.values.BString;
 import io.ballerina.runtime.api.values.BTypedesc;
 import io.ballerina.runtime.api.values.BXml;
-import io.ballerina.stdlib.data.utils.DiagnosticErrorCode;
-import io.ballerina.stdlib.data.utils.DiagnosticLog;
+import io.ballerina.stdlib.data.xmldata.utils.DiagnosticErrorCode;
+import io.ballerina.stdlib.data.xmldata.utils.DiagnosticLog;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStreamReader;

diff --git a/...lerina/stdlib/data/xml/QualifiedName.java → ...tdlib/data/xmldata/xml/QualifiedName.java b/...lerina/stdlib/data/xml/QualifiedName.java → ...tdlib/data/xmldata/xml/QualifiedName.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.ballerina.stdlib.data.xml;
+package io.ballerina.stdlib.data.xmldata.xml;
 
 /**
  * Represents a qualified name.

diff --git a/.../ballerina/stdlib/data/xml/XmlParser.java → ...na/stdlib/data/xmldata/xml/XmlParser.java b/.../ballerina/stdlib/data/xml/XmlParser.java → ...na/stdlib/data/xmldata/xml/XmlParser.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.ballerina.stdlib.data.xml;
+package io.ballerina.stdlib.data.xmldata.xml;
 
 import io.ballerina.runtime.api.PredefinedTypes;
 import io.ballerina.runtime.api.TypeTags;
@@ -34,11 +34,11 @@
 import io.ballerina.runtime.api.values.BError;
 import io.ballerina.runtime.api.values.BMap;
 import io.ballerina.runtime.api.values.BString;
-import io.ballerina.stdlib.data.FromString;
-import io.ballerina.stdlib.data.utils.Constants;
-import io.ballerina.stdlib.data.utils.DataUtils;
-import io.ballerina.stdlib.data.utils.DiagnosticErrorCode;
-import io.ballerina.stdlib.data.utils.DiagnosticLog;
+import io.ballerina.stdlib.data.xmldata.FromString;
+import io.ballerina.stdlib.data.xmldata.utils.Constants;
+import io.ballerina.stdlib.data.xmldata.utils.DataUtils;
+import io.ballerina.stdlib.data.xmldata.utils.DiagnosticErrorCode;
+import io.ballerina.stdlib.data.xmldata.utils.DiagnosticLog;
 
 import java.io.Reader;
 import java.util.HashMap;

diff --git a/...llerina/stdlib/data/xml/XmlTraversal.java → ...stdlib/data/xmldata/xml/XmlTraversal.java b/...llerina/stdlib/data/xml/XmlTraversal.java → ...stdlib/data/xmldata/xml/XmlTraversal.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.ballerina.stdlib.data.xml;
+package io.ballerina.stdlib.data.xmldata.xml;
 
 import io.ballerina.runtime.api.PredefinedTypes;
 import io.ballerina.runtime.api.TypeTags;
@@ -37,11 +37,11 @@
 import io.ballerina.runtime.api.values.BXml;
 import io.ballerina.runtime.api.values.BXmlItem;
 import io.ballerina.runtime.api.values.BXmlSequence;
-import io.ballerina.stdlib.data.utils.Constants;
-import io.ballerina.stdlib.data.utils.DataUtils;
-import io.ballerina.stdlib.data.utils.DataUtils.XmlAnalyzerData;
-import io.ballerina.stdlib.data.utils.DiagnosticErrorCode;
-import io.ballerina.stdlib.data.utils.DiagnosticLog;
+import io.ballerina.stdlib.data.xmldata.utils.Constants;
+import io.ballerina.stdlib.data.xmldata.utils.DataUtils;
+import io.ballerina.stdlib.data.xmldata.utils.DataUtils.XmlAnalyzerData;
+import io.ballerina.stdlib.data.xmldata.utils.DiagnosticErrorCode;
+import io.ballerina.stdlib.data.xmldata.utils.DiagnosticLog;
 
 import java.util.ArrayList;
 import java.util.HashMap;

diff --git a/native/src/main/java/module-info.java b/native/src/main/java/module-info.java
@@ -22,5 +22,5 @@
     requires java.xml;
     requires junit;
     requires org.apache.commons.lang3;
-    exports io.ballerina.stdlib.data.xml;
+    exports io.ballerina.stdlib.data.xmldata.xml;
 }
diff --git a/...a.stdlib/data-native/resource-config.json → .../data/xmldata-native/resource-config.json b/...a.stdlib/data-native/resource-config.json → .../data/xmldata-native/resource-config.json