Webapp demo sn as (#554)

* Verify commits are only done with actual changes, Closes #527
* Fix wring recipe name in report
* Fix condition for action in paging and sorting recipe

Co-authored-by: Fabian Krüger <[email protected]>
Co-authored-by: Sandeep Nagaraj <[email protected]>

Author: 3 people

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

@@ -252,7 +252,7 @@ public void commitWhenGitAvailable(ProjectContext context, String appliedRecipeN
                 .map(r -> context.getProjectRootDirectory().relativize(Path.of(r)).toString())
                 .collect(Collectors.toList());
 
-        if (sbmApplicationProperties.isGitSupportEnabled() && !(modifiedResources.isEmpty() || deletedResources.isEmpty())) {
+        if (sbmApplicationProperties.isGitSupportEnabled() && (!modifiedResources.isEmpty() || !deletedResources.isEmpty())) {
             File repoDir = context.getProjectRootDirectory().toFile();
             if (repoExists(repoDir)) {
                 String commitMessage = "SBM: applied recipe '" + appliedRecipeName + "'";

components/sbm-recipes-boot-upgrade/src/main/resources/recipes/27_30/report/sbu30-migrate-to-jakarta-packages.yaml

@@ -1,4 +1,4 @@
-- name: sbu30-remove-construtor-binding
+- name: sbu30-migrate-javax-to-jakarta
   description: Spring boot 3.0 Upgrade - Migrate javax packages to new jakarta packages
   condition:
     type: org.springframework.sbm.common.migration.conditions.TrueCondition

components/sbm-recipes-boot-upgrade/src/main/resources/recipes/27_30/report/sbu30-paging-and-sorting-repository.yaml

@@ -7,7 +7,7 @@
     - type: org.springframework.sbm.engine.recipe.OpenRewriteDeclarativeRecipeAdapter
       condition:
         type: org.springframework.sbm.boot.common.conditions.IsSpringBootProject
-        versionPattern: "3\\.0\\..*"
+        versionPattern: "2\\.7\\..*|3\\.0\\..*"
       description: Add CrudRepository interface extension additionally to PagingAndSortingRepository
       openRewriteRecipe: |-
         type: specs.openrewrite.org/v1beta/recipe

components/sbm-recipes-boot-upgrade/src/main/resources/recipes/27_30/report/sbu30-remove-construtor-binding.yaml

@@ -7,12 +7,12 @@
     - type: org.springframework.sbm.engine.recipe.OpenRewriteDeclarativeRecipeAdapter
       condition:
         type: org.springframework.sbm.boot.common.conditions.IsSpringBootProject
-        versionPattern: "3\\.0\\..*"
+        versionPattern: "2\\.7\\..*|3\\.0\\..*"
       description: Remove redundant @ConstructorBinding annotations when applicable
       openRewriteRecipe: |-
         type: specs.openrewrite.org/v1beta/recipe
         name: org.openrewrite.java.spring.boot3.ImprovedConstructorBinding
-        displayName: Migrate additional Spring Boot properties to 2.7
+        displayName: Remove redundant @ConstructorBinding annotations
         description: Remove redundant @ConstructorBinding annotations when applicable
         recipeList:
           - org.openrewrite.java.spring.boot3.RemoveConstructorBindingAnnotation

components/sbm-recipes-boot-upgrade/src/main/resources/recipes/boot-2.7-3.0-dependency-version-update.yaml

@@ -178,7 +178,7 @@
 #    - type: org.springframework.sbm.engine.recipe.OpenRewriteDeclarativeRecipeAdapter
 #      condition:
 #        type: org.springframework.sbm.boot.common.conditions.IsSpringBootProject
-#        versionPattern: "3\\.0\\..*"
+#        versionPattern: "2\\.7\\..*|3\\.0\\..*"
 #      description: Remove redundant @ConstructorBinding annotations when applicable
 #      openRewriteRecipe: |-
 #        type: specs.openrewrite.org/v1beta/recipe