Removed unused constructor arg

spring-projects-experimental · Oct 16, 2023 · 0010a0c · 0010a0c
1 parent 7910103
commit 0010a0c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/...ort-rewrite/src/main/java/org/springframework/sbm/parsers/RewriteParserConfiguration.java b/...ort-rewrite/src/main/java/org/springframework/sbm/parsers/RewriteParserConfiguration.java
@@ -152,8 +152,8 @@ ParsingEventListener parsingEventListener(ApplicationEventPublisher eventPublish
 //    }
 
     @Bean
-    MavenProjectAnalyzer mavenProjectAnalyzer(MavenArtifactDownloader artifactDownloader, ClasspathExtractor classpathExtractor) {
-        return new MavenProjectAnalyzer(artifactDownloader, classpathExtractor);
+    MavenProjectAnalyzer mavenProjectAnalyzer(ClasspathExtractor classpathExtractor) {
+        return new MavenProjectAnalyzer(classpathExtractor);
     }
 
     @Bean

diff --git a/...ort-rewrite/src/main/java/org/springframework/sbm/parsers/maven/MavenProjectAnalyzer.java b/...ort-rewrite/src/main/java/org/springframework/sbm/parsers/maven/MavenProjectAnalyzer.java
@@ -42,11 +42,9 @@ public class MavenProjectAnalyzer {
 
     private static final String POM_XML = "pom.xml";
     private static final MavenXpp3Reader XPP_3_READER = new MavenXpp3Reader();
-    private final MavenArtifactDownloader rewriteMavenArtifactDownloader;
     private final ClasspathExtractor classpathExtractor;
 
-    public MavenProjectAnalyzer(MavenArtifactDownloader rewriteMavenArtifactDownloader, ClasspathExtractor classpathExtractor) {
-        this.rewriteMavenArtifactDownloader = rewriteMavenArtifactDownloader;
+    public MavenProjectAnalyzer(ClasspathExtractor classpathExtractor) {
         this.classpathExtractor = classpathExtractor;
     }
 

diff --git a/...pport-rewrite/src/test/java/org/springframework/sbm/parsers/RewriteProjectParserTest.java b/...pport-rewrite/src/test/java/org/springframework/sbm/parsers/RewriteProjectParserTest.java
@@ -107,7 +107,7 @@ void parseSimpleMavenProject(@TempDir Path tempDir) {
                 mock(ConfigurableListableBeanFactory.class),
                 new ProjectScanner(new DefaultResourceLoader(), parserProperties),
                 executionContext,
-                new MavenProjectAnalyzer(mock(RewriteMavenArtifactDownloader.class), classpathExtractor)
+                new MavenProjectAnalyzer(new ClasspathExtractor(mock(RewriteMavenArtifactDownloader.class)))
         );
 
         List<String> parsedFiles = new ArrayList<>();

diff --git a/...rewrite/src/test/java/org/springframework/sbm/parsers/maven/MavenProjectAnalyzerTest.java b/...rewrite/src/test/java/org/springframework/sbm/parsers/maven/MavenProjectAnalyzerTest.java
@@ -26,6 +26,7 @@
 import org.mockito.Mockito;
 import org.openrewrite.maven.utilities.MavenArtifactDownloader;
 import org.springframework.core.io.Resource;
+import org.springframework.sbm.parsers.ClasspathExtractor;
 import org.springframework.sbm.parsers.MavenProject;
 import org.springframework.sbm.parsers.RewriteMavenArtifactDownloader;
 import org.springframework.sbm.test.util.DummyResource;
@@ -50,7 +51,8 @@ class MavenProjectAnalyzerTest {
     @BeforeEach
     void beforeEach() {
         MavenArtifactDownloader rewriteMavenArtifactDownloader = Mockito.mock(RewriteMavenArtifactDownloader.class);
-        sut = new MavenProjectAnalyzer(rewriteMavenArtifactDownloader, classpathExtractor);
+        ClasspathExtractor classpathExtractor = new ClasspathExtractor(rewriteMavenArtifactDownloader);
+        sut = new MavenProjectAnalyzer(classpathExtractor);
     }
 
     @Nested

diff --git a/...te/src/test/java/org/springframework/sbm/parsers/maven/RewriteMavenProjectParserTest.java b/...te/src/test/java/org/springframework/sbm/parsers/maven/RewriteMavenProjectParserTest.java
@@ -281,7 +281,7 @@ void parseMultiModule1_WithCustomParser() {
                 beanFactory,
                 new ProjectScanner(new DefaultResourceLoader(), parserProperties),
                 new RewriteExecutionContext(),
-                new MavenProjectAnalyzer(mock(RewriteMavenArtifactDownloader.class), classpathExtractor)
+                new MavenProjectAnalyzer(new ClasspathExtractor(mock(RewriteMavenArtifactDownloader.class)))
         );
 
         Set<String> ignoredPatters = Set.of();