Load spring-security-web dependency from resources (#519)

* Load `spring-security-web` dependency from resources * Expand use of .classpathWithResources * Also refresh spring-security-web classpath resources * Drop unused Spring Batch 4 classpath resource * Restore spring-batch for tests --------- Co-authored-by: Tim te Beek <[email protected]>
openrewrite · May 19, 2024 · e9e3340 · e9e3340
1 parent a5911e3
commit e9e3340
Show file tree

Hide file tree

Showing 15 changed files with 9 additions and 8 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -79,6 +79,7 @@ recipeDependencies {
     parserClasspath("org.springframework:spring-web:5.+")
     parserClasspath("org.springframework:spring-web:6.+")
 
+    parserClasspath("org.springframework:spring-webflux:5.+")
     parserClasspath("org.springframework:spring-webmvc:5.+")
 
     parserClasspath("org.springframework.data:spring-data-commons:2.+")
@@ -87,8 +88,6 @@ recipeDependencies {
 
     parserClasspath("org.springframework.batch:spring-batch-core:4.+")
     parserClasspath("org.springframework.batch:spring-batch-core:5.+")
-
-    parserClasspath("org.springframework.batch:spring-batch-infrastructure:4.+")
     parserClasspath("org.springframework.batch:spring-batch-infrastructure:5.+")
 
     parserClasspath("org.springframework.security:spring-security-config:5.8.+")
@@ -212,7 +211,9 @@ dependencies {
     "testWithSpringBoot_3_0RuntimeOnly"("org.springframework.boot:spring-boot-starter-test:3.0.+")
     "testWithSpringBoot_3_0RuntimeOnly"("org.springframework:spring-context:6.0.+")
     "testWithSpringBoot_3_0RuntimeOnly"("org.springframework:spring-web:6.0.+")
+    "testWithSpringBoot_3_0RuntimeOnly"("org.springframework.batch:spring-batch-core:4.+")
     "testWithSpringBoot_3_0RuntimeOnly"("org.springframework.batch:spring-batch-core:5.+")
+    "testWithSpringBoot_3_0RuntimeOnly"("org.springframework.batch:spring-batch-infrastructure:4.+")
     "testWithSpringBoot_3_0RuntimeOnly"("org.springframework.batch:spring-batch-infrastructure:5.+")
     "testWithSpringBoot_3_0RuntimeOnly"("org.springframework.security:spring-security-core:6.0.+")
     "testWithSpringBoot_3_0RuntimeOnly"("org.springframework.security:spring-security-config:6.0.+")

diff --git a/src/main/java/org/openrewrite/java/spring/batch/ReplaceSupportClassWithItsInterface.java b/src/main/java/org/openrewrite/java/spring/batch/ReplaceSupportClassWithItsInterface.java
@@ -78,7 +78,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl,
                     cd = JavaTemplate
                         .builder(JavaType.ShallowClass.build(fullyQualifiedInterfaceName).getClassName())
                         .imports(fullyQualifiedInterfaceName)
-                        .javaParser(JavaParser.fromJavaVersion().classpath("spring-batch"))
+                        .javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "spring-batch-core-5", "spring-batch-infrastructure-5"))
                         .build()
                         .apply(
                             getCursor(),

diff --git a/src/main/java/org/openrewrite/java/spring/boot3/AddSetUseTrailingSlashMatch.java b/src/main/java/org/openrewrite/java/spring/boot3/AddSetUseTrailingSlashMatch.java
@@ -110,7 +110,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
                                     ".setUseTrailingSlashMatch(true); }")
                             .contextSensitive()
                             .javaParser(JavaParser.fromJavaVersion()
-                                    .classpath("spring-webmvc", "spring-context", "spring-web"))
+                                    .classpathFromResources(ctx, "spring-webmvc-5", "spring-context-5", "spring-web-5"))
                             .imports(WEB_MVC_PATH_MATCH_CONFIGURER,
                                     "org.springframework.web.servlet.config.annotation.WebMvcConfigurer",
                                     "org.springframework.context.annotation.Configuration")
@@ -122,7 +122,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
                                             ".setUseTrailingSlashMatch(true); }")
                                     .contextSensitive()
                                     .javaParser(JavaParser.fromJavaVersion()
-                                            .classpath("spring-webflux", "spring-context", "spring-web"))
+                                            .classpathFromResources(ctx, "spring-webflux-5", "spring-context-5", "spring-web-5"))
                                     .imports(WEB_FLUX_PATH_MATCH_CONFIGURER,
                                             "org.springframework.web.reactive.config.WebFluxConfigurer",
                                             "org.springframework.context.annotation.Configuration")
@@ -152,7 +152,7 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method,
                         JavaTemplate webMvcTemplate = JavaTemplate.builder("#{any()}.setUseTrailingSlashMatch(true);")
                                 .contextSensitive()
                                 .javaParser(JavaParser.fromJavaVersion()
-                                        .classpath("spring-webmvc", "spring-context", "spring-web"))
+                                        .classpathFromResources(ctx, "spring-webmvc-5", "spring-context-5", "spring-web-5"))
                                 .imports(WEB_MVC_PATH_MATCH_CONFIGURER,
                                         "org.springframework.web.servlet.config.annotation.WebMvcConfigurer",
                                         "org.springframework.context.annotation.Configuration")

diff --git a/src/main/java/org/openrewrite/java/spring/security6/UpdateRequestCache.java b/src/main/java/org/openrewrite/java/spring/security6/UpdateRequestCache.java
@@ -75,7 +75,7 @@ public J.Block visitBlock(J.Block block, ExecutionContext ctx) {
                         statement = JavaTemplate.builder("#{any()}.setMatchingRequestParameterName(\"continue\");")
                             .contextSensitive()
                             .javaParser(JavaParser.fromJavaVersion()
-                                .classpath("spring-security-web"))
+                                    .classpathFromResources(ctx, "spring-security-web-6"))
                             .imports(
                                 "org.springframework.security.web.savedrequest.HttpSessionRequestCache")
                             .build()
@@ -100,7 +100,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method,
                     if (isNewHttpSessionRequestCacheExpression(arg)) {
                         JavaTemplate template = JavaTemplate.builder("new NullRequestCache()")
                                 .javaParser(JavaParser.fromJavaVersion()
-                                        .classpath("spring-security-web"))
+                                        .classpathFromResources(ctx, "spring-security-web-6"))
                                 .imports(
                                         "org.springframework.security.web.savedrequest.NullRequestCache")
                                 .build();

diff --git a/...ite/classpath/spring-batch-core-4.3.8.jar → ...te/classpath/spring-batch-core-4.3.10.jar b/...ite/classpath/spring-batch-core-4.3.8.jar → ...te/classpath/spring-batch-core-4.3.10.jar
diff --git a/src/main/resources/META-INF/rewrite/classpath/spring-batch-core-5.0.1.jar b/src/main/resources/META-INF/rewrite/classpath/spring-batch-core-5.0.1.jar
diff --git a/src/main/resources/META-INF/rewrite/classpath/spring-batch-core-5.1.1.jar b/src/main/resources/META-INF/rewrite/classpath/spring-batch-core-5.1.1.jar
diff --git a/...ath/spring-batch-infrastructure-4.3.8.jar → ...th/spring-batch-infrastructure-4.3.10.jar b/...ath/spring-batch-infrastructure-4.3.8.jar → ...th/spring-batch-infrastructure-4.3.10.jar
diff --git a/src/main/resources/META-INF/rewrite/classpath/spring-batch-infrastructure-5.0.1.jar b/src/main/resources/META-INF/rewrite/classpath/spring-batch-infrastructure-5.0.1.jar
diff --git a/src/main/resources/META-INF/rewrite/classpath/spring-batch-infrastructure-5.1.1.jar b/src/main/resources/META-INF/rewrite/classpath/spring-batch-infrastructure-5.1.1.jar
diff --git a/...e/classpath/spring-security-web-5.8.8.jar → .../classpath/spring-security-web-5.8.12.jar b/...e/classpath/spring-security-web-5.8.8.jar → .../classpath/spring-security-web-5.8.12.jar
diff --git a/...e/classpath/spring-security-web-6.0.3.jar → ...e/classpath/spring-security-web-6.0.8.jar b/...e/classpath/spring-security-web-6.0.3.jar → ...e/classpath/spring-security-web-6.0.8.jar
diff --git a/...F/rewrite/classpath/spring-web-5.3.27.jar → ...F/rewrite/classpath/spring-web-5.3.35.jar b/...F/rewrite/classpath/spring-web-5.3.27.jar → ...F/rewrite/classpath/spring-web-5.3.35.jar
diff --git a/src/main/resources/META-INF/rewrite/classpath/spring-webflux-5.3.35.jar b/src/main/resources/META-INF/rewrite/classpath/spring-webflux-5.3.35.jar
diff --git a/...ewrite/classpath/spring-webmvc-5.3.27.jar → ...ewrite/classpath/spring-webmvc-5.3.35.jar b/...ewrite/classpath/spring-webmvc-5.3.27.jar → ...ewrite/classpath/spring-webmvc-5.3.35.jar