Merge branch 'develop' into SDMEXT-2853

Author: akgarg06

.github/workflows/multi tenancy_Integration.yml

@@ -251,6 +251,8 @@ jobs:
           cmisClientSecret="$CMIS_CLIENT_SECRET"
           defaultRepositoryID="$DEFAULTREPOSITORYID"
           defaultRepositoryIDMT="$DEFAULTREPOSITORYIDMT"
+
+          echo "::add-mask::$clientSecret"
           echo "::add-mask::$clientID"
           echo "::add-mask::$clientSecretMT"
           echo "::add-mask::$clientIDMT"
@@ -322,7 +324,7 @@ jobs:
           while [ $ATTEMPT -lt $MAX_RETRIES ]; do
             ATTEMPT=$((ATTEMPT + 1))
             echo "🔄 Attempt $ATTEMPT of $MAX_RETRIES..."
-            if mvn clean verify -P integration-tests -DtokenFlow=${{ matrix.tokenFlow }} -DtenancyModel=multi -Dtenant=${{ matrix.tenant }} -DskipUnitTests -Dfailsafe.includes="**/${{ matrix.testClass }}.java"; then
+            if mvn clean verify -P integration-tests -DtokenFlow=${{ matrix.tokenFlow }} -DtenancyModel=multi -Dtenant=${{ matrix.tenant }} -DskipUnitTests -Deicar.file.path=eicar.com.txt -Dfailsafe.includes="**/${{ matrix.testClass }}.java"; then
               echo "✅ Tests passed on attempt $ATTEMPT!"
               EXIT_CODE=0
               break

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

@@ -192,131 +192,6 @@ static void setup() throws IOException {
     }
   }
 
-  /**
-   * Helper method to wait for attachment upload to complete. Polls the attachment metadata until
-   * uploadStatus is "Success" or "Failed", or timeout is reached.
-   *
-   * @param chapterId The chapter ID containing the attachment
-   * @param attachmentId The attachment ID to wait for
-   * @param timeoutSeconds Maximum time to wait in seconds
-   * @param facetName The facet name (attachments, references, footnotes)
-   * @return true if upload completed successfully, false if failed or timed out
-   */
-  private static boolean waitForUploadCompletion(
-      String chapterId, String attachmentId, int timeoutSeconds, String facetName) {
-    int pollIntervalSeconds = 2;
-    int maxAttempts = timeoutSeconds / pollIntervalSeconds;
-
-    for (int attempt = 0; attempt < maxAttempts; attempt++) {
-      try {
-        // Fetch metadata for the attachment in draft mode
-        Map<String, Object> metadata = null;
-        boolean metadataFetched = false;
-
-        try {
-          // First try fetchMetadataDraft for draft entities
-          metadata =
-              api.fetchMetadataDraft(appUrl, chapterEntityName, facetName, chapterId, attachmentId);
-          metadataFetched = true;
-        } catch (IOException e) {
-          // If draft fetch fails, entity might be active, try regular fetch
-          try {
-            metadata =
-                api.fetchMetadata(appUrl, chapterEntityName, facetName, chapterId, attachmentId);
-            metadataFetched = true;
-          } catch (IOException e2) {
-            // If both fail, attachment might not exist yet or has been deleted
-            // Wait and retry
-            Thread.sleep(pollIntervalSeconds * 1000);
-            continue;
-          }
-        }
-
-        if (!metadataFetched || metadata == null) {
-          Thread.sleep(pollIntervalSeconds * 1000);
-          continue;
-        }
-
-        // Check upload status
-        if (metadata.containsKey("uploadStatus")) {
-          String uploadStatus = (String) metadata.get("uploadStatus");
-
-          if ("Success".equals(uploadStatus)) {
-            return true;
-          } else if ("Failed".equals(uploadStatus)) {
-            System.err.println(
-                "Upload failed for attachment "
-                    + attachmentId
-                    + " in chapter "
-                    + chapterId
-                    + ". Status: "
-                    + uploadStatus);
-            return false;
-          }
-          // If status is "uploading" or any other status, continue waiting
-        }
-
-        // Wait before next poll
-        Thread.sleep(pollIntervalSeconds * 1000);
-
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-        System.err.println("Wait interrupted for attachment " + attachmentId);
-        return false;
-      }
-    }
-
-    // Timeout reached
-    System.err.println(
-        "Timeout waiting for upload completion of attachment "
-            + attachmentId
-            + " in chapter "
-            + chapterId);
-    return false;
-  }
-
-  private static boolean waitForAllUploadsCompletion(
-      String chapterId, String facetName, int timeoutSeconds) {
-    int maxIterations = timeoutSeconds / 2; // Check every 2 seconds
-    for (int i = 0; i < maxIterations; i++) {
-      try {
-        List<Map<String, Object>> attachmentsMetadata =
-            api.fetchEntityMetadataDraft(appUrl, chapterEntityName, facetName, chapterId);
-
-        boolean allComplete = true;
-        boolean anyFailed = false;
-
-        for (Map<String, Object> metadata : attachmentsMetadata) {
-          String uploadStatus = (String) metadata.get("uploadStatus");
-          if (uploadStatus == null || "InProgress".equals(uploadStatus)) {
-            allComplete = false;
-          } else if ("Failed".equals(uploadStatus)) {
-            anyFailed = true;
-            System.err.println("Upload failed for attachment: " + metadata.get("ID"));
-          }
-        }
-
-        if (anyFailed) {
-          return false;
-        }
-
-        if (allComplete) {
-          return true;
-        }
-
-        // Still uploading, wait before checking again
-        Thread.sleep(5000);
-      } catch (Exception e) {
-        System.err.println(
-            "Error checking upload status for chapter " + chapterId + ": " + e.getMessage());
-        return false;
-      }
-    }
-
-    System.err.println("Upload timed out for chapter: " + chapterId);
-    return false;
-  }
-
   private String CreateandReturnFacetID(
       String appUrl,
       String serviceName,