code q

Author: mcanoy

src/main/java/com/redhat/labs/lodestar/model/GetListOptions.java

@@ -46,22 +46,24 @@ public Sort getQuerySort(Sort defaultSort) {
             return defaultSort;
         }
         String[] sortAll = sort.split(",");
-        Sort sort = null;
+        Sort querySort = null;
         String direction;
 
         for (String s : sortAll) {
             String[] sortFields = s.split("\\|");
             direction = sortFields.length == 2 ? sortFields[1] : "";
-            if (sort == null) {
-                sort = Sort.by(sortFields[0], getDirection(direction));
+            if (querySort == null) {
+                querySort = Sort.by(sortFields[0], getDirection(direction));
             } else {
-                sort.and(sortFields[0], getDirection(direction));
+                querySort.and(sortFields[0], getDirection(direction));
             }
         }
 
-        sort.and("uuid");
+        if(querySort != null) {
+            querySort.and("uuid");
+        }
 
-        return sort;
+        return querySort;
     }
 
     private Sort.Direction getDirection(String dir) {

src/main/java/com/redhat/labs/lodestar/model/GetOptions.java

@@ -27,8 +27,7 @@ public class GetOptions {
 
     @Parameter(name = "region", required = false, description = "return only artifacts for the given region. Do not use with engagementUuid")
     @QueryParam("region")
-    
-    private List<String> region = new ArrayList<String>();
+    private List<String> region = new ArrayList<>();
 
     public Optional<String> getEngagementUuid() {
         return Optional.ofNullable(engagementUuid);
@@ -39,11 +38,7 @@ public Optional<String> getType() {
     }
 
     public List<String> getRegion() {
-        if(region == null) {
-            region = new ArrayList<String>();
-        }
-        
-        return region;
+        return region == null ? new ArrayList<>() : region;
     }
 
 }

src/main/java/com/redhat/labs/lodestar/service/ArtifactService.java

@@ -158,7 +158,6 @@ public void updateArtifacts(String engagementUuid, String region, List<Artifact>
         }
 
     }
-    
 
     /**
      * Returns a {@link List} of {@link Artifact}s matching the specified
@@ -170,7 +169,7 @@ public void updateArtifacts(String engagementUuid, String region, List<Artifact>
     public List<Artifact> getArtifacts(GetListOptions options) {
 
         if(!options.getRegion().isEmpty() && options.getType().isPresent()) { //by region and type
-            return Artifact.pagedArtifactsByRegionAndType(options.getType().get(), options.getRegion(), options.getPage(),
+            return Artifact.pagedArtifactsByRegionAndType(options.getType().orElse(""), options.getRegion(), options.getPage(),
                     options.getPageSize(), options.getQuerySort());
         }
 
@@ -180,7 +179,7 @@ public List<Artifact> getArtifacts(GetListOptions options) {
 
         if(options.getType().isPresent()) { //by type
             checkEngagementUuid(options.getEngagementUuid());
-            return Artifact.pagedArtifactsByType(options.getType().get(), options.getPage(), options.getPageSize(), options.getQuerySort());
+            return Artifact.pagedArtifactsByType(options.getType().orElse(""), options.getPage(), options.getPageSize(), options.getQuerySort());
         }
 
         Optional<String> engagementUuid = options.getEngagementUuid();
@@ -211,17 +210,18 @@ private void checkEngagementUuid(Optional<String> engagementUuid) {
      * @return
      */
     public ArtifactCount countArtifacts(GetOptions options) {
+        String type = options.getType().orElse("");
 
         Optional<String> engagementUuid = options.getEngagementUuid();
 
         ArtifactCount count;
 
         if(!options.getRegion().isEmpty() && options.getType().isPresent()) {
-            count = Artifact.countArtifactsByRegionAndType(options.getType().get(), options.getRegion());
+            count = Artifact.countArtifactsByRegionAndType(type, options.getRegion());
         } else if(!options.getRegion().isEmpty()) {
             count = Artifact.countArtifactsByRegion(options.getRegion());
         } else if(options.getType().isPresent()) {
-            count = Artifact.countArtifactsByType(options.getType().get());
+            count = Artifact.countArtifactsByType(type);
         } else if(engagementUuid.isPresent()) {
             count = Artifact.countArtifactsByEngagementUuid(engagementUuid.get());
         } else {