Revert "LPS-166113 Move relationship endpoints to a non autogenerated…

… class as it will return java Object class for both System and Custom objects" This reverts commit 33d74cc.
liferay · Nov 18, 2022 · 01e2f37 · 01e2f37
1 parent eb7667b
commit 01e2f37
Show file tree

Hide file tree

Showing 6 changed files with 127 additions and 305 deletions.
diff --git a/modules/apps/object/object-rest-impl/rest-openapi.yaml b/modules/apps/object/object-rest-impl/rest-openapi.yaml
@@ -319,6 +319,74 @@ paths:
                             schema:
                                 $ref: "#/components/schemas/ObjectEntry"
             tags: ["ObjectEntry"]
+    "/{currentObjectEntryId}/{objectRelationshipName}":
+        get:
+            operationId: getCurrentObjectEntriesObjectRelationshipNamePage
+            parameters:
+                - in: path
+                  name: currentObjectEntryId
+                  required: true
+                  schema:
+                      format: int64
+                      type: integer
+                - in: path
+                  name: objectRelationshipName
+                  required: true
+                  schema:
+                      type: string
+                - in: query
+                  name: page
+                  schema:
+                      type: integer
+                - in: query
+                  name: pageSize
+                  schema:
+                      type: integer
+            responses:
+                200:
+                    content:
+                        application/json:
+                            schema:
+                                items:
+                                    $ref: "#/components/schemas/ObjectEntry"
+                                type: array
+                        application/xml:
+                            schema:
+                                items:
+                                    $ref: "#/components/schemas/ObjectEntry"
+                                type: array
+            tags: ["ObjectEntry"]
+    "/{currentObjectEntryId}/{objectRelationshipName}/{relatedObjectEntryId}":
+        put:
+            operationId: putCurrentObjectEntry
+            parameters:
+                - in: path
+                  name: currentObjectEntryId
+                  required: true
+                  schema:
+                      format: int64
+                      type: integer
+                - in: path
+                  name: objectRelationshipName
+                  required: true
+                  schema:
+                      type: string
+                - in: path
+                  name: relatedObjectEntryId
+                  required: true
+                  schema:
+                      format: int64
+                      type: integer
+            responses:
+                200:
+                    content:
+                        application/json:
+                            schema:
+                                $ref: "#/components/schemas/ObjectEntry"
+                        application/xml:
+                            schema:
+                                $ref: "#/components/schemas/ObjectEntry"
+            tags: ["ObjectEntry"]
     "/{objectEntryId}":
         delete:
             operationId: deleteObjectEntry

diff --git a/...src/main/java/com/liferay/object/rest/internal/deployer/ObjectDefinitionDeployerImpl.java b/...src/main/java/com/liferay/object/rest/internal/deployer/ObjectDefinitionDeployerImpl.java
@@ -24,7 +24,6 @@
 import com.liferay.object.rest.internal.jaxrs.exception.mapper.ObjectValidationRuleEngineExceptionMapper;
 import com.liferay.object.rest.internal.jaxrs.exception.mapper.RequiredObjectRelationshipExceptionMapper;
 import com.liferay.object.rest.internal.resource.v1_0.BaseObjectEntryResourceImpl;
-import com.liferay.object.rest.internal.resource.v1_0.ObjectEntryRelatedObjectsResourceImpl;
 import com.liferay.object.rest.internal.resource.v1_0.ObjectEntryResourceFactoryImpl;
 import com.liferay.object.rest.internal.resource.v1_0.ObjectEntryResourceImpl;
 import com.liferay.object.rest.manager.v1_0.ObjectEntryManagerRegistry;
@@ -418,47 +417,6 @@ public void ungetService(
 						"(osgi.jaxrs.name=" + osgiJaxRsName + ")"
 					).put(
 						"osgi.jaxrs.resource", "true"
-					).build()),
-				_bundleContext.registerService(
-					ObjectEntryRelatedObjectsResourceImpl.class,
-					new PrototypeServiceFactory
-						<ObjectEntryRelatedObjectsResourceImpl>() {
-
-						@Override
-						public ObjectEntryRelatedObjectsResourceImpl getService(
-							Bundle bundle,
-							ServiceRegistration
-								<ObjectEntryRelatedObjectsResourceImpl>
-									serviceRegistration) {
-
-							return new ObjectEntryRelatedObjectsResourceImpl(
-								_objectDefinitionLocalService,
-								_objectEntryManagerRegistry,
-								_objectRelationshipService);
-						}
-
-						@Override
-						public void ungetService(
-							Bundle bundle,
-							ServiceRegistration
-								<ObjectEntryRelatedObjectsResourceImpl>
-									serviceRegistration,
-							ObjectEntryRelatedObjectsResourceImpl
-								objectEntryRelatedObjectsResourceImpl) {
-						}
-
-					},
-					HashMapDictionaryBuilder.<String, Object>put(
-						"api.version", "v1.0"
-					).put(
-						"entity.class.name",
-						ObjectEntry.class.getName() + "#" +
-							objectDefinition.getName()
-					).put(
-						"osgi.jaxrs.application.select",
-						"(osgi.jaxrs.name=" + osgiJaxRsName + ")"
-					).put(
-						"osgi.jaxrs.resource", "true"
 					).build())));
 	}
 

diff --git a/...ain/java/com/liferay/object/rest/internal/manager/v1_0/DefaultObjectEntryManagerImpl.java b/...ain/java/com/liferay/object/rest/internal/manager/v1_0/DefaultObjectEntryManagerImpl.java
@@ -32,7 +32,6 @@
 import com.liferay.object.rest.dto.v1_0.ObjectEntry;
 import com.liferay.object.rest.internal.dto.v1_0.converter.ObjectEntryDTOConverter;
 import com.liferay.object.rest.internal.petra.sql.dsl.expression.OrderByExpressionUtil;
-import com.liferay.object.rest.internal.resource.v1_0.ObjectEntryRelatedObjectsResourceImpl;
 import com.liferay.object.rest.internal.resource.v1_0.ObjectEntryResourceImpl;
 import com.liferay.object.rest.internal.util.ObjectEntryValuesUtil;
 import com.liferay.object.rest.manager.v1_0.BaseObjectEntryManager;
@@ -549,8 +548,8 @@ public Page<ObjectEntry> getObjectEntryRelatedObjectEntries(
 			HashMapBuilder.put(
 				"get",
 				ActionUtil.addAction(
-					ActionKeys.VIEW,
-					ObjectEntryRelatedObjectsResourceImpl.class, objectEntryId,
+					ActionKeys.VIEW, ObjectEntryResourceImpl.class,
+					objectEntryId,
 					"getCurrentObjectEntriesObjectRelationshipNamePage", null,
 					objectEntry.getUserId(),
 					_getObjectEntryPermissionName(

diff --git a/...liferay/object/rest/internal/resource/v1_0/BaseObjectEntryRelatedObjectsResourceImpl.java b/...liferay/object/rest/internal/resource/v1_0/BaseObjectEntryRelatedObjectsResourceImpl.java