FISH-886 Deploy GAV from local repository + some code cleanup (#5035)

* Deploy GAV from local repository * Change copyright year
payara · Dec 18, 2020 · 6b12732 · 6b12732
1 parent 41a2eda
commit 6b12732
Showing 1 changed file with 37 additions and 24 deletions.
diff --git a/nucleus/deployment/common/src/main/java/fish/payara/deployment/util/GAVConvertor.java b/nucleus/deployment/common/src/main/java/fish/payara/deployment/util/GAVConvertor.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2016-2018 Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016-2020 Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -44,7 +44,10 @@
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.ProtocolException;
+import java.net.URISyntaxException;
 import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.AbstractMap;
 import java.util.Base64;
 import java.util.Collection;
@@ -77,7 +80,7 @@ public class GAVConvertor {
      */
     public Map.Entry<String, URL> getArtefactMapEntry(String GAV, List<URL> repositoryURLs) throws MalformedURLException {
         final Map<String, String> GAVMap = splitGAV(GAV);
-        Map.Entry<String, URL> artefactMapEntry = null;
+        Map.Entry<String, URL> artefactMapEntry;
 
         final String relativeURLString = constructRelativeURLString(GAVMap);
         final URL artefactURL = findArtefactURL(repositoryURLs, relativeURLString);
@@ -97,7 +100,7 @@ public Map.Entry<String, URL> getArtefactMapEntry(String GAV, List<URL> reposito
      * the provided GAV
      */
     public Map.Entry<String, URL> getArtefactMapEntry(String GAV, Collection<String> repositoryURLs) throws MalformedURLException {
-        List<URL> repoURLs = new LinkedList<URL>();
+        List<URL> repoURLs = new LinkedList<>();
         for (String url: repositoryURLs) {
             String convertedURL = TranslatedConfigView.expandValue(url);
             if (!convertedURL.endsWith("/")) {
@@ -117,7 +120,7 @@ public Map.Entry<String, URL> getArtefactMapEntry(String GAV, Collection<String>
      * the provided GAV as Strings
      */
     private Map<String, String> splitGAV(String GAV) throws MalformedURLException {
-        final String[] splitGAV = GAV.split(",|:");
+        final String[] splitGAV = GAV.split("[,:]");
         final Map<String, String> GAVMap = new HashMap<>();
         try {
             GAVMap.put("groupId", splitGAV[0].replace('.', '/'));
@@ -134,17 +137,15 @@ private Map<String, String> splitGAV(String GAV) throws MalformedURLException {
 
     /**
      * Constructs the relative URL of the provided GAV as a String.
-     * @param GAV A map containing the target artefact's groupId, artifactId, 
+     * @param GAVMap A map containing the target artefact's groupId, artifactId,
      * and version number.
      * @return A String representing the relative URL of the provided GAV.
-     * @throws MalformedURLException 
      */
-    private String constructRelativeURLString(Map<String, String> GAVMap) throws MalformedURLException {
+    private String constructRelativeURLString(Map<String, String> GAVMap) {
         final String artefactFileName = GAVMap.get("artefactId") + "-" + GAVMap.get("versionNumber");
-        final String relativeURLString = GAVMap.get("groupId") + "/" + GAVMap.get("artefactId") + "/" 
-                + GAVMap.get("versionNumber") + "/" + artefactFileName;
-
-        return relativeURLString;
+
+        return GAVMap.get("groupId") + "/" + GAVMap.get("artefactId") + "/"
+               + GAVMap.get("versionNumber") + "/" + artefactFileName;
     }
 
     /**
@@ -155,7 +156,8 @@ private String constructRelativeURLString(Map<String, String> GAVMap) throws Mal
      * @param relativeURLString A String representation of the relative
      * artefact URL.
      * @return A valid URL to download the target artefact from.
-     * @throws IOException 
+     * @throws MalformedURLException Thrown if an artefact cannot be found for
+     * the provided GAV
      */
     private URL findArtefactURL(List<URL> repositoryURLs, String relativeURLString) throws MalformedURLException {     
         final String[] archiveTypes = new String[]{".jar", ".war", ".ear", ".rar"};
@@ -171,18 +173,27 @@ private URL findArtefactURL(List<URL> repositoryURLs, String relativeURLString)
                 try {
                     artefactURL = new URL(repositoryURL, relativeURLString + archiveType);
 
-                    HttpURLConnection httpConnection = (HttpURLConnection) artefactURL.openConnection();
-
-                    String auth = artefactURL.getUserInfo();
-                    if (auth != null) {
-                        String encodedAuth = Base64.getEncoder().encodeToString(auth.getBytes());
-                        httpConnection.setRequestProperty("Authorization", "Basic " + encodedAuth);
+                    if ("file".equalsIgnoreCase(artefactURL.getProtocol())) {
+                        if (Files.exists(Paths.get(artefactURL.toURI()))) {
+                            validURLFound = true;
+                        }
+                    } else {
+                        HttpURLConnection httpConnection = (HttpURLConnection) artefactURL.openConnection();
+
+                        String auth = artefactURL.getUserInfo();
+                        if (auth != null) {
+                            String encodedAuth = Base64.getEncoder().encodeToString(auth.getBytes());
+                            httpConnection.setRequestProperty("Authorization", "Basic " + encodedAuth);
+                        }
+
+                        httpConnection.setRequestMethod("HEAD");
+
+                        if (httpConnection.getResponseCode() == HttpURLConnection.HTTP_OK) {
+                            validURLFound = true;
+                        }
                     }
-
-                    httpConnection.setRequestMethod("HEAD");
 
-                    if (httpConnection.getResponseCode() == HttpURLConnection.HTTP_OK) {
-                        validURLFound = true;
+                    if (validURLFound) {
                         break;
                     } else {
                         logger.log(Level.FINE, "Artefact not found at URL: {0}", artefactURL.toString());
@@ -191,19 +202,21 @@ private URL findArtefactURL(List<URL> repositoryURLs, String relativeURLString)
                     String[] errorParameters = new String[]{repositoryURL.toString(), relativeURLString, archiveType};
                     logger.log(Level.WARNING, "Error creating URL from repository URL, {0}, relative URL, {1}, and archive"
                             + " type, {2}", errorParameters);
+                } catch (URISyntaxException ex) {
+                    logger.log(Level.WARNING, "Error creating URI from artefact URL, {0}", artefactURL.toString());
                 } catch (ProtocolException ex) {
                     logger.log(Level.WARNING,"Error setting request method to \"HEAD\"");
                 } catch (IOException ex) {
                     logger.log(Level.WARNING, "Error getting HTTP connection response code");
                 }      
             }
 
-            if (validURLFound == true) {
+            if (validURLFound) {
                 break;
             }
         }
 
-        if (validURLFound == false) {
+        if (!validURLFound) {
             throw new MalformedURLException("No artefact can be found for relative URL: "+ relativeURLString);
         }