Rename ParserSettings to ParserProperties

Author: fabapp2

sbm-support-rewrite/src/main/java/org/springframework/sbm/RewriteParserConfig.java

@@ -41,16 +41,16 @@ public class RewriteParserConfig {
 
     @Bean
     @ConditionalOnMissingBean(MavenPomCache.class)
-    MavenPomCache mavenPomCache(ExecutionContext executionContext, ParserSettings parserSettings) {
+    MavenPomCache mavenPomCache(ParserProperties parserProperties) {
         MavenPomCache mavenPomCache = new InMemoryMavenPomCache();
-        if (parserSettings.isPomCacheEnabled()) {
-            if (!"32".equals(System.getProperty("sun.arch.data.model", "64"))) {
+        if (parserProperties.isPomCacheEnabled()) {
+            if (!"64".equals(System.getProperty("sun.arch.data.model", "64"))) {
                 log.warn("parser.isPomCacheEnabled was set to true but RocksdbMavenPomCache is not supported on 32-bit JVM. falling back to InMemoryMavenPomCache");
             } else {
                 try {
                     mavenPomCache = new CompositeMavenPomCache(
                             new InMemoryMavenPomCache(),
-                            new RocksdbMavenPomCache(Path.of(parserSettings.getPomCacheDirectory()))
+                            new RocksdbMavenPomCache(Path.of(parserProperties.getPomCacheDirectory()))
                     );
                 } catch (Exception e) {
                     log.warn("Unable to initialize RocksdbMavenPomCache, falling back to InMemoryMavenPomCache");

sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/MavenMojoProjectParserFactory.java

@@ -39,19 +39,19 @@
 @RequiredArgsConstructor
 class MavenMojoProjectParserFactory {
 
-    private final ParserSettings parserSettings;
+    private final ParserProperties parserProperties;
 
     public MavenMojoProjectParser create(Path baseDir, List<MavenProject> mavenProjects, PlexusContainer plexusContainer, MavenSession session) {
         return buildMavenMojoProjectParser(
                 baseDir,
                 mavenProjects,
-                parserSettings.isPomCacheEnabled(),
-                parserSettings.getPomCacheDirectory(),
-                parserSettings.isSkipMavenParsing(),
-                parserSettings.getIgnoredPathPatterns(),
-                parserSettings.getPlainTextMasks(),
-                parserSettings.getSizeThresholdMb(),
-                parserSettings.isRunPerSubmodule(),
+                parserProperties.isPomCacheEnabled(),
+                parserProperties.getPomCacheDirectory(),
+                parserProperties.isSkipMavenParsing(),
+                parserProperties.getIgnoredPathPatterns(),
+                parserProperties.getPlainTextMasks(),
+                parserProperties.getSizeThresholdMb(),
+                parserProperties.isRunPerSubmodule(),
                 plexusContainer,
                 session);
     }
@@ -98,16 +98,16 @@ public MavenMojoProjectParser create(Path baseDir, RuntimeInformation runtimeInf
         return new MavenMojoProjectParser(
                 new Slf4jToMavenLoggerAdapter(log),
                 baseDir,
-                parserSettings.isPomCacheEnabled(),
-                parserSettings.getPomCacheDirectory(),
+                parserProperties.isPomCacheEnabled(),
+                parserProperties.getPomCacheDirectory(),
                 runtimeInformation,
-                parserSettings.isSkipMavenParsing(),
-                parserSettings.getIgnoredPathPatterns(),
-                parserSettings.getPlainTextMasks(),
-                parserSettings.getSizeThresholdMb(),
+                parserProperties.isSkipMavenParsing(),
+                parserProperties.getIgnoredPathPatterns(),
+                parserProperties.getPlainTextMasks(),
+                parserProperties.getSizeThresholdMb(),
                 null,
                 settingsDecrypter,
-                parserSettings.isRunPerSubmodule()
+                parserProperties.isRunPerSubmodule()
         );
     }
 }

sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/ParserProperties.java

@@ -35,7 +35,8 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @ConfigurationProperties(prefix = "parser")
-public class ParserSettings {
+@SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
+public class ParserProperties {
 
     private String loggerClass;
     private boolean pomCacheEnabled = false;

sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/ProjectScanner.java

@@ -39,7 +39,7 @@
 @RequiredArgsConstructor
 class ProjectScanner {
     private final ResourceLoader resourceLoader;
-    private final ParserSettings parserSettings;
+    private final ParserProperties parserProperties;
 
     public List<Resource> scan(Path baseDir) {
         if(!baseDir.isAbsolute()) {
@@ -54,7 +54,7 @@ public List<Resource> scan(Path baseDir) {
         try {
             Resource[] resources = ResourcePatternUtils.getResourcePatternResolver(resourceLoader).getResources(pattern);
 
-            List<PathMatcher> pathMatchers = parserSettings.getIgnoredPathPatterns().stream()
+            List<PathMatcher> pathMatchers = parserProperties.getIgnoredPathPatterns().stream()
                     .map(p -> p.startsWith("glob:") ? p : "glob:" + p)
                     .map(baseDir.getFileSystem()::getPathMatcher)
                     .toList();

sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/RewriteProjectParser.java

@@ -85,7 +85,7 @@ public class RewriteProjectParser {
     private final BuildFileParser buildFileParser;
     private final SourceFileParser sourceFileParser;
     private final StyleDetector styleDetector;
-    private final ParserSettings parserSettings;
+    private final ParserProperties parserProperties;
     private final ParsingEventListener parsingEventListener;
     private final ApplicationEventPublisher eventPublisher;
     private final ScanScope scanScope;
@@ -146,7 +146,7 @@ public RewriteProjectParsingResult parse(Path givenBaseDir, List<Resource> resou
             Map<Path, List<Marker>> provenanceMarkers = provenanceMarkerFactory.generateProvenanceMarkers(baseDir, mavenInfos);
 
             // 127: parse build files
-            Map<Path, Xml.Document> resourceToDocumentMap = buildFileParser.parseBuildFiles(baseDir, mavenInfos.getResources(), mavenInfos.getActiveProfiles(), executionContext, parserSettings.isSkipMavenParsing(), provenanceMarkers);
+            Map<Path, Xml.Document> resourceToDocumentMap = buildFileParser.parseBuildFiles(baseDir, mavenInfos.getResources(), mavenInfos.getActiveProfiles(), executionContext, parserProperties.isSkipMavenParsing(), provenanceMarkers);
 
             List<SourceFile> parsedAndSortedBuildFileDocuments = mavenInfos.getResources().stream()
                     .map(r -> resourceToDocumentMap.get(ResourceUtil.getPath(r)))

sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/SourceFileParser.java

@@ -44,7 +44,7 @@
 class SourceFileParser {
 
     private final MavenModelReader modelReader;
-    private final ParserSettings parserSettings;
+    private final ParserProperties parserProperties;
     private final MavenMojoProjectParserPrivateMethods mavenMojoProjectParserPrivateMethods;
 
     public List<SourceFile> parseOtherSourceFiles(
@@ -101,9 +101,9 @@ private List<SourceFile> parseModuleSourceFiles(
         ResourceParser rp = new ResourceParser(
                 baseDir,
                 new Slf4jToMavenLoggerAdapter(log),
-                parserSettings.getIgnoredPathPatterns(),
-                parserSettings.getPlainTextMasks(),
-                parserSettings.getSizeThresholdMb(),
+                parserProperties.getIgnoredPathPatterns(),
+                parserProperties.getPlainTextMasks(),
+                parserProperties.getSizeThresholdMb(),
                 pathsToOtherModules,
                 javaParserBuilder.clone()
         );
@@ -120,7 +120,7 @@ private List<SourceFile> parseModuleSourceFiles(
                 .map(mavenMojoProjectParserPrivateMethods.addProvenance(baseDir, provenanceMarkers, null));
 
         // 157:169
-        List<SourceFile> resourceSourceFiles = mergeAndFilterExcluded(baseDir, parserSettings.getIgnoredPathPatterns(), mainSources, testSources);
+        List<SourceFile> resourceSourceFiles = mergeAndFilterExcluded(baseDir, parserProperties.getIgnoredPathPatterns(), mainSources, testSources);
         List<SourceFile> resourceFilesList = parsedResourceFiles.toList();
         sourceFiles.addAll(resourceFilesList);
         sourceFiles.addAll(resourceSourceFiles);

sbm-support-rewrite/src/main/java/org/springframework/sbm/recipes/RewriteRecipeDiscovery.java

@@ -29,7 +29,7 @@
 import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.maven.AbstractRewriteMojo;
 import org.springframework.sbm.parsers.RecipeValidationErrorException;
-import org.springframework.sbm.parsers.ParserSettings;
+import org.springframework.sbm.parsers.ParserProperties;
 import org.springframework.stereotype.Component;
 
 import java.nio.file.Path;
@@ -51,7 +51,7 @@
 @RequiredArgsConstructor
 public class RewriteRecipeDiscovery {
 
-    private final ParserSettings parserSettings;
+    private final ParserProperties parserProperties;
     /**
      *
      */
@@ -89,7 +89,7 @@ public List<Recipe> discoverFilteredRecipes(List<String> activeRecipes, Properti
             failedValidations.forEach(failedValidation -> log.error(
                     "Recipe validation error in " + failedValidation.getProperty() + ": " +
                             failedValidation.getMessage(), failedValidation.getException()));
-            if (parserSettings.isFailOnInvalidActiveRecipes()) {
+            if (parserProperties.isFailOnInvalidActiveRecipes()) {
                 throw new RecipeValidationErrorException("Recipe validation errors detected as part of one or more activeRecipe(s). Please check error logs.");
             } else {
                 log.error("Recipe validation errors detected as part of one or more activeRecipe(s). Execution will continue regardless.");
@@ -127,7 +127,7 @@ public List<Recipe> discoverFilteredRecipes(List<String> activeRecipes, MavenPro
             failedValidations.forEach(failedValidation -> log.error(
                     "Recipe validation error in " + failedValidation.getProperty() + ": " +
                             failedValidation.getMessage(), failedValidation.getException()));
-            if (parserSettings.isFailOnInvalidActiveRecipes()) {
+            if (parserProperties.isFailOnInvalidActiveRecipes()) {
                 throw new RecipeValidationErrorException("Recipe validation errors detected as part of one or more activeRecipe(s). Please check error logs.");
             } else {
                 log.error("Recipe validation errors detected as part of one or more activeRecipe(s). Execution will continue regardless.");

sbm-support-rewrite/src/test/java/org/springframework/sbm/parsers/ParserEventPublicationIntegrationTest.java

@@ -48,7 +48,7 @@ public class ParserEventPublicationIntegrationTest {
     ProjectScanner projectScanner;
 
     @Autowired
-    ParserSettings parserSettings;
+    ParserProperties parserProperties;
 
     private static List<ParsedResourceEvent> capturedEvents = new ArrayList<>();
     private static StartedParsingProjectEvent startedParsingEvent;
@@ -58,7 +58,7 @@ public class ParserEventPublicationIntegrationTest {
     @DisplayName("Should publish parsing events")
     void shouldPublishParsingEvents() {
         Path baseDir = Path.of("./testcode/maven-projects/multi-module-events");
-        parserSettings.setIgnoredPathPatterns(Set.of("{**/target,target}", "**.adoc"));
+        parserProperties.setIgnoredPathPatterns(Set.of("{**/target,target}", "**.adoc"));
         List<Resource> resources = projectScanner.scan(baseDir);
         ExecutionContext ctx = new InMemoryExecutionContext(t -> {throw new RuntimeException(t);});
 

sbm-support-rewrite/src/test/java/org/springframework/sbm/parsers/ParserSettingsTest.java

@@ -71,7 +71,7 @@ void testMavenMojoProjectParserGenerateProvenance() {
             // create sut using a factory
             RuntimeInformation runtimeInformation = new DefaultRuntimeInformation();
             SettingsDecrypter settingsDecrypter = null;
-            MavenMojoProjectParserFactory mavenMojoProjectParserFactory = new MavenMojoProjectParserFactory(new ParserSettings());
+            MavenMojoProjectParserFactory mavenMojoProjectParserFactory = new MavenMojoProjectParserFactory(new ParserProperties());
             MavenMojoProjectParser sut = mavenMojoProjectParserFactory.create(baseDir, runtimeInformation, settingsDecrypter);
 
             // the sut requires a MavenProject, let's retrieve it from Maven