addressing review comments

Author: rishikunnath2747

sdm/src/main/java/com/sap/cds/sdm/handler/applicationservice/helper/AttachmentsHandlerUtils.java

@@ -12,7 +12,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@ServiceName(value = "*", type = ApplicationService.class)
 public class AttachmentsHandlerUtils {
 
   private static final Logger logger = LoggerFactory.getLogger(AttachmentsHandlerUtils.class);
@@ -55,7 +54,7 @@ public static Map<String, String> getAttachmentPathMapping(
 
       return pathMapping;
     } catch (Exception e) {
-      logger.error("Error getting attachment path mapping", e);
+      logger.error("Error getting attachment path mapping", e.getMessage());
       return new HashMap<>();
     }
   }
@@ -64,11 +63,11 @@ private static void processDirectAttachmentComposition(
       CdsEntity entity, Map<String, String> pathMapping, Object composition) {
     String compositionName = ((com.sap.cds.reflect.CdsElement) composition).getName();
     if (((com.sap.cds.reflect.CdsElement) composition).getType().isAssociation()) {
-      CdsAssociationType assocType =
+      CdsAssociationType associationType =
           (CdsAssociationType) ((com.sap.cds.reflect.CdsElement) composition).getType();
       String targetAspect =
-          assocType.getTargetAspect().isPresent()
-              ? assocType.getTargetAspect().get().getQualifiedName()
+          associationType.getTargetAspect().isPresent()
+              ? associationType.getTargetAspect().get().getQualifiedName()
               : null;
 
       if (isDirectAttachmentTargetAspect(targetAspect)) {
@@ -90,18 +89,18 @@ private static void processNestedAttachmentComposition(
     String compositionTargetEntityName = "";
 
     if (((com.sap.cds.reflect.CdsElement) composition).getType().isAssociation()) {
-      CdsAssociationType assocType =
+      CdsAssociationType associationType =
           (CdsAssociationType) ((com.sap.cds.reflect.CdsElement) composition).getType();
       String targetAspect =
-          assocType.getTargetAspect().isPresent()
-              ? assocType.getTargetAspect().get().getQualifiedName()
+          associationType.getTargetAspect().isPresent()
+              ? associationType.getTargetAspect().get().getQualifiedName()
               : null;
 
       if (isDirectAttachmentTargetAspect(targetAspect)) {
         return; // Skip direct attachment compositions
       }
 
-      compositionTargetEntityName = assocType.getTarget().getQualifiedName();
+      compositionTargetEntityName = associationType.getTarget().getQualifiedName();
     }
 
     processCompositionTargetEntity(
@@ -252,7 +251,6 @@ private static List<Map<String, Object>> processAttachmentKey(
     // Check if the parent matches (if parentKey is specified)
     if (parentKey == null || isCorrectParentContext(currentParentKey, parentKey)) {
       try {
-        @SuppressWarnings("unchecked")
         List<Map<String, Object>> attachments = (List<Map<String, Object>>) value;
         result.addAll(attachments);
       } catch (ClassCastException e) {
@@ -268,7 +266,6 @@ private static List<Map<String, Object>> processNestedMap(
     List<Map<String, Object>> result = new ArrayList<>();
 
     try {
-      @SuppressWarnings("unchecked")
       Map<String, Object> nestedMap = (Map<String, Object>) value;
       result.addAll(findNestedAttachments(nestedMap, attachmentKey, parentKey, key));
     } catch (ClassCastException e) {
@@ -286,7 +283,6 @@ private static List<Map<String, Object>> processNestedList(
       List<?> list = (List<?>) value;
       for (Object item : list) {
         if (item instanceof Map) {
-          @SuppressWarnings("unchecked")
           Map<String, Object> itemMap = (Map<String, Object>) item;
           result.addAll(findNestedAttachments(itemMap, attachmentKey, parentKey, key));
         }

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

@@ -188,9 +188,9 @@ private String getUpIdKey(CdsEntity attachmentDraftEntity) {
     if (upAssociation.isPresent()) {
       CdsElement association = upAssociation.get();
       // get association type
-      CdsAssociationType assocType = association.getType();
+      CdsAssociationType associationType = association.getType();
       // get the refs of the association
-      List<String> fkElements = assocType.refs().map(ref -> "up__" + ref.path()).toList();
+      List<String> fkElements = associationType.refs().map(ref -> "up__" + ref.path()).toList();
       upIdKey = fkElements.get(0);
     }
     return upIdKey;

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

@@ -106,8 +106,8 @@ public void copyAttachments(AttachmentCopyEventContext context) throws IOExcepti
     Optional<CdsElement> upAssociation = attachmentDraftEntity.get().findAssociation("up_");
     if (upAssociation.isPresent()) {
       CdsElement association = upAssociation.get();
-      CdsAssociationType assocType = association.getType();
-      List<String> fkElements = assocType.refs().map(ref -> "up__" + ref.path()).toList();
+      CdsAssociationType associationType = association.getType();
+      List<String> fkElements = associationType.refs().map(ref -> "up__" + ref.path()).toList();
       upIdKey = fkElements.get(0);
     }
     Map<String, Object> updatedFields = new HashMap<>();

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

@@ -210,9 +210,9 @@ private String getUpIdKey(CdsEntity attachmentDraftEntity) {
     if (upAssociation.isPresent()) {
       CdsElement association = upAssociation.get();
       // get association type
-      CdsAssociationType assocType = association.getType();
+      CdsAssociationType associationType = association.getType();
       // get the refs of the association
-      List<String> fkElements = assocType.refs().map(ref -> "up__" + ref.path()).toList();
+      List<String> fkElements = associationType.refs().map(ref -> "up__" + ref.path()).toList();
       upIdKey = fkElements.get(0);
     }
     return upIdKey;

sdm/src/test/java/unit/com/sap/cds/sdm/utilities/SDMUtilsTest.java

@@ -643,7 +643,6 @@ void testElementWithoutAnnotation() {
   void testElementWithAnnotation() {
     CdsEntity entity = mock(CdsEntity.class);
     CdsElement element = mock(CdsElement.class);
-    @SuppressWarnings("unchecked")
     CdsAnnotation<Object> annotation = mock(CdsAnnotation.class);
     when(annotation.getValue()).thenReturn("name");