Merge branch 'master' into master

ballerina-platform · Oct 18, 2023 · 41ad482 · 41ad482
2 parents 12a1e20 + a6bf31b
commit 41ad482
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 11 deletions.
diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
@@ -1,7 +1,7 @@
 [package]
 org = "ballerina"
 name = "xmldata"
-version = "2.7.0"
+version = "2.7.1"
 authors = ["Ballerina"]
 keywords = ["xml", "json"]
 repository = "https://github.com/ballerina-platform/module-ballerina-xmldata"
@@ -15,5 +15,5 @@ graalvmCompatible = true
 [[platform.java17.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "xmldata-native"
-version = "2.7.0"
-path = "../native/build/libs/xmldata-native-2.7.0-SNAPSHOT.jar"
+version = "2.7.1"
+path = "../native/build/libs/xmldata-native-2.7.1-SNAPSHOT.jar"
diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml
@@ -3,4 +3,4 @@ id = "xmldata-compiler-plugin"
 class = "io.ballerina.stdlib.xmldata.compiler.XmldataCompilerPlugin"
 
 [[dependency]]
-path = "../compiler-plugin/build/libs/xmldata-compiler-plugin-2.7.0-SNAPSHOT.jar"
+path = "../compiler-plugin/build/libs/xmldata-compiler-plugin-2.7.1-SNAPSHOT.jar"
diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
@@ -5,7 +5,7 @@
 
 [ballerina]
 dependencies-toml-version = "2"
-distribution-version = "2201.8.0-20230726-145300-b2bdf796"
+distribution-version = "2201.8.0"
 
 [[package]]
 org = "ballerina"
@@ -40,7 +40,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "xmldata"
-version = "2.7.0"
+version = "2.7.1"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "test"}

diff --git a/changelog.md b/changelog.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 [Fix the mismatch error by `fromXml` API while the field has the name annotation](https://github.com/ballerina-platform/ballerina-standard-library/issues/3802)
+[Make some of the Java classes proper utility classes](https://github.com/ballerina-platform/ballerina-standard-library/issues/4902)
 
 ## [2.4.3] - 2023-05-12
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 org.gradle.caching=true
 group=io.ballerina.stdlib
-version=2.7.0-SNAPSHOT
-ballerinaLangVersion=2201.8.0-20230830-220400-8a7556d8
+version=2.7.1-SNAPSHOT
+ballerinaLangVersion=2201.8.0
 
 checkstyleToolVersion=10.12.0
 puppycrawlCheckstyleVersion=10.12.0

diff --git a/native/src/main/java/io/ballerina/stdlib/xmldata/MapFromXml.java b/native/src/main/java/io/ballerina/stdlib/xmldata/MapFromXml.java
@@ -47,7 +47,9 @@
  *
  * @since 2.3.0
  */
-public class MapFromXml {
+public final class MapFromXml {
+
+    private MapFromXml() {}
 
     @SuppressWarnings("unchecked")
     public static Object fromXml(BXml xml, BTypedesc type) {

diff --git a/native/src/main/java/io/ballerina/stdlib/xmldata/XmlToRecord.java b/native/src/main/java/io/ballerina/stdlib/xmldata/XmlToRecord.java
@@ -39,7 +39,9 @@
  *
  * @since 2.0.2
  */
-public class XmlToRecord {
+public final class XmlToRecord {
+
+    private XmlToRecord() {}
 
     public static Object toRecord(BXml xml, boolean preserveNamespaces, BTypedesc type) {
         return toRecord(xml, preserveNamespaces, Constants.UNDERSCORE, type);

diff --git a/native/src/main/java/io/ballerina/stdlib/xmldata/utils/XmlDataUtils.java b/native/src/main/java/io/ballerina/stdlib/xmldata/utils/XmlDataUtils.java
@@ -46,7 +46,9 @@
  *
  * @since 1.1.0
  */
-public class XmlDataUtils {
+public final class XmlDataUtils {
+
+    private XmlDataUtils() {}
 
     private static final String ERROR = "Error";
     private static final String ATTRIBUTE_PREFIX = "attribute_";