Merge pull request #46 from ballerina-platform/java-fix

Change java command to bal command
ballerina-platform · May 29, 2024 · 87eadc6 · 87eadc6
2 parents ba61e1c + aeacbfa
commit 87eadc6
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 17 deletions.
diff --git a/changelog.md b/changelog.md
@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+### Changed
+- [bal tool is not working when java is not installed](https://github.com/ballerina-platform/ballerina-library/issues/6473)
+
+## [1.0.0] - 2024-03-13
+
 ### Added
 - [Add support for Ballerina Swan Lake Update 8.](https://github.com/ballerina-platform/ballerina-library/issues/5900)
 - [Add support for field length constraints (min/max).](https://github.com/ballerina-platform/ballerina-library/issues/5896)

diff --git a/edi-tools-cli/src/main/java/io/ballerina/edi/cmd/CodegenCmd.java b/edi-tools-cli/src/main/java/io/ballerina/edi/cmd/CodegenCmd.java
@@ -60,12 +60,12 @@ public void execute() {
             printStream.println("Generating code for " + schemaPath + "...");
             Class<?> clazz = CodegenCmd.class;
             ClassLoader classLoader = clazz.getClassLoader();
-            Path tempFile = Files.createTempFile(null, null);
+            Path tempFile = Files.createTempFile(null, ".jar");
             try (InputStream in = classLoader.getResourceAsStream(EDI_TOOL)) {
                 Files.copy(in, tempFile, StandardCopyOption.REPLACE_EXISTING);
             }
             ProcessBuilder processBuilder = new ProcessBuilder(
-                    "java", "-jar", tempFile.toAbsolutePath().toString(), "codegen", schemaPath, outputPath);
+                    "bal", "run", tempFile.toAbsolutePath().toString(), "--", "codegen", schemaPath, outputPath);
             processBuilder.inheritIO();
             Process process = processBuilder.start();
             process.waitFor();

diff --git a/edi-tools-cli/src/main/java/io/ballerina/edi/cmd/ConvertEdifactCmd.java b/edi-tools-cli/src/main/java/io/ballerina/edi/cmd/ConvertEdifactCmd.java
@@ -61,12 +61,12 @@ public void execute() {
         try {
             printStream.println("Generating EDI schema for EDIFACT schema ...");
             URL res = ConvertEdifactCmd.class.getClassLoader().getResource("editools.jar");
-            Path tempFile = Files.createTempFile(null, null);
+            Path tempFile = Files.createTempFile(null, ".jar");
             try (InputStream in = res.openStream()) {
                 Files.copy(in, tempFile, StandardCopyOption.REPLACE_EXISTING);
             }
             ProcessBuilder processBuilder = new ProcessBuilder(
-                    "java", "-jar", tempFile.toAbsolutePath().toString(), CMD_NAME, version, type == null ? "" : type,
+                    "bal", "run", tempFile.toAbsolutePath().toString(), "--", CMD_NAME, version, type == null ? "" : type,
                     dir);
             processBuilder.inheritIO();
             Process process = processBuilder.start();

diff --git a/edi-tools-cli/src/main/java/io/ballerina/edi/cmd/ConvertX12Cmd.java b/edi-tools-cli/src/main/java/io/ballerina/edi/cmd/ConvertX12Cmd.java
@@ -80,14 +80,15 @@ public void execute() {
         Class<?> clazz = ConvertX12Cmd.class;
         ClassLoader classLoader = clazz.getClassLoader();
         try {
-            Path tempFile = Files.createTempFile(null, null);
+            Path tempFile = Files.createTempFile(null, ".jar");
             try (InputStream in = classLoader.getResourceAsStream(EDI_TOOL)) {
                 Files.copy(in, tempFile, StandardCopyOption.REPLACE_EXISTING);
             }
             List<String> argsList = new ArrayList<>();
-            argsList.add("java");
-            argsList.add("-jar");
+            argsList.add("bal");
+            argsList.add("run");
             argsList.add(tempFile.toAbsolutePath().toString());
+            argsList.add("--");
             argsList.add(CMD_NAME);
             if (headersIncluded) {
                 argsList.add("H");

diff --git a/edi-tools-cli/src/main/java/io/ballerina/edi/cmd/EdiCmd.java b/edi-tools-cli/src/main/java/io/ballerina/edi/cmd/EdiCmd.java
@@ -58,11 +58,11 @@ public void execute() {
         try {
             Class<?> clazz = EdiCmd.class;
             ClassLoader classLoader = clazz.getClassLoader();
-            Path tempFile = Files.createTempFile(null, null);
+            Path tempFile = Files.createTempFile(null, ".jar");
             try (InputStream in = classLoader.getResourceAsStream(EDI_TOOL)) {
                 Files.copy(in, tempFile, StandardCopyOption.REPLACE_EXISTING);
             }
-            ProcessBuilder processBuilder = new ProcessBuilder("java", "-jar", tempFile.toAbsolutePath().toString());
+            ProcessBuilder processBuilder = new ProcessBuilder("bal", "run", tempFile.toAbsolutePath().toString());
             processBuilder.inheritIO();
             Process process = processBuilder.start();
             process.waitFor();

diff --git a/edi-tools-cli/src/main/java/io/ballerina/edi/cmd/EslCmd.java b/edi-tools-cli/src/main/java/io/ballerina/edi/cmd/EslCmd.java
@@ -63,12 +63,12 @@ public void execute() {
             printStream.println("Converting ESL schemas in " + schemaPath);
             Class<?> clazz = LibgenCmd.class;
             ClassLoader classLoader = clazz.getClassLoader();
-            Path tempFile = Files.createTempFile(null, null);
+            Path tempFile = Files.createTempFile(null, ".jar");
             try (InputStream in = classLoader.getResourceAsStream(EDI_TOOL)) {
                 Files.copy(in, tempFile, StandardCopyOption.REPLACE_EXISTING);
             }
             ProcessBuilder processBuilder = new ProcessBuilder(
-                    "java", "-jar", tempFile.toAbsolutePath().toString(), "convertESL", schemaPath, basedefPath,
+                    "bal", "run", tempFile.toAbsolutePath().toString(), "--", "convertESL", schemaPath, basedefPath,
                     outputPath);
             Process process = processBuilder.start();
             process.waitFor();

diff --git a/edi-tools-cli/src/main/java/io/ballerina/edi/cmd/LibgenCmd.java b/edi-tools-cli/src/main/java/io/ballerina/edi/cmd/LibgenCmd.java
@@ -67,14 +67,14 @@ public void execute() {
             printStream.println("Generating library package for " + packageName + " : " + schemaPath);
             Class<?> clazz = LibgenCmd.class;
             ClassLoader classLoader = clazz.getClassLoader();
-            Path tempFile = Files.createTempFile(null, null);
+            Path tempFile = Files.createTempFile(null, ".jar");
             try (InputStream in = classLoader.getResourceAsStream(EDI_TOOL)) {
                 Files.copy(in, tempFile, StandardCopyOption.REPLACE_EXISTING);
             }
             String orgName = packageName.split("/")[0];
             String libName = packageName.split("/")[1];
             ProcessBuilder processBuilder = new ProcessBuilder(
-                    "java", "-jar", tempFile.toAbsolutePath().toString(), "libgen", orgName, libName, schemaPath,
+                    "bal", "run", tempFile.toAbsolutePath().toString(), "--", "libgen", orgName, libName, schemaPath,
                     outputPath);
             processBuilder.inheritIO();
             Process process = processBuilder.start();

diff --git a/edi-tools-package/BalTool.toml b/edi-tools-package/BalTool.toml
@@ -2,4 +2,4 @@
 id = "edi"
 
 [[dependency]]
-path = "resources/edi-tools-cli-1.0.0.jar"
+path = "resources/edi-tools-cli-2.0.0.jar"
diff --git a/edi-tools-package/Ballerina.toml b/edi-tools-package/Ballerina.toml
@@ -1,7 +1,7 @@
 [package]
 org = "ballerina"
 name = "editoolspackage"
-version = "1.0.0"
+version = "2.0.0"
 authors = ["Ballerina"]
 keywords = ["edi"]
 license = ["Apache-2.0"]

diff --git a/edi-tools/Ballerina.toml b/edi-tools/Ballerina.toml
@@ -1,7 +1,7 @@
 [package]
 org = "ballerina"
 name = "editools"
-version = "1.0.0"
+version = "2.0.0"
 authors = ["Ballerina"]
 keywords = ["edi"]
 license = ["Apache-2.0"]

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 org.gradle.caching=true
 group=io.ballerina.stdlib
-version=1.0.1
+version=2.0.0
 
 #dependency
 checkstylePluginVersion=10.12.0