Fix detailed summary target url for maven and gradle (#530)

Author: gailazar300

build-info-extractor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/task/DeployTask.java

@@ -141,7 +141,7 @@ private void handleBuildInfoDeployment(ArtifactoryClientConfiguration accRoot, B
                 }
                 if (isGenerateDeployableArtifactsToFile(accRoot)) {
                     try {
-                        exportDeployableArtifacts(allDeployDetails, new File(accRoot.info.getDeployableArtifactsFilePath()), accRoot.info.isBackwardCompatibleDeployableArtifacts());
+                        exportDeployableArtifacts(allDeployDetails, new File(accRoot.info.getDeployableArtifactsFilePath()), accRoot.info.isBackwardCompatibleDeployableArtifacts(), contextUrl);
                     } catch (Exception e) {
                         log.error("Failed writing deployable artifacts to file: ", e);
                         throw new RuntimeException("Failed writing deployable artifacts to file", e);
@@ -235,9 +235,9 @@ private void exportBuildInfo(Build build, File toFile) throws IOException {
         BuildInfoExtractorUtils.saveBuildInfoToFile(build, toFile);
     }
 
-    private void exportDeployableArtifacts(Map<String, Set<DeployDetails>> allDeployDetails, File toFile, boolean exportBackwardCompatibleDeployableArtifacts) throws IOException {
+    private void exportDeployableArtifacts(Map<String, Set<DeployDetails>> allDeployDetails, File toFile, boolean exportBackwardCompatibleDeployableArtifacts, String rtUrl) throws IOException {
         log.debug("Exporting deployable artifacts to '{}'", toFile.getAbsolutePath());
-        DeployableArtifactsUtils.saveDeployableArtifactsToFile(allDeployDetails, toFile, exportBackwardCompatibleDeployableArtifacts);
+        DeployableArtifactsUtils.saveDeployableArtifactsToFile(allDeployDetails, toFile, exportBackwardCompatibleDeployableArtifacts, rtUrl);
     }
 
     private File getExportFile(ArtifactoryClientConfiguration clientConf) {

build-info-extractor-maven3/src/main/java/org/jfrog/build/extractor/maven/BuildDeploymentHelper.java

@@ -82,7 +82,8 @@ public void deploy( Build                          build,
 
         if (!StringUtils.isEmpty(clientConf.info.getDeployableArtifactsFilePath())) {
             try {
-                DeployableArtifactsUtils.saveDeployableArtifactsToFile(deployableArtifactsByModule, new File(clientConf.info.getDeployableArtifactsFilePath()), false);
+                String rtUrl = clientConf.info.getProps().get("artifactory.publish.contextUrl");
+                DeployableArtifactsUtils.saveDeployableArtifactsToFile(deployableArtifactsByModule, new File(clientConf.info.getDeployableArtifactsFilePath()), false, rtUrl);
             } catch (Exception e) {
                 logger.error("Failed writing deployable artifacts to file: ", e);
                 throw new RuntimeException("Failed writing deployable artifacts to file", e);

build-info-extractor/src/main/java/org/jfrog/build/extractor/clientConfiguration/deploy/DeployableArtifactsUtils.java

@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
+import org.apache.commons.lang.StringUtils;
 import org.jfrog.build.client.DeployableArtifactDetail;
 
 import java.io.File;
@@ -19,18 +20,18 @@
  */
 public class DeployableArtifactsUtils {
 
-    public static void saveDeployableArtifactsToFile(Map<String, Set<DeployDetails>> deployableArtifactsByModule, File toFile, boolean saveBackwardCompatible) throws IOException {
+    public static void saveDeployableArtifactsToFile(Map<String, Set<DeployDetails>> deployableArtifactsByModule, File toFile, boolean saveBackwardCompatible, String rtUrl) throws IOException {
         if (saveBackwardCompatible) {
             saveBackwardCompatibleDeployableArtifacts(deployableArtifactsByModule, toFile);
             return;
         }
-        saveDeployableArtifactsByModule(deployableArtifactsByModule, toFile);
+        saveDeployableArtifactsByModule(deployableArtifactsByModule, toFile, rtUrl);
     }
 
-    private static void saveDeployableArtifactsByModule(Map<String, Set<DeployDetails>> deployableArtifactsByModule, File toFile) throws IOException {
+    private static void saveDeployableArtifactsByModule(Map<String, Set<DeployDetails>> deployableArtifactsByModule, File toFile, String rtUrl) throws IOException {
         Map<String, List<DeployableArtifactDetail>> deployableArtifactsDetails = new HashMap<>();
         deployableArtifactsByModule.forEach((module, deployableArtifacts) ->
-                deployableArtifactsDetails.put(module, DeployableArtifactsUtils.getDeployableArtifactsPaths(deployableArtifacts)));
+                deployableArtifactsDetails.put(module, DeployableArtifactsUtils.getDeployableArtifactsPaths(deployableArtifacts, rtUrl)));
         ObjectMapper mapper = new ObjectMapper();
         mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
         mapper.writeValue(toFile, deployableArtifactsDetails);
@@ -43,7 +44,7 @@ private static void saveDeployableArtifactsByModule(Map<String, Set<DeployDetail
     private static void saveBackwardCompatibleDeployableArtifacts(Map<String, Set<DeployDetails>> deployableArtifactsByModule, File toFile) throws IOException {
         List<DeployableArtifactDetail> deployableArtifactsList = new ArrayList<DeployableArtifactDetail>();
         deployableArtifactsByModule.forEach((module, deployableArtifacts) ->
-            deployableArtifactsList.addAll(DeployableArtifactsUtils.getDeployableArtifactsPaths(deployableArtifacts)));
+            deployableArtifactsList.addAll(DeployableArtifactsUtils.getDeployableArtifactsPaths(deployableArtifacts, "")));
         ObjectMapper mapper = new ObjectMapper();
         mapper.writeValue(toFile, deployableArtifactsList);
     }
@@ -83,10 +84,15 @@ private static Map<String, List<DeployableArtifactDetail>> loadBackwardCompatibl
         return deployableArtifactMap;
     }
 
-    private static List<DeployableArtifactDetail> getDeployableArtifactsPaths(Set<DeployDetails> deployDetails) {
-        List<DeployableArtifactDetail> deployableArtifacts = new ArrayList<DeployableArtifactDetail>();
+    private static List<DeployableArtifactDetail> getDeployableArtifactsPaths(Set<DeployDetails> deployDetails, String rtUrl) {
+        List<DeployableArtifactDetail> deployableArtifacts = new ArrayList<>();
         for (DeployDetails artifact : deployDetails) {
-            deployableArtifacts.add(new DeployableArtifactDetail(artifact.getFile().getAbsolutePath(), artifact.getArtifactPath(), artifact.getSha1(), artifact.getSha256(), artifact.getDeploySucceeded()));
+            String artifactDest = artifact.getArtifactPath();
+            // In case we want artifact absolute path in Artifactory - add rtUrl and repository to destination.
+            if (StringUtils.isBlank(rtUrl)){
+                artifactDest = rtUrl + artifact.getTargetRepository() + "/" + artifactDest;
+            }
+            deployableArtifacts.add(new DeployableArtifactDetail(artifact.getFile().getAbsolutePath(), artifactDest, artifact.getSha1(), artifact.getSha256(), artifact.getDeploySucceeded()));
         }
         return deployableArtifacts;
     }