error messages

Author: rishikunnath2747

sdm/src/main/java/com/sap/cds/sdm/constants/SDMConstants.java

@@ -93,6 +93,7 @@ private SDMConstants() {
       "Unable to find target attachment entity: %s";
   public static final String INVALID_FACET_FORMAT_ERROR =
       "Invalid facet format. Expected: Service.Entity.Composition, got: %s";
+  public static final String FETCH_ATTACHMENT_COMPOSITION_ERROR = "Failed to fetch attachment composition";
 
   public static String nameConstraintMessage(
       List<String> fileNameWithRestrictedCharacters, String operation) {

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

@@ -3,6 +3,7 @@
 import com.sap.cds.reflect.CdsAssociationType;
 import com.sap.cds.reflect.CdsEntity;
 import com.sap.cds.reflect.CdsModel;
+import com.sap.cds.sdm.constants.SDMConstants;
 import com.sap.cds.sdm.handler.common.SDMAssociationCascader;
 import com.sap.cds.sdm.handler.common.SDMAttachmentsReader;
 import com.sap.cds.services.persistence.PersistenceService;
@@ -81,7 +82,7 @@ public static Map<String, String> getAttachmentPathMapping(
 
       return pathMapping;
     } catch (Exception e) {
-      logger.error("Error getting attachment path mapping", e.getMessage());
+      logger.error(SDMConstants.FETCH_ATTACHMENT_COMPOSITION_ERROR, e.getMessage());
       return new HashMap<>();
     }
   }
@@ -228,11 +229,7 @@ private static String buildEntityPath(
         return serviceName + "." + targetEntityName + "." + attachmentPart;
       }
     } catch (Exception e) {
-      logger.warn(
-          "Failed to build entity path for target entity '{}' and attachment path '{}'",
-          targetEntity.getName(),
-          attachmentPath,
-          e);
+      logger.warn(SDMConstants.FETCH_ATTACHMENT_COMPOSITION_ERROR, e.getMessage());
     }
     return null;
   }
@@ -253,11 +250,7 @@ private static String buildActualPath(
         return serviceName + "." + compositionPropertyName + "." + attachmentPart;
       }
     } catch (Exception e) {
-      logger.warn(
-          "Failed to build actual path for composition '{}' and attachment path '{}'",
-          compositionPropertyName,
-          attachmentPath,
-          e);
+      logger.warn(SDMConstants.FETCH_ATTACHMENT_COMPOSITION_ERROR, e.getMessage());
     }
     return null;
   }
@@ -297,7 +290,7 @@ private static List<Map<String, Object>> processAttachmentKey(
         List<Map<String, Object>> attachments = (List<Map<String, Object>>) value;
         result.addAll(attachments);
       } catch (ClassCastException e) {
-        logger.warn("Failed to cast attachments list for key '{}': {}", key, e.getMessage());
+        logger.warn(SDMConstants.FETCH_ATTACHMENT_COMPOSITION_ERROR, e.getMessage());
       }
     }
 
@@ -312,7 +305,7 @@ private static List<Map<String, Object>> processNestedMap(
       Map<String, Object> nestedMap = (Map<String, Object>) value;
       result.addAll(findNestedAttachments(nestedMap, attachmentKey, parentKey, key));
     } catch (ClassCastException e) {
-      logger.warn("Failed to cast nested map for key '{}': {}", key, e.getMessage());
+      logger.warn(SDMConstants.FETCH_ATTACHMENT_COMPOSITION_ERROR, e.getMessage());
     }
 
     return result;
@@ -331,7 +324,7 @@ private static List<Map<String, Object>> processNestedList(
         }
       }
     } catch (ClassCastException e) {
-      logger.warn("Failed to process list for key '{}': {}", key, e.getMessage());
+      logger.warn(SDMConstants.FETCH_ATTACHMENT_COMPOSITION_ERROR, e.getMessage());
     }
 
     return result;

sdm/src/main/java/com/sap/cds/sdm/handler/common/SDMAssociationCascader.java

@@ -10,8 +10,6 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * The class {@link SDMAssociationCascader} is used to find entity paths to all media resource
@@ -20,20 +18,14 @@
  */
 public class SDMAssociationCascader {
 
-  private static final Logger logger = LoggerFactory.getLogger(SDMAssociationCascader.class);
-
   public SDMNodeTree findEntityPath(CdsModel model, CdsEntity entity) {
-    logger.debug("Start finding path to attachments for entity {}", entity.getQualifiedName());
     var firstList = new LinkedList<SDMAssociationIdentifier>();
     var internalResultList =
         getAttachmentAssociationPath(
             model, entity, "", firstList, new ArrayList<>(List.of(entity.getQualifiedName())));
 
     var rootTree = new SDMNodeTree(new SDMAssociationIdentifier("", entity.getQualifiedName()));
     internalResultList.forEach(rootTree::addPath);
-
-    logger.debug(
-        "Found path to attachments for entity {}: {}", entity.getQualifiedName(), rootTree);
     return rootTree;
   }
 

sdm/src/main/java/com/sap/cds/sdm/handler/common/SDMAttachmentsReader.java

@@ -14,8 +14,6 @@
 import com.sap.cds.services.persistence.PersistenceService;
 import java.util.ArrayList;
 import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * The class {@link SDMAttachmentsReader} is used to deep read attachments from the database for a
@@ -26,8 +24,6 @@
  */
 public class SDMAttachmentsReader {
 
-  private static final Logger logger = LoggerFactory.getLogger(SDMAttachmentsReader.class);
-
   private final SDMAssociationCascader cascader;
   private final PersistenceService persistence;
 
@@ -38,7 +34,6 @@ public SDMAttachmentsReader(SDMAssociationCascader cascader, PersistenceService
 
   public List<Attachments> readAttachments(
       CdsModel model, CdsEntity entity, CqnFilterableStatement statement) {
-    logger.debug("Start reading attachments for entity {}", entity.getQualifiedName());
 
     SDMNodeTree nodePath = cascader.findEntityPath(model, entity);
     List<Expand<?>> expandList = buildExpandList(nodePath);