wip: Merge changes from #786 and delete removed classes

Author: fabapp2

components/recipe-test-support/src/main/java/org/springframework/sbm/test/RecipeTestSupport.java

@@ -16,14 +16,14 @@
 package org.springframework.sbm.test;
 
 import org.springframework.sbm.build.impl.MavenBuildFileRefactoringFactory;
-import org.springframework.sbm.build.impl.MavenSettingsInitializer;
 import org.springframework.sbm.build.impl.RewriteMavenParser;
 import org.springframework.sbm.engine.context.ProjectContextHolder;
 import org.springframework.sbm.engine.context.RewriteJavaSearchActionDeserializer;
 import org.springframework.sbm.engine.recipe.*;
 import org.springframework.sbm.java.impl.RewriteJavaParser;
 import org.springframework.sbm.java.util.BasePackageCalculator;
 import org.springframework.sbm.project.RewriteSourceFileWrapper;
+import org.springframework.sbm.project.parser.RewriteMavenSettingsInitializer;
 import org.springframework.sbm.project.resource.ProjectResourceSetHolder;
 import org.springframework.sbm.project.resource.SbmApplicationProperties;
 import org.springframework.sbm.project.resource.ResourceHelper;
@@ -76,7 +76,7 @@ private RecipeTestSupport() {
             BasePackageCalculator.class,
             ProjectContextHolder.class,
             RewriteMavenParser.class,
-            MavenSettingsInitializer.class,
+            RewriteMavenSettingsInitializer.class,
             MavenBuildFileRefactoringFactory.class,
             ProjectResourceSetHolder.class,
             ScopeConfiguration.class,

components/sbm-core/src/main/java/org/springframework/sbm/build/impl/RewriteMavenParser.java

@@ -15,12 +15,14 @@
  */
 package org.springframework.sbm.build.impl;
 
+import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.NotNull;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Parser;
 import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.maven.MavenParser;
 import org.openrewrite.xml.tree.Xml;
+import org.springframework.sbm.project.parser.RewriteMavenSettingsInitializer;
 import org.springframework.stereotype.Component;
 
 import java.nio.file.Path;
@@ -35,18 +37,17 @@
  * all settings from {@code settings.xml} are respected.
  */
 @Component
+@RequiredArgsConstructor
 public class RewriteMavenParser implements Parser<Xml.Document> {
 
+    private final ExecutionContext executionContext;
     private MavenParser parser;
-    private final MavenSettingsInitializer mavenSettingsInitializer;
 
-    private ExecutionContext executionContext;
-
-    public RewriteMavenParser(MavenSettingsInitializer mavenSettingsInitializer, ExecutionContext executionContext) {
-        this.mavenSettingsInitializer = mavenSettingsInitializer;
-        this.executionContext = executionContext;
-        initMavenParser(this.executionContext, null);
-    }
+//    @Deprecated
+//    public RewriteMavenParser(RewriteMavenSettingsInitializer mavenSettingsInitializer, ExecutionContext executionContext) {
+//        this.executionContext = executionContext;
+//        initMavenParser(this.executionContext, null);
+//    }
 
     @NotNull
     private void initMavenParser(ExecutionContext executionContext, Path projectRoot) {
@@ -73,7 +74,6 @@ public List<Xml.Document> parse(String... sources) {
 
     @Override
     public List<Xml.Document> parse(ExecutionContext ctx, String... sources) {
-        mavenSettingsInitializer.initializeMavenSettings(ctx);
         return parser.parse(ctx, sources);
     }
 
@@ -86,8 +86,6 @@ public List<Xml.Document> parse(ExecutionContext ctx, String... sources) {
     public List<Xml.Document> parseInputs(Iterable<Input> sources, @Nullable Path relativeTo, ExecutionContext ctx) {
         if (relativeTo != null) {
             initMavenParser(ctx, relativeTo);
-        } else {
-            mavenSettingsInitializer.initializeMavenSettings(ctx);
         }
         return parser.parseInputs(sources, relativeTo, ctx);
     }

components/sbm-core/src/main/java/org/springframework/sbm/project/parser/RewriteMavenSettingsInitializer.java

@@ -55,7 +55,9 @@ public void initializeMavenSettings(ExecutionContext executionContext) {
     public MavenSettings initializeMavenSettings(ExecutionContext executionContext, Resource mavenSettingsFile, Path securitySettingsFilePath) {
         Parser.Input input = new Parser.Input(ResourceUtil.getPath(mavenSettingsFile), () -> ResourceUtil.getInputStream(mavenSettingsFile));
         MavenSettings mavenSettings = MavenSettings.parse(input, executionContext);
-        mavenPasswordDecrypter.decryptMavenServerPasswords(mavenSettings, securitySettingsFilePath);
+        if(securitySettingsFilePath != null && securitySettingsFilePath.toFile().exists()) {
+            mavenPasswordDecrypter.decryptMavenServerPasswords(mavenSettings, securitySettingsFilePath);
+        }
         MavenExecutionContextView.view(executionContext).setMavenSettings(mavenSettings);
         return mavenSettings;
     }