Organize imports

sbm-support-rewrite/src/main/java/org/springframework/sbm/boot/autoconfigure/ParserPropertiesPostProcessor.java

@@ -22,7 +22,6 @@
 import org.springframework.core.env.PropertySource;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
-import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
 
 import java.io.IOException;

sbm-support-rewrite/src/main/java/org/springframework/sbm/boot/autoconfigure/ScopeConfiguration.java

@@ -17,11 +17,12 @@
 
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.InMemoryExecutionContext;
+import org.openrewrite.java.AddOrUpdateAnnotationAttribute;
 import org.openrewrite.maven.MavenExecutionContextView;
 import org.openrewrite.maven.cache.MavenPomCache;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.sbm.scopes.ExecutionScope;
 import org.springframework.sbm.scopes.ProjectMetadata;

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

@@ -20,8 +20,9 @@
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Plugin;
 import org.jetbrains.annotations.NotNull;
-import org.openrewrite.SourceFile;
-import org.openrewrite.maven.tree.*;
+import org.openrewrite.maven.tree.MavenResolutionResult;
+import org.openrewrite.maven.tree.ResolvedDependency;
+import org.openrewrite.maven.tree.Scope;
 import org.openrewrite.maven.utilities.MavenArtifactDownloader;
 import org.openrewrite.xml.tree.Xml;
 import org.springframework.core.io.Resource;
@@ -30,7 +31,10 @@
 
 import java.io.File;
 import java.nio.file.Path;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Properties;
 import java.util.function.Predicate;
 
 

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

@@ -33,7 +33,10 @@
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
 import java.util.function.Predicate;
 import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;

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

@@ -17,7 +17,6 @@
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import org.openrewrite.SourceFile;
 import org.openrewrite.xml.tree.Xml;
 import org.springframework.core.io.Resource;
 import org.springframework.sbm.utils.ResourceUtil;

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

@@ -15,12 +15,10 @@
  */
 package org.springframework.sbm.parsers;
 
-import lombok.*;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.stereotype.Component;
 
-import java.nio.file.PathMatcher;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

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

@@ -23,7 +23,6 @@
 import org.springframework.core.io.support.ResourcePatternUtils;
 import org.springframework.sbm.utils.LinuxWindowsPathUnifier;
 import org.springframework.sbm.utils.ResourceUtil;
-import org.springframework.stereotype.Component;
 
 import java.io.IOException;
 import java.nio.file.Path;

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

@@ -21,7 +21,6 @@
 import org.openrewrite.maven.MavenSettings;
 import org.openrewrite.maven.cache.MavenArtifactCache;
 import org.openrewrite.maven.utilities.MavenArtifactDownloader;
-import org.springframework.stereotype.Component;
 
 import java.util.function.Consumer;
 

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

@@ -29,12 +29,12 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
 import org.springframework.sbm.boot.autoconfigure.ParserPropertiesPostProcessor;
+import org.springframework.sbm.boot.autoconfigure.ScopeConfiguration;
 import org.springframework.sbm.parsers.events.RewriteParsingEventListenerAdapter;
 import org.springframework.sbm.parsers.maven.*;
 import org.springframework.sbm.project.resource.SbmApplicationProperties;
 import org.springframework.sbm.scopes.ProjectMetadata;
 import org.springframework.sbm.scopes.ScanScope;
-import org.springframework.sbm.boot.autoconfigure.ScopeConfiguration;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

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

@@ -28,15 +28,17 @@
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.core.io.Resource;
-import org.springframework.sbm.parsers.events.SuccessfullyParsedProjectEvent;
 import org.springframework.sbm.parsers.events.StartedParsingProjectEvent;
+import org.springframework.sbm.parsers.events.SuccessfullyParsedProjectEvent;
 import org.springframework.sbm.parsers.maven.BuildFileParser;
 import org.springframework.sbm.parsers.maven.MavenProjectAnalyzer;
 import org.springframework.sbm.parsers.maven.ProvenanceMarkerFactory;
 import org.springframework.sbm.scopes.ScanScope;
 
 import java.nio.file.Path;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Project parser parsing resources under a given {@link Path} to OpenRewrite abstract syntax tree (AST).
@@ -92,6 +94,7 @@ public RewriteProjectParsingResult parse(Path baseDir) {
      */
     public RewriteProjectParsingResult parse(Path givenBaseDir, List<Resource> resources) {
         scanScope.clear(beanFactory);
+
         final Path baseDir = normalizePath(givenBaseDir);
 
         eventPublisher.publishEvent(new StartedParsingProjectEvent(resources));

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

@@ -33,7 +33,9 @@
 import org.springframework.core.io.Resource;
 import org.springframework.sbm.utils.ResourceUtil;
 
-import java.nio.file.*;
+import java.nio.file.Path;
+import java.nio.file.PathMatcher;
+import java.nio.file.Paths;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

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

@@ -19,19 +19,14 @@
 import lombok.extern.slf4j.Slf4j;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.SourceFile;
-import org.openrewrite.java.JavaParser;
 import org.openrewrite.marker.Marker;
 import org.openrewrite.style.NamedStyles;
 import org.openrewrite.xml.tree.Xml;
 import org.springframework.core.io.Resource;
 import org.springframework.sbm.parsers.maven.MavenModuleParser;
-import org.springframework.sbm.utils.ResourceUtil;
 
 import java.nio.file.Path;
-import java.nio.file.PathMatcher;
 import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * @author Fabian Krüger

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

@@ -18,17 +18,16 @@
 import org.openrewrite.SourceFile;
 import org.openrewrite.Tree;
 import org.openrewrite.internal.ListUtils;
-import org.openrewrite.java.style.Autodetect;
 import org.openrewrite.java.tree.JavaSourceFile;
 import org.openrewrite.marker.Marker;
 import org.openrewrite.style.NamedStyles;
 import org.openrewrite.xml.tree.Xml;
-import org.springframework.util.ReflectionUtils;
 
-import java.lang.reflect.Method;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import java.util.function.UnaryOperator;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 /**

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

@@ -16,7 +16,6 @@
 package org.springframework.sbm.parsers.events;
 
 import org.openrewrite.Parser;
-import org.springframework.context.ApplicationEvent;
 
 /**
  * @author Fabian Krüger

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

@@ -43,8 +43,7 @@
  */
 @Slf4j
 @RequiredArgsConstructor
-public
-class BuildFileParser {
+public class BuildFileParser {
 
     /**
      * Parse a list of Maven Pom files to a Map of {@code Path} and their parsed {@link Xml.Document}s.

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

@@ -20,7 +20,6 @@
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import org.springframework.core.io.Resource;
 import org.springframework.sbm.utils.ResourceUtil;
-import org.springframework.stereotype.Component;
 
 import java.io.IOException;
 import java.nio.file.Path;

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

@@ -19,7 +19,6 @@
 import org.openrewrite.maven.MavenSettings;
 import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher;
 import org.sonatype.plexus.components.sec.dispatcher.SecDispatcherException;
-import org.springframework.stereotype.Component;
 
 import java.nio.file.Path;
 import java.util.List;

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

@@ -24,7 +24,10 @@
 import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.marker.JavaProject;
 import org.openrewrite.java.marker.JavaVersion;
-import org.openrewrite.marker.*;
+import org.openrewrite.marker.BuildTool;
+import org.openrewrite.marker.GitProvenance;
+import org.openrewrite.marker.Marker;
+import org.openrewrite.marker.OperatingSystemProvenance;
 import org.openrewrite.marker.ci.BuildEnvironment;
 import org.springframework.sbm.parsers.MavenProject;
 

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

@@ -16,15 +16,15 @@
 package org.springframework.sbm.parsers.maven;
 
 import lombok.RequiredArgsConstructor;
-import org.apache.maven.project.MavenProject;
 import org.openrewrite.marker.Marker;
 import org.springframework.core.io.Resource;
 import org.springframework.sbm.parsers.ParserContext;
-import org.springframework.sbm.parsers.maven.MavenProvenanceMarkerFactory;
 import org.springframework.sbm.utils.ResourceUtil;
 
 import java.nio.file.Path;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author Fabian Krüger

sbm-support-rewrite/src/main/java/org/springframework/sbm/project/RewriteSourceFileWrapper.java

@@ -17,7 +17,6 @@
 
 import org.openrewrite.SourceFile;
 import org.springframework.sbm.project.resource.RewriteSourceFileHolder;
-import org.springframework.stereotype.Component;
 
 import java.nio.file.Path;
 import java.util.List;

sbm-support-rewrite/src/main/java/org/springframework/sbm/project/resource/ProjectResourceSetSerializer.java

@@ -16,7 +16,6 @@
 package org.springframework.sbm.project.resource;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
 
 @RequiredArgsConstructor
 public class ProjectResourceSetSerializer {

sbm-support-rewrite/src/main/java/org/springframework/sbm/project/resource/RewriteMigrationResultMerger.java

@@ -20,7 +20,6 @@
 import org.openrewrite.SourceFile;
 import org.springframework.sbm.project.RewriteSourceFileWrapper;
 import org.springframework.sbm.project.resource.finder.AbsolutePathResourceFinder;
-import org.springframework.stereotype.Component;
 
 import java.nio.file.Path;
 import java.util.List;

sbm-support-rewrite/src/main/java/org/springframework/sbm/project/resource/SbmApplicationProperties.java

@@ -18,7 +18,6 @@
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;

sbm-support-rewrite/src/main/java/org/springframework/sbm/project/resource/finder/AbsolutePathResourcesFinder.java

@@ -20,7 +20,10 @@
 import org.springframework.sbm.project.resource.RewriteSourceFileHolder;
 
 import java.nio.file.Path;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 public class AbsolutePathResourcesFinder implements ProjectResourceFinder<List<RewriteSourceFileHolder<? extends SourceFile>>> {

sbm-support-rewrite/src/main/java/org/springframework/sbm/project/resource/finder/GenericTypeFinder.java

@@ -15,11 +15,8 @@
  */
 package org.springframework.sbm.project.resource.finder;
 
-import org.springframework.sbm.project.resource.ProjectResourceSet;
-import org.springframework.sbm.project.resource.finder.GenericTypeListFinder;
-import org.springframework.sbm.project.resource.finder.ProjectResourceFinder;
-import org.springframework.sbm.project.resource.finder.ResourceFilterException;
 import lombok.Getter;
+import org.springframework.sbm.project.resource.ProjectResourceSet;
 
 import java.util.List;
 import java.util.Optional;

sbm-support-rewrite/src/main/java/org/springframework/sbm/project/resource/finder/GenericTypeListFinder.java

@@ -15,8 +15,8 @@
  */
 package org.springframework.sbm.project.resource.finder;
 
-import org.springframework.sbm.project.resource.ProjectResourceSet;
 import lombok.Getter;
+import org.springframework.sbm.project.resource.ProjectResourceSet;
 
 import java.util.List;
 import java.util.stream.Collectors;

sbm-support-rewrite/src/main/java/org/springframework/sbm/project/resource/finder/PathPatternMatchingProjectResourceFinder.java

@@ -15,9 +15,9 @@
  */
 package org.springframework.sbm.project.resource.finder;
 
-import org.springframework.sbm.utils.OsAgnosticPathMatcher;
 import org.springframework.sbm.project.resource.ProjectResource;
 import org.springframework.sbm.project.resource.ProjectResourceSet;
+import org.springframework.sbm.utils.OsAgnosticPathMatcher;
 import org.springframework.util.PathMatcher;
 
 import java.util.Arrays;

sbm-support-rewrite/src/main/java/org/springframework/sbm/project/resource/finder/RewriteSourceFileHolderListFinder.java

@@ -15,10 +15,10 @@
  */
 package org.springframework.sbm.project.resource.finder;
 
-import org.springframework.sbm.project.resource.ProjectResourceSet;
-import org.springframework.sbm.project.resource.RewriteSourceFileHolder;
 import lombok.RequiredArgsConstructor;
 import org.openrewrite.SourceFile;
+import org.springframework.sbm.project.resource.ProjectResourceSet;
+import org.springframework.sbm.project.resource.RewriteSourceFileHolder;
 
 import java.util.List;
 import java.util.stream.Collectors;

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

@@ -23,11 +23,9 @@
 import org.openrewrite.config.Environment;
 import org.openrewrite.config.RecipeDescriptor;
 import org.openrewrite.config.ResourceLoader;
-import org.openrewrite.internal.lang.Nullable;
-import org.springframework.sbm.parsers.RecipeValidationErrorException;
 import org.springframework.sbm.parsers.ParserProperties;
+import org.springframework.sbm.parsers.RecipeValidationErrorException;
 
-import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;

sbm-support-rewrite/src/main/java/org/springframework/sbm/utils/OsAgnosticPathMatcher.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.sbm.utils;
 
-import org.springframework.sbm.utils.LinuxWindowsPathUnifier;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.util.PathMatcher;
 

sbm-support-rewrite/src/test/java/io/example/recipes/AnotherDummyRecipe.java

@@ -22,7 +22,6 @@
 import org.openrewrite.Recipe;
 import org.openrewrite.config.RecipeExample;
 
-import java.net.URI;
 import java.util.List;
 import java.util.Set;
 

sbm-support-rewrite/src/test/java/org/openrewrite/maven/CalculateClasspathTest.java

@@ -27,7 +27,6 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.core.io.Resource;
 import org.springframework.sbm.boot.autoconfigure.ScannerConfiguration;
-import org.springframework.sbm.parsers.RewriteExecutionContext;
 import org.springframework.sbm.parsers.RewriteProjectParser;
 import org.springframework.sbm.parsers.RewriteProjectParsingResult;
 import org.springframework.sbm.test.util.DummyResource;

sbm-support-rewrite/src/test/java/org/openrewrite/maven/MavenParserTest.java

@@ -15,7 +15,6 @@
  */
 package org.openrewrite.maven;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junitpioneer.jupiter.ExpectedToFail;