120 fix demo for spring boot 24 25 upgrade (#122)

Provides demo for Spring Boot 2.4 to 2.5 upgrade 
Fixes some bugs in Spring Boot 2.4 to 2.5 upgrade

Author: fabapp2

applications/spring-shell/pom.xml

@@ -160,12 +160,19 @@
                 <version>${spring-boot.version}</version>
                 <executions>
                     <execution>
-                        <configuration>
-                            <mainClass>org.springframework.sbm.SpringShellApplication</mainClass>
-                        </configuration>
+                        <id>repackage</id>
                         <goals>
                             <goal>repackage</goal>
                         </goals>
+                        <configuration>
+                            <requiresUnpack>
+                                <dependency>
+                                    <groupId>org.asciidoctor</groupId>
+                                    <artifactId>asciidoctorj</artifactId>
+                                </dependency>
+                            </requiresUnpack>
+                            <mainClass>org.springframework.sbm.SpringShellApplication</mainClass>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>

changelog.md

@@ -1,13 +1,20 @@
-## [0.11.0](https://github.com/spring-projects-experimental/spring-boot-migrator/releases/tag/0.10.0) -  
+## [0.11.0](https://github.com/spring-projects-experimental/spring-boot-migrator/releases/tag/0.11.0) -  
 
 ### Adds
 - Unmarshalling ejb-jar.xml for EJB 2.1 (#62) 
 - Demo for Mule to Boot migration (#80)
+- Demo for Spring Boot 2.4 to 2.5 upgrade (#120)
+- New Mule 3.9 components and schemas (#110, #95, #87)
+- Bumped some dependency versions
 
 ### Fixes
 - Paths and CLI rendering under Windows (#58)
 - Fix SBM when using Windows (#58)
 - Bump some dependency versions, removes CVEs
+- SBM generates Asciidoc report when started as jar
+- 2.4 to 2.5 upgrade does not randomly fail anymore
+- Full Windows support (#91)
+- Builds on Mac M1 (#114) 
 
 ## [0.10.0](https://github.com/spring-projects-experimental/spring-boot-migrator/releases/tag/0.10.0) -  2022-03-28
 

components/sbm-core/src/main/java/org/springframework/sbm/engine/recipe/Action.java

@@ -36,7 +36,7 @@ default void applyWithStatusEvent(ProjectContext context) {
         try {
             apply(context);
         } catch(Exception e) {
-            throw new ActionFailedException("'"+this.getDescription()+"' failed: " + e.getMessage(), e);
+            throw new ActionFailedException("Action ["+ getClass().getName()+"] with description '"+this.getDescription()+"' failed: " + e.getMessage(), e);
         }
         if (eventPublisher != null) {
             eventPublisher.publishEvent(new ActionFinishedEvent(getDescription()));

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

@@ -15,9 +15,12 @@
  */
 package org.springframework.sbm.java.impl;
 
+import org.openrewrite.java.tree.JavaSourceFile;
+import org.openrewrite.marker.SearchResult;
 import org.springframework.sbm.java.api.*;
 import org.springframework.sbm.java.migration.visitor.RemoveImplementsVisitor;
 import org.springframework.sbm.java.refactoring.JavaRefactoring;
+import org.springframework.sbm.openrewrite.RewriteExecutionContext;
 import org.springframework.sbm.project.resource.RewriteSourceFileHolder;
 import org.springframework.sbm.support.openrewrite.GenericOpenRewriteRecipe;
 import org.springframework.sbm.support.openrewrite.java.AddAnnotationVisitor;
@@ -278,9 +281,13 @@ public boolean hasMethod(String methodPattern) {
         // TODO: parse and validate methodPattern
         methodPattern = this.getFullyQualifiedName() + " " + methodPattern;
         DeclaresMethod<ExecutionContext> declaresMethod = new DeclaresMethod(new MethodMatcher(methodPattern, true));
-        List<RewriteSourceFileHolder<J.CompilationUnit>> matches = refactoring.find(rewriteSourceFileHolder, new GenericOpenRewriteRecipe<>(() -> declaresMethod));
+        JavaSourceFile javaSourceFile = declaresMethod.visitJavaSourceFile(rewriteSourceFileHolder.getSourceFile(), new RewriteExecutionContext());
+        Optional<SearchResult> match = javaSourceFile.getMarkers().findFirst(SearchResult.class);
+        return match.isPresent() ? true : false;
+        // this.getClassDeclaration()
+        // List<RewriteSourceFileHolder<J.CompilationUnit>> matches = refactoring.find(rewriteSourceFileHolder, new GenericOpenRewriteRecipe<>(() -> declaresMethod));
         // TODO: searches in all classes, either filter result list or provide findInCurrent() or similar
-        return !matches.isEmpty();
+        // return !matches.isEmpty();
     }
 
     @Override

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

@@ -15,6 +15,7 @@
  */
 package org.springframework.sbm.java.impl;
 
+import org.openrewrite.java.tree.TypeTree;
 import org.springframework.sbm.java.api.MethodCall;
 import org.springframework.sbm.java.api.JavaSource;
 import org.springframework.sbm.java.api.JavaSourceAndType;
@@ -91,6 +92,11 @@ public Optional<? extends JavaSource> findJavaSourceDeclaringType(String fqName)
                 .findFirst();
     }
 
+    /**
+     * Find method calls matching given {@code methodPattern}.
+     *
+     * @param methodPattern the pattern for the method like {@code com.example.TheType theMethod(com.example.Arg1, com.example.Arg2)}
+     */
     @Override
     public List<MethodCall> findMethodCalls(String methodPattern) {
         List<MethodCall> matches = new ArrayList<>();
@@ -120,15 +126,17 @@ public List<JavaSourceAndType> findTypesImplementing(String type) {
 
     private boolean hasTypeImplementing(J.ClassDeclaration c, String type) {
         try {
-            return c.getImplements() != null &&
-                    c.getImplements()
+            List<TypeTree> implmeneting = c.getImplements();
+            return implmeneting != null &&
+                    implmeneting
                             .stream()
                             .anyMatch(intaface -> {
                                         JavaType.FullyQualified fullyQualified = TypeUtils.asFullyQualified(
                                                 intaface.getType()
                                         );
                                         if(fullyQualified == null) {
-                                            log.error("Could not resolve implemented type '" + ((J.Identifier)intaface).getSimpleName() + "'");
+                                            String simpleName = ((J.Identifier) ((J.ParameterizedType) intaface).getClazz()).getSimpleName();
+                                            log.error("Could not resolve implemented type '" + simpleName + "'");
                                             return false;
                                         }
                                         return fullyQualified

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

@@ -18,6 +18,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.openrewrite.maven.cache.LocalMavenArtifactCache;
 import org.openrewrite.maven.cache.ReadOnlyLocalMavenArtifactCache;
+import org.openrewrite.maven.internal.MavenDownloadingException;
 import org.openrewrite.maven.internal.MavenParsingException;
 import org.openrewrite.maven.tree.MavenRepository;
 import org.openrewrite.maven.tree.Pom;
@@ -55,10 +56,10 @@ public List<Path> downloadArtifacts(Set<Pom.Dependency> dependencies) {
 
     private static Consumer<Throwable> createErrorHandler() {
         Consumer<Throwable> errorConsumer = (t) -> {
-            if (t instanceof MavenParsingException) {
+            if (MavenParsingException.class.isInstance(t) || MavenDownloadingException.class.isInstance(t)) {
                 log.error(t.getMessage());
             } else {
-                t.printStackTrace();
+                throw new RuntimeException(t);
             }
         };
         return errorConsumer;

components/sbm-core/src/test/java/org/springframework/sbm/build/api/ApplicationModuleTest.java

@@ -78,8 +78,8 @@ void testGetModuleResources() {
                 .addProjectResource("pom.xml", parentPom)
                 .addProjectResource("module1/pom.xml", pom1)
                 .addProjectResource("module2/pom.xml", pom2)
-                .addJavaSource("module1/src/main/java", javaSource2)
-                .addJavaSource("module2/src/main/java", javaSource3)
+                .withJavaSource("module1/src/main/java", javaSource2)
+                .withJavaSource("module2/src/main/java", javaSource3)
                 .build();
 
         ApplicationModule parentModule = context.getApplicationModules().getModule(Path.of(""));

components/sbm-core/src/test/java/org/springframework/sbm/project/openrewrite/RewriteSourceFileHolderTest.java

@@ -31,7 +31,7 @@ class RewriteSourceFileHolderTest {
     public static final String SOURCE_CODE = "package com.foo.bar; class Foo{}";
 
     private ProjectContext projectContext = TestProjectContext.buildProjectContext()
-            .addJavaSource("src/main/java", SOURCE_CODE)
+            .withJavaSource("src/main/java", SOURCE_CODE)
             .build();
 
     private RewriteSourceFileHolder<J.CompilationUnit> sut = projectContext
@@ -43,7 +43,7 @@ class RewriteSourceFileHolderTest {
     @Test
     void replaceWithShouldMarkAsChanged_whenContentDiffers() {
         J.CompilationUnit newSourceFile = TestProjectContext.buildProjectContext()
-                .addJavaSource("src/main/java", "package com.foo.bar; class Bar{}")
+                .withJavaSource("src/main/java", "package com.foo.bar; class Bar{}")
                 .build()
                 .getProjectJavaSources()
                 .list()
@@ -61,7 +61,7 @@ void replaceWithShouldMarkAsChanged_whenContentDiffers() {
     void replaceWithShouldNotMarkAsChanged_WhenContentEquals() {
         String sourceCode = "class Foo{}";
         J.CompilationUnit newSourceFile = TestProjectContext.buildProjectContext()
-                .addJavaSource("src/main/java", SOURCE_CODE)
+                .withJavaSource("src/main/java", SOURCE_CODE)
                 .build()
                 .getProjectJavaSources()
                 .list()

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

@@ -289,12 +289,12 @@ public Builder addRegistrar(ProjectResourceWrapper projectResourceWrapper) {
          * The source Path is ' src/main/java' in the root module and the path inside is calculated from package declaration if exists.
          */
         @Deprecated
-        public Builder addJavaSource(String sourceCode) {
+        public Builder withJavaSource(String sourceCode) {
             return withJavaSources(sourceCode);
         }
 
 
-        public Builder addJavaSource(Path sourcePathDir, String sourceCode) {
+        public Builder withJavaSource(Path sourcePathDir, String sourceCode) {
             if (sourcePathDir.isAbsolute()) {
                 throw new IllegalArgumentException("Source path must be relative to project root dir.");
             }
@@ -304,8 +304,8 @@ public Builder addJavaSource(Path sourcePathDir, String sourceCode) {
             return this;
         }
 
-        public Builder addJavaSource(String sourcePath, String sourceCode) {
-            return addJavaSource(Path.of(sourcePath), sourceCode);
+        public Builder withJavaSource(String sourcePath, String sourceCode) {
+            return withJavaSource(Path.of(sourcePath), sourceCode);
         }
 
         public Builder addJavaSourceToModule(String modulePath, String sourceCode) {

components/sbm-recipes-boot-upgrade/src/main/java/org/springframework/sbm/boot/upgrade_24_25/filter/SpringDataJpaAnalyzer.java

@@ -31,14 +31,16 @@ public List<MethodCall> findCallsToGetOneMethod(ProjectContext context) {
 
     public List<MatchingMethod> getJpaRepositoriesWithGetByIdMethod(ProjectContext context) {
         String jpaRepositoryInterface = "org.springframework.data.jpa.repository.JpaRepository";
-        return getJpaRepositoriesWithGetByIdMethod(context, jpaRepositoryInterface);
-    }
-
-    private List<MatchingMethod> getJpaRepositoriesWithGetByIdMethod(ProjectContext context, String jpaRepositoryInterface) {
         List<JavaSourceAndType> jpaRepositories = context.getProjectJavaSources().findTypesImplementing(jpaRepositoryInterface);
         // FIXME: type of PK must be retrieved, moves to rewrite when these migrations are provided as OpenRewrite recipes
         String methodPattern = "getById(java.lang.Long)";
-        return findRepositoriesDeclaring(jpaRepositories, methodPattern);
+        return jpaRepositories.stream()
+                .filter(jat -> jat.getType().hasMethod(methodPattern))
+                .map(jat -> {
+                    return new MatchingMethod(jat, methodPattern, jat.getType().getMethod(methodPattern));
+                })
+                .collect(Collectors.toList());
+        //return findRepositoriesDeclaring(jpaRepositories, methodPattern);
     }
 
     private List<MatchingMethod> findRepositoriesDeclaring(List<JavaSourceAndType> jpaRepositories, String methodPattern) {