Prepare to merge to main

src/main/java/se/kth/deptrim/mojo/DepTrimManager.java

@@ -1,19 +1,14 @@
 package se.kth.deptrim.mojo;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Arrays;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Objects;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.jar.JarOutputStream;
 import java.util.stream.Collectors;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
@@ -28,6 +23,8 @@
 import se.kth.depclean.core.util.JarUtils;
 import se.kth.depclean.core.wrapper.DependencyManagerWrapper;
 import se.kth.depclean.core.wrapper.LogWrapper;
+import se.kth.depclean.util.MavenInvoker;
+import se.kth.deptrim.mojo.util.TimeUtils;
 
 /**
  * Runs the DepTrim process, regardless of a specific dependency manager.
@@ -91,14 +88,15 @@ public ProjectDependencyAnalysis execute() throws AnalysisFailureException {
     });
 
     printString("STARTING TRIMMING DEPENDENCIES");
-    debloatLibClasses(analysis, trimDependencies);
+    trimLibClasses(analysis, trimDependencies);
 
     // ************************ Code added ********************** //
 
     // analysis.print();
 
     final long stopTime = System.currentTimeMillis();
-    getLog().info("Analysis done in " + getTime(stopTime - startTime));
+    TimeUtils timeUtils = new TimeUtils();
+    getLog().info("Analysis done in " + timeUtils.toHumanReadableTime(stopTime - startTime));
 
     return analysis;
   }
@@ -137,7 +135,7 @@ private void extractLibClasses() {
    * @param trimDependencies The dependencies to be trimmed, if empty then trims all the dependencies.
    */
   @SneakyThrows
-  private void debloatLibClasses(ProjectDependencyAnalysis analysis, Set<String> trimDependencies) {
+  private void trimLibClasses(ProjectDependencyAnalysis analysis, Set<String> trimDependencies) {
     analysis
         .getDependencyClassesMap()
         .forEach((key, value) -> {
@@ -152,54 +150,52 @@ private void debloatLibClasses(ProjectDependencyAnalysis analysis, Set<String> t
             File srcDir = dependencyManager.getBuildDirectory().resolve(DIRECTORY_TO_EXTRACT_DEPENDENCIES + File.separator + dependencyDirName).toFile();
             File destDir = dependencyManager.getBuildDirectory().resolve(DIRECTORY_TO_LOCATE_THE_DEBLOATED_DEPENDENCIES + File.separator + dependencyDirName).toFile();
             getLog().info("copying from files from " + srcDir.getAbsolutePath() + " to " + destDir.getAbsolutePath());
-            // copy all files from srcDir to destDir
+
+            // Copy all files from srcDir to destDir
             try {
               FileUtils.copyDirectory(srcDir, destDir);
             } catch (IOException e) {
               getLog().error("Error copying files from " + srcDir + " to " + destDir);
             }
-            // remove files in destDir
+            // Remove files in destDir.
             for (ClassName className : unusedTypes) {
               String fileName = className.toString().replace(".", File.separator) + ".class";
               File file = new File(destDir.getAbsolutePath() + File.separator + fileName);
               printString("Removing file " + file.getAbsolutePath());
               file.delete();
             }
-            // Delete all empty directories in destDir
-            deleteEmptyDirectories(destDir);
+            // Delete all empty directories in destDir.
+            se.kth.deptrim.mojo.util.FileUtils fileUtils = new se.kth.deptrim.mojo.util.FileUtils();
+            fileUtils.deleteEmptyDirectories(destDir);
 
-            // Create a new jar file with the debloated classes and move it to lib-deptrim
-            Path libDeptrimPath = Paths.get("lib-deptrim");
+            // Create a new jar file with the debloated classes and move it to libs-deptrim.
+            Path libDeptrimPath = Paths.get("libs-deptrim");
             String jarName = destDir.getName() + ".jar";
             File jarFile = libDeptrimPath.resolve(jarName).toFile();
             try {
-              Files.createDirectories(libDeptrimPath); // create lib-deptrim directory if it does not exist
-              se.kth.deptrim.mojo.JarUtils.createJarFromDirectory(destDir, jarFile);
+              Files.createDirectories(libDeptrimPath); // create libs-deptrim directory if it does not exist
+              se.kth.deptrim.mojo.util.JarUtils.createJarFromDirectory(destDir, jarFile);
             } catch (Exception e) {
               getLog().error("Error creating trimmed jar for " + destDir.getName());
             }
+
+            // Install the dependency in the local repository.
+            try {
+              MavenInvoker.runCommand(
+                  "mvn deploy:deploy-file -Durl=" + libDeptrimPath +
+                      " -Dpackaging=jar" +
+                      " -Dfile=" + jarFile.getAbsolutePath() +
+                      " -DgroupId=" + key.getGroupId() +
+                      " -DartifactId=" + key.getDependencyId() +
+                      " -Dversion=" + key.getVersion(),
+                  null);
+            } catch (IOException | InterruptedException e) {
+              getLog().error("Error installing the trimmed dependency jar in local repo");
+            }
           }
         });
   }
 
-  /**
-   * Delete all empty directories in the given directory.
-   *
-   * @param directory the directory to delete empty directories from
-   */
-  private int deleteEmptyDirectories(File directory) {
-    List<File> toBeDeleted = Arrays.stream(directory.listFiles()).sorted()
-        .filter(File::isDirectory)
-        .filter(f -> f.listFiles().length == deleteEmptyDirectories(f))
-        .collect(Collectors.toList());
-    int size = toBeDeleted.size();
-    toBeDeleted.forEach(t -> {
-      final String path = t.getAbsolutePath();
-      final boolean delete = t.delete();
-    });
-    return size; // the number of deleted directories.
-  }
-
   private void copyDependencies(Dependency dependency, File destFolder) {
     copyDependencies(dependency.getFile(), destFolder);
   }
@@ -307,12 +303,6 @@ private Dependency findDependency(Set<Dependency> allDependencies, String depend
         .orElse(null);
   }
 
-  private String getTime(long millis) {
-    long minutes = TimeUnit.MILLISECONDS.toMinutes(millis);
-    long seconds = (TimeUnit.MILLISECONDS.toSeconds(millis) % 60);
-    return String.format("%smin %ss", minutes, seconds);
-  }
-
   private void printString(final String string) {
     System.out.println(string); //NOSONAR avoid a warning of non-used logger
   }

src/main/java/se/kth/deptrim/mojo/util/FileUtils.java

@@ -0,0 +1,31 @@
+package se.kth.deptrim.mojo.util;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Utility class for handling files.
+ */
+public class FileUtils {
+
+  /**
+   * Delete all empty directories in the given directory.
+   *
+   * @param directory the directory to delete empty directories from
+   */
+  public int deleteEmptyDirectories(File directory) {
+    List<File> toBeDeleted = Arrays.stream(directory.listFiles()).sorted()
+        .filter(File::isDirectory)
+        .filter(f -> f.listFiles().length == deleteEmptyDirectories(f))
+        .collect(Collectors.toList());
+    int size = toBeDeleted.size();
+    toBeDeleted.forEach(t -> {
+      final String path = t.getAbsolutePath();
+      final boolean delete = t.delete();
+    });
+    return size; // the number of deleted directories.
+  }
+
+}

src/main/java/se/kth/deptrim/mojo/JarUtils.java → src/main/java/se/kth/deptrim/mojo/util/JarUtils.java

@@ -1,4 +1,4 @@
-package se.kth.deptrim.mojo;
+package se.kth.deptrim.mojo.util;
 
 import java.io.BufferedInputStream;
 import java.io.File;

src/main/java/se/kth/deptrim/mojo/util/PomUtils.java

@@ -0,0 +1,7 @@
+package se.kth.deptrim.mojo.util;
+
+public class PomUtils {
+
+// TODO
+
+}

src/main/java/se/kth/deptrim/mojo/util/TimeUtils.java

@@ -0,0 +1,22 @@
+package se.kth.deptrim.mojo.util;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Utility class for handling time.
+ */
+public class TimeUtils {
+
+  /**
+   * Convert milliseconds to a human-readable format.
+   *
+   * @param millis The milliseconds to be converted.
+   * @return A string representing the time.
+   */
+  public String toHumanReadableTime(long millis) {
+    long minutes = TimeUnit.MILLISECONDS.toMinutes(millis);
+    long seconds = (TimeUnit.MILLISECONDS.toSeconds(millis) % 60);
+    return String.format("%smin %ss", minutes, seconds);
+  }
+
+}

src/test/java/se/kth/deptrim/mojo/JarUtilsTest.java

@@ -7,6 +7,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.rules.TemporaryFolder;
+import se.kth.deptrim.mojo.util.JarUtils;
 
 class JarUtilsTest {
 

src/test/java/se/kth/deptrim/mojo/util/TimeUtilsTest.java

@@ -0,0 +1,20 @@
+package se.kth.deptrim.mojo.util;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class TimeUtilsTest {
+
+  TimeUtils timeUtils;
+
+  @BeforeEach
+  void setUp() {
+    timeUtils = new TimeUtils();
+  }
+
+  @Test
+  void ifGettingTheTimeThenTimeIsCorrect() {
+    Assertions.assertEquals("1min 40s", timeUtils.toHumanReadableTime(100000));
+  }
+}