Revamp/make other modules compile (#943)

* Update license header * Add sbm-support-boot module * Add sbm-support-boot module * Module sbm-support-boot compiles * Module sbm-support-jee compiles * Module sbm-support-weblogic compiles * WIP sbm-recipes-jee-to-boot * Make SwapResponseWithResponseEntity compile * Make SwapCacheControl compile * Make SwapStatusForHttpStatus compile * Make fieldsMapping a member * Remove unused member * Make ReplaceMediaType compile Also removes unused member * Make ReplaceResponseEntityBuilder compile * Make sbm-recipes-jee-to-boot compile * Make sbm-recipes-spring-cloud compile * Delete unused classes * Delete unused classes * Make sbm-recipes-boot-upgrade compile
spring-projects-experimental · Sep 24, 2023 · 800f34f · 800f34f
1 parent a7b8155
commit 800f34f
Show file tree

Hide file tree

Showing 67 changed files with 798 additions and 2,192 deletions.
diff --git a/components/sbm-core/src/main/java/org/springframework/sbm/java/api/JavaSource.java b/components/sbm-core/src/main/java/org/springframework/sbm/java/api/JavaSource.java
@@ -59,7 +59,7 @@ public interface JavaSource extends ProjectResource {
      * <p>
      * Be careful if the given {@code Recipe} affects more than the wrapped compilation unit YOU MUST CALL {@link JavaSourceSet.apply(..)}
      */
-    void apply(Recipe recipe);
+    void apply(Recipe... recipe);
 
     /**
      * Retrieve the {@code Type} declared in this {@code JavaSource}.

diff --git a/components/sbm-core/src/main/java/org/springframework/sbm/java/api/Type.java b/components/sbm-core/src/main/java/org/springframework/sbm/java/api/Type.java
@@ -59,7 +59,7 @@ public interface Type {
 
     Annotation getAnnotation(String fqName);
 
-    void apply(Recipe r);
+    void apply(Recipe... r);
 
     boolean hasMethod(String methodPattern);
 

diff --git a/components/sbm-core/src/main/java/org/springframework/sbm/java/impl/CompiledType.java b/components/sbm-core/src/main/java/org/springframework/sbm/java/impl/CompiledType.java
@@ -123,8 +123,8 @@ public Annotation getAnnotation(String fqName) {
     }
 
     @Override
-    public void apply(Recipe r) {
-
+    public void apply(Recipe... r) {
+        throw new UnsupportedOperationException();
     }
 
     @Override

diff --git a/...nents/sbm-core/src/main/java/org/springframework/sbm/java/impl/OpenRewriteJavaSource.java b/...nents/sbm-core/src/main/java/org/springframework/sbm/java/impl/OpenRewriteJavaSource.java
@@ -171,7 +171,6 @@ public <T> void replaceLiteral(Class<T> klass, LiteralTransformer<T> t) {
         refactoring.refactor(getResource(), new ReplaceLiteralVisitor<>(klass, t));
     }
 
-
     @Override
     public String toString() {
         return "OpenRewriteJavaSource(" + getAbsolutePath() + ")";
@@ -181,7 +180,7 @@ public String toString() {
      * {@inheritDoc}
      */
     @Override
-    public void apply(Recipe recipe) {
+    public void apply(Recipe... recipe) {
         refactoring.refactor(getResource(), recipe);
     }
 

diff --git a/components/sbm-core/src/main/java/org/springframework/sbm/java/impl/OpenRewriteType.java b/components/sbm-core/src/main/java/org/springframework/sbm/java/impl/OpenRewriteType.java
@@ -295,7 +295,7 @@ public String toString() {
     }
 
     @Override
-    public void apply(Recipe r) {
+    public void apply(Recipe... r) {
         refactoring.refactor(rewriteSourceFileHolder, r);
     }
 

diff --git a/components/sbm-recipes-boot-upgrade/pom.xml b/components/sbm-recipes-boot-upgrade/pom.xml
@@ -29,8 +29,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
     <dependencies>
@@ -73,6 +73,7 @@
         <dependency>
             <groupId>org.springframework.sbm</groupId>
             <artifactId>recipe-test-support</artifactId>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/...n/java/org/springframework/sbm/boot/upgrade_27_30/CassandraApplicationPropertiesMove.java b/...n/java/org/springframework/sbm/boot/upgrade_27_30/CassandraApplicationPropertiesMove.java
@@ -36,7 +36,7 @@ public String getDescription() {
     }
 
     @Override
-    protected TreeVisitor<?, ExecutionContext> getVisitor() {
+    public TreeVisitor<?, ExecutionContext> getVisitor() {
 
         return new PropertiesVisitor<ExecutionContext>() {
 

diff --git a/...ade/src/main/java/org/springframework/sbm/boot/upgrade_27_30/CrudRepositoryExtension.java b/...ade/src/main/java/org/springframework/sbm/boot/upgrade_27_30/CrudRepositoryExtension.java
diff --git a/...ava/org/springframework/sbm/boot/upgrade_27_30/CrudRepositoryExtensionWithReferences.java b/...ava/org/springframework/sbm/boot/upgrade_27_30/CrudRepositoryExtensionWithReferences.java