Skip to content

Commit e5ffdd4

Browse files
authored
Organize imports (#972)
1 parent 8d3cda1 commit e5ffdd4

File tree

44 files changed

+64
-79
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+64
-79
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.springframework.core.env.PropertySource;
2323
import org.springframework.core.io.ClassPathResource;
2424
import org.springframework.core.io.Resource;
25-
import org.springframework.stereotype.Component;
2625
import org.springframework.util.Assert;
2726

2827
import java.io.IOException;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@
1717

1818
import org.openrewrite.ExecutionContext;
1919
import org.openrewrite.InMemoryExecutionContext;
20+
import org.openrewrite.java.AddOrUpdateAnnotationAttribute;
2021
import org.openrewrite.maven.MavenExecutionContextView;
2122
import org.openrewrite.maven.cache.MavenPomCache;
2223
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
23-
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2424
import org.springframework.boot.autoconfigure.AutoConfiguration;
25+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2526
import org.springframework.context.annotation.Bean;
2627
import org.springframework.sbm.scopes.ExecutionScope;
2728
import org.springframework.sbm.scopes.ProjectMetadata;

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@
2020
import org.apache.maven.model.Model;
2121
import org.apache.maven.model.Plugin;
2222
import org.jetbrains.annotations.NotNull;
23-
import org.openrewrite.SourceFile;
24-
import org.openrewrite.maven.tree.*;
23+
import org.openrewrite.maven.tree.MavenResolutionResult;
24+
import org.openrewrite.maven.tree.ResolvedDependency;
25+
import org.openrewrite.maven.tree.Scope;
2526
import org.openrewrite.maven.utilities.MavenArtifactDownloader;
2627
import org.openrewrite.xml.tree.Xml;
2728
import org.springframework.core.io.Resource;
@@ -30,7 +31,10 @@
3031

3132
import java.io.File;
3233
import java.nio.file.Path;
33-
import java.util.*;
34+
import java.util.ArrayList;
35+
import java.util.List;
36+
import java.util.Objects;
37+
import java.util.Properties;
3438
import java.util.function.Predicate;
3539

3640

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@
3333

3434
import java.nio.file.Path;
3535
import java.nio.file.Paths;
36-
import java.util.*;
36+
import java.util.ArrayList;
37+
import java.util.Collection;
38+
import java.util.List;
39+
import java.util.Set;
3740
import java.util.function.Predicate;
3841
import java.util.function.UnaryOperator;
3942
import java.util.stream.Collectors;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import lombok.Getter;
1919
import lombok.RequiredArgsConstructor;
20-
import org.openrewrite.SourceFile;
2120
import org.openrewrite.xml.tree.Xml;
2221
import org.springframework.core.io.Resource;
2322
import org.springframework.sbm.utils.ResourceUtil;

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@
1515
*/
1616
package org.springframework.sbm.parsers;
1717

18-
import lombok.*;
18+
import lombok.Getter;
19+
import lombok.Setter;
1920
import org.springframework.boot.context.properties.ConfigurationProperties;
20-
import org.springframework.context.annotation.PropertySource;
21-
import org.springframework.stereotype.Component;
2221

23-
import java.nio.file.PathMatcher;
2422
import java.util.HashSet;
2523
import java.util.List;
2624
import java.util.Set;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.springframework.core.io.support.ResourcePatternUtils;
2424
import org.springframework.sbm.utils.LinuxWindowsPathUnifier;
2525
import org.springframework.sbm.utils.ResourceUtil;
26-
import org.springframework.stereotype.Component;
2726

2827
import java.io.IOException;
2928
import java.nio.file.Path;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.openrewrite.maven.MavenSettings;
2222
import org.openrewrite.maven.cache.MavenArtifactCache;
2323
import org.openrewrite.maven.utilities.MavenArtifactDownloader;
24-
import org.springframework.stereotype.Component;
2524

2625
import java.util.function.Consumer;
2726

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
import org.springframework.context.annotation.Bean;
3030
import org.springframework.context.annotation.Import;
3131
import org.springframework.sbm.boot.autoconfigure.ParserPropertiesPostProcessor;
32+
import org.springframework.sbm.boot.autoconfigure.ScopeConfiguration;
3233
import org.springframework.sbm.parsers.events.RewriteParsingEventListenerAdapter;
3334
import org.springframework.sbm.parsers.maven.*;
3435
import org.springframework.sbm.project.resource.SbmApplicationProperties;
3536
import org.springframework.sbm.scopes.ProjectMetadata;
3637
import org.springframework.sbm.scopes.ScanScope;
37-
import org.springframework.sbm.boot.autoconfigure.ScopeConfiguration;
3838

3939
import java.io.PrintWriter;
4040
import java.io.StringWriter;

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,17 @@
2828
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
2929
import org.springframework.context.ApplicationEventPublisher;
3030
import org.springframework.core.io.Resource;
31-
import org.springframework.sbm.parsers.events.SuccessfullyParsedProjectEvent;
3231
import org.springframework.sbm.parsers.events.StartedParsingProjectEvent;
32+
import org.springframework.sbm.parsers.events.SuccessfullyParsedProjectEvent;
3333
import org.springframework.sbm.parsers.maven.BuildFileParser;
3434
import org.springframework.sbm.parsers.maven.MavenProjectAnalyzer;
3535
import org.springframework.sbm.parsers.maven.ProvenanceMarkerFactory;
3636
import org.springframework.sbm.scopes.ScanScope;
3737

3838
import java.nio.file.Path;
39-
import java.util.*;
39+
import java.util.ArrayList;
40+
import java.util.List;
41+
import java.util.Map;
4042

4143
/**
4244
* Project parser parsing resources under a given {@link Path} to OpenRewrite abstract syntax tree (AST).
@@ -92,6 +94,7 @@ public RewriteProjectParsingResult parse(Path baseDir) {
9294
*/
9395
public RewriteProjectParsingResult parse(Path givenBaseDir, List<Resource> resources) {
9496
scanScope.clear(beanFactory);
97+
9598
final Path baseDir = normalizePath(givenBaseDir);
9699

97100
eventPublisher.publishEvent(new StartedParsingProjectEvent(resources));

0 commit comments

Comments
 (0)