Check conditions for 2.4 to 2.5 upgrade actions. Closes #133

components/sbm-recipes-boot-upgrade/src/main/java/org/springframework/sbm/boot/upgrade_24_25/actions/Boot_24_25_SpringDataJpaAction.java

@@ -15,6 +15,7 @@
  */
 package org.springframework.sbm.boot.upgrade_24_25.actions;
 
+import org.springframework.sbm.boot.upgrade_24_25.conditions.Boot_24_25_SpringDataJpaActionCondition;
 import org.springframework.sbm.engine.recipe.AbstractAction;
 import org.springframework.sbm.boot.upgrade_24_25.filter.SpringDataJpaAnalyzer;
 import org.springframework.sbm.build.MultiModuleApplicationNotSupportedException;

components/sbm-recipes-boot-upgrade/src/main/java/org/springframework/sbm/boot/upgrade_24_25/actions/Boot_24_25_SpringDataJpaActionCondition.java → components/sbm-recipes-boot-upgrade/src/main/java/org/springframework/sbm/boot/upgrade_24_25/conditions/Boot_24_25_SpringDataJpaActionCondition.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.sbm.boot.upgrade_24_25.actions;
+package org.springframework.sbm.boot.upgrade_24_25.conditions;
 
 import org.springframework.sbm.boot.upgrade_24_25.filter.SpringDataJpaAnalyzer;
 import org.springframework.sbm.engine.recipe.Condition;

components/sbm-recipes-boot-upgrade/src/main/java/org/springframework/sbm/boot/upgrade_24_25/conditions/Boot_24_25_SqlScriptDataSourceInitializationCondition.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2021 - 2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.sbm.boot.upgrade_24_25.conditions;
+
+import org.springframework.sbm.boot.properties.api.SpringBootApplicationProperties;
+import org.springframework.sbm.boot.properties.search.SpringBootApplicationPropertiesResourceListFilter;
+import org.springframework.sbm.boot.upgrade_24_25.filter.SqlScriptDataSourceInitializationPropertiesAnalyzer;
+import org.springframework.sbm.engine.context.ProjectContext;
+import org.springframework.sbm.engine.recipe.Condition;
+
+import java.util.List;
+
+public class Boot_24_25_SqlScriptDataSourceInitializationCondition implements Condition {
+    @Override
+    public String getDescription() {
+        return "Check if deprecated Datasource init properties exist.";
+    }
+
+    @Override
+    public boolean evaluate(ProjectContext context) {
+        List<SpringBootApplicationProperties> filteredResources = context.search(new SpringBootApplicationPropertiesResourceListFilter());
+        List<SqlScriptDataSourceInitializationPropertiesAnalyzer.DeperecatedPropertyMatch> properties = new SqlScriptDataSourceInitializationPropertiesAnalyzer().findDeprecatedProperties(filteredResources);
+        return !properties.isEmpty();
+    }
+}

components/sbm-recipes-boot-upgrade/src/main/java/org/springframework/sbm/boot/upgrade_24_25/conditions/HasSpringBoot24Parent.java → components/sbm-recipes-boot-upgrade/src/main/java/org/springframework/sbm/boot/upgrade_24_25/conditions/HasSpringBootParentOfVersion.java

@@ -15,10 +15,19 @@
  */
 package org.springframework.sbm.boot.upgrade_24_25.conditions;
 
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.sbm.engine.context.ProjectContext;
 import org.springframework.sbm.engine.recipe.Condition;
 
-public class HasSpringBoot24Parent implements Condition {
+public class HasSpringBootParentOfVersion implements Condition {
+
+    /**
+     * VersionPattern will be used for {@code startsWith} check against the version number found.
+     */
+    @Setter
+    private String versionPattern;
+
     @Override
     public String getDescription() {
         return "Check if updating Spring Boot version from 2.4.x to 2.5.x is applicable.";
@@ -28,6 +37,6 @@ public String getDescription() {
     public boolean evaluate(ProjectContext context) {
         return context.getBuildFile().hasParent() &&
                 context.getBuildFile().getParentPomDeclaration().getArtifactId().equals("spring-boot-starter-parent") &&
-                context.getBuildFile().getParentPomDeclaration().getVersion().startsWith("2.4.");
+                context.getBuildFile().getParentPomDeclaration().getVersion().startsWith(versionPattern);
     }
 }

components/sbm-recipes-boot-upgrade/src/main/java/org/springframework/sbm/boot/upgrade_24_25/conditions/IsAnyMatchingSpringBootVersion.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright 2021 - 2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.sbm.boot.upgrade_24_25.conditions;
+
+import lombok.Setter;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.sbm.build.migration.conditions.AnyDependencyExistMatchingRegex;
+import org.springframework.sbm.engine.context.ProjectContext;
+import org.springframework.sbm.engine.recipe.Condition;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.Arrays;
+import java.util.List;
+
+public class IsAnyMatchingSpringBootVersion implements Condition {
+
+    /**
+     * VersionPattern will be used for {@code startsWith} check against the version number found.
+     */
+    @NotNull
+    @NotEmpty
+    private List<String> versionPatterns;
+
+    @Override
+    public String getDescription() {
+        return "Check if scanned application is Spring Boot application of given version";
+    }
+
+    @Override
+    public boolean evaluate(ProjectContext context) {
+        return versionPatterns.stream()
+                .anyMatch(p ->  new IsMatchingSpringBootVersion(p).evaluate(context));
+    }
+
+    public void setVersionPatterns(String versionPatterns) {
+        this.versionPatterns = Arrays.asList(versionPatterns.split(","));
+    }
+}

components/sbm-recipes-boot-upgrade/src/main/java/org/springframework/sbm/boot/upgrade_24_25/conditions/IsMatchingSpringBootVersion.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2021 - 2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.sbm.boot.upgrade_24_25.conditions;
+
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.sbm.build.migration.conditions.AnyDependencyExistMatchingRegex;
+import org.springframework.sbm.engine.context.ProjectContext;
+import org.springframework.sbm.engine.recipe.Condition;
+
+import java.util.List;
+
+@AllArgsConstructor
+@NoArgsConstructor
+public class IsMatchingSpringBootVersion implements Condition {
+
+    /**
+     * VersionPattern will be used for {@code startsWith} check against the version number found.
+     */
+    @NotNull
+    @Setter
+    private String versionPattern;
+
+    @Override
+    public String getDescription() {
+        return "Check if scanned application is Spring Boot application of given version";
+    }
+
+    @Override
+    public boolean evaluate(ProjectContext context) {
+        HasSpringBootParentOfVersion hasSpringBootParentOfVersion = new HasSpringBootParentOfVersion();
+        hasSpringBootParentOfVersion.setVersionPattern(versionPattern);
+        String versionRegex = versionPattern.replace(".", "\\.") + ".*";
+        AnyDependencyExistMatchingRegex anyDependencyExistMatchingRegex = new AnyDependencyExistMatchingRegex(List.of("org\\.springframework\\.boot\\:.*\\:" + versionRegex));
+        return hasSpringBootParentOfVersion.evaluate(context) || anyDependencyExistMatchingRegex.evaluate(context);
+    }
+}

components/sbm-recipes-boot-upgrade/src/main/java/org/springframework/sbm/boot/upgrade_24_25/report/Boot_24_25_SpringDataJpa.java

@@ -20,7 +20,7 @@
 import org.springframework.sbm.boot.asciidoctor.Section;
 import org.springframework.sbm.boot.asciidoctor.Table;
 import org.springframework.sbm.boot.asciidoctor.TodoList;
-import org.springframework.sbm.boot.upgrade_24_25.actions.Boot_24_25_SpringDataJpaActionCondition;
+import org.springframework.sbm.boot.upgrade_24_25.conditions.Boot_24_25_SpringDataJpaActionCondition;
 import org.springframework.sbm.boot.upgrade_24_25.filter.SpringDataJpaAnalyzer;
 import org.springframework.sbm.java.api.MethodCall;
 import org.springframework.sbm.engine.context.ProjectContext;

components/sbm-recipes-boot-upgrade/src/main/java/org/springframework/sbm/boot/upgrade_24_25/report/Boot_24_25_SqlScriptDataSourceInitialization.java

@@ -20,6 +20,7 @@
 import org.springframework.sbm.boot.asciidoctor.Section;
 import org.springframework.sbm.boot.asciidoctor.Table;
 import org.springframework.sbm.boot.asciidoctor.TodoList;
+import org.springframework.sbm.boot.upgrade_24_25.conditions.Boot_24_25_SqlScriptDataSourceInitializationCondition;
 import org.springframework.sbm.boot.upgrade_24_25.filter.SqlScriptDataSourceInitializationPropertiesAnalyzer;
 import org.springframework.sbm.engine.context.ProjectContext;
 import org.springframework.sbm.boot.properties.api.SpringBootApplicationProperties;
@@ -33,9 +34,7 @@ public class Boot_24_25_SqlScriptDataSourceInitialization implements UpgradeSect
 
     @Override
     public boolean isApplicable(ProjectContext projectContext) {
-        List<SpringBootApplicationProperties> filteredResources = projectContext.search(new SpringBootApplicationPropertiesResourceListFilter());
-        List<SqlScriptDataSourceInitializationPropertiesAnalyzer.DeperecatedPropertyMatch> properties = new SqlScriptDataSourceInitializationPropertiesAnalyzer().findDeprecatedProperties(filteredResources);
-        return !properties.isEmpty();
+        return new Boot_24_25_SqlScriptDataSourceInitializationCondition().evaluate(projectContext);
     }
 
     @Override

components/sbm-recipes-boot-upgrade/src/main/java/org/springframework/sbm/boot/upgrade_24_25/report/Boot_24_25_UpdateDependencies.java

@@ -19,7 +19,7 @@
 import org.springframework.sbm.boot.asciidoctor.RelevantChangeSection;
 import org.springframework.sbm.boot.asciidoctor.Section;
 import org.springframework.sbm.boot.asciidoctor.TodoList;
-import org.springframework.sbm.boot.upgrade_24_25.conditions.HasSpringBoot24Parent;
+import org.springframework.sbm.boot.upgrade_24_25.conditions.HasSpringBootParentOfVersion;
 import org.springframework.sbm.engine.context.ProjectContext;
 import org.springframework.sbm.build.impl.OpenRewriteMavenBuildFile;
 
@@ -28,7 +28,8 @@
 public class Boot_24_25_UpdateDependencies implements UpgradeSectionBuilder {
     @Override
     public boolean isApplicable(ProjectContext projectContext) {
-        HasSpringBoot24Parent condition = new HasSpringBoot24Parent();
+        HasSpringBootParentOfVersion condition = new HasSpringBootParentOfVersion();
+        condition.setVersionPattern("2.4.");
         return condition.evaluate(projectContext);
     }
 

components/sbm-recipes-boot-upgrade/src/main/resources/recipes/boot-2.4-2.5-datasource-initializer.yaml

@@ -1,4 +1,5 @@
 - name: boot-2.4-2.5-datasource-initializer
+  description: Replace deprecated spring.datasource.* properties
   condition:
     type: org.springframework.sbm.boot.upgrade_24_25.conditions.Boot_24_25_CreateDatasourceInitializerCondition
   actions:

components/sbm-recipes-boot-upgrade/src/main/resources/recipes/boot-2.4-2.5-dependency-version-update.yaml

@@ -1,9 +1,11 @@
 - name: boot-2.4-2.5-dependency-version-update
   description: Update Spring Boot dependencies from 2.4 to 2.5
   condition:
-    type: org.springframework.sbm.boot.upgrade_24_25.conditions.HasSpringBoot24Parent
+    type: org.springframework.sbm.boot.upgrade_24_25.conditions.IsMatchingSpringBootVersion
+    versionPattern: 2.4.
   actions:
     - type: org.springframework.sbm.boot.upgrade_24_25.actions.Boot_24_35_UpdateDependenciesAction
       description: Update Spring Boot dependencies from 2.4 to 2.5
       condition:
-        type: org.springframework.sbm.boot.upgrade_24_25.conditions.HasSpringBoot24Parent
+        type: org.springframework.sbm.boot.upgrade_24_25.conditions.IsMatchingSpringBootVersion
+        versionPattern: 2.4

components/sbm-recipes-boot-upgrade/src/main/resources/recipes/boot-2.4-2.5-spring-data-jpa.yaml

@@ -1,8 +1,9 @@
 - name: boot-2.4-2.5-spring-data-jpa
+  description: Rename JpaRepository methods getId() and calls to getOne()
   condition:
-    type: org.springframework.sbm.common.migration.conditions.TrueCondition
+    type: org.springframework.sbm.boot.upgrade_24_25.conditions.Boot_24_25_SpringDataJpaActionCondition
   actions:
     - type: org.springframework.sbm.boot.upgrade_24_25.actions.Boot_24_25_SpringDataJpaAction
-      description: Rename JpaRepository mehtods getId() and calls to getOne()
+      description: Rename JpaRepository methods getId() and calls to getOne()
       condition:
-        type: org.springframework.sbm.common.migration.conditions.TrueCondition
+        type: org.springframework.sbm.boot.upgrade_24_25.conditions.Boot_24_25_SpringDataJpaActionCondition

components/sbm-recipes-boot-upgrade/src/main/resources/recipes/boot-2.4-2.5-sql-init-properties.yaml

@@ -1,8 +1,9 @@
 - name: boot-2.4-2.5-sql-init-properties
+  description: Replace deprecated spring.datasource.* properties
   condition:
-    type: org.springframework.sbm.common.migration.conditions.TrueCondition
+    type: org.springframework.sbm.boot.upgrade_24_25.conditions.Boot_24_25_SqlScriptDataSourceInitializationCondition
   actions:
     - type: org.springframework.sbm.boot.upgrade_24_25.actions.Boot_24_25_SqlScriptDataSourceInitializationAction
       description: Replace deprecated spring.datasource.* properties
       condition:
-        type: org.springframework.sbm.common.migration.conditions.TrueCondition
+        type: org.springframework.sbm.boot.upgrade_24_25.conditions.Boot_24_25_SqlScriptDataSourceInitializationCondition

components/sbm-recipes-boot-upgrade/src/main/resources/recipes/boot-2.4-2.5-upgrade-report.yaml

@@ -1,7 +1,8 @@
 - name: boot-2.4-2.5-upgrade-report
   description: Create Upgrade Report for a Spring Boot 2.4 Application
   condition:
-    type: org.springframework.sbm.common.migration.conditions.TrueCondition
+    type: org.springframework.sbm.boot.upgrade_24_25.conditions.IsAnyMatchingSpringBootVersion
+    versionPatterns: 2.4.,2.5.
   actions:
     - type: org.springframework.sbm.boot.upgrade_24_25.actions.Boot_24_25_UpgradeReportAction
       description: Create Upgrade Report for a Spring Boot 2.4 Application