Migrate Cassandra configuration to Spring Boot 3.0 in yaml and properties format

kuldeep-singh-tw · fabapp2 · commit 86ab9de7df67 · 2022-11-03T14:53:32.000+01:00
diff --git a/applications/spring-shell/src/test/java/org/springframework/sbm/BootUpgrade_27_30_IntegrationTest.java b/applications/spring-shell/src/test/java/org/springframework/sbm/BootUpgrade_27_30_IntegrationTest.java
@@ -225,6 +225,17 @@ private void verifyYamlConfigurationUpdate() {
                                 "                  certificate-location: classpath:saml/idpone.crt\n" +
                                 "              entity-id: https://idpone.com\n" +
                                 "              sso-url: https://idpone.com\n" +
+                                "  cassandra:\n" +
+                                "    keyspaceName: testKeySpace\n" +
+                                "    contactPoints: localhost\n" +
+                                "    port: 9042\n" +
+                                "    username: testusername\n" +
+                                "    schemaAction: NONE\n" +
+                                "    request:\n" +
+                                "      timeout: 10s\n" +
+                                "    connection:\n" +
+                                "      connectTimeout: 10s\n" +
+                                "      initQueryTimeout: 10s\n" +
                                 "  elasticsearch.connection-timeout: '1000'\n" +
                                 "  elasticsearch.webclient.max-in-memory-size: '122'\n" +
                                 "  elasticsearch.password: abc\n" +
@@ -282,7 +293,16 @@ private void verifyPropertyConfigurationUpdate() {
                                 "spring.datasource.driverClassName=org.h2.Driver\n" +
                                 "spring.datasource.username=sa\n" +
                                 "spring.datasource.password=password\n" +
-                                "spring.jpa.database-platform=org.hibernate.dialect.H2Dialect\n");
+                                "spring.jpa.database-platform=org.hibernate.dialect.H2Dialect\n" +
+                                "\n" +
+                                "spring.cassandra.keyspace-name=testKeySpace\n" +
+                                "spring.cassandra.port=9042\n" +
+                                "spring.cassandra.contact-points=localhost\n" +
+                                "spring.cassandra.username=testusername\n" +
+                                "spring.cassandra.schema-action=NONE\n" +
+                                "spring.cassandra.request.timeout=10s\n" +
+                                "spring.cassandra.connection.connect-timeout=10s\n" +
+                                "spring.cassandra.connection.init-query-timeout=10s\n");
     }
 
     private void verifyParentPomVersion() {
diff --git a/applications/spring-shell/src/test/java/org/springframework/sbm/BootUpgrade_27_30_MultiModule_IntegrationTest.java b/applications/spring-shell/src/test/java/org/springframework/sbm/BootUpgrade_27_30_MultiModule_IntegrationTest.java
@@ -98,6 +98,17 @@ private void verifyYamlConfigurationUpdate() {
                         "                  certificate-location: classpath:saml/idpone.crt\n" +
                         "              entity-id: https://idpone.com\n" +
                         "              sso-url: https://idpone.com\n" +
+                        "  cassandra:\n" +
+                        "    keyspaceName: testKeySpace\n" +
+                        "    contactPoints: localhost\n" +
+                        "    port: 9042\n" +
+                        "    username: testusername\n" +
+                        "    schemaAction: NONE\n" +
+                        "    request:\n" +
+                        "      timeout: 10s\n" +
+                        "    connection:\n" +
+                        "      connectTimeout: 10s\n" +
+                        "      initQueryTimeout: 10s\n" +
                         "  elasticsearch.connection-timeout: '1000'\n" +
                         "  elasticsearch.webclient.max-in-memory-size: '122'\n" +
                         "  elasticsearch.password: abc\n" +
@@ -154,6 +165,16 @@ private void verifyPropertyConfigurationUpdate() {
                         "spring.datasource.username=sa\n" +
                         "spring.datasource.password=password\n" +
                         "spring.jpa.database-platform=org.hibernate.dialect.H2Dialect\n" +
+                        "\n" +
+                        "spring.cassandra.keyspace-name=testKeySpace\n" +
+                        "spring.cassandra.port=9042\n" +
+                        "spring.cassandra.contact-points=localhost\n" +
+                        "spring.cassandra.username=testusername\n" +
+                        "spring.cassandra.schema-action=NONE\n" +
+                        "spring.cassandra.request.timeout=10s\n" +
+                        "spring.cassandra.connection.connect-timeout=10s\n" +
+                        "spring.cassandra.connection.init-query-timeout=10s\n" +
+                        "spring.jpa.database-platform=org.hibernate.dialect.H2Dialect\n" +
                         "logging.pattern.dateformat=yyyy-MM-dd HH:mm:ss.SSS\n");
     }
 
diff --git a/applications/spring-shell/src/test/resources/testcode/boot-migration-27-30-multi-module/spring-app/src/main/resources/application.properties b/applications/spring-shell/src/test/resources/testcode/boot-migration-27-30-multi-module/spring-app/src/main/resources/application.properties
@@ -119,3 +119,12 @@ spring.datasource.driverClassName=org.h2.Driver
 spring.datasource.username=sa
 spring.datasource.password=password
 spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
+
+spring.data.cassandra.keyspace-name=testKeySpace
+spring.data.cassandra.port=9042
+spring.data.cassandra.contact-points=localhost
+spring.data.cassandra.username=testusername
+spring.data.cassandra.schema-action=NONE
+spring.data.cassandra.request.timeout=10s
+spring.data.cassandra.connection.connect-timeout=10s
+spring.data.cassandra.connection.init-query-timeout=10s
diff --git a/applications/spring-shell/src/test/resources/testcode/boot-migration-27-30-multi-module/spring-app/src/main/resources/application.yaml b/applications/spring-shell/src/test/resources/testcode/boot-migration-27-30-multi-module/spring-app/src/main/resources/application.yaml
@@ -85,6 +85,17 @@ spring:
           socket-timeout: '100'
           max-in-memory-size: '122'
           username: testUser
+    cassandra:
+      keyspaceName: testKeySpace
+      contactPoints: localhost
+      port: 9042
+      username: testusername
+      schemaAction: NONE
+      request:
+        timeout: 10s
+      connection:
+          connectTimeout: 10s
+          initQueryTimeout: 10s
   h2:
     console:
       path: "/tmp"
diff --git a/applications/spring-shell/src/test/resources/testcode/boot-migration-27-30/src/main/resources/application.properties b/applications/spring-shell/src/test/resources/testcode/boot-migration-27-30/src/main/resources/application.properties
@@ -119,3 +119,12 @@ spring.datasource.driverClassName=org.h2.Driver
 spring.datasource.username=sa
 spring.datasource.password=password
 spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
+
+spring.data.cassandra.keyspace-name=testKeySpace
+spring.data.cassandra.port=9042
+spring.data.cassandra.contact-points=localhost
+spring.data.cassandra.username=testusername
+spring.data.cassandra.schema-action=NONE
+spring.data.cassandra.request.timeout=10s
+spring.data.cassandra.connection.connect-timeout=10s
+spring.data.cassandra.connection.init-query-timeout=10s
diff --git a/applications/spring-shell/src/test/resources/testcode/boot-migration-27-30/src/main/resources/application.yaml b/applications/spring-shell/src/test/resources/testcode/boot-migration-27-30/src/main/resources/application.yaml
@@ -85,6 +85,17 @@ spring:
           socket-timeout: '100'
           max-in-memory-size: '122'
           username: testUser
+    cassandra:
+      keyspaceName: testKeySpace
+      contactPoints: localhost
+      port: 9042
+      username: testusername
+      schemaAction: NONE
+      request:
+        timeout: 10s
+      connection:
+          connectTimeout: 10s
+          initQueryTimeout: 10s
   h2:
     console:
       path: "/tmp"
diff --git a/components/sbm-recipes-boot-upgrade/src/main/java/org/springframework/sbm/boot/upgrade_27_30/CassandraApplicationPropertiesMove.java b/components/sbm-recipes-boot-upgrade/src/main/java/org/springframework/sbm/boot/upgrade_27_30/CassandraApplicationPropertiesMove.java
@@ -0,0 +1,59 @@
+/*
+ * 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_27_30;
+
+import org.jetbrains.annotations.NotNull;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Recipe;
+import org.openrewrite.TreeVisitor;
+import org.openrewrite.properties.PropertiesVisitor;
+import org.openrewrite.properties.tree.Properties;
+
+public class CassandraApplicationPropertiesMove extends Recipe {
+    private final static String REGEX_PATTERN = "(spring)(\\.data)(\\.cassandra\\..*)";
+
+    @Override
+    public String getDisplayName() {
+        return "Moves spring.data.cassandra.* properties to spring.cassandra.*";
+    }
+
+    @Override
+    public String getDescription() {
+        return "Renames spring.data.cassandra.(any) to spring.cassandra.(any)";
+    }
+
+    @Override
+    protected TreeVisitor<?, ExecutionContext> getVisitor() {
+
+        return new PropertiesVisitor<ExecutionContext>() {
+
+            @Override
+            public Properties visitEntry(Properties.Entry entry, ExecutionContext executionContext) {
+
+                if (entry.getKey().matches(REGEX_PATTERN)) {
+                    return super.visitEntry(updateEntry(entry), executionContext);
+                }
+
+                return super.visitEntry(entry, executionContext);
+            }
+
+            @NotNull
+            private Properties.Entry updateEntry(Properties.Entry entry) {
+                return entry.withKey(entry.getKey().replaceAll(REGEX_PATTERN, "$1$3"));
+            }
+        };
+    }
+}
diff --git a/components/sbm-recipes-boot-upgrade/src/main/resources/recipes/boot-2.7-3.0-dependency-version-update.yaml b/components/sbm-recipes-boot-upgrade/src/main/resources/recipes/boot-2.7-3.0-dependency-version-update.yaml
@@ -147,6 +147,36 @@
         recipeList:
           - org.springframework.sbm.boot.upgrade_27_30.SamlRelyingPartyPropertyApplicationPropertiesMove
 
+    - type: org.springframework.sbm.engine.recipe.OpenRewriteDeclarativeRecipeAdapter
+      condition:
+        type: org.springframework.sbm.boot.common.conditions.IsSpringBootProject
+        versionPattern: "3\\.0\\..*"
+      description: Migrate Cassandra configuration to Spring Boot 3.0 in yaml format
+      openRewriteRecipe: |-
+        type: specs.openrewrite.org/v1beta/recipe
+        name: org.openrewrite.java.spring.boot2.SpringBootPropertiesManual_2_7
+        displayName: Migrate Cassandra configuration to Spring Boot 3.0 in yaml format
+        description: Renames spring.data.cassandra.(any) to spring.cassandra.(any)
+        recipeList:
+          - org.openrewrite.yaml.ChangePropertyKey:
+              oldPropertyKey: spring.data.cassandra
+              newPropertyKey: spring.cassandra
+
+    - type: org.springframework.sbm.engine.recipe.OpenRewriteDeclarativeRecipeAdapter
+      condition:
+        type: org.springframework.sbm.boot.common.conditions.IsSpringBootProject
+        versionPattern: "3\\.0\\..*"
+      description: Migrate Cassandra configuration to Spring Boot 3.0 in properties format
+      openRewriteRecipe: |-
+        type: specs.openrewrite.org/v1beta/recipe
+        name: org.openrewrite.java.spring.boot2.SpringBootPropertiesManual_2_7
+        displayName: Migrate Cassandra properties to Spring Boot 3.0 in properties
+        description: Renames spring.data.cassandra.(any) to spring.cassandra.(any)
+        recipeList:
+          - org.openrewrite.properties.ChangePropertyKey:
+              oldPropertyKey: spring.data.cassandra
+              newPropertyKey: spring.cassandra
+
     - type: org.springframework.sbm.engine.recipe.OpenRewriteDeclarativeRecipeAdapter
       condition:
         type: org.springframework.sbm.boot.common.conditions.IsSpringBootProject
