Wrong @manytoone relationship naming. Fixes #861.

bnasslahsen · bnasslahsen · commit f4f9ff71cdc4 · 2020-09-14T13:24:01.000+02:00
diff --git a/springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/SpringRepositoryRestResourceProvider.java b/springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/SpringRepositoryRestResourceProvider.java
@@ -173,8 +173,7 @@ public List<RouterOperation> getRouterOperations(OpenAPI openAPI) {
 						entity.doWithAssociations((SimpleAssociationHandler) association -> {
 							PersistentProperty<?> property = association.getInverse();
 							if (jackson.isExported(property) && associations.isLinkableAssociation(property)) {
-								ResourceMetadata targetTypeMetadata = associations.getMetadataFor(property.getActualType());
-								dataRestRepository.setRelationName(targetTypeMetadata.getItemResourceRel().toString());
+								dataRestRepository.setRelationName(resourceMetadata.getMappingFor(property).getRel().value());
 								dataRestRepository.setControllerType(ControllerType.PROPERTY);
 								findControllers(routerOperationList, handlerMethodMapFilteredMethodMap, resourceMetadata, dataRestRepository, openAPI);
 							}
diff --git a/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app17/Property.java b/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app17/Property.java
@@ -21,7 +21,7 @@ class Property {
 
     @ManyToOne
     @JoinColumn(name = "child_property_id")
-    private ChildProperty childProperty;
+    private ChildProperty myChildPropertyName;
 
 	public long getId() {
 		return id;
@@ -39,11 +39,11 @@ public void setName(String name) {
 		this.name = name;
 	}
 
-	public ChildProperty getChildProperty() {
-		return childProperty;
+	public ChildProperty getMyChildPropertyName() {
+		return myChildPropertyName;
 	}
 
-	public void setChildProperty(ChildProperty childProperty) {
-		this.childProperty = childProperty;
+	public void setMyChildPropertyName(ChildProperty myChildPropertyName) {
+		this.myChildPropertyName = myChildPropertyName;
 	}
 }
diff --git a/springdoc-openapi-data-rest/src/test/resources/results/app17.json b/springdoc-openapi-data-rest/src/test/resources/results/app17.json
@@ -583,7 +583,7 @@
         }
       }
     },
-    "/properties/{id}/childProperty": {
+    "/properties/{id}/myChildPropertyName": {
       "get": {
         "tags": [
           "property-property-reference-controller"
@@ -759,7 +759,7 @@
         }
       }
     },
-    "/properties/{id}/childProperty/{propertyId}": {
+    "/properties/{id}/myChildPropertyName/{propertyId}": {
       "get": {
         "tags": [
           "property-property-reference-controller"
@@ -903,12 +903,6 @@
           }
         }
       },
-      "Links": {
-        "type": "object",
-        "additionalProperties": {
-          "$ref": "#/components/schemas/Link"
-        }
-      },
       "RepresentationModelObject": {
         "type": "object",
         "properties": {
@@ -929,34 +923,22 @@
           }
         }
       },
-      "CollectionModelChildProperty": {
+      "Property": {
         "type": "object",
         "properties": {
-          "_embedded": {
-            "type": "object",
-            "properties": {
-              "childProperties": {
-                "type": "array",
-                "items": {
-                  "$ref": "#/components/schemas/ChildProperty"
-                }
-              }
-            }
+          "id": {
+            "type": "integer",
+            "format": "int64"
           },
-          "_links": {
-            "$ref": "#/components/schemas/Links"
-          }
-        }
-      },
-      "RepresentationModelChildProperty": {
-        "type": "object",
-        "properties": {
-          "_links": {
-            "$ref": "#/components/schemas/Links"
+          "name": {
+            "type": "string"
+          },
+          "myChildPropertyName": {
+            "$ref": "#/components/schemas/ChildProperty"
           }
         }
       },
-      "EntityModelChildProperty": {
+      "EntityModelProperty": {
         "type": "object",
         "properties": {
           "id": {
@@ -966,6 +948,23 @@
           "name": {
             "type": "string"
           },
+          "myChildPropertyName": {
+            "$ref": "#/components/schemas/ChildProperty"
+          },
+          "_links": {
+            "$ref": "#/components/schemas/Links"
+          }
+        }
+      },
+      "Links": {
+        "type": "object",
+        "additionalProperties": {
+          "$ref": "#/components/schemas/Link"
+        }
+      },
+      "RepresentationModelProperty": {
+        "type": "object",
+        "properties": {
           "_links": {
             "$ref": "#/components/schemas/Links"
           }
@@ -990,30 +989,26 @@
           }
         }
       },
-      "Property": {
+      "CollectionModelObject": {
         "type": "object",
         "properties": {
-          "id": {
-            "type": "integer",
-            "format": "int64"
-          },
-          "name": {
-            "type": "string"
+          "_embedded": {
+            "type": "object",
+            "properties": {
+              "objects": {
+                "type": "array",
+                "items": {
+                  "type": "object"
+                }
+              }
+            }
           },
-          "childProperty": {
-            "$ref": "#/components/schemas/ChildProperty"
-          }
-        }
-      },
-      "RepresentationModelProperty": {
-        "type": "object",
-        "properties": {
           "_links": {
             "$ref": "#/components/schemas/Links"
           }
         }
       },
-      "EntityModelProperty": {
+      "EntityModelChildProperty": {
         "type": "object",
         "properties": {
           "id": {
@@ -1023,24 +1018,29 @@
           "name": {
             "type": "string"
           },
-          "childProperty": {
-            "$ref": "#/components/schemas/ChildProperty"
-          },
           "_links": {
             "$ref": "#/components/schemas/Links"
           }
         }
       },
-      "CollectionModelObject": {
+      "RepresentationModelChildProperty": {
+        "type": "object",
+        "properties": {
+          "_links": {
+            "$ref": "#/components/schemas/Links"
+          }
+        }
+      },
+      "CollectionModelChildProperty": {
         "type": "object",
         "properties": {
           "_embedded": {
             "type": "object",
             "properties": {
-              "objects": {
+              "childProperties": {
                 "type": "array",
                 "items": {
-                  "type": "object"
+                  "$ref": "#/components/schemas/ChildProperty"
                 }
               }
             }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class Property {`
`21`	`21`
`22`	`22`	`@ManyToOne`
`23`	`23`	`@JoinColumn(name = "child_property_id")`
`24`		`- private ChildProperty childProperty;`
	`24`	`+ private ChildProperty myChildPropertyName;`
`25`	`25`
`26`	`26`	`public long getId() {`
`27`	`27`	`return id;`
`@@ -39,11 +39,11 @@ public void setName(String name) {`
`39`	`39`	`this.name = name;`
`40`	`40`	`}`
`41`	`41`
`42`		`- public ChildProperty getChildProperty() {`
`43`		`- return childProperty;`
	`42`	`+ public ChildProperty getMyChildPropertyName() {`
	`43`	`+ return myChildPropertyName;`
`44`	`44`	`}`
`45`	`45`
`46`		`- public void setChildProperty(ChildProperty childProperty) {`
`47`		`- this.childProperty = childProperty;`
	`46`	`+ public void setMyChildPropertyName(ChildProperty myChildPropertyName) {`
	`47`	`+ this.myChildPropertyName = myChildPropertyName;`
`48`	`48`	`}`
`49`	`49`	`}`