review comments

Author: deepikaSingh2711

pom.xml

@@ -23,7 +23,7 @@
     </developers>
 
     <properties>
-        <revision>1.0.0-RC1</revision>
+        <revision>1.6.2-SNAPSHOT</revision>
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>

sdm/src/main/java/com/sap/cds/sdm/service/handler/SDMServiceGenericHandler.java

@@ -586,8 +586,7 @@ private String fetchUPIDFromCQN(CqnSelect select, CdsEntity parentEntity) {
       JsonNode whereArray = secondLast.path("where");
 
       // Get the actual key field names from the parent entity
-      List<String> keyElementNames =
-          parentEntity != null ? getKeyElementNames(parentEntity) : List.of("ID");
+      List<String> keyElementNames = getKeyElementNames(parentEntity);
 
       for (int i = 0; i < whereArray.size(); i++) {
         JsonNode node = whereArray.get(i);

sdm/src/test/java/integration/com/sap/cds/sdm/IntegrationTest_SingleFacet.java

@@ -2148,7 +2148,7 @@ void testNAttachments_NewEntity() throws IOException {
         response = api.saveEntityDraft(appUrl, entityName, srvpath, entityID4);
         if (response.equals("Saved")) {
           String expectedJson =
-              "{\"error\":{\"code\":\"500\",\"message\":\"Cannot upload more than 4 attachments as set up by the application\"}}";
+              "{\"error\":{\"code\":\"500\",\"message\":\"Maximum number of attachments reached in English\"}}";
           ObjectMapper objectMapper = new ObjectMapper();
           JsonNode actualJsonNode = objectMapper.readTree(check);
           JsonNode expectedJsonNode = objectMapper.readTree(expectedJson);
@@ -2196,7 +2196,7 @@ void testUploadNAttachments() throws IOException {
         System.out.println("Result message for attachment " + i + ": " + resultMessage);
 
         String expectedResponse =
-            "{\"error\":{\"code\":\"500\",\"message\":\"Cannot upload more than 4 attachments as set up by the application\"}}";
+            "{\"error\":{\"code\":\"500\",\"message\":\"Maximum number of attachments reached in English\"}}";
         if (resultMessage.equals(expectedResponse)) {
           ObjectMapper objectMapper = new ObjectMapper();
           JsonNode actualJsonNode = objectMapper.readTree(resultMessage);
@@ -2702,7 +2702,7 @@ void testCreateLinkFailure() throws IOException {
         String errorMessage = json.getJSONObject("error").getString("message");
         assertEquals("500", errorCode);
         assertEquals(
-            "Cannot upload more than 4 attachments as set up by the application", errorMessage);
+            "Maximum number of attachments reached in English", errorMessage);
       }
       String response = api.saveEntityDraft(appUrl, entityName, srvpath, createLinkEntity);
       if (!response.equals("Saved")) {