Merge pull request #286 from cap-java/V2/RepoAlreadyExist

Bugfix for Already Exist Repo

Author: akshatjain-official

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

@@ -51,6 +51,8 @@ private SDMConstants() {
   public static final int CHUNK_SIZE = 20 * 1024 * 1024; // 20MB Chunk Size
   public static final String ONBOARD_REPO_MESSAGE =
       "Repository with name %s  and id %s onboarded successfully";
+  public static final String REPOSITORY_ALREADY_EXIST =
+      "Repository with name %s and id %s already exists. Skipping onboarding.";
   public static final String ONBOARD_REPO_ERROR_MESSAGE =
       "Error in onboarding repository with name %s";
   public static final String UPDATE_ATTACHMENT_ERROR = "Could not update the attachment";

sdm/src/main/java/com/sap/cds/sdm/service/SDMAdminServiceImpl.java

@@ -52,9 +52,10 @@ public String onboardRepository(Repository repository)
     onboardingReq.setHeader("Content-Type", "application/json");
     try (var response = (CloseableHttpResponse) httpClient.execute(onboardingReq)) {
       String responseString = EntityUtils.toString(response.getEntity());
-      if (responseString.contains("already exists")) {
+      if ((responseString.contains(REPOSITORY_ID + " already exists"))
+          && response.getStatusLine().getStatusCode() == 409) {
         return String.format(
-            SDMConstants.ONBOARD_REPO_MESSAGE, repository.getDisplayName(), REPOSITORY_ID);
+            SDMConstants.REPOSITORY_ALREADY_EXIST, repository.getDisplayName(), REPOSITORY_ID);
       }
       JsonObject jsonObject = JsonParser.parseString(responseString).getAsJsonObject();
       String repositoryId = jsonObject.get("id").getAsString();