IRT-5512 CPI artifacts deployment/undeployment enhancement from Lands…

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'com.github.figaf'
-version = '3.16'
+version = '3.17-IRT-5512-SNAPSHOT'
 ext {
     enableSnapshotsForDependencyResolutionAndPublishing = project.findProperty('enableSnapshots') ?: 'false'
     snapshotsRepoUrl = project.findProperty('snapshotsRepoUrl') ?: ''

src/main/java/com/figaf/integration/cpi/client/CpiFunctionLibrariesClient.java

@@ -89,7 +89,8 @@ public String deployFunctionLibraries(
         String resolvedUrl = appendRuntimeProfileIfPresent(
             baseUrl,
             requestContext.getRuntimeLocationId(),
-            requestContext
+            requestContext,
+            "FunctionLibraries"
         );
 
         return executeMethod(

src/main/java/com/figaf/integration/cpi/client/CpiImportedArchivesClient.java

@@ -88,7 +88,8 @@ public String deployImportedArchives(
         String resolvedUrl = appendRuntimeProfileIfPresent(
             baseUrl,
             requestContext.getRuntimeLocationId(),
-            requestContext
+            requestContext,
+            "ImportedArchives"
         );
         return executeMethod(
             requestContext,

src/main/java/com/figaf/integration/cpi/client/CpiScriptCollectionClient.java

@@ -6,7 +6,6 @@
 import com.figaf.integration.cpi.entity.designtime_artifacts.CreateScriptCollectionRequest;
 import com.figaf.integration.cpi.entity.designtime_artifacts.UpdateScriptCollectionRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
 import java.util.Objects;
@@ -107,11 +106,9 @@ public String deployScriptCollection(
         String resolvedUrl = appendRuntimeProfileIfPresent(
             baseUrl,
             requestContext.getRuntimeLocationId(),
-            requestContext
+            requestContext,
+            "ScriptCollection"
         );
-        if (StringUtils.isNotBlank(requestContext.getRuntimeLocationId())) {
-            resolvedUrl = resolvedUrl + "&artifactType=ScriptCollection";
-        }
         return executeMethod(
             requestContext,
             resolvedUrl,

src/main/java/com/figaf/integration/cpi/utils/CpiApiUtils.java

@@ -100,4 +100,27 @@ public static String appendRuntimeProfileIfPresent(
             + "runtimeProfile="
             + finalizedRuntimeProfile;
     }
+
+    public static String appendRuntimeProfileIfPresent(
+        String baseUrl,
+        String runtimeProfile,
+        RequestContext requestContext,
+        String artifactType
+    ) {
+        String resolvedUrl = appendRuntimeProfileIfPresent(
+            baseUrl,
+            runtimeProfile,
+            requestContext
+        );
+
+        if (StringUtils.isBlank(artifactType)) {
+            return resolvedUrl;
+        }
+
+        String queryDelimiter = resolvedUrl.contains("?") ? "&" : "?";
+        return resolvedUrl
+            + queryDelimiter
+            + "artifactType="
+            + artifactType;
+    }
 }