( self ref) for HAL hypermedia types. Fixes #609

Author: bnasslahsen

springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/SpringDocDataRestConfiguration.java

@@ -107,7 +107,7 @@ OpenApiCustomiser linksSchemaCustomiser(HalProvider halProvider) {
 		Json.mapper().addMixIn(RepresentationModel.class, RepresentationModelLinksOASMixin.class);
 
 		ResolvedSchema resolvedLinkSchema = ModelConverters.getInstance()
-				.resolveAsResolvedSchema(new AnnotatedType(Link.class).resolveAsRef(true));
+				.resolveAsResolvedSchema(new AnnotatedType(Link.class));
 
 		return openApi -> openApi
 				.schema("Link", resolvedLinkSchema.schema)

springdoc-openapi-data-rest/src/test/resources/results/app4.json

@@ -125,25 +125,6 @@
   },
   "components": {
     "schemas": {
-      "CollectionModelEntityModelEmployee": {
-        "type": "object",
-        "properties": {
-          "_embedded": {
-            "type": "object",
-            "properties": {
-              "employees": {
-                "type": "array",
-                "items": {
-                  "$ref": "#/components/schemas/EntityModelEmployee"
-                }
-              }
-            }
-          },
-          "_links": {
-            "$ref": "#/components/schemas/Links"
-          }
-        }
-      },
       "Employee": {
         "type": "object",
         "properties": {
@@ -189,9 +170,54 @@
           "$ref": "#/components/schemas/Link"
         }
       },
+      "CollectionModelEntityModelEmployee": {
+        "type": "object",
+        "properties": {
+          "_embedded": {
+            "type": "object",
+            "properties": {
+              "employees": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/EntityModelEmployee"
+                }
+              }
+            }
+          },
+          "_links": {
+            "$ref": "#/components/schemas/Links"
+          }
+        }
+      },
       "Link": {
-        "$ref": "#/components/schemas/Link"
+        "type": "object",
+        "properties": {
+          "href": {
+            "type": "string"
+          },
+          "hreflang": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string"
+          },
+          "deprecation": {
+            "type": "string"
+          },
+          "profile": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "templated": {
+            "type": "boolean"
+          }
+        }
       }
     }
   }
-}
+}

springdoc-openapi-data-rest/src/test/resources/results/app6.json

@@ -45,6 +45,17 @@
   },
   "components": {
     "schemas": {
+      "ExceptionMessage": {
+        "type": "object",
+        "properties": {
+          "cause": {
+            "$ref": "#/components/schemas/ExceptionMessage"
+          },
+          "message": {
+            "type": "string"
+          }
+        }
+      },
       "RepositoryConstraintViolationExceptionMessage": {
         "type": "object",
         "properties": {
@@ -73,17 +84,6 @@
           }
         }
       },
-      "ExceptionMessage": {
-        "type": "object",
-        "properties": {
-          "cause": {
-            "$ref": "#/components/schemas/ExceptionMessage"
-          },
-          "message": {
-            "type": "string"
-          }
-        }
-      },
       "Employee": {
         "type": "object",
         "properties": {
@@ -130,7 +130,33 @@
         }
       },
       "Link": {
-        "$ref": "#/components/schemas/Link"
+        "type": "object",
+        "properties": {
+          "href": {
+            "type": "string"
+          },
+          "hreflang": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string"
+          },
+          "deprecation": {
+            "type": "string"
+          },
+          "profile": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "templated": {
+            "type": "boolean"
+          }
+        }
       }
     }
   }

springdoc-openapi-data-rest/src/test/resources/results/app8.json

@@ -98,7 +98,33 @@
         }
       },
       "Link": {
-        "$ref": "#/components/schemas/Link"
+        "type": "object",
+        "properties": {
+          "href": {
+            "type": "string"
+          },
+          "hreflang": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string"
+          },
+          "deprecation": {
+            "type": "string"
+          },
+          "profile": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "templated": {
+            "type": "boolean"
+          }
+        }
       }
     }
   }