upgrade to spring-boot 2.6.0

bnasslahsen · bnasslahsen · commit 3483389593a9 · 2021-11-24T06:31:40.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.5.5</version>
+		<version>2.6.0</version>
 	</parent>
 
 	<licenses>
diff --git a/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app4/EmployeeController.java b/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app4/EmployeeController.java
@@ -60,13 +60,13 @@ class EmployeeController {
 	ResponseEntity<CollectionModel<EntityModel<Employee>>> findAll() {
 
 		List<EntityModel<Employee>> employees = StreamSupport.stream(repository.findAll().spliterator(), false)
-				.map(employee -> new EntityModel<>(employee, //
+				.map(employee ->  EntityModel.of(employee, //
 						linkTo(methodOn(EmployeeController.class).findOne(employee.getId())).withSelfRel(), //
 						linkTo(methodOn(EmployeeController.class).findAll()).withRel("employees"))) //
 				.collect(Collectors.toList());
 
 		return ResponseEntity.ok( //
-				new CollectionModel<>(employees, //
+				 CollectionModel.of(employees, //
 						linkTo(methodOn(EmployeeController.class).findAll()).withSelfRel()));
 	}
 
@@ -76,7 +76,7 @@ ResponseEntity<EntityModel<Employee>> newEmployee(@RequestBody Employee employee
 		try {
 			Employee savedEmployee = repository.save(employee);
 
-			EntityModel<Employee> employeeResource = new EntityModel<>(savedEmployee, //
+			EntityModel<Employee> employeeResource =  EntityModel.of(savedEmployee, //
 					linkTo(methodOn(EmployeeController.class).findOne(savedEmployee.getId())).withSelfRel());
 
 			return ResponseEntity //
@@ -98,7 +98,7 @@ ResponseEntity<EntityModel<Employee>> newEmployee(@RequestBody Employee employee
 	ResponseEntity<EntityModel<Employee>> findOne(@PathVariable long id) {
 
 		return repository.findById(id) //
-				.map(employee -> new EntityModel<>(employee, //
+				.map(employee ->  EntityModel.of(employee, //
 						linkTo(methodOn(EmployeeController.class).findOne(employee.getId())).withSelfRel(), //
 						linkTo(methodOn(EmployeeController.class).findAll()).withRel("employees"))) //
 				.map(ResponseEntity::ok) //
diff --git a/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app8/AlbumModelAssembler.java b/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app8/AlbumModelAssembler.java
@@ -14,7 +14,7 @@ public class AlbumModelAssembler implements RepresentationModelAssembler<Album,
 	@Override
 	public EntityModel<Album> toModel(Album entity) {
 		List<Link> links = new ArrayList<>();
-		return new EntityModel<>(entity, links);
+		return  EntityModel.of(entity, links);
 	}
 
 }
diff --git a/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app9/component/controller/ComponentsController.java b/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app9/component/controller/ComponentsController.java
@@ -68,7 +68,7 @@ public ResponseEntity<EntityModel<DemoComponentDto>> findById(@PathVariable Stri
 		Optional<DemoComponent> foundComponent = componentsService.findById(componentId);
 
 		if (foundComponent.isPresent()) {
-			return ResponseEntity.ok(new EntityModel<>(toDtoConverter.convert(foundComponent.get()), //
+			return ResponseEntity.ok( EntityModel.of(toDtoConverter.convert(foundComponent.get()), //
 					linkTo(methodOn(ComponentsController.class).findAll(null)).withRel("components")));
 		}
 
diff --git a/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app9/component/controller/hateoas/ComponentDtoModelAssembler.java b/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app9/component/controller/hateoas/ComponentDtoModelAssembler.java
@@ -21,7 +21,7 @@ public class ComponentDtoModelAssembler implements RepresentationModelAssembler<
 
 	@Override
 	public RepresentationModel<EntityModel<DemoComponentDto>> toModel(DemoComponent entity) {
-		return new EntityModel<DemoComponentDto>(toDtoConverter.convert(entity));
+		return  EntityModel.of(toDtoConverter.convert(entity));
 	}
 
 }
diff --git a/springdoc-openapi-data-rest/src/test/resources/results/app18.json b/springdoc-openapi-data-rest/src/test/resources/results/app18.json
@@ -11,7 +11,7 @@
     }
   ],
   "paths": {
-    "/v1/helloWorld/helloWorld": {
+    "/latest/helloWorld/helloWorld": {
       "get": {
         "tags": [
           "hello-controller"
@@ -55,7 +55,7 @@
         }
       }
     },
-    "/latest/helloWorld/helloWorld": {
+    "/v1/helloWorld/helloWorld": {
       "get": {
         "tags": [
           "hello-controller"
@@ -120,4 +120,4 @@
       }
     }
   }
-}
+}
diff --git a/springdoc-openapi-hateoas/src/test/java/test/org/springdoc/api/app1/EmployeeController.java b/springdoc-openapi-hateoas/src/test/java/test/org/springdoc/api/app1/EmployeeController.java
@@ -62,13 +62,13 @@ class EmployeeController {
 	ResponseEntity<CollectionModel<EntityModel<Employee>>> findAll() {
 
 		List<EntityModel<Employee>> employees = StreamSupport.stream(repository.findAll().spliterator(), false)
-				.map(employee -> new EntityModel<>(employee, //
+				.map(employee ->  EntityModel.of(employee, //
 						linkTo(methodOn(EmployeeController.class).findOne(employee.getId())).withSelfRel(), //
 						linkTo(methodOn(EmployeeController.class).findAll()).withRel("employees"))) //
 				.collect(Collectors.toList());
 
 		return ResponseEntity.ok( //
-				new CollectionModel<>(employees, //
+				 CollectionModel.of(employees, //
 						linkTo(methodOn(EmployeeController.class).findAll()).withSelfRel()));
 	}
 
@@ -79,7 +79,7 @@ ResponseEntity<EntityModel<Employee>> newEmployee(@RequestBody Employee employee
 		try {
 			Employee savedEmployee = repository.save(employee);
 
-			EntityModel<Employee> employeeResource = new EntityModel<>(savedEmployee, //
+			EntityModel<Employee> employeeResource =  EntityModel.of(savedEmployee, //
 					linkTo(methodOn(EmployeeController.class).findOne(savedEmployee.getId())).withSelfRel());
 
 			return ResponseEntity //
@@ -101,7 +101,7 @@ ResponseEntity<EntityModel<Employee>> newEmployee(@RequestBody Employee employee
 	ResponseEntity<EntityModel<Employee>> findOne(@PathVariable long id) {
 
 		return repository.findById(id) //
-				.map(employee -> new EntityModel<>(employee, //
+				.map(employee ->  EntityModel.of(employee, //
 						linkTo(methodOn(EmployeeController.class).findOne(employee.getId())).withSelfRel(), //
 						linkTo(methodOn(EmployeeController.class).findAll()).withRel("employees"))) //
 				.map(ResponseEntity::ok) //
diff --git a/springdoc-openapi-hateoas/src/test/java/test/org/springdoc/api/app2/hateoas/PostResourceAssembler.java b/springdoc-openapi-hateoas/src/test/java/test/org/springdoc/api/app2/hateoas/PostResourceAssembler.java
@@ -18,6 +18,6 @@ public class PostResourceAssembler implements RepresentationModelAssembler<Post,
 
 	@Override
 	public EntityModel<Post> toModel(Post entity) {
-		return new EntityModel<>(entity);
+		return  EntityModel.of(entity);
 	}
 }
diff --git a/springdoc-openapi-hateoas/src/test/java/test/org/springdoc/api/app4/AlbumModelAssembler.java b/springdoc-openapi-hateoas/src/test/java/test/org/springdoc/api/app4/AlbumModelAssembler.java
@@ -14,7 +14,7 @@ public class AlbumModelAssembler implements RepresentationModelAssembler<Album,
 	@Override
 	public EntityModel<Album> toModel(Album entity) {
 		List<Link> links = new ArrayList<>();
-		return new EntityModel<>(entity, links);
+		return  EntityModel.of(entity, links);
 	}
 
 }
diff --git a/springdoc-openapi-javadoc/src/test/resources/results/app65.json b/springdoc-openapi-javadoc/src/test/resources/results/app65.json
@@ -17,7 +17,7 @@
     }
   ],
   "paths": {
-    "/ping": {
+    "/health": {
       "get": {
         "tags": [
           "Health"
@@ -39,7 +39,7 @@
         }
       }
     },
-    "/health": {
+    "/ping": {
       "get": {
         "tags": [
           "Health"
diff --git a/springdoc-openapi-javadoc/src/test/resources/results/app66.json b/springdoc-openapi-javadoc/src/test/resources/results/app66.json
@@ -46,7 +46,7 @@
         ],
         "summary": "Check server status",
         "description": "Check server status, will return 200 with simple string if alive. Do nothing else.",
-        "operationId": "ping_1",
+        "operationId": "ping",
         "responses": {
           "200": {
             "description": "the response entity",
@@ -68,7 +68,7 @@
         ],
         "summary": "Check server status",
         "description": "Check server status, will return 200 with simple string if alive. Do nothing else.",
-        "operationId": "ping",
+        "operationId": "ping_1",
         "responses": {
           "200": {
             "description": "the response entity",
diff --git a/springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocConfigPathsTest.java b/springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocConfigPathsTest.java
@@ -30,6 +30,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @TestPropertySource(properties = {
+		"spring.mvc.pathmatch.matching-strategy=ant-path-matcher",
         "springdoc.swagger-ui.path=/test/swagger.html",
         "server.servlet.context-path=/context-path",
         "spring.mvc.servlet.path=/servlet-path"
diff --git a/springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app5/SpringDocOauthServletPathsTest.java b/springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app5/SpringDocOauthServletPathsTest.java
@@ -30,6 +30,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @TestPropertySource(properties = {
+		"spring.mvc.pathmatch.matching-strategy=ant-path-matcher",
 		"springdoc.swagger-ui.path=/test/swagger.html",
 		"spring.mvc.servlet.path=/servlet-path"
 })
diff --git a/springdoc-openapi-webmvc-core/src/test/resources/results/app65.json b/springdoc-openapi-webmvc-core/src/test/resources/results/app65.json
@@ -17,7 +17,7 @@
     }
   ],
   "paths": {
-    "/ping": {
+    "/health": {
       "get": {
         "tags": [
           "Health"
@@ -39,7 +39,7 @@
         }
       }
     },
-    "/health": {
+    "/ping": {
       "get": {
         "tags": [
           "Health"
@@ -85,4 +85,4 @@
     }
   },
   "components": {}
-}
+}
diff --git a/springdoc-openapi-webmvc-core/src/test/resources/results/app66.json b/springdoc-openapi-webmvc-core/src/test/resources/results/app66.json
@@ -17,14 +17,14 @@
     }
   ],
   "paths": {
-    "/ping": {
+    "/": {
       "get": {
         "tags": [
           "Health"
         ],
         "summary": "Check server status",
         "description": "Check server status, will return 200 with simple string if alive. Do nothing else.",
-        "operationId": "ping",
+        "operationId": "ping_2",
         "responses": {
           "200": {
             "description": "OK",
@@ -46,7 +46,7 @@
         ],
         "summary": "Check server status",
         "description": "Check server status, will return 200 with simple string if alive. Do nothing else.",
-        "operationId": "ping_1",
+        "operationId": "ping",
         "responses": {
           "200": {
             "description": "OK",
@@ -61,14 +61,14 @@
         }
       }
     },
-    "/": {
+    "/ping": {
       "get": {
         "tags": [
           "Health"
         ],
         "summary": "Check server status",
         "description": "Check server status, will return 200 with simple string if alive. Do nothing else.",
-        "operationId": "ping_2",
+        "operationId": "ping_1",
         "responses": {
           "200": {
             "description": "OK",
@@ -85,4 +85,4 @@
     }
   },
   "components": {}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public class AlbumModelAssembler implements RepresentationModelAssembler<Album,`
`14`	`14`	`@Override`
`15`	`15`	`public EntityModel<Album> toModel(Album entity) {`
`16`	`16`	`List<Link> links = new ArrayList<>();`
`17`		`- return new EntityModel<>(entity, links);`
	`17`	`+ return EntityModel.of(entity, links);`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public ResponseEntity<EntityModel<DemoComponentDto>> findById(@PathVariable Stri`
`68`	`68`	`Optional<DemoComponent> foundComponent = componentsService.findById(componentId);`
`69`	`69`
`70`	`70`	`if (foundComponent.isPresent()) {`
`71`		`- return ResponseEntity.ok(new EntityModel<>(toDtoConverter.convert(foundComponent.get()), //`
	`71`	`+ return ResponseEntity.ok( EntityModel.of(toDtoConverter.convert(foundComponent.get()), //`
`72`	`72`	`linkTo(methodOn(ComponentsController.class).findAll(null)).withRel("components")));`
`73`	`73`	`}`
`74`	`74`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public class ComponentDtoModelAssembler implements RepresentationModelAssembler<`
`21`	`21`
`22`	`22`	`@Override`
`23`	`23`	`public RepresentationModel<EntityModel<DemoComponentDto>> toModel(DemoComponent entity) {`
`24`		`- return new EntityModel<DemoComponentDto>(toDtoConverter.convert(entity));`
	`24`	`+ return EntityModel.of(toDtoConverter.convert(entity));`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`}`
`12`	`12`	`],`
`13`	`13`	`"paths": {`
`14`		`- "/v1/helloWorld/helloWorld": {`
	`14`	`+ "/latest/helloWorld/helloWorld": {`
`15`	`15`	`"get": {`
`16`	`16`	`"tags": [`
`17`	`17`	`"hello-controller"`
`@@ -55,7 +55,7 @@`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`},`
`58`		`- "/latest/helloWorld/helloWorld": {`
	`58`	`+ "/v1/helloWorld/helloWorld": {`
`59`	`59`	`"get": {`
`60`	`60`	`"tags": [`
`61`	`61`	`"hello-controller"`
`@@ -120,4 +120,4 @@`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`	`}`
`123`		`-}`
	`123`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@ public class PostResourceAssembler implements RepresentationModelAssembler<Post,`
`18`	`18`
`19`	`19`	`@Override`
`20`	`20`	`public EntityModel<Post> toModel(Post entity) {`
`21`		`- return new EntityModel<>(entity);`
	`21`	`+ return EntityModel.of(entity);`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`}`
`18`	`18`	`],`
`19`	`19`	`"paths": {`
`20`		`- "/ping": {`
	`20`	`+ "/health": {`
`21`	`21`	`"get": {`
`22`	`22`	`"tags": [`
`23`	`23`	`"Health"`
`@@ -39,7 +39,7 @@`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`},`
`42`		`- "/health": {`
	`42`	`+ "/ping": {`
`43`	`43`	`"get": {`
`44`	`44`	`"tags": [`
`45`	`45`	`"Health"`