Merge pull request #7 from gumtreeuk/master

Fix NPE on empty content & add option to get content with different extension/classifier

Author: chenlingmin

Dockerfile

@@ -1,7 +1,7 @@
 FROM sonatype/nexus3
 
 #Nexus 3 version to use
-ARG NEXUS_VERSION=3.5.1-02
+ARG NEXUS_VERSION=3.6.0
 ARG RUNDECK_PLUGIN_VERSION=1.0.0-SNAPSHOT
 
 USER root
@@ -14,7 +14,7 @@ RUN mkdir -p system/com/nongfenqi/nexus/plugin/${RUNDECK_PLUGIN_VERSION}
 
 ADD build/libs/nexus3-rundeck-plugin-${RUNDECK_PLUGIN_VERSION}.jar \
     system/com/nongfenqi/nexus/plugin/${RUNDECK_PLUGIN_VERSION}/nexus3-rundeck-plugin-${RUNDECK_PLUGIN_VERSION}.jar
-RUN chomd 644 system/com/nongfenqi/nexus/plugin/${RUNDECK_PLUGIN_VERSION}/nexus3-rundeck-plugin-${RUNDECK_PLUGIN_VERSION}.jar
+RUN chmod 644 system/com/nongfenqi/nexus/plugin/${RUNDECK_PLUGIN_VERSION}/nexus3-rundeck-plugin-${RUNDECK_PLUGIN_VERSION}.jar
 
 RUN echo "bundle.mvn\:com.nongfenqi.nexus.plugin/nexus3-rundeck-plugin/"${RUNDECK_PLUGIN_VERSION}" = mvn:com.nongfenqi.nexus.plugin/nexus3-rundeck-plugin/"${RUNDECK_PLUGIN_VERSION} \
     >> etc/karaf/profile.cfg \

README.md

@@ -35,14 +35,17 @@ The plugin provides the following new HTTP resources :
   - `a` : artifactId of the artifacts to match
   - `p` : packaging of the artifacts to match ('jar', 'war', etc)
   - `c` : classifier of the artifacts to match ('sources', 'javadoc', etc)
-  - `l` : limit - max number of results to return (default 10)
+  - `l` : limit - max number of results to return, default value is 10
 
 - `http://NEXUS_HOST/service/siesta/rundeck/maven/options/content` : return artifact stream
   Parameters (all required) :
   - `r` : repository ID to search in (null for searching in all indexed repositories)
   - `g` : groupId of the artifacts to match
   - `a` : artifactId of the artifacts to match
-  - `v` : artifact version
+  - `v` : artifact version, default value is latest version
+  - `c` : classifier of the artifacts to match ('sources', 'javadoc', etc)
+  - `p` : packaging of the artifacts to match ('jar', 'war', etc), default value is jar
+
 
 Note that if you want to retrieve the artifact from your Rundeck script, you can use content api, example is:
 

src/main/java/com/nongfenqi/nexus/plugin/rundeck/RundeckMavenResource.java

@@ -53,9 +53,8 @@
 @Singleton
 @Path("/rundeck/maven/options")
 public class RundeckMavenResource
-    extends ComponentSupport
-    implements Resource
-{
+        extends ComponentSupport
+        implements Resource {
     private final SearchService searchService;
 
     private final RepositoryManager repositoryManager;
@@ -78,8 +77,18 @@ public Response content(
             @QueryParam("r") String repositoryName,
             @QueryParam("g") String groupId,
             @QueryParam("a") String artifactId,
-            @QueryParam("v") String version
+            @QueryParam("v") String version,
+            @QueryParam("c") String classifier,
+            @QueryParam("p") @DefaultValue("jar") String extension
     ) {
+
+
+        // default version
+        version = Optional.ofNullable(version).orElse(latestVersion(
+                repositoryName, groupId, artifactId, classifier, extension
+        ));
+
+        // valid params
         if (isBlank(repositoryName) || isBlank(groupId) || isBlank(artifactId) || isBlank(version)) {
             return NOT_FOUND;
         }
@@ -102,7 +111,11 @@ public Response content(
             return commitAndReturn(NOT_FOUND, tx);
         }
 
-        String path = groupId.replace(".", "/") + "/" + artifactId + "/" + version + "/" + artifactId + "-" + version + ".jar";
+        String fileName = artifactId + "-" + version + (isBlank(classifier) ? "" : ("-" + classifier)) + "." + extension;
+        String path = groupId.replace(".", "/") +
+                "/" + artifactId +
+                "/" + version +
+                "/" + fileName;
         Asset asset = tx.findAssetWithProperty("name", path, bucket);
         log.debug("rundeck download asset: {}", asset);
         if (null == asset) {
@@ -113,7 +126,7 @@ public Response content(
         Blob blob = tx.requireBlob(asset.requireBlobRef());
         Response.ResponseBuilder ok = Response.ok(blob.getInputStream());
         ok.header("Content-Type", blob.getHeaders().get("BlobStore.content-type"));
-        ok.header("Content-Disposition", "attachment;filename=\"" + path.substring(path.lastIndexOf("/")) + "\"");
+        ok.header("Content-Disposition", "attachment;filename=\"" + fileName + "\"");
         return commitAndReturn(ok.build(), tx);
     }
 
@@ -162,15 +175,25 @@ public List<RundeckXO> version(
                 .collect(Collectors.toList());
     }
 
+    private String latestVersion(String repositoryName, String groupId, String artifactId, String classifier, String extension) {
+        List<RundeckXO> latestVersion = version(1, repositoryName, groupId, artifactId, classifier, extension);
+        if (!latestVersion.isEmpty()) {
+            return latestVersion.get(0).getValue();
+        }
+        return null;
+    }
+
     private RundeckXO his2RundeckXO(SearchHit hit) {
         String version = (String) hit.getSource().get("version");
 
         List<Map<String, Object>> assets = (List<Map<String, Object>>) hit.getSource().get("assets");
         Map<String, Object> attributes = (Map<String, Object>) assets.get(0).get("attributes");
         Map<String, Object> content = (Map<String, Object>) attributes.get("content");
-        long lastModified = (long) content.get("last_modified");
-
-        String lastModifiedTime = DateUtils.formatDate(new Date(lastModified), "yyyy-MM-dd HH:mm:ss");
+        String lastModifiedTime = "null";
+        if (content != null && content.containsKey("last_modified")) {
+            Long lastModified = (Long) content.get("last_modified");
+            lastModifiedTime = DateUtils.formatDate(new Date(lastModified), "yyyy-MM-dd HH:mm:ss");
+        }
 
         return RundeckXO.builder().name(version + " (" + lastModifiedTime + ")").value(version).build();
     }
@@ -181,4 +204,5 @@ private Response commitAndReturn(Response response, StorageTx tx) {
         }
         return response;
     }
+
 }