Make sbm-recipes-jee-to-boot compile

spring-projects-experimental · Sep 24, 2023 · 0e1baa4 · 0e1baa4
1 parent 5570686
commit 0e1baa4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/...a/org/springframework/sbm/architecture/ControlledInstantiationOfExecutionContextTest.java b/...a/org/springframework/sbm/architecture/ControlledInstantiationOfExecutionContextTest.java
@@ -24,7 +24,7 @@
 import com.tngtech.archunit.lang.ArchRule;
 import org.openrewrite.ExecutionContext;
 import org.springframework.sbm.boot.autoconfigure.ScopeConfiguration;
-import org.springframework.sbm.openrewrite.RewriteExecutionContext;
+import org.springframework.sbm.parsers.RewriteExecutionContext;
 
 import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses;
 

diff --git a/...-to-boot/src/test/java/org/springframework/sbm/jee/jaxrs/recipes/ResponseBuilderTest.java b/...-to-boot/src/test/java/org/springframework/sbm/jee/jaxrs/recipes/ResponseBuilderTest.java
@@ -15,6 +15,7 @@
  */
 package org.springframework.sbm.jee.jaxrs.recipes;
 
+import org.openrewrite.SourceFile;
 import org.openrewrite.java.tree.J;
 import org.springframework.sbm.engine.recipe.AbstractAction;
 import org.springframework.sbm.engine.context.ProjectContext;
@@ -26,6 +27,7 @@
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
+import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -375,7 +377,7 @@ void type() {
         String actual = projectContext.getProjectJavaSources().list().get(0).print();
 
         // verify it compiles
-        List<J.CompilationUnit> parse = new RewriteJavaParser(new SbmApplicationProperties(),
+        Stream<SourceFile> parse = new RewriteJavaParser(new SbmApplicationProperties(),
                                                               new RewriteExecutionContext()).parse(actual);
 
         assertThat(actual)

diff --git a/...test/java/org/springframework/sbm/jee/jpa/actions/MigrateEclipseLinkToSpringBootTest.java b/...test/java/org/springframework/sbm/jee/jpa/actions/MigrateEclipseLinkToSpringBootTest.java
@@ -82,7 +82,7 @@ void shouldAddDependencyToSpringBootStarterDataJpaIfNoneExists() {
 
         sut.apply(projectContext);
 
-        assertThat(projectContext.getBuildFile().print()).isEqualTo(
+        assertThat(projectContext.getApplicationModules().getRootModule().getBuildFile().print()).isEqualTo(
                 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                 "<project xmlns=\"http://maven.apache.org/POM/4.0.0\"\n" +
                 "         xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
@@ -152,7 +152,7 @@ void shouldAddExcludesToSpringBootStarterDataJpaIfExists() {
 
         sut.apply(projectContext);
 
-        assertThat(projectContext.getBuildFile().print()).isEqualTo(
+        assertThat(projectContext.getApplicationModules().getRootModule().getBuildFile().print()).isEqualTo(
                 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                 "<project xmlns=\"http://maven.apache.org/POM/4.0.0\"\n" +
                 "         xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
@@ -338,7 +338,6 @@ void shouldAddEclipseLinkConfigurationClass() {
         ProjectContext projectContext = TestProjectContext.buildProjectContext()
                 .withMavenRootBuildFileSource(pomXml)
                 .withProjectResource("src/main/resources/META-INF/persistence.xml", persistenceXml)
-                .addRegistrar(new PersistenceXmlProjectResourceRegistrar())
                 .build();
 
         sut.apply(projectContext);

diff --git a/...mework/sbm/jee/jpa/actions/PersistenceXmlToSpringBootApplicationPropertiesActionTest.java b/...mework/sbm/jee/jpa/actions/PersistenceXmlToSpringBootApplicationPropertiesActionTest.java
@@ -76,7 +76,6 @@ void whenNoProjectContextExistThenExceptionThrown() {
                     .withMavenRootBuildFileSource(parentPom)
                     .withProjectResource("pom1/pom.xml", pom1)
                     .withProjectResource("pom2/pom.xml", pom2)
-                    .addRegistrar(new PersistenceXmlProjectResourceRegistrar())
                     .build();
 
             MigratePersistenceXmlToApplicationPropertiesAction sut = new MigratePersistenceXmlToApplicationPropertiesAction();
@@ -142,7 +141,6 @@ void whenNoApplicationPropertiesExistThenPropertiesShouldBeCreated() {
                     .withProjectResource("pom1/pom.xml", pom1)
                     .withProjectResource("pom2/pom.xml", pom2)
                     .withProjectResource("pom2/src/main/resources/META-INF/persistence.xml", persistenceXml)
-                    .addRegistrar(new PersistenceXmlProjectResourceRegistrar())
                     .build();
 
             assertThat(projectContext.search(new SpringBootApplicationPropertiesResourceListFilter())).isEmpty();
@@ -176,7 +174,7 @@ void migrateJpaToSpringBoot() {
                                     </persistence-unit>
                                 </persistence>
                                 """)
-                        .addRegistrar(new PersistenceXmlProjectResourceRegistrar()))
+                )
                 .actionUnderTest(new MigratePersistenceXmlToApplicationPropertiesAction())
                 .verify(context -> {
                     List<SpringBootApplicationProperties> applicationProperties = context.search(new SpringBootApplicationPropertiesResourceListFilter());