LPD-37559 Using new MSOD object relationship field names

is-solutions-delivery · Sep 30, 2024 · 8724e53 · 8724e53
1 parent 0ddbb22
commit 8724e53
Show file tree

Hide file tree

Showing 35 changed files with 273 additions and 273 deletions.
diff --git a/...om/liferay/headless/builder/internal/application/provider/APIApplicationProviderImpl.java b/...om/liferay/headless/builder/internal/application/provider/APIApplicationProviderImpl.java
@@ -109,7 +109,7 @@ public String getPathParameter() {
 					public APIApplication.Schema getRequestSchema() {
 						return _getSchema(
 							(String)properties.get(
-								"r_requestAPISchemaToAPIEndpoints_c_" +
+								"r_requestAPISchemaToAPIEndpoints_l_" +
 									"apiSchemaERC"),
 							schemas);
 					}
@@ -118,7 +118,7 @@ public APIApplication.Schema getRequestSchema() {
 					public APIApplication.Schema getResponseSchema() {
 						return _getSchema(
 							(String)properties.get(
-								"r_responseAPISchemaToAPIEndpoints_c_" +
+								"r_responseAPISchemaToAPIEndpoints_l_" +
 									"apiSchemaERC"),
 							schemas);
 					}

diff --git a/...der-impl/src/main/java/com/liferay/headless/builder/internal/helper/ValidationHelper.java b/...der-impl/src/main/java/com/liferay/headless/builder/internal/helper/ValidationHelper.java
@@ -83,7 +83,7 @@ public void validateAPIEndpointRelationship(
 			Map<String, Serializable> values = objectEntry.getValues();
 
 			long apiEndpointId = (long)values.get(
-				"r_" + relationshipName + "_c_apiEndpointId");
+				"r_" + relationshipName + "_l_apiEndpointId");
 
 			if (!isValidObjectEntry("L_API_ENDPOINT", apiEndpointId)) {
 				throw new ObjectEntryValuesException.InvalidObjectField(
@@ -130,7 +130,7 @@ public void validateAPIEndpointRelationship(
 						StringBundler.concat(
 							"id ne '", objectEntry.getObjectEntryId(),
 							"' and r_", relationshipName,
-							"_c_apiEndpointId eq '", apiEndpointId, "'"),
+							"_l_apiEndpointId eq '", apiEndpointId, "'"),
 						objectDefinition.getExternalReferenceCode()))) {
 
 				throw new ObjectEntryValuesException.InvalidObjectField(

diff --git a/...less/builder/internal/model/listener/APIApplicationPublisherObjectEntryModelListener.java b/...less/builder/internal/model/listener/APIApplicationPublisherObjectEntryModelListener.java
@@ -117,7 +117,7 @@ else if (StringUtil.equals(externalReferenceCode, "L_API_ENDPOINT")) {
 
 			return GetterUtil.getLong(
 				values.get(
-					"r_apiApplicationToAPIEndpoints_c_apiApplicationId"));
+					"r_apiApplicationToAPIEndpoints_l_apiApplicationId"));
 		}
 		else if (StringUtil.equals(externalReferenceCode, "L_API_FILTER")) {
 			Map<String, Serializable> apiFilterObjectEntryValues =
@@ -127,7 +127,7 @@ else if (StringUtil.equals(externalReferenceCode, "L_API_FILTER")) {
 				_objectEntryLocalService.fetchObjectEntry(
 					GetterUtil.getLong(
 						apiFilterObjectEntryValues.get(
-							"r_apiEndpointToAPIFilters_c_apiEndpointId")));
+							"r_apiEndpointToAPIFilters_l_apiEndpointId")));
 
 			if (apiEndpointObjectEntry == null) {
 				return 0;
@@ -138,7 +138,7 @@ else if (StringUtil.equals(externalReferenceCode, "L_API_FILTER")) {
 
 			return GetterUtil.getLong(
 				apiEndpointObjectEntryValues.get(
-					"r_apiApplicationToAPIEndpoints_c_apiApplicationId"));
+					"r_apiApplicationToAPIEndpoints_l_apiApplicationId"));
 		}
 		else if (StringUtil.equals(externalReferenceCode, "L_API_PROPERTY")) {
 			Map<String, Serializable> apiPropertyObjectEntryValues =
@@ -148,7 +148,7 @@ else if (StringUtil.equals(externalReferenceCode, "L_API_PROPERTY")) {
 				_objectEntryLocalService.fetchObjectEntry(
 					GetterUtil.getLong(
 						apiPropertyObjectEntryValues.get(
-							"r_apiSchemaToAPIProperties_c_apiSchemaId")));
+							"r_apiSchemaToAPIProperties_l_apiSchemaId")));
 
 			if (apiSchemaObjectEntry == null) {
 				return 0;
@@ -159,13 +159,13 @@ else if (StringUtil.equals(externalReferenceCode, "L_API_PROPERTY")) {
 
 			return GetterUtil.getLong(
 				apiSchemaObjectEntryValues.get(
-					"r_apiApplicationToAPISchemas_c_apiApplicationId"));
+					"r_apiApplicationToAPISchemas_l_apiApplicationId"));
 		}
 		else if (StringUtil.equals(externalReferenceCode, "L_API_SCHEMA")) {
 			Map<String, Serializable> values = objectEntry.getValues();
 
 			return GetterUtil.getLong(
-				values.get("r_apiApplicationToAPISchemas_c_apiApplicationId"));
+				values.get("r_apiApplicationToAPISchemas_l_apiApplicationId"));
 		}
 		else if (StringUtil.equals(externalReferenceCode, "L_API_SORT")) {
 			Map<String, Serializable> apiSortObjectEntryValues =
@@ -175,7 +175,7 @@ else if (StringUtil.equals(externalReferenceCode, "L_API_SORT")) {
 				_objectEntryLocalService.fetchObjectEntry(
 					GetterUtil.getLong(
 						apiSortObjectEntryValues.get(
-							"r_apiEndpointToAPISorts_c_apiEndpointId")));
+							"r_apiEndpointToAPISorts_l_apiEndpointId")));
 
 			if (apiEndpointObjectEntry == null) {
 				return 0;
@@ -186,7 +186,7 @@ else if (StringUtil.equals(externalReferenceCode, "L_API_SORT")) {
 
 			return GetterUtil.getLong(
 				apiEndpointObjectEntryValues.get(
-					"r_apiApplicationToAPIEndpoints_c_apiApplicationId"));
+					"r_apiApplicationToAPIEndpoints_l_apiApplicationId"));
 		}
 
 		if (_log.isDebugEnabled()) {

diff --git a/...headless/builder/internal/model/listener/APIEndpointRelevantObjectEntryModelListener.java b/...headless/builder/internal/model/listener/APIEndpointRelevantObjectEntryModelListener.java
@@ -73,9 +73,9 @@ public void onBeforeUpdate(
 				originalObjectEntry.getValues(), objectEntry.getValues(),
 				"httpMethod", "path", "pathParameter",
 				"pathParameterDescription", "retrieveType",
-				"r_apiApplicationToAPIEndpoints_c_apiApplicationId",
-				"r_requestAPISchemaToAPIEndpoints_c_apiSchemaId",
-				"r_responseAPISchemaToAPIEndpoints_c_apiSchemaId")) {
+				"r_apiApplicationToAPIEndpoints_l_apiApplicationId",
+				"r_requestAPISchemaToAPIEndpoints_l_apiSchemaId",
+				"r_responseAPISchemaToAPIEndpoints_l_apiSchemaId")) {
 
 			_validate(objectEntry);
 		}
@@ -129,7 +129,7 @@ private void _validate(ObjectEntry objectEntry) {
 
 			long apiApplicationId = GetterUtil.getLong(
 				values.get(
-					"r_apiApplicationToAPIEndpoints_c_apiApplicationId"));
+					"r_apiApplicationToAPIEndpoints_l_apiApplicationId"));
 
 			if (!_validationHelper.isValidObjectEntry(
 					"L_API_APPLICATION", apiApplicationId)) {
@@ -141,7 +141,7 @@ private void _validate(ObjectEntry objectEntry) {
 			}
 
 			long responseAPISchemaId = GetterUtil.getLong(
-				values.get("r_responseAPISchemaToAPIEndpoints_c_apiSchemaId"));
+				values.get("r_responseAPISchemaToAPIEndpoints_l_apiSchemaId"));
 
 			APIApplication.Endpoint.Scope scope =
 				APIApplication.Endpoint.Scope.parse(
@@ -153,7 +153,7 @@ private void _validate(ObjectEntry objectEntry) {
 			}
 
 			long requestAPISchemaId = GetterUtil.getLong(
-				values.get("r_requestAPISchemaToAPIEndpoints_c_apiSchemaId"));
+				values.get("r_requestAPISchemaToAPIEndpoints_l_apiSchemaId"));
 
 			if (requestAPISchemaId != 0) {
 				_validateAPISchema(apiApplicationId, requestAPISchemaId, scope);
@@ -187,8 +187,8 @@ else if (Objects.equals(method, Http.Method.POST)) {
 				"id ne '", objectEntry.getObjectEntryId(),
 				"' and httpMethod eq '", values.get("httpMethod"),
 				"' and path eq '", values.get("path"),
-				"' and r_apiApplicationToAPIEndpoints_c_apiApplicationId eq '",
-				values.get("r_apiApplicationToAPIEndpoints_c_apiApplicationId"),
+				"' and r_apiApplicationToAPIEndpoints_l_apiApplicationId eq '",
+				values.get("r_apiApplicationToAPIEndpoints_l_apiApplicationId"),
 				"'");
 			ObjectDefinition apiEndpointObjectDefinition =
 				_objectDefinitionLocalService.getObjectDefinition(
@@ -249,7 +249,7 @@ private void _validateAPISchema(
 		if (!Objects.equals(
 				apiApplicationId,
 				apiSchemaValues.get(
-					"r_apiApplicationToAPISchemas_c_apiApplicationId"))) {
+					"r_apiApplicationToAPISchemas_l_apiApplicationId"))) {
 
 			throw new ObjectEntryValuesException.InvalidObjectField(
 				null,

diff --git a/...headless/builder/internal/model/listener/APIPropertyRelevantObjectEntryModelListener.java b/...headless/builder/internal/model/listener/APIPropertyRelevantObjectEntryModelListener.java
@@ -120,7 +120,7 @@ private void _validate(ObjectEntry objectEntry) {
 			Map<String, Serializable> values = objectEntry.getValues();
 
 			long apiSchemaId = GetterUtil.getLong(
-				values.get("r_apiSchemaToAPIProperties_c_apiSchemaId"));
+				values.get("r_apiSchemaToAPIProperties_l_apiSchemaId"));
 
 			if (!_validationHelper.isValidObjectEntry(
 					"L_API_SCHEMA", apiSchemaId)) {
@@ -183,7 +183,7 @@ private void _validate(ObjectEntry objectEntry) {
 			}
 
 			long parentAPIPropertyId = GetterUtil.getLong(
-				values.get("r_apiPropertyToAPIProperties_c_apiPropertyId"));
+				values.get("r_apiPropertyToAPIProperties_l_apiPropertyId"));
 
 			if (parentAPIPropertyId != 0) {
 				if (!_validationHelper.isValidObjectEntry(
@@ -204,7 +204,7 @@ private void _validate(ObjectEntry objectEntry) {
 
 				if (!Objects.equals(
 						apiPropertyValues.get(
-							"r_apiSchemaToAPIProperties_c_apiSchemaId"),
+							"r_apiSchemaToAPIProperties_l_apiSchemaId"),
 						apiSchemaId)) {
 
 					throw new ObjectEntryValuesException.InvalidObjectField(
@@ -247,9 +247,9 @@ private void _validate(ObjectEntry objectEntry) {
 							StringBundler.concat(
 								"id ne '", objectEntry.getObjectEntryId(),
 								"' and name eq '", values.get("name"), "' and ",
-								"r_apiPropertyToAPIProperties_c_apiPropertyId ",
+								"r_apiPropertyToAPIProperties_l_apiPropertyId ",
 								"eq '", parentAPIPropertyId, "' and ",
-								"r_apiSchemaToAPIProperties_c_apiSchemaId eq '",
+								"r_apiSchemaToAPIProperties_l_apiSchemaId eq '",
 								apiSchemaId, "'"),
 							_objectDefinitionLocalService.getObjectDefinition(
 								objectEntry.getObjectDefinitionId())),

diff --git a/...y/headless/builder/internal/model/listener/APISchemaRelevantObjectEntryModelListener.java b/...y/headless/builder/internal/model/listener/APISchemaRelevantObjectEntryModelListener.java
@@ -61,7 +61,7 @@ private void _validate(ObjectEntry objectEntry) {
 					"L_API_APPLICATION",
 					GetterUtil.getLong(
 						values.get(
-							"r_apiApplicationToAPISchemas_c_" +
+							"r_apiApplicationToAPISchemas_l_" +
 								"apiApplicationId")))) {
 
 				throw new ObjectEntryValuesException.InvalidObjectField(
@@ -96,10 +96,10 @@ private void _validate(ObjectEntry objectEntry) {
 						StringBundler.concat(
 							"id ne '", objectEntry.getObjectEntryId(),
 							"' and name eq '", values.get("name"),
-							"' and r_apiApplicationToAPISchemas_c_",
+							"' and r_apiApplicationToAPISchemas_l_",
 							"apiApplicationId eq '",
 							values.get(
-								"r_apiApplicationToAPISchemas_c_" +
+								"r_apiApplicationToAPISchemas_l_" +
 									"apiApplicationId"),
 							"'"),
 						"L_API_SCHEMA"))) {

diff --git a/...dless/headless-builder/headless-builder-test/src/testFunctional/macros/APIBuilderUI.macro b/...dless/headless-builder/headless-builder-test/src/testFunctional/macros/APIBuilderUI.macro
@@ -218,7 +218,7 @@ definition {
 		if (isSet(applicationId)) {
 			Click.pauseClickAt(
 				locator1 = "TextInput#ANY_WITH_NAME",
-				name = "r_apiApplicationToAPIEndpoints_c_apiApplicationId");
+				name = "r_apiApplicationToAPIEndpoints_l_apiApplicationId");
 
 			Click(
 				applicationId = ${applicationId},

diff --git a/...adless/headless-builder/headless-builder-test/src/testFunctional/macros/EndpointAPI.macro b/...adless/headless-builder/headless-builder-test/src/testFunctional/macros/EndpointAPI.macro
@@ -39,15 +39,15 @@ definition {
 			"httpMethod": "${httpMethod}",
 			"name": "${name}",
 			"path": "${path}",
-			"r_apiApplicationToAPIEndpoints_c_apiApplicationERC": "${apiApplicationERC}"
+			"r_apiApplicationToAPIEndpoints_l_apiApplicationERC": "${apiApplicationERC}"
 		''';
 
 		if (isSet(requestSchemaId)) {
-			var body = StringUtil.add(${body}, ", \"r_requestAPISchemaToAPIEndpoints_c_apiSchemaId\": ${requestSchemaId}", "");
+			var body = StringUtil.add(${body}, ", \"r_requestAPISchemaToAPIEndpoints_l_apiSchemaId\": ${requestSchemaId}", "");
 		}
 
 		if (isSet(responseSchemaId)) {
-			var body = StringUtil.add(${body}, ", \"r_responseAPISchemaToAPIEndpoints_c_apiSchemaId\": ${responseSchemaId}", "");
+			var body = StringUtil.add(${body}, ", \"r_responseAPISchemaToAPIEndpoints_l_apiSchemaId\": ${responseSchemaId}", "");
 		}
 
 		var curl = StringUtil.add(${curl}, " -d { ${body} }", "");

diff --git a/...headless/headless-builder/headless-builder-test/src/testFunctional/macros/FilterAPI.macro b/...headless/headless-builder/headless-builder-test/src/testFunctional/macros/FilterAPI.macro
@@ -32,7 +32,7 @@ definition {
 		var curl = FilterAPI._curlAPIFilter(virtualHost = ${virtualHost});
 		var body = '''
 			"oDataFilter": "${filterValue}",
-			"r_apiEndpointToAPIFilters_c_apiEndpointERC": "${endpointERC}"
+			"r_apiEndpointToAPIFilters_l_apiEndpointERC": "${endpointERC}"
 		''';
 
 		var curl = StringUtil.add(${curl}, " -d { ${body} }", "");

diff --git a/...adless/headless-builder/headless-builder-test/src/testFunctional/macros/PropertyAPI.macro b/...adless/headless-builder/headless-builder-test/src/testFunctional/macros/PropertyAPI.macro
@@ -39,7 +39,7 @@ definition {
 			"name": "${name}",
 			"objectFieldERC": "${objectFieldERC}",
 			"objectRelationshipNames": "${relationshipName}",
-			"r_apiSchemaToAPIProperties_c_apiSchemaERC": "${schemaERC}"
+			"r_apiSchemaToAPIProperties_l_apiSchemaERC": "${schemaERC}"
 		''';
 
 		var curl = StringUtil.add(${curl}, " -d { ${body} }", "");

diff --git a/...headless/headless-builder/headless-builder-test/src/testFunctional/macros/SchemaAPI.macro b/...headless/headless-builder/headless-builder-test/src/testFunctional/macros/SchemaAPI.macro
@@ -56,7 +56,7 @@ definition {
 				"externalReferenceCode": "${schemaERC}",
 				"mainObjectDefinitionERC": "${mainObjectDefinitionERC}",
 				"name": "${name}",
-				"r_apiApplicationToAPISchemas_c_apiApplicationERC": "${apiApplicationERC}"
+				"r_apiApplicationToAPISchemas_l_apiApplicationERC": "${apiApplicationERC}"
 			}
 		''';
 
@@ -102,7 +102,7 @@ definition {
 
 		var response = JSONCurlUtil.put(${curl});
 
-		var schemaErc = JSONUtil.getWithJSONPath(${response}, "$.r_requestAPISchemaToAPIEndpoints_c_apiSchemaERC");
+		var schemaErc = JSONUtil.getWithJSONPath(${response}, "$.r_requestAPISchemaToAPIEndpoints_l_apiSchemaERC");
 
 		TestUtils.assertEquals(
 			actual = ${schemaErc},
@@ -119,7 +119,7 @@ definition {
 
 		var response = JSONCurlUtil.put(${curl});
 
-		var schemaId = JSONUtil.getWithJSONPath(${response}, "$.r_requestAPISchemaToAPIEndpoints_c_apiSchemaId");
+		var schemaId = JSONUtil.getWithJSONPath(${response}, "$.r_requestAPISchemaToAPIEndpoints_l_apiSchemaId");
 
 		TestUtils.assertEquals(
 			actual = ${schemaId},
@@ -136,7 +136,7 @@ definition {
 
 		var response = JSONCurlUtil.put(${curl});
 
-		var schemaErc = JSONUtil.getWithJSONPath(${response}, "$.r_responseAPISchemaToAPIEndpoints_c_apiSchemaERC");
+		var schemaErc = JSONUtil.getWithJSONPath(${response}, "$.r_responseAPISchemaToAPIEndpoints_l_apiSchemaERC");
 
 		TestUtils.assertEquals(
 			actual = ${schemaErc},
@@ -153,7 +153,7 @@ definition {
 
 		var response = JSONCurlUtil.put(${curl});
 
-		var schemaId = JSONUtil.getWithJSONPath(${response}, "$.r_responseAPISchemaToAPIEndpoints_c_apiSchemaId");
+		var schemaId = JSONUtil.getWithJSONPath(${response}, "$.r_responseAPISchemaToAPIEndpoints_l_apiSchemaId");
 
 		TestUtils.assertEquals(
 			actual = ${schemaId},

diff --git a/...s/headless/headless-builder/headless-builder-test/src/testFunctional/macros/SortAPI.macro b/...s/headless/headless-builder/headless-builder-test/src/testFunctional/macros/SortAPI.macro
@@ -32,7 +32,7 @@ definition {
 		var curl = SortAPI._curlAPISort(virtualHost = ${virtualHost});
 		var body = '''
 			"oDataSort": "${sortValue}",
-			"r_apiEndpointToAPISorts_c_apiEndpointERC": ${endpointERC}
+			"r_apiEndpointToAPISorts_l_apiEndpointERC": ${endpointERC}
 		''';
 
 		var curl = StringUtil.add(${curl}, " -d { ${body} }", "");

diff --git a/...l/tests/[UI]AllowUsersToDefineAPIApplicationEndpoints/EditAPIApplicationEndpoint.testcase b/...l/tests/[UI]AllowUsersToDefineAPIApplicationEndpoints/EditAPIApplicationEndpoint.testcase
@@ -254,7 +254,7 @@ definition {
 			var response = EndpointAPI.getAPIEndpoints();
 
 			var actualValue = JSONPathUtil.getProperty(
-				property = "$.items..r_responseAPISchemaToAPIEndpoints_c_apiSchemaERC",
+				property = "$.items..r_responseAPISchemaToAPIEndpoints_l_apiSchemaERC",
 				response = ${response});
 
 			TestUtils.assertEquals(