Upgrade spring-boot version to 2.3.3.RELEASE

bnasslahsen · bnasslahsen · commit 82425180fe18 · 2020-09-06T20:19:43.000+02:00
diff --git a/springdoc-openapi-data-rest/src/test/resources/results/app10.json b/springdoc-openapi-data-rest/src/test/resources/results/app10.json
@@ -904,12 +904,6 @@
           }
         }
       },
-      "Links": {
-        "type": "object",
-        "additionalProperties": {
-          "$ref": "#/components/schemas/Link"
-        }
-      },
       "RepresentationModelObject": {
         "type": "object",
         "properties": {
@@ -952,12 +946,10 @@
           }
         }
       },
-      "RepresentationModelCustomer": {
+      "Links": {
         "type": "object",
-        "properties": {
-          "_links": {
-            "$ref": "#/components/schemas/Links"
-          }
+        "additionalProperties": {
+          "$ref": "#/components/schemas/Link"
         }
       },
       "EntityModelCustomer": {
@@ -978,7 +970,15 @@
           }
         }
       },
-      "PageMetadata": {
+      "RepresentationModelCustomer": {
+        "type": "object",
+        "properties": {
+          "_links": {
+            "$ref": "#/components/schemas/Links"
+          }
+        }
+      },
+      "PageMetadataCustomer": {
         "type": "object",
         "properties": {
           "size": {
@@ -1017,7 +1017,7 @@
             "$ref": "#/components/schemas/Links"
           },
           "page": {
-            "$ref": "#/components/schemas/PageMetadata"
+            "$ref": "#/components/schemas/PageMetadataCustomer"
           }
         }
       },
@@ -1056,14 +1056,6 @@
           }
         }
       },
-      "RepresentationModelAccount": {
-        "type": "object",
-        "properties": {
-          "_links": {
-            "$ref": "#/components/schemas/Links"
-          }
-        }
-      },
       "EntityModelAccount": {
         "type": "object",
         "properties": {
@@ -1083,6 +1075,14 @@
           }
         }
       },
+      "RepresentationModelAccount": {
+        "type": "object",
+        "properties": {
+          "_links": {
+            "$ref": "#/components/schemas/Links"
+          }
+        }
+      },
       "CollectionModelObject": {
         "type": "object",
         "properties": {
diff --git a/springdoc-openapi-data-rest/src/test/resources/results/app16.json b/springdoc-openapi-data-rest/src/test/resources/results/app16.json
@@ -974,12 +974,6 @@
           }
         }
       },
-      "Links": {
-        "type": "object",
-        "additionalProperties": {
-          "$ref": "#/components/schemas/Link"
-        }
-      },
       "RepresentationModelObject": {
         "type": "object",
         "properties": {
@@ -1038,12 +1032,10 @@
           }
         }
       },
-      "RepresentationModelAccount": {
+      "Links": {
         "type": "object",
-        "properties": {
-          "_links": {
-            "$ref": "#/components/schemas/Links"
-          }
+        "additionalProperties": {
+          "$ref": "#/components/schemas/Link"
         }
       },
       "EntityModelAccount": {
@@ -1065,6 +1057,14 @@
           }
         }
       },
+      "RepresentationModelAccount": {
+        "type": "object",
+        "properties": {
+          "_links": {
+            "$ref": "#/components/schemas/Links"
+          }
+        }
+      },
       "CollectionModelObject": {
         "type": "object",
         "properties": {
@@ -1103,14 +1103,6 @@
           }
         }
       },
-      "RepresentationModelCustomer": {
-        "type": "object",
-        "properties": {
-          "_links": {
-            "$ref": "#/components/schemas/Links"
-          }
-        }
-      },
       "EntityModelCustomer": {
         "type": "object",
         "properties": {
@@ -1129,7 +1121,15 @@
           }
         }
       },
-      "PageMetadata": {
+      "RepresentationModelCustomer": {
+        "type": "object",
+        "properties": {
+          "_links": {
+            "$ref": "#/components/schemas/Links"
+          }
+        }
+      },
+      "PageMetadataCustomer": {
         "type": "object",
         "properties": {
           "size": {
@@ -1168,7 +1168,7 @@
             "$ref": "#/components/schemas/Links"
           },
           "page": {
-            "$ref": "#/components/schemas/PageMetadata"
+            "$ref": "#/components/schemas/PageMetadataCustomer"
           }
         }
       },
diff --git a/springdoc-openapi-data-rest/src/test/resources/results/app8.json b/springdoc-openapi-data-rest/src/test/resources/results/app8.json
@@ -54,7 +54,7 @@
           "$ref": "#/components/schemas/Link"
         }
       },
-      "PageMetadata": {
+      "PageMetadataAlbum": {
         "type": "object",
         "properties": {
           "size": {
@@ -93,7 +93,7 @@
             "$ref": "#/components/schemas/Links"
           },
           "page": {
-            "$ref": "#/components/schemas/PageMetadata"
+            "$ref": "#/components/schemas/PageMetadataAlbum"
           }
         }
       },
diff --git a/springdoc-openapi-data-rest/src/test/resources/results/app9.json b/springdoc-openapi-data-rest/src/test/resources/results/app9.json
@@ -140,7 +140,7 @@
           }
         }
       },
-      "PageMetadata": {
+      "PageMetadataRepresentationModelEntityModelDemoComponentDto": {
         "type": "object",
         "properties": {
           "size": {
@@ -177,7 +177,7 @@
             }
           },
           "page": {
-            "$ref": "#/components/schemas/PageMetadata"
+            "$ref": "#/components/schemas/PageMetadataRepresentationModelEntityModelDemoComponentDto"
           }
         }
       },
@@ -215,4 +215,4 @@
       }
     }
   }
-}
+}
diff --git a/springdoc-openapi-hateoas/src/test/resources/results/app2.json b/springdoc-openapi-hateoas/src/test/resources/results/app2.json
@@ -93,7 +93,7 @@
           "$ref": "#/components/schemas/Link"
         }
       },
-      "PageMetadata": {
+      "PageMetadataEntityModelPost": {
         "type": "object",
         "properties": {
           "size": {
@@ -132,7 +132,7 @@
             "$ref": "#/components/schemas/Links"
           },
           "page": {
-            "$ref": "#/components/schemas/PageMetadata"
+            "$ref": "#/components/schemas/PageMetadataEntityModelPost"
           }
         }
       },
@@ -167,4 +167,4 @@
       }
     }
   }
-}
+}
diff --git a/springdoc-openapi-hateoas/src/test/resources/results/app4.json b/springdoc-openapi-hateoas/src/test/resources/results/app4.json
@@ -54,7 +54,7 @@
           "$ref": "#/components/schemas/Link"
         }
       },
-      "PageMetadata": {
+      "PageMetadataAlbum": {
         "type": "object",
         "properties": {
           "size": {
@@ -93,7 +93,7 @@
             "$ref": "#/components/schemas/Links"
           },
           "page": {
-            "$ref": "#/components/schemas/PageMetadata"
+            "$ref": "#/components/schemas/PageMetadataAlbum"
           }
         }
       },
@@ -128,4 +128,4 @@
       }
     }
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@`
`54`	`54`	`"$ref": "#/components/schemas/Link"`
`55`	`55`	`}`
`56`	`56`	`},`
`57`		`- "PageMetadata": {`
	`57`	`+ "PageMetadataAlbum": {`
`58`	`58`	`"type": "object",`
`59`	`59`	`"properties": {`
`60`	`60`	`"size": {`
`@@ -93,7 +93,7 @@`
`93`	`93`	`"$ref": "#/components/schemas/Links"`
`94`	`94`	`},`
`95`	`95`	`"page": {`
`96`		`- "$ref": "#/components/schemas/PageMetadata"`
	`96`	`+ "$ref": "#/components/schemas/PageMetadataAlbum"`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`	`},`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`	`},`
`143`		`- "PageMetadata": {`
	`143`	`+ "PageMetadataRepresentationModelEntityModelDemoComponentDto": {`
`144`	`144`	`"type": "object",`
`145`	`145`	`"properties": {`
`146`	`146`	`"size": {`
`@@ -177,7 +177,7 @@`
`177`	`177`	`}`
`178`	`178`	`},`
`179`	`179`	`"page": {`
`180`		`- "$ref": "#/components/schemas/PageMetadata"`
	`180`	`+ "$ref": "#/components/schemas/PageMetadataRepresentationModelEntityModelDemoComponentDto"`
`181`	`181`	`}`
`182`	`182`	`}`
`183`	`183`	`},`
`@@ -215,4 +215,4 @@`
`215`	`215`	`}`
`216`	`216`	`}`
`217`	`217`	`}`
`218`		`-}`
	`218`	`+}`