Some more cleanup

ASSERT-KTH · Apr 3, 2022 · 29ed30a · 29ed30a
1 parent 66eb70f
commit 29ed30a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/depclean-core/src/main/java/se/kth/depclean/core/AbstractDebloater.java b/depclean-core/src/main/java/se/kth/depclean/core/AbstractDebloater.java
@@ -24,7 +24,7 @@ public void write() throws IOException {
     log.info("Starting debloating file");
     logChanges();
     setDependencies(analysis.getDebloatedDependencies().stream()
-        .map(this::toMavenDependency)
+        .map(this::toProviderDependency)
         .collect(Collectors.toList()));
 
     if (log.isDebugEnabled()) {
@@ -34,7 +34,7 @@ public void write() throws IOException {
     writeFile();
   }
 
-  protected abstract T toMavenDependency(DebloatedDependency debloatedDependency);
+  protected abstract T toProviderDependency(DebloatedDependency debloatedDependency);
 
   protected abstract void setDependencies(List<T> dependencies);
 

diff --git a/depclean-core/src/main/java/se/kth/depclean/core/wrapper/DependencyManagerWrapper.java b/depclean-core/src/main/java/se/kth/depclean/core/wrapper/DependencyManagerWrapper.java
@@ -2,7 +2,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.io.Serializable;
 import java.nio.file.Path;
 import java.util.Set;
 import se.kth.depclean.core.AbstractDebloater;
@@ -70,7 +69,7 @@ public interface DependencyManagerWrapper {
    * @param analysis the depclean analysis
    * @return the debloater
    */
-  AbstractDebloater<? extends Serializable> getDebloater(ProjectDependencyAnalysis analysis);
+  AbstractDebloater<?> getDebloater(ProjectDependencyAnalysis analysis);
 
   /**
    * The build directory path.

diff --git a/depclean-maven-plugin/src/main/java/se/kth/depclean/util/MavenDebloater.java b/depclean-maven-plugin/src/main/java/se/kth/depclean/util/MavenDebloater.java
@@ -51,7 +51,7 @@ protected void logDependencies() {
   }
 
   @Override
-  protected Dependency toMavenDependency(DebloatedDependency debloatedDependency) {
+  protected Dependency toProviderDependency(DebloatedDependency debloatedDependency) {
     final Dependency dependency = createDependency(debloatedDependency);
     debloatedDependency.getExclusions().forEach(depToExclude -> exclude(dependency, depToExclude));
     return dependency;