Upgrade version of qfj spring boot starter and renamed application classes

esanchezros · esanchezros · commit 566c0731aeea · 2023-12-29T13:42:22.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -59,7 +59,7 @@
 
 		<skipDocker>true</skipDocker>
 		<docker.image.prefix>allune</docker.image.prefix>
-		<quickfixj-spring-boot-starter.version>2.16.1</quickfixj-spring-boot-starter.version>
+		<quickfixj-spring-boot-starter.version>2.17.0</quickfixj-spring-boot-starter.version>
 	</properties>
 
 	<dependencyManagement>
diff --git a/simple-client-and-server-config-string/pom.xml b/simple-client-and-server-config-string/pom.xml
@@ -11,6 +11,20 @@
 	<name>QuickFixJ Spring Boot Starter Examples :: Simple Client and Server using Config String</name>
 	<description>QuickFixJ Spring Boot Starter Simple Client and Server using Config String</description>
 
+	<dependencyManagement>
+		<dependencies>
+			<!-- Spring Boot -->
+			<dependency>
+				<!-- Import dependency management from Spring Boot -->
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-dependencies</artifactId>
+				<version>3.2.0</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/simple-client-and-server-config-string/src/main/java/io/allune/quickfixj/spring/boot/starter/examples/sender/SimpleClientAndServerConfigString.java b/simple-client-and-server-config-string/src/main/java/io/allune/quickfixj/spring/boot/starter/examples/sender/SimpleClientAndServerConfigString.java
@@ -23,9 +23,9 @@
 @EnableQuickFixJServer
 @EnableQuickFixJClient
 @SpringBootApplication
-public class AppServer {
+public class SimpleClientAndServerConfigString {
 
 	public static void main(String[] args) {
-		SpringApplication.run(AppServer.class, args);
+		SpringApplication.run(SimpleClientAndServerConfigString.class, args);
 	}
 }
diff --git a/simple-client-and-server/src/main/java/io/allune/quickfixj/spring/boot/starter/examples/sender/SimpleClientAndServer.java b/simple-client-and-server/src/main/java/io/allune/quickfixj/spring/boot/starter/examples/sender/SimpleClientAndServer.java
@@ -23,9 +23,9 @@
 @EnableQuickFixJServer
 @EnableQuickFixJClient
 @SpringBootApplication
-public class AppServer {
+public class SimpleClientAndServer {
 
 	public static void main(String[] args) {
-		SpringApplication.run(AppServer.class, args);
+		SpringApplication.run(SimpleClientAndServer.class, args);
 	}
 }
diff --git a/simple-client-listener/src/main/java/io/allune/quickfixj/spring/boot/starter/examples/client/SimpleClientListener.java b/simple-client-listener/src/main/java/io/allune/quickfixj/spring/boot/starter/examples/client/SimpleClientListener.java
@@ -23,9 +23,9 @@
 @Slf4j
 @EnableQuickFixJClient
 @SpringBootApplication
-public class AppClient {
+public class SimpleClientListener {
 
 	public static void main(String[] args) {
-		SpringApplication.run(AppClient.class, args);
+		SpringApplication.run(SimpleClientListener.class, args);
 	}
 }
diff --git a/simple-client-spring-3/src/main/java/io/allune/quickfixj/spring/boot/starter/examples/client/SimpleClientSpring3.java b/simple-client-spring-3/src/main/java/io/allune/quickfixj/spring/boot/starter/examples/client/SimpleClientSpring3.java
@@ -29,10 +29,10 @@
 @Slf4j
 @EnableQuickFixJClient
 @SpringBootApplication
-public class AppClient {
+public class SimpleClientSpring3 {
 
 	public static void main(String[] args) {
-		SpringApplication.run(AppClient.class, args);
+		SpringApplication.run(SimpleClientSpring3.class, args);
 	}
 
 	@Bean
diff --git a/simple-client-with-database/src/main/java/io/allune/quickfixj/spring/boot/starter/examples/client/SimpleClientWithDatabase.java b/simple-client-with-database/src/main/java/io/allune/quickfixj/spring/boot/starter/examples/client/SimpleClientWithDatabase.java
@@ -36,10 +36,10 @@
 @Slf4j
 @EnableQuickFixJClient
 @SpringBootApplication
-public class AppClient {
+public class SimpleClientWithDatabase {
 
 	public static void main(String[] args) {
-		SpringApplication.run(AppClient.class, args);
+		SpringApplication.run(SimpleClientWithDatabase.class, args);
 	}
 
 	@Bean
diff --git a/simple-client/src/main/java/io/allune/quickfixj/spring/boot/starter/examples/client/SimpleClient.java b/simple-client/src/main/java/io/allune/quickfixj/spring/boot/starter/examples/client/SimpleClient.java
@@ -34,10 +34,10 @@
 @Slf4j
 @EnableQuickFixJClient
 @SpringBootApplication
-public class AppClient {
+public class SimpleClient {
 
 	public static void main(String[] args) {
-		SpringApplication.run(AppClient.class, args);
+		SpringApplication.run(SimpleClient.class, args);
 	}
 
 	@Bean
diff --git a/simple-server-dynamic-sessions/src/main/java/io/allune/quickfixj/spring/boot/starter/examples/server/SimpleServerDynamicSessions.java b/simple-server-dynamic-sessions/src/main/java/io/allune/quickfixj/spring/boot/starter/examples/server/SimpleServerDynamicSessions.java
@@ -42,10 +42,10 @@
 
 @EnableQuickFixJServer
 @SpringBootApplication
-public class AppServer {
+public class SimpleServerDynamicSessions {
 
 	public static void main(String[] args) {
-		SpringApplication.run(AppServer.class, args);
+		SpringApplication.run(SimpleServerDynamicSessions.class, args);
 	}
 
 	@Bean
diff --git a/simple-server-listener/src/main/java/io/allune/quickfixj/spring/boot/starter/examples/server/SimpleServerListener.java b/simple-server-listener/src/main/java/io/allune/quickfixj/spring/boot/starter/examples/server/SimpleServerListener.java
@@ -23,9 +23,9 @@
 @Slf4j
 @EnableQuickFixJServer
 @SpringBootApplication
-public class AppServer {
+public class SimpleServerListener {
 
 	public static void main(String[] args) {
-		SpringApplication.run(AppServer.class, args);
+		SpringApplication.run(SimpleServerListener.class, args);
 	}
 }
diff --git a/simple-server-sender/src/main/java/io/allune/quickfixj/spring/boot/starter/examples/sender/SimpleServerSender.java b/simple-server-sender/src/main/java/io/allune/quickfixj/spring/boot/starter/examples/sender/SimpleServerSender.java
@@ -31,10 +31,10 @@
 
 @EnableQuickFixJServer
 @SpringBootApplication
-public class AppServer {
+public class SimpleServerSender {
 
 	public static void main(String[] args) {
-		SpringApplication.run(AppServer.class, args);
+		SpringApplication.run(SimpleServerSender.class, args);
 	}
 
 	@Bean
diff --git a/simple-server-sender/src/test/java/io/allune/quickfixj/spring/boot/starter/examples/sender/SenderControllerGetPath1IntegrationTest.java b/simple-server-sender/src/test/java/io/allune/quickfixj/spring/boot/starter/examples/sender/SenderControllerGetPath1IntegrationTest.java
@@ -23,7 +23,7 @@
 
 import static io.restassured.RestAssured.given;
 
-@ContextConfiguration(classes = AppServer.class)
+@ContextConfiguration(classes = SimpleServerSender.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
 public class SenderControllerGetPath1IntegrationTest {
diff --git a/simple-server-sender/src/test/java/io/allune/quickfixj/spring/boot/starter/examples/sender/SenderControllerGetPath2IntegrationTest.java b/simple-server-sender/src/test/java/io/allune/quickfixj/spring/boot/starter/examples/sender/SenderControllerGetPath2IntegrationTest.java
@@ -22,7 +22,7 @@
 
 import static io.restassured.RestAssured.given;
 
-@ContextConfiguration(classes = AppServer.class)
+@ContextConfiguration(classes = SimpleServerSender.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
 public class SenderControllerGetPath2IntegrationTest {
diff --git a/simple-server-spring-3/src/main/java/io/allune/quickfixj/spring/boot/starter/examples/server/SimpleServerSpring3.java b/simple-server-spring-3/src/main/java/io/allune/quickfixj/spring/boot/starter/examples/server/SimpleServerSpring3.java
@@ -31,10 +31,10 @@
 
 @EnableQuickFixJServer
 @SpringBootApplication
-public class AppServer {
+public class SimpleServerSpring3 {
 
 	public static void main(String[] args) {
-		SpringApplication.run(AppServer.class, args);
+		SpringApplication.run(SimpleServerSpring3.class, args);
 	}
 
 	@Bean
diff --git a/simple-server-with-database/src/main/java/io/allune/quickfixj/spring/boot/starter/examples/server/SimpleServerWithDatabase.java b/simple-server-with-database/src/main/java/io/allune/quickfixj/spring/boot/starter/examples/server/SimpleServerWithDatabase.java
@@ -36,10 +36,10 @@
 @Slf4j
 @EnableQuickFixJServer
 @SpringBootApplication
-public class AppServer {
+public class SimpleServerWithDatabase {
 
 	public static void main(String[] args) {
-		SpringApplication.run(AppServer.class, args);
+		SpringApplication.run(SimpleServerWithDatabase.class, args);
 	}
 
 	@Bean
diff --git a/simple-server/src/main/java/io/allune/quickfixj/spring/boot/starter/examples/server/SimpleServer.java b/simple-server/src/main/java/io/allune/quickfixj/spring/boot/starter/examples/server/SimpleServer.java
@@ -31,10 +31,10 @@
 
 @EnableQuickFixJServer
 @SpringBootApplication
-public class AppServer {
+public class SimpleServer {
 
 	public static void main(String[] args) {
-		SpringApplication.run(AppServer.class, args);
+		SpringApplication.run(SimpleServer.class, args);
 	}
 
 	@Bean

Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,9 @@`
`23`	`23`	`@EnableQuickFixJServer`
`24`	`24`	`@EnableQuickFixJClient`
`25`	`25`	`@SpringBootApplication`
`26`		`-public class AppServer {`
	`26`	`+public class SimpleClientAndServerConfigString {`
`27`	`27`
`28`	`28`	`public static void main(String[] args) {`
`29`		`- SpringApplication.run(AppServer.class, args);`
	`29`	`+ SpringApplication.run(SimpleClientAndServerConfigString.class, args);`
`30`	`30`	`}`
`31`	`31`	`}`