Renamed class ApplicationProperties to SbmApplicationProperties

Author: fabapp2

applications/spring-shell/src/test/java/org/springframework/sbm/IntegrationTestBaseClass.java

@@ -31,7 +31,7 @@
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.sbm.engine.commands.ApplicableRecipeListCommand;
 import org.springframework.sbm.engine.context.ProjectContextHolder;
-import org.springframework.sbm.project.resource.ApplicationProperties;
+import org.springframework.sbm.project.resource.SbmApplicationProperties;
 import org.springframework.sbm.project.resource.ResourceHelper;
 import org.springframework.sbm.shell.ApplyShellCommand;
 import org.springframework.sbm.shell.ScanShellCommand;
@@ -98,7 +98,7 @@ public abstract class IntegrationTestBaseClass {
 	@Autowired
 	ProjectContextHolder projectContextHolder;
 	@Autowired
-	private ApplicationProperties applicationProperties;
+	private SbmApplicationProperties sbmApplicationProperties;
 	private Path testDir;
 
 	private String output;
@@ -122,7 +122,7 @@ public void beforeEach() throws IOException {
 	}
 
 	protected void enableGitSupport() {
-		applicationProperties.setGitSupportEnabled(true);
+		sbmApplicationProperties.setGitSupportEnabled(true);
 		System.out.println("Programmatically enabled git support!");
 	}
 

applications/spring-shell/src/test/java/org/springframework/sbm/recipes/MigrateJsf2xToSpringBootRecipeIntegrationTest.java

@@ -23,7 +23,7 @@
 import org.springframework.sbm.IntegrationTestBaseClass;
 import org.springframework.sbm.engine.git.Commit;
 import org.springframework.sbm.engine.git.GitSupport;
-import org.springframework.sbm.project.resource.ApplicationProperties;
+import org.springframework.sbm.project.resource.SbmApplicationProperties;
 
 import java.io.File;
 import java.io.IOException;
@@ -72,9 +72,9 @@ void testRecipe() throws IOException {
 
     @NotNull
     private GitSupport initGitRepo() {
-        ApplicationProperties applicationProperties = new ApplicationProperties();
-        applicationProperties.setGitSupportEnabled(true);
-        GitSupport gitSupport = new GitSupport(applicationProperties);
+        SbmApplicationProperties sbmApplicationProperties = new SbmApplicationProperties();
+        sbmApplicationProperties.setGitSupportEnabled(true);
+        GitSupport gitSupport = new GitSupport(sbmApplicationProperties);
         File repo = getTestDir().toFile();
         Git git = gitSupport.initGit(repo);
         gitSupport.add(repo, ".");

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

@@ -20,7 +20,7 @@
 import org.springframework.sbm.engine.commands.ScanCommand;
 import org.springframework.sbm.engine.context.ProjectContext;
 import org.springframework.sbm.engine.recipe.Recipe;
-import org.springframework.sbm.project.resource.ApplicationProperties;
+import org.springframework.sbm.project.resource.SbmApplicationProperties;
 import freemarker.template.Configuration;
 import lombok.AccessLevel;
 import lombok.Setter;
@@ -96,8 +96,8 @@ public void andApplyRecipe(String recipeName) {
 
                     ScanCommand scanCommand = ctx.getBean(ScanCommand.class);
 
-                    ApplicationProperties applicationProperties = ctx.getBean(ApplicationProperties.class);
-                    applicationProperties.setDefaultBasePackage("org.springframework.sbm");
+                    SbmApplicationProperties sbmApplicationProperties = ctx.getBean(SbmApplicationProperties.class);
+                    sbmApplicationProperties.setDefaultBasePackage("org.springframework.sbm");
 
                     ApplicableRecipeListCommand applicableRecipeListCommand = ctx.getBean(ApplicableRecipeListCommand.class);
                     ProjectContext projectContext = scanCommand.execute(rootDir.toString());
@@ -110,7 +110,7 @@ public void andApplyRecipe(String recipeName) {
                     applyCommand.execute(projectContext, recipe.getName());
                 },
                 SpringBeanProvider.ComponentScanConfiguration.class,
-                ApplicationProperties.class,
+                SbmApplicationProperties.class,
                 Configuration.class,
                 UserInteractionsDummy.class
         );

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

@@ -19,7 +19,7 @@
 import org.springframework.sbm.engine.context.RewriteJavaSearchActionDeserializer;
 import org.springframework.sbm.engine.recipe.*;
 import org.springframework.sbm.java.util.BasePackageCalculator;
-import org.springframework.sbm.project.resource.ApplicationProperties;
+import org.springframework.sbm.project.resource.SbmApplicationProperties;
 import org.springframework.sbm.project.resource.ResourceHelper;
 import org.springframework.sbm.search.recipe.actions.OpenRewriteJavaSearchAction;
 import org.springframework.context.annotation.Bean;
@@ -50,7 +50,7 @@ private RecipeTestSupport() {
     }
 
     private static final Class<?>[] springBeans = {
-            ApplicationProperties.class,
+            SbmApplicationProperties.class,
             RecipesBuilder.class,
             ResourceHelper.class,
             RecipeParser.class,

components/sbm-core/src/main/java/org/springframework/sbm/engine/git/GitSupport.java

@@ -24,7 +24,7 @@
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
 import org.springframework.sbm.engine.context.ProjectContext;
-import org.springframework.sbm.project.resource.ApplicationProperties;
+import org.springframework.sbm.project.resource.SbmApplicationProperties;
 import org.springframework.sbm.project.resource.RepositoryNotFoundException;
 import org.springframework.stereotype.Component;
 
@@ -45,7 +45,7 @@
 @RequiredArgsConstructor
 public class GitSupport {
 
-    private final ApplicationProperties applicationProperties;
+    private final SbmApplicationProperties sbmApplicationProperties;
 
     /**
      * Adds files to git index.
@@ -234,7 +234,7 @@ public boolean repoExists(File repoDir) {
 
     // TODO: test this method
     public void commitWhenGitAvailable(ProjectContext context, String appliedRecipeName, List<String> modifiedResources, List<String> deletedResources) {
-        if (applicationProperties.isGitSupportEnabled()) {
+        if (sbmApplicationProperties.isGitSupportEnabled()) {
             File repoDir = context.getProjectRootDirectory().toFile();
             modifiedResources = makeRelativeToRoot(modifiedResources, repoDir);
             deletedResources = makeRelativeToRoot(deletedResources, repoDir);

components/sbm-core/src/main/java/org/springframework/sbm/engine/git/ProjectSyncVerifier.java

@@ -18,7 +18,7 @@
 import org.springframework.sbm.engine.commands.ScanCommand;
 import org.springframework.sbm.engine.context.ProjectContext;
 import org.springframework.sbm.engine.context.ProjectContextHolder;
-import org.springframework.sbm.project.resource.ApplicationProperties;
+import org.springframework.sbm.project.resource.SbmApplicationProperties;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
@@ -31,11 +31,11 @@ public class ProjectSyncVerifier {
 
     private final GitSupport gitSupport;
     private final ScanCommand scanCommand;
-    private final ApplicationProperties applicationProperties;
+    private final SbmApplicationProperties sbmApplicationProperties;
     private final ProjectContextHolder projectContextHolder;
 
     public void rescanWhenProjectIsOutOfSyncAndGitAvailable(ProjectContext context) {
-        if (applicationProperties.isGitSupportEnabled()) {
+        if (sbmApplicationProperties.isGitSupportEnabled()) {
             File repo = context.getProjectRootDirectory().toFile();
             if (gitSupport.repoExists(repo)) {
                 String expectedRevision = context.getRevision();
@@ -48,7 +48,7 @@ public void rescanWhenProjectIsOutOfSyncAndGitAvailable(ProjectContext context)
     }
 
     public void verifyProjectIsInSyncWhenGitAvailable(ProjectContext context) {
-        if (applicationProperties.isGitSupportEnabled()) {
+        if (sbmApplicationProperties.isGitSupportEnabled()) {
             File repo = context.getProjectRootDirectory().toFile();
             if (gitSupport.repoExists(repo)) {
                 String expectedRevision = context.getRevision();

components/sbm-core/src/main/java/org/springframework/sbm/engine/precondition/DoesGitDirExistWhenGitSupportEnabledPreconditionCheck.java

@@ -20,7 +20,7 @@
 import org.springframework.core.io.Resource;
 import org.springframework.sbm.engine.git.GitStatus;
 import org.springframework.sbm.engine.git.GitSupport;
-import org.springframework.sbm.project.resource.ApplicationProperties;
+import org.springframework.sbm.project.resource.SbmApplicationProperties;
 import org.springframework.stereotype.Component;
 
 import java.io.File;
@@ -45,7 +45,7 @@
 @RequiredArgsConstructor
 class DoesGitDirExistWhenGitSupportEnabledPreconditionCheck extends PreconditionCheck {
 
-    private final ApplicationProperties applicationProperties;
+    private final SbmApplicationProperties sbmApplicationProperties;
 
     private static final String NO_GIT_DIR_EXISTS = "'sbm.gitSupportEnabled' is 'true' but no '.git' dir exists in project dir. Either disable git support or initialize git.";
     private static final String HAS_UNCOMMITTED_CHANGES = "'sbm.gitSupportEnabled' is 'true' but Git status is not clean. Commit all changes and add or ignore all resources before scan.";
@@ -55,7 +55,7 @@ class DoesGitDirExistWhenGitSupportEnabledPreconditionCheck extends Precondition
 
 	@Override
 	public PreconditionCheckResult verify(Path projectRoot, List<Resource> projectResources) {
-		if (applicationProperties.isGitSupportEnabled()) {
+		if (sbmApplicationProperties.isGitSupportEnabled()) {
 			if (noGitDirExists(projectRoot)) {
                 return new PreconditionCheckResult(FAILED, NO_GIT_DIR_EXISTS);
 			}

components/sbm-core/src/main/java/org/springframework/sbm/java/util/BasePackageCalculator.java

@@ -16,7 +16,7 @@
 package org.springframework.sbm.java.util;
 
 import org.springframework.sbm.java.api.JavaSource;
-import org.springframework.sbm.project.resource.ApplicationProperties;
+import org.springframework.sbm.project.resource.SbmApplicationProperties;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
@@ -29,10 +29,10 @@
 @RequiredArgsConstructor
 public class BasePackageCalculator {
 
-    private final ApplicationProperties applicationProperties;
+    private final SbmApplicationProperties sbmApplicationProperties;
 
     public String calculateBasePackage(List<JavaSource> javaSources) {
-       if(javaSources.isEmpty()) return applicationProperties.getDefaultBasePackage();
+       if(javaSources.isEmpty()) return sbmApplicationProperties.getDefaultBasePackage();
 
         List<JavaSource> sortableJavaSources = new ArrayList<>();
         sortableJavaSources.addAll(javaSources);
@@ -48,7 +48,7 @@ public String calculateBasePackage(List<JavaSource> javaSources) {
                     .findFirst();
 
             if(javaSourceInDifferentBasePackage.isPresent()) {
-                return applicationProperties.getDefaultBasePackage();
+                return sbmApplicationProperties.getDefaultBasePackage();
                 /*
                 throw new RuntimeException(String.format("Could not calculate base package. Found at least two conflicting candidates: [%s] and [%s] found in these resources [%s] and [%s]",
                         javaSources.get(0).getPackageName(),

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

@@ -19,7 +19,7 @@
 import org.springframework.core.io.Resource;
 import org.springframework.sbm.common.util.LinuxWindowsPathUnifier;
 import org.springframework.sbm.common.util.OsAgnosticPathMatcher;
-import org.springframework.sbm.project.resource.ApplicationProperties;
+import org.springframework.sbm.project.resource.SbmApplicationProperties;
 import org.springframework.sbm.project.resource.ResourceHelper;
 import org.springframework.stereotype.Service;
 import org.springframework.util.PathMatcher;
@@ -34,7 +34,7 @@
 @RequiredArgsConstructor
 public class PathScanner {
 
-	private final ApplicationProperties applicationProperties;
+	private final SbmApplicationProperties sbmApplicationProperties;
 	private final ResourceHelper resourceHelper;
 	private final PathMatcher pathMatcher = new OsAgnosticPathMatcher();
 	private final LinuxWindowsPathUnifier pathUnifier = new LinuxWindowsPathUnifier();
@@ -54,7 +54,7 @@ private boolean isRelevant(Path projectRoot, Path givenResource) {
 		if (givenResource.toFile().isDirectory()) {
 			return false;
 		}
-		return applicationProperties.getIgnoredPathsPatterns().stream()
+		return sbmApplicationProperties.getIgnoredPathsPatterns().stream()
 				.noneMatch(ir -> pathMatcher.match(ir,
 						pathUnifier.unifyPath(projectRoot.relativize(givenResource))));
 	}

…ject/resource/ApplicationProperties.java …t/resource/SbmApplicationProperties.javacomponents/sbm-core/src/main/java/org/springframework/sbm/project/resource/ApplicationProperties.java renamed to components/sbm-core/src/main/java/org/springframework/sbm/project/resource/SbmApplicationProperties.java components/sbm-core/src/main/java/org/springframework/sbm/project/resource/ApplicationProperties.java renamed to components/sbm-core/src/main/java/org/springframework/sbm/project/resource/SbmApplicationProperties.java

@@ -28,7 +28,7 @@
 @Getter
 @Component
 @ConfigurationProperties(prefix = "sbm")
-public class ApplicationProperties {
+public class SbmApplicationProperties {
     private boolean gitSupportEnabled;
     private String defaultBasePackage;
     private List<String> ignoredPathsPatterns = new ArrayList<>();