2.7: Changes to Auto-configuration #156

Author: admitrov

components/sbm-core/pom.xml

@@ -68,6 +68,10 @@
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-java-11</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.openrewrite</groupId>
+            <artifactId>rewrite-java-17</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-protobuf</artifactId>

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

@@ -16,18 +16,39 @@
 package org.springframework.sbm.build.impl;
 
 import lombok.extern.slf4j.Slf4j;
-import org.openrewrite.*;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Parser;
+import org.openrewrite.Recipe;
+import org.openrewrite.Result;
+import org.openrewrite.SourceFile;
 import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.marker.Markers;
+import org.openrewrite.maven.AddDependencyVisitor;
+import org.openrewrite.maven.AddMavenRepository;
+import org.openrewrite.maven.ChangePackaging;
+import org.openrewrite.maven.ChangePropertyValue;
+import org.openrewrite.maven.ExcludeDependency;
+import org.openrewrite.maven.MavenParser;
+import org.openrewrite.maven.MavenVisitor;
+import org.openrewrite.maven.RemoveDependency;
+import org.openrewrite.maven.RemoveProperty;
+import org.openrewrite.maven.UpgradeParentVersion;
 import org.openrewrite.maven.*;
 import org.openrewrite.maven.tree.MavenResolutionResult;
 import org.openrewrite.maven.tree.Parent;
 import org.openrewrite.maven.tree.ResolvedDependency;
+import org.openrewrite.maven.tree.ResolvedManagedDependency;
 import org.openrewrite.maven.tree.Scope;
 import org.openrewrite.xml.tree.Xml;
 import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.sbm.build.api.*;
+import org.springframework.sbm.build.api.BuildFile;
+import org.springframework.sbm.build.api.DependenciesChangedEvent;
+import org.springframework.sbm.build.api.Dependency;
+import org.springframework.sbm.build.api.ParentDeclaration;
+import org.springframework.sbm.build.api.Plugin;
+import org.springframework.sbm.build.api.RepositoryDefinition;
+import org.springframework.sbm.build.api.RewriteMavenParentDeclaration;
 import org.springframework.sbm.build.migration.recipe.AddMavenPlugin;
 import org.springframework.sbm.build.migration.recipe.RemoveMavenPlugin;
 import org.springframework.sbm.build.migration.visitor.AddOrUpdateDependencyManagement;
@@ -41,9 +62,19 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
+import static java.util.function.Predicate.not;
+
 @Slf4j
 public class OpenRewriteMavenBuildFile extends RewriteSourceFileHolder<Xml.Document> implements BuildFile {
 
@@ -333,7 +364,7 @@ protected void addDependenciesInner(List<Dependency> dependencies) {
             apply(r);
             apply(new RefreshPomModel());
             List<Dependency> exclusions = dependencies.stream()
-                    .filter(d -> false == d.getExclusions().isEmpty())
+                    .filter(not(d -> d.getExclusions().isEmpty()))
                     .flatMap(d -> d.getExclusions().stream())
                     .collect(Collectors.toList());
 
@@ -373,7 +404,7 @@ private boolean hasEffectiveDependency(Dependency d) {
      * Does not updateClasspathRegistry
      */
     private void excludeDependenciesInner(List<Dependency> exclusions) {
-        if (false == exclusions.isEmpty()) {
+        if (!exclusions.isEmpty()) {
             Dependency excludedDependency = exclusions.get(0);
             ExcludeDependency excludeDependency = new ExcludeDependency(excludedDependency.getGroupId(), excludedDependency.getArtifactId(), excludedDependency.getScope());
             exclusions.stream().skip(1).forEach(d -> excludeDependency.doNext(new ExcludeDependency(d.getGroupId(), d.getArtifactId(), d.getScope())));
@@ -385,14 +416,13 @@ private void excludeDependenciesInner(List<Dependency> exclusions) {
     private void updateClasspathRegistry() {
         ClasspathRegistry instance = ClasspathRegistry.getInstance();
         // FIXME: removed dependencies must be removed from ProjectDependenciesRegistry too
-        Set<ResolvedDependency> compileDependencies = getPom().getDependencies().get(Scope.Compile).stream().collect(Collectors.toSet());
+        Set<ResolvedDependency> compileDependencies = new HashSet<>(getPom().getDependencies().get(Scope.Compile));
         Set<ResolvedDependency> testDependencies = getPom().getDependencies().get(Scope.Test)
                 .stream()
                 .flatMap(d -> d.getDependencies().stream())
                 .collect(Collectors.toSet());
         compileDependencies.addAll(testDependencies);
-        compileDependencies.stream()
-                .forEach(instance::addDependency);
+        compileDependencies.forEach(instance::addDependency);
     }
 
     private Recipe getAddDependencyRecipe(Dependency dependency) {
@@ -436,16 +466,20 @@ public List<Dependency> getDependencyManagement() {
             return Collections.emptyList();
         }
         return pom.getPom().getDependencyManagement().stream()
-                .map(d -> Dependency.builder()
-                        .groupId(d.getGroupId())
-                        .artifactId(d.getArtifactId())
-                        .version(d.getVersion())
-                        .scope(scopeString(d.getScope()))
-                        .build())
+                .map(this::getDependency)
                 .distinct()
                 .collect(Collectors.toList());
     }
 
+    private Dependency getDependency(ResolvedManagedDependency d) {
+        return Dependency.builder()
+            .groupId(d.getGroupId())
+            .artifactId(d.getArtifactId())
+            .version(d.getVersion())
+            .scope(scopeString(d.getScope()))
+            .build();
+    }
+
     @Override
     public void addToDependencyManagementInner(Dependency dependency) {
         AddOrUpdateDependencyManagement addOrUpdateDependencyManagement = new AddOrUpdateDependencyManagement(dependency);
@@ -461,7 +495,8 @@ public void addToDependencyManagementInner(Dependency dependency) {
     public List<Path> getResolvedDependenciesPaths() {
         RewriteMavenArtifactDownloader rewriteMavenArtifactDownloader = new RewriteMavenArtifactDownloader();
         return getPom().getDependencies().get(Scope.Provided).stream()
-                .map(d -> rewriteMavenArtifactDownloader.downloadArtifact(d)).collect(Collectors.toList());
+                .map(rewriteMavenArtifactDownloader::downloadArtifact)
+                .collect(Collectors.toList());
 
 /*
         Field classpathField = ReflectionUtils.findField(Java11Parser.class, "classpath");

components/sbm-core/src/main/java/org/springframework/sbm/common/migration/actions/DeleteFileMatchingPattern.java

@@ -21,8 +21,6 @@
 import org.springframework.sbm.engine.recipe.AbstractAction;
 import org.springframework.sbm.project.resource.ProjectResource;
 
-import java.util.List;
-
 /**
  * Delete files matching path pattern.
  *
@@ -35,7 +33,6 @@ public class DeleteFileMatchingPattern extends AbstractAction {
 
     @Override
     public void apply(ProjectContext context) {
-        List<ProjectResource> search = context.search(new PathPatternMatchingProjectResourceFinder(pattern));
-        search.stream().forEach(ProjectResource::delete);
+        context.search(new PathPatternMatchingProjectResourceFinder(pattern)).forEach(ProjectResource::delete);
     }
 }

components/sbm-core/src/main/java/org/springframework/sbm/common/migration/actions/DocumentationExtraction.java

@@ -15,13 +15,13 @@
  */
 package org.springframework.sbm.common.migration.actions;
 
+import org.jetbrains.annotations.NotNull;
+import org.springframework.sbm.engine.context.ProjectContext;
 import org.springframework.sbm.engine.recipe.AbstractAction;
 import org.springframework.sbm.engine.recipe.Action;
 import org.springframework.sbm.java.api.JavaSource;
 import org.springframework.sbm.java.api.Member;
 import org.springframework.sbm.java.impl.OpenRewriteType;
-import org.springframework.sbm.engine.context.ProjectContext;
-import org.jetbrains.annotations.NotNull;
 
 import java.nio.file.Path;
 import java.util.List;
@@ -43,7 +43,7 @@ public void apply(ProjectContext context) {
                     .map(OpenRewriteType.class::cast)
                     .filter(this::filterActions)
                     .forEach(t -> {
-                        Class actionClass = getaClass(t);
+                        Class<?> actionClass = getaClass(t);
                         List<? extends Member> members = t.getMembers();
                         String render = render(actionClass.getName(), members);
                         System.out.println(render);
@@ -76,9 +76,9 @@ public boolean isApplicable(ProjectContext context) {
                 .flatMap(js -> js.getTypes().stream())
 //                .flatMap(t -> t.getImplements().stream())
                 .filter(t -> OpenRewriteType.class.isAssignableFrom(t.getClass()))
-                .map(t -> (OpenRewriteType) t)
-                .map(t -> getaClass(t))
-                .anyMatch(c -> Action.class.isAssignableFrom(c));
+                .map(OpenRewriteType.class::cast)
+                .map(this::getaClass)
+                .anyMatch(Action.class::isAssignableFrom);
     }
 
     @NotNull

components/sbm-core/src/main/java/org/springframework/sbm/common/migration/conditions/NoFileMatchingPathPatternExist.java

@@ -15,7 +15,11 @@
  */
 package org.springframework.sbm.common.migration.conditions;
 
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.springframework.sbm.engine.context.ProjectContext;
 import org.springframework.sbm.engine.recipe.Condition;
 
@@ -43,6 +47,6 @@ public String getDescription() {
 
     @Override
     public boolean evaluate(ProjectContext context) {
-        return false == new FileMatchingPatternExist(pattern).evaluate(context);
+        return !new FileMatchingPatternExist(pattern).evaluate(context);
     }
 }

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

@@ -29,7 +29,7 @@ public String unifyPath(Path path) {
     public String unifyPath(String path) {
         path = StringUtils.cleanPath(path);
         if (isWindows()) {
-            path = tranformToLinuxPath(path);
+            path = transformToLinuxPath(path);
         }
         return path;
     }
@@ -38,7 +38,7 @@ boolean isWindows() {
         return System.getProperty("os.name").contains("Windows");
     }
 
-    private String tranformToLinuxPath(String path) {
+    private String transformToLinuxPath(String path) {
         return path.replaceAll("^[\\w]+:\\/?", "/");
     }
 }

components/sbm-core/src/main/java/org/springframework/sbm/engine/commands/DescribeCommand.java

@@ -19,8 +19,6 @@
 import org.springframework.sbm.engine.recipe.RecipesBuilder;
 import org.springframework.stereotype.Component;
 
-import java.util.Optional;
-
 @Component
 public class DescribeCommand extends AbstractCommand<Recipe> {
 
@@ -36,11 +34,9 @@ public Recipe execute(String... arguments) {
         if (arguments == null || arguments.length == 0) {
             throw new IllegalArgumentException("Describe command needs recipe name to be provided");
         } else {
-            final Optional<Recipe> recipe = recipesBuilder.buildRecipes().getRecipeByName(arguments[0]);
-            if (!recipe.isPresent()) {
-                throw new IllegalArgumentException("Recipe with name '" + arguments[0] + "' could not be found");
-            }
-            return recipe.get();
+            return recipesBuilder.buildRecipes()
+                .getRecipeByName(arguments[0])
+                .orElseThrow(() -> new IllegalArgumentException("Recipe with name '" + arguments[0] + "' could not be found"));
         }
     }
 }

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

@@ -15,6 +15,7 @@
  */
 package org.springframework.sbm.project.parser;
 
+import org.jetbrains.annotations.NotNull;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Parser;
 import org.openrewrite.Tree;
@@ -24,7 +25,6 @@
 import org.openrewrite.text.PlainTextParser;
 import org.openrewrite.tree.ParsingEventListener;
 import org.openrewrite.tree.ParsingExecutionContextView;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.stereotype.Component;
 
 import java.nio.file.Path;

components/sbm-core/src/main/java/org/springframework/sbm/project/resource/SbmApplicationProperties.java

@@ -41,7 +41,7 @@ public void setIgnoredPathsPatterns(List<String> patterns) {
                 .collect(Collectors.toList());
 
         if( ! absolutePatterns.isEmpty()) {
-            throw new IllegalArgumentException("Found absolute ignore paths patterns defined in sbm.ignoredPathsPatterns. Patterns must be relative and not start with '/'. Invalid patterns found: ['" + absolutePatterns.stream().collect(Collectors.joining("', '")) + "'].");
+            throw new IllegalArgumentException("Found absolute ignore paths patterns defined in sbm.ignoredPathsPatterns. Patterns must be relative and not start with '/'. Invalid patterns found: ['" + String.join("', '", absolutePatterns) + "'].");
         }
 
         this.ignoredPathsPatterns = patterns;

components/sbm-core/src/test/java/org/springframework/sbm/project/resource/TestProjectContext.java

@@ -39,15 +39,28 @@
 import org.springframework.sbm.openrewrite.RewriteExecutionContext;
 import org.springframework.sbm.project.RewriteSourceFileWrapper;
 import org.springframework.sbm.project.TestDummyResource;
-import org.springframework.sbm.project.parser.*;
+import org.springframework.sbm.project.parser.DependencyHelper;
+import org.springframework.sbm.project.parser.JavaProvenanceMarkerFactory;
+import org.springframework.sbm.project.parser.MavenProjectParser;
+import org.springframework.sbm.project.parser.ProjectContextInitializer;
+import org.springframework.sbm.project.parser.ResourceParser;
+import org.springframework.sbm.project.parser.RewriteJsonParser;
+import org.springframework.sbm.project.parser.RewritePlainTextParser;
+import org.springframework.sbm.project.parser.RewriteYamlParser;
 import org.springframework.sbm.properties.parser.RewritePropertiesParser;
 import org.springframework.sbm.xml.parser.RewriteXmlParser;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import static org.mockito.Mockito.mock;

components/sbm-openrewrite/pom.xml

@@ -56,6 +56,10 @@
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-java-11</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.openrewrite</groupId>
+            <artifactId>rewrite-java-17</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.rocksdb</groupId>
             <artifactId>rocksdbjni</artifactId>