Bump spring boot version to 2.7.2

pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.22.RELEASE</version>
+        <version>2.7.2</version>
     </parent>
 
     <modules>
@@ -97,6 +97,12 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- https://github.com/spring-projects/spring-boot/issues/21465 -->
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

ts-admin-basic-info-service/src/main/java/adminbasic/entity/Station.java

@@ -2,8 +2,8 @@
 
 import lombok.Data;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author fdse

ts-admin-basic-info-service/src/main/resources/application.yml

@@ -4,6 +4,8 @@ server:
 spring:
   application:
     name: ts-admin-basic-info-service
+  main:
+    allow-circular-references: true
 
 swagger:
-  controllerPackage: adminbasic.microservice
+  controllerPackage: adminbasic.microservice

ts-admin-order-service/src/main/resources/application.yml

@@ -4,7 +4,8 @@ server:
 spring:
   application:
     name: ts-admin-order-service
-
+  main:
+    allow-circular-references: true
 
 swagger:
-  controllerPackage: adminorder.controller
+  controllerPackage: adminorder.controller

ts-admin-route-service/src/main/resources/application.yml

@@ -4,6 +4,8 @@ server:
 spring:
   application:
     name: ts-admin-route-service
+  main:
+    allow-circular-references: true
 
 swagger:
-  controllerPackage: adminroute.controller
+  controllerPackage: adminroute.controller

ts-admin-travel-service/src/main/resources/application.yml

@@ -4,6 +4,8 @@ server:
 spring:
   application:
     name: ts-admin-travel-service
+  main:
+    allow-circular-references: true
 
 swagger:
-  controllerPackage: admintravel.controller
+  controllerPackage: admintravel.controller

ts-admin-user-service/src/main/resources/application.yml

@@ -4,6 +4,8 @@ server:
 spring:
   application:
     name: ts-admin-user-service
+  main:
+    allow-circular-references: true
 
 swagger:
-  controllerPackage: adminuser.controller
+  controllerPackage: adminuser.controller

ts-assurance-service/src/main/java/assurance/entity/Assurance.java

@@ -6,7 +6,7 @@
 import org.springframework.data.mongodb.core.index.Indexed;
 import org.springframework.data.mongodb.core.mapping.Document;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.UUID;
 
 /**

ts-assurance-service/src/main/resources/application.yml

@@ -4,6 +4,8 @@ server:
 spring:
   application:
     name: ts-assurance-service
+  main:
+    allow-circular-references: true
   data:
     mongodb:
       host: ts-assurance-mongo
@@ -13,4 +15,4 @@ spring:
       port: 27017
 
 swagger:
-  controllerPackage: assurance.controller
+  controllerPackage: assurance.controller

ts-assurance-service/src/test/java/assurance/service/AssuranceServiceImplTest.java

@@ -92,7 +92,7 @@ public void tesCreate2() {
     public void testCreate3() {
         UUID orderId = UUID.randomUUID();
         Mockito.when(assuranceRepository.findByOrderId(orderId)).thenReturn(null);
-        Mockito.when(assuranceRepository.save(Mockito.anyCollection())).thenReturn(null);
+        Mockito.when(assuranceRepository.saveAll(Mockito.anyCollection())).thenReturn(null);
         Response result = assuranceServiceImpl.create(1, orderId.toString(), headers);
         Assert.assertNotNull(result);
     }

ts-auth-service/src/main/resources/application.yaml

@@ -3,11 +3,13 @@ server:
 spring:
   application:
     name: ts-auth-service
+  main:
+    allow-circular-references: true
   data:
     mongodb:
       host: ts-auth-mongo
       database: ts-auth-mongo
       port: 27017
 
 swagger:
-  controllerPackage: auth.controller
+  controllerPackage: auth.controller

ts-basic-service/src/main/java/fdse/microservice/entity/Trip.java

@@ -3,8 +3,8 @@
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import java.util.Date;
 
 /**

ts-basic-service/src/main/resources/application.yml

@@ -4,6 +4,8 @@ server:
 spring:
   application:
     name: ts-basic-service
+  main:
+    allow-circular-references: true
 
 swagger:
-  controllerPackage: fdse.microservice.controller
+  controllerPackage: fdse.microservice.controller

ts-cancel-service/src/main/resources/application.yml

@@ -4,6 +4,8 @@ server:
 spring:
   application:
     name: ts-cancel-service
+  main:
+    allow-circular-references: true
 
 swagger:
-  controllerPackage: cancel.controller
+  controllerPackage: cancel.controller

ts-config-service/src/main/java/config/entity/Config.java

@@ -4,8 +4,8 @@
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author fdse

ts-config-service/src/main/resources/application.yml

@@ -1,6 +1,8 @@
 spring:
     application:
       name: ts-config-service
+    main:
+      allow-circular-references: true
     data:
       mongodb:
         host: ts-config-mongo
@@ -14,4 +16,4 @@ server:
   port: 15679  # HTTP (Tomcat) port
 
 swagger:
-  controllerPackage: config.controller
+  controllerPackage: config.controller

ts-consign-price-service/src/main/resources/application.yml

@@ -1,6 +1,8 @@
 spring:
   application:
     name: ts-consign-price-service
+  main:
+    allow-circular-references: true
   data:
     mongodb:
       host: ts-consign-price-mongo
@@ -13,4 +15,4 @@ server:
   port: 16110
 
 swagger:
-  controllerPackage: consignprice.controller
+  controllerPackage: consignprice.controller

ts-consign-service/src/main/resources/application.yml

@@ -1,6 +1,8 @@
 spring:
   application:
     name: ts-consign-service
+  main:
+    allow-circular-references: true
   data:
     mongodb:
       host: ts-consign-mongo
@@ -13,4 +15,4 @@ server:
   port: 16111
 
 swagger:
-  controllerPackage: consign.controller
+  controllerPackage: consign.controller

ts-contacts-service/src/main/resources/application.yml

@@ -4,11 +4,13 @@ server:
 spring:
   application:
     name: ts-contacts-service
+  main:
+    allow-circular-references: true
   data:
     mongodb:
       host: ts-contacts-mongo
       database: ts
       port: 27017
 
 swagger:
-  controllerPackage: contacts.controller
+  controllerPackage: contacts.controller

ts-delivery-service/src/main/resources/application.yml

@@ -4,6 +4,8 @@ server:
 spring:
   application:
     name: ts-delivery-service
+  main:
+    allow-circular-references: true
   data:
     mongodb:
       host: ${mongohost:ts-delivery-mongo}

ts-execute-service/src/main/resources/application.yml

@@ -4,5 +4,7 @@ server:
 spring:
   application:
     name: ts-execute-service
+  main:
+    allow-circular-references: true
 swagger:
-  controllerPackage: execute.controller
+  controllerPackage: execute.controller

ts-food-map-service/src/main/java/food/entity/FoodStore.java

@@ -5,7 +5,7 @@
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 import java.util.UUID;
 

ts-food-map-service/src/main/java/food/entity/TrainFood.java

@@ -5,7 +5,7 @@
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 import java.util.UUID;
 

ts-food-map-service/src/main/resources/application.yml

@@ -4,6 +4,8 @@ server:
 spring:
   application:
     name: ts-food-map-service
+  main:
+    allow-circular-references: true
   data:
     mongodb:
       host: ts-food-map-mongo
@@ -13,4 +15,4 @@ spring:
       port: 27017
 
 swagger:
-  controllerPackage: food.controller
+  controllerPackage: food.controller

ts-food-service/src/main/resources/application.yml

@@ -4,6 +4,8 @@ server:
 spring:
   application:
     name: ts-food-service
+  main:
+    allow-circular-references: true
   data:
     mongodb:
       host: ts-food-mongo
@@ -15,4 +17,4 @@ spring:
     host: ${rabbitmq_host:localhost}
     port: ${rabbitmq_port:5672}
 swagger:
-  controllerPackage: foodsearch.controller
+  controllerPackage: foodsearch.controller

ts-inside-payment-service/src/main/java/inside_payment/entity/Balance.java

@@ -2,8 +2,8 @@
 
 import lombok.Data;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author fdse

ts-inside-payment-service/src/main/java/inside_payment/entity/Money.java

@@ -4,8 +4,8 @@
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import java.util.UUID;
 
 /**

ts-inside-payment-service/src/main/java/inside_payment/entity/Payment.java

@@ -4,8 +4,8 @@
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import java.util.UUID;
 
 /**

ts-inside-payment-service/src/main/java/inside_payment/repository/PaymentRepository.java

@@ -16,7 +16,7 @@ public interface PaymentRepository extends CrudRepository<Payment,String> {
      * @param id id
      * @return Payment
      */
-    Payment findById(String id);
+    Payment findByPaymentId(String id);
 
     /**
      * find by order id

ts-inside-payment-service/src/main/java/inside_payment/service/InsidePaymentServiceImpl.java

@@ -346,7 +346,7 @@ private Response setOrderStatus(String tripId, String orderId, HttpHeaders heade
 
     @Override
     public void initPayment(Payment payment, HttpHeaders headers) {
-        Payment paymentTemp = paymentRepository.findById(payment.getId());
+        Payment paymentTemp = paymentRepository.findByPaymentId(payment.getId());
         if (paymentTemp == null) {
             paymentRepository.save(payment);
         } else {

ts-inside-payment-service/src/main/resources/application.yml

@@ -4,6 +4,8 @@ server:
 spring:
   application:
     name: ts-inside-payment-service
+  main:
+    allow-circular-references: true
 
   data:
     mongodb:
@@ -14,4 +16,4 @@ spring:
       port: 27017
 
 swagger:
-  controllerPackage: inside_payment.controller
+  controllerPackage: inside_payment.controller