Merge pull request BuildCLI#204 from BuildCLI/develop

Develop to main

Author: wheslleyrimar

src/main/java/org/buildcli/OptionCommand.java

@@ -0,0 +1,5 @@
+package org.buildcli.actions.commandline;
+
+public abstract class BuildTool {
+  public abstract int run();
+}

src/main/java/org/buildcli/OptionCommandMap.java

@@ -0,0 +1,46 @@
+package org.buildcli.actions.commandline;
+
+import org.buildcli.constants.GradleConstants;
+import org.buildcli.utils.GradleInstaller;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.buildcli.utils.tools.ToolChecks.checksGradle;
+
+public class GradleProcess extends BuildTool implements CommandLineProcess {
+  private final List<String> commands = new ArrayList<>();
+
+  private GradleProcess() {
+    if (!checksGradle()) {
+      GradleInstaller.installGradle();
+    }
+
+    commands.add(GradleConstants.GRADLE_CMD);
+  }
+
+  public static GradleProcess createProcessor(String... tasks) {
+    var processor = new GradleProcess();
+    processor.commands.addAll(Arrays.asList(tasks));
+    return processor;
+  }
+
+  public static GradleProcess createPackageProcessor() {
+    return createProcessor("clean", "build");
+  }
+
+  public static GradleProcess createCompileProcessor() {
+    return createProcessor("clean", "classes");
+  }
+
+  @Override
+  public int run() {
+    try {
+      return new ProcessBuilder().command(commands).inheritIO().start().waitFor();
+    } catch (IOException | InterruptedException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}

src/main/java/org/buildcli/actions/commandline/BuildTool.java

@@ -10,7 +10,7 @@
 
 import static org.buildcli.utils.tools.ToolChecks.checksMaven;
 
-public class MavenProcess implements CommandLineProcess {
+public class MavenProcess extends BuildTool implements CommandLineProcess {
   private final List<String> commands = new ArrayList<>();
 
   private MavenProcess() {

src/main/java/org/buildcli/actions/commandline/GradleProcess.java

@@ -1,7 +1,10 @@
 package org.buildcli.commands.project;
 
+import org.buildcli.actions.commandline.BuildTool;
+import org.buildcli.actions.commandline.GradleProcess;
 import org.buildcli.actions.commandline.MavenProcess;
 import org.buildcli.domain.BuildCLICommand;
+import org.buildcli.utils.tools.ToolChecks;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
 
@@ -14,22 +17,30 @@ public class BuildCommand implements BuildCLICommand {
   @Option(names = {"--compileOnly", "--compile", "-c"}, description = "", defaultValue = "false")
   private boolean compileOnly;
 
+  private String projectBuild = ToolChecks.checkIsMavenOrGradle();
 
   @Override
   public void run() {
-    MavenProcess process;
+
+    if (projectBuild.equals("Neither")) {
+      logger.severe("Neither Maven nor Gradle project detected. Please ensure one of these build files (pom.xml or build.gradle) exists.");
+      return;
+    }
+
+    BuildTool process;
+
     if (compileOnly) {
-      process = MavenProcess.createCompileProcessor();
+      process = projectBuild.equals("Maven") ? MavenProcess.createCompileProcessor() : GradleProcess.createCompileProcessor();
     } else {
-      process = MavenProcess.createPackageProcessor();
+      process = projectBuild.equals("Maven") ? MavenProcess.createPackageProcessor() : GradleProcess.createPackageProcessor();
     }
 
     int exitCode = process.run();
 
     if (exitCode == 0) {
-      logger.info("Project compiled successfully. JAR file generated in target directory.");
+      logger.info("Project built successfully.");
     } else {
-      logger.severe("Failed to compile project. Maven exited with code: " + exitCode);
+      logger.severe("Failed to build project. Process exited with code: " + exitCode);
     }
   }
-}
+}

src/main/java/org/buildcli/actions/commandline/MavenProcess.java

@@ -21,6 +21,8 @@
 public class InitCommand implements BuildCLICommand {
   @Option(names = {"--name", "-n"}, defaultValue = "buildcli")
   private String projectName;
+  @Option(names = {"--jdk", "-j"}, defaultValue = "17")
+  private String jdkVersion;
 
   @Override
   public void run() {
@@ -96,8 +98,8 @@ private void createPomFile(String projectName) throws IOException {
                     <version>1.0-SNAPSHOT</version>
             
                     <properties>
-                        <maven.compiler.source>17</maven.compiler.source>
-                        <maven.compiler.target>17</maven.compiler.target>
+                        <maven.compiler.source>%s</maven.compiler.source>
+                        <maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
                         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                     </properties>
             
@@ -136,7 +138,7 @@ private void createPomFile(String projectName) throws IOException {
                         </plugins>
                     </build>
                 </project>
-            """.formatted(projectName.toLowerCase(), projectName, projectName.toLowerCase()));
+            """.formatted(projectName.toLowerCase(), projectName, jdkVersion, projectName.toLowerCase()));
       }
       SystemOutLogger.log("pom.xml file created with default configuration.");
     }

src/main/java/org/buildcli/commands/project/BuildCommand.java

@@ -1,11 +1,12 @@
 package org.buildcli.commands.project;
 
 import org.buildcli.commands.project.update.DependencyCommand;
+import org.buildcli.commands.project.update.JDKCommand;
 import org.buildcli.commands.project.update.VersionCommand;
 import picocli.CommandLine.Command;
 
 @Command(name = "update", aliases = {"up"}, description = "Updates project versions and dependencies.", mixinStandardHelpOptions = true,
-    subcommands = {VersionCommand.class, DependencyCommand.class}
+    subcommands = {VersionCommand.class, DependencyCommand.class, JDKCommand.class}
 )
 public class UpdateCommand {
 }

src/main/java/org/buildcli/commands/project/InitCommand.java

@@ -0,0 +1,57 @@
+package org.buildcli.commands.project.update;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.buildcli.commands.project.BuildCommand;
+import org.buildcli.constants.MavenConstants;
+import org.buildcli.domain.BuildCLICommand;
+import org.buildcli.log.SystemOutLogger;
+
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
+
+@Command(name = "jdk", description = "Updates JDK version of the project.", mixinStandardHelpOptions = true)
+public class JDKCommand implements BuildCLICommand {
+    private static final Logger logger = Logger.getLogger(JDKCommand.class.getName());
+    @Option(names = {"--recomp", "-r"}, description = "Rebuilds the project with the new JDK version.", defaultValue = "false")
+    private boolean recomp;
+    @Option(names = {"--jdkver", "-jv"}, description = "The JDK version to update to.", defaultValue = "17")
+    private String version;
+
+    @Override
+    public void run() {
+        try {
+            var docFactory = DocumentBuilderFactory.newInstance();
+            docFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+            var xmlDoc = docFactory.newDocumentBuilder().parse(MavenConstants.FILE);
+            
+            var node = xmlDoc.getElementsByTagName("maven.compiler.source").item(0);
+            node.setTextContent(version);   
+            
+            var transformFactory = TransformerFactory.newInstance();
+            transformFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+            var transformer = transformFactory.newTransformer();
+
+            try {
+                transformer.transform(new DOMSource(xmlDoc), new StreamResult(MavenConstants.FILE));
+                SystemOutLogger.log("JDK version updated in pom.xml");
+            } catch (Exception e) {
+                logger.log(Level.SEVERE, "Error updating JDK version in pom.xml", e);
+            }
+        } catch (Exception e) {
+            logger.log(Level.SEVERE, "Error updating JDK version in pom.xml", e);
+        }
+
+        if (recomp) {
+            SystemOutLogger.log("Rebuilding project with new java version");
+            new BuildCommand().run();
+        }
+    }
+}

src/main/java/org/buildcli/commands/project/UpdateCommand.java

@@ -0,0 +1,12 @@
+package org.buildcli.constants;
+
+import org.buildcli.utils.OS;
+
+public class GradleConstants {
+  public static final String GRADLE_CMD_WINDOWS = "gradle.bat";
+  public static final String GRADLE_CMD_UNIX = "gradle";
+  public static final String GRADLE_CMD = OS.isWindows() ? GRADLE_CMD_WINDOWS : GRADLE_CMD_UNIX;
+  public static final String FILE = "build.gradle";
+  public static final String DEPENDENCIES_PATTERN = "##dependencies##";
+  public static final String BUILD_DIR = "build";
+}