Merge branch 'master' into master

ballerina-platform · Feb 22, 2024 · bf6e343 · bf6e343
2 parents 750a77c + 7da2c15
commit bf6e343
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 7 deletions.
diff --git a/changelog.md b/changelog.md
@@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - [Support retrieval of enum types](https://github.com/ballerina-platform/ballerina-standard-library/issues/4588)
+- [Make some of the Java classes proper utility classes](https://github.com/ballerina-platform/ballerina-standard-library/issues/4921)
 
 ### Changed
 - [Fix failure for unsupported time type](https://github.com/ballerina-platform/ballerina-standard-library/issues/4531)

diff --git a/native/src/main/java/io/ballerina/stdlib/sql/utils/ProcedureCallResultUtils.java b/native/src/main/java/io/ballerina/stdlib/sql/utils/ProcedureCallResultUtils.java
@@ -52,7 +52,7 @@
  * This class provides functionality for the `ProcedureCallResult` to iterate through the sql result sets.
  */
 public class ProcedureCallResultUtils {
-    public ProcedureCallResultUtils() {
+    private ProcedureCallResultUtils() {
     }
 
     public static Object getNextQueryResult(BObject procedureCallResult) {

diff --git a/native/src/main/java/io/ballerina/stdlib/sql/utils/RecordIteratorUtils.java b/native/src/main/java/io/ballerina/stdlib/sql/utils/RecordIteratorUtils.java
@@ -37,7 +37,7 @@
  * @since 1.2.0
  */
 public class RecordIteratorUtils {
-    public RecordIteratorUtils() {
+    private RecordIteratorUtils() {
     }
 
     public static Object nextResult(BObject recordIterator) {

diff --git a/native/src/test/java/io/ballerina/stdlib/sql/TestUtils.java b/native/src/test/java/io/ballerina/stdlib/sql/TestUtils.java
@@ -73,7 +73,9 @@
 /**
  * TestUtils class for testing ballerina native classes/methods.
  */
-public class TestUtils {
+public final class TestUtils {
+
+    private TestUtils() {}
 
     /**
      * ExtendedColumnDefinition Class for test utils.

diff --git a/test-utils/src/main/java/io/ballerina/stdlib/sql/testutils/nativeimpl/Exec.java b/test-utils/src/main/java/io/ballerina/stdlib/sql/testutils/nativeimpl/Exec.java
@@ -36,7 +36,9 @@
  *
  * @since 0.6.0
  */
-public class Exec {
+public final class Exec {
+
+    private Exec() {}
 
     public static Object exec(BString command, BMap<BString, BString> env, Object dir, BString[] args) {
         List<String> commandList = new ArrayList<>();

diff --git a/test-utils/src/main/java/io/ballerina/stdlib/sql/testutils/nativeimpl/ExitCode.java b/test-utils/src/main/java/io/ballerina/stdlib/sql/testutils/nativeimpl/ExitCode.java
@@ -27,7 +27,9 @@
  *
  * @since 0.6.0
  */
-public class ExitCode {
+public final class ExitCode {
+
+    private ExitCode() {}
 
     public static Object exitCode(BObject objVal) {
         Process process = OSUtils.processFromObject(objVal);

diff --git a/test-utils/src/main/java/io/ballerina/stdlib/sql/testutils/nativeimpl/WaitForExit.java b/test-utils/src/main/java/io/ballerina/stdlib/sql/testutils/nativeimpl/WaitForExit.java
@@ -27,7 +27,9 @@
  *
  * @since 0.6.0
  */
-public class WaitForExit {
+public final class WaitForExit {
+
+    private WaitForExit() {}
 
     public static Object waitForExit(BObject objVal) {
         Process process = OSUtils.processFromObject(objVal);

diff --git a/test-utils/src/main/java/io/ballerina/stdlib/sql/testutils/utils/OSUtils.java b/test-utils/src/main/java/io/ballerina/stdlib/sql/testutils/utils/OSUtils.java
@@ -30,7 +30,9 @@
 /**
  * @since 0.6.0
  */
-public class OSUtils {
+public final class OSUtils {
+
+    private OSUtils() {}
 
     private static final BString UNKNOWN_MESSAGE = StringUtils.fromString("Unknown Error");