Skip to content

Commit 462c921

Browse files
sanagaraj-pivotalfabapp2
sanagaraj-pivotal
authored and
fabapp2
committed
Integrating Spring boot 3 property refactor into SBM (#238)
closes #164 closes #198 closes #155 closes #165 closes #197 closes #166 Crud repository extension (#242) closes #236 Co-authored-by: sanagaraj-pivotal <[email protected]>
1 parent a433d5c commit 462c921

File tree

33 files changed

+1919
-823
lines changed

33 files changed

+1919
-823
lines changed

‎applications/spring-shell/src/test/java/org/springframework/sbm/BootUpgrade_27_30_IntegrationTest.java

Lines changed: 198 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,198 @@
1+
/*
2+
* Copyright 2021 - 2022 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package org.springframework.sbm;
17+
18+
import org.jetbrains.annotations.NotNull;
19+
import org.junit.jupiter.api.Tag;
20+
import org.junit.jupiter.api.Test;
21+
import org.openrewrite.maven.MavenParser;
22+
import org.openrewrite.xml.tree.Xml;
23+
24+
import java.nio.file.Path;
25+
26+
import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
27+
28+
public class BootUpgrade_27_30_IntegrationTest extends IntegrationTestBaseClass {
29+
30+
@Override
31+
protected String getTestSubDir() {
32+
return "boot-migration-27-30";
33+
}
34+
35+
@Test
36+
@Tag("integration")
37+
void migrateSimpleApplication() {
38+
intializeTestProject();
39+
40+
scanProject();
41+
42+
applyRecipe("boot-2.7-3.0-dependency-version-update");
43+
44+
verifyParentPomVersion();
45+
verifyMicrometerPackageUpdate();
46+
verifyYamlConfigurationUpdate();
47+
verifyPropertyConfigurationUpdate();
48+
verifyConstructorBindingRemoval();
49+
verifyCrudRepoAddition();
50+
}
51+
52+
private void verifyCrudRepoAddition() {
53+
54+
String studentRepo = loadJavaFile("org.springboot.example.upgrade", "StudentRepo");
55+
56+
assertThat(studentRepo).isEqualTo("""
57+
package org.springboot.example.upgrade;
58+
59+
import org.springframework.data.repository.CrudRepository;
60+
import org.springframework.data.repository.PagingAndSortingRepository;
61+
62+
public interface StudentRepo extends PagingAndSortingRepository<Student<?>, Long>, CrudRepository<Student<?>, Long> {
63+
}
64+
""");
65+
}
66+
67+
private void verifyConstructorBindingRemoval() {
68+
String constructorBindingConfigClass = loadJavaFile("org.springboot.example.upgrade", "ConstructorBindingConfig");
69+
assertThat(constructorBindingConfigClass).isEqualTo("package org.springboot.example.upgrade;\n" +
70+
"\n" +
71+
"import org.springframework.boot.context.properties.ConfigurationProperties;\n" +
72+
"\n" +
73+
"@ConfigurationProperties(prefix = \"mail\")\n" +
74+
"public class ConstructorBindingConfig {\n" +
75+
" private String hostName;\n" +
76+
"\n" +
77+
" public ConstructorBindingConfig(String hostName) {\n" +
78+
" this.hostName = hostName;\n" +
79+
" }\n" +
80+
"}" +
81+
"\n");
82+
}
83+
84+
private void verifyMicrometerPackageUpdate() {
85+
String micrometerClass = loadFile(Path.of("src/main/java/org/springboot/example/upgrade/MicrometerConfig.java"));
86+
assertThat(micrometerClass).isEqualTo(
87+
"package org.springboot.example.upgrade;\n" +
88+
"\n" +
89+
"import io.micrometer.binder.MeterBinder;\n" +
90+
"\n" +
91+
"public class MicroMeterConfig {\n" +
92+
"\n" +
93+
" private MeterBinder k;\n" +
94+
"}\n");
95+
}
96+
97+
private void verifyYamlConfigurationUpdate() {
98+
String micrometerClass = loadFile(Path.of("src/main/resources/application.yaml"));
99+
assertThat(micrometerClass).isEqualTo(
100+
"spring:\n" +
101+
" elasticsearch:\n" +
102+
" connection-timeout: '1'\n" +
103+
" password: testpassword\n" +
104+
" socket-timeout: '2'\n" +
105+
" restclient.sniffer.delay-after-failure: '3'\n" +
106+
" restclient.sniffer.interval: '4'\n" +
107+
" username: username\n" +
108+
" security:\n" +
109+
" saml2:\n" +
110+
" relyingparty:\n" +
111+
" registration:\n" +
112+
" idpone:\n" +
113+
" assertingparty:\n" +
114+
" verification:\n" +
115+
" credentials:\n" +
116+
" certificate-location: classpath:saml/idpone.crt\n" +
117+
" entity-id: https://idpone.com\n" +
118+
" sso-url: https://idpone.com\n" +
119+
" elasticsearch.connection-timeout: '1000'\n" +
120+
" elasticsearch.webclient.max-in-memory-size: '122'\n" +
121+
" elasticsearch.password: abc\n" +
122+
" elasticsearch.socket-timeout: '100'\n" +
123+
" elasticsearch.username: testUser\n" +
124+
" sql.init.data-locations: testdata\n" +
125+
" sql.init.password: password\n" +
126+
" sql.init.username: username-data\n" +
127+
" sql.init.mode: mode1\n" +
128+
" sql.init.platform: pls\n" +
129+
" sql.init.schema-locations: table1\n" +
130+
" sql.init.password: password2\n" +
131+
" sql.init.username: username-schema\n" +
132+
" sql.init.separator: k\n" +
133+
" sql.init.encoding: UTF-8\n" +
134+
"server.reactive.session.cookie.same-site: 'true'" +
135+
"\n");
136+
}
137+
138+
139+
private void verifyPropertyConfigurationUpdate() {
140+
141+
String applicationProperties = loadFile(Path.of("src/main/resources/application.properties"));
142+
assertThat(applicationProperties).isEqualTo(
143+
"spring.elasticsearch.connection-timeout=1000\n" +
144+
"spring.elasticsearch.webclient.max-in-memory-size=122\n" +
145+
"spring.elasticsearch.password=abc\n" +
146+
"spring.elasticsearch.socket-timeout=100\n" +
147+
"spring.elasticsearch.username=testUser\n" +
148+
"\n" +
149+
"spring.sql.init.data-locations=testdata\n" +
150+
"spring.sql.init.password=password\n" +
151+
"spring.sql.init.username=username\n" +
152+
"spring.sql.init.mode=mode1\n" +
153+
"spring.sql.init.platform=pls\n" +
154+
"spring.sql.init.schema-locations=table1\n" +
155+
"spring.sql.init.password=password2\n" +
156+
"spring.sql.init.username=username2\n" +
157+
"spring.sql.init.separator=k\n" +
158+
"spring.sql.init.encoding=UTF-8\n" +
159+
"\n" +
160+
"spring.elasticsearch.connection-timeout=1\n" +
161+
"spring.elasticsearch.password=testpassword\n" +
162+
"spring.elasticsearch.socket-timeout=2\n" +
163+
"spring.elasticsearch.restclient.sniffer.delay-after-failure=3\n" +
164+
"spring.elasticsearch.restclient.sniffer.interval=4\n" +
165+
"spring.elasticsearch.username=username\n" +
166+
"\n" +
167+
"spring.security.saml2.relyingparty.registration.idpone.assertingparty.entity-id=https://idpone.com\n" +
168+
"spring.security.saml2.relyingparty.registration.idpone.assertingparty.sso-url=https://idpone.com\n" +
169+
"spring.security.saml2.relyingparty.registration.idpone.assertingparty.verification.credentials.certificate-location=classpath:saml/idpone.crt\n" +
170+
"\n" +
171+
"server.reactive.session.cookie.same-site=true\n");
172+
}
173+
174+
private void verifyParentPomVersion() {
175+
String pomContent = loadFile(Path.of("pom.xml"));
176+
177+
Xml.Document mavenAsXMLDocument = parsePom(pomContent);
178+
179+
Xml.Tag parentTag =mavenAsXMLDocument
180+
.getRoot()
181+
.getChildren("parent").get(0);
182+
183+
String version = parentTag.getChildValue("version").get();
184+
185+
String groupId = parentTag.getChildValue("groupId").get();
186+
String artifactId = parentTag.getChildValue("artifactId").get();
187+
188+
assertThat(version).isEqualTo("3.0.0-M3");
189+
assertThat(groupId).isEqualTo("org.springframework.boot");
190+
assertThat(artifactId).isEqualTo("spring-boot-starter-parent");
191+
}
192+
193+
@NotNull
194+
private Xml.Document parsePom(String pomContent) {
195+
MavenParser mavenParser = new MavenParser.Builder().build();
196+
return mavenParser.parse(pomContent).get(0);
197+
}
198+
}

‎applications/spring-shell/src/test/resources/testcode/boot-migration-27-30/pom.xml

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<parent>
6+
<groupId>org.springframework.boot</groupId>
7+
<artifactId>spring-boot-starter-parent</artifactId>
8+
<version>2.7.1</version>
9+
<relativePath/> <!-- lookup parent from repository -->
10+
</parent>
11+
<groupId>com.example</groupId>
12+
<artifactId>boot-upgrade-27_30</artifactId>
13+
<version>0.0.1-SNAPSHOT</version>
14+
<name>boot-upgrade-27_30</name>
15+
<description>boot-upgrade-27_30</description>
16+
<properties>
17+
<java.version>17</java.version>
18+
</properties>
19+
<dependencies>
20+
<dependency>
21+
<groupId>org.springframework.boot</groupId>
22+
<artifactId>spring-boot-starter-web</artifactId>
23+
</dependency>
24+
<dependency>
25+
<groupId>io.micrometer</groupId>
26+
<artifactId>micrometer-registry-prometheus</artifactId>
27+
</dependency>
28+
<dependency>
29+
<groupId>org.springframework.boot</groupId>
30+
<artifactId>spring-boot-starter-data-jpa</artifactId>
31+
</dependency>
32+
<dependency>
33+
<groupId>org.springframework.boot</groupId>
34+
<artifactId>spring-boot-starter-test</artifactId>
35+
<scope>test</scope>
36+
</dependency>
37+
</dependencies>
38+
39+
<repositories>
40+
<repository>
41+
<id>spring-snapshot</id>
42+
<url>https://repo.spring.io/snapshot</url>
43+
<releases>
44+
<enabled>false</enabled>
45+
</releases>
46+
</repository>
47+
<repository>
48+
<id>spring-milestone</id>
49+
<url>https://repo.spring.io/milestone</url>
50+
<snapshots>
51+
<enabled>false</enabled>
52+
</snapshots>
53+
</repository>
54+
<!-- <repository>-->
55+
<!-- <id>spring-milestone</id>-->
56+
<!-- <url>https://repo.spring.io/milestone</url>-->
57+
<!-- <snapshots>-->
58+
<!-- <enabled>false</enabled>-->
59+
<!-- </snapshots>-->
60+
<!-- </repository>-->
61+
<repository>
62+
<id>spring-release</id>
63+
<url>https://repo.spring.io/release</url>
64+
<snapshots>
65+
<enabled>false</enabled>
66+
</snapshots>
67+
</repository>
68+
</repositories>
69+
70+
<build>
71+
<plugins>
72+
<plugin>
73+
<groupId>org.springframework.boot</groupId>
74+
<artifactId>spring-boot-maven-plugin</artifactId>
75+
</plugin>
76+
</plugins>
77+
</build>
78+
79+
</project>

‎applications/spring-shell/src/test/resources/testcode/boot-migration-27-30/src/main/java/org/springboot/example/upgrade/BootUpgrade2730Application.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package org.springboot.example.upgrade;
2+
3+
import org.springframework.boot.SpringApplication;
4+
import org.springframework.boot.autoconfigure.SpringBootApplication;
5+
import org.springframework.context.annotation.Bean;
6+
7+
@SpringBootApplication
8+
public class BootUpgrade2730Application {
9+
10+
public static void main(String[] args) {
11+
SpringApplication.run(BootUpgrade2730Application.class, args);
12+
}
13+
}

‎applications/spring-shell/src/test/resources/testcode/boot-migration-27-30/src/main/java/org/springboot/example/upgrade/ConstructorBindingConfig.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package org.springboot.example.upgrade;
2+
3+
import org.springframework.boot.context.properties.ConfigurationProperties;
4+
import org.springframework.boot.context.properties.ConstructorBinding;
5+
6+
@ConfigurationProperties(prefix = "mail")
7+
@ConstructorBinding
8+
public class ConstructorBindingConfig {
9+
private String hostName;
10+
11+
public ConstructorBindingConfig(String hostName) {
12+
this.hostName = hostName;
13+
}
14+
}

‎applications/spring-shell/src/test/resources/testcode/boot-migration-27-30/src/main/java/org/springboot/example/upgrade/MicroMeterConfig.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package org.springboot.example.upgrade;
2+
3+
import io.micrometer.core.instrument.binder.MeterBinder;
4+
5+
public class MicroMeterConfig {
6+
7+
private MeterBinder k;
8+
}

‎applications/spring-shell/src/test/resources/testcode/boot-migration-27-30/src/main/java/org/springboot/example/upgrade/Student.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package org.springboot.example.upgrade;
2+
3+
public class Student<T> {
4+
private T name;
5+
}

‎applications/spring-shell/src/test/resources/testcode/boot-migration-27-30/src/main/java/org/springboot/example/upgrade/StudentRepo.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package org.springboot.example.upgrade;
2+
3+
import org.springframework.data.repository.PagingAndSortingRepository;
4+
5+
public interface StudentRepo extends PagingAndSortingRepository<Student<?>, Long> {
6+
}

0 commit comments

Comments
 (0)