Improved logging of WebRequestsHandler

Author: TechsCode

src/main/java/me/TechsCode/ReleaseServer/WebRequestsHandler.java

@@ -9,7 +9,9 @@
 
 import java.io.File;
 import java.net.MalformedURLException;
+import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 @RestController
 public class WebRequestsHandler {
@@ -20,7 +22,7 @@ public String index() {
     }
 
     @GetMapping("/download/{project}/{tag}")
-    public Object download(@RequestParam(value = "token") String token, @PathVariable(value = "project") String project, @PathVariable(value = "tag") String tag){
+    public Object download(@RequestParam(value = "token", required = false) String token, @PathVariable(value = "project") String project, @PathVariable(value = "tag") String tag){
         if(token == null){
             return "You dont have any token provided!";
         }
@@ -29,10 +31,16 @@ public Object download(@RequestParam(value = "token") String token, @PathVariabl
             return "The token you have provided is invalid!";
         }
 
-        Optional<Artifact> artifact = ReleaseServer.getArtifacts().stream()
+        List<Artifact> artifactsOfProject = ReleaseServer.getArtifacts().stream()
                 .filter(x -> x.getRelease().getProject().getName().equalsIgnoreCase(project))
-                .filter(x -> x.getRelease().getUniqueTag().equals(tag))
-                .findFirst();
+                .collect(Collectors.toList());
+
+        if(artifactsOfProject.size() == 0){
+            return "Could not find any artifact for project '"+project+"'";
+        }
+
+        Optional<Artifact> artifact = artifactsOfProject.stream()
+                .filter(x -> x.getReleaseTag().equals(tag)).findFirst();
 
         if(artifact.isPresent()){
             if(artifact.get().getAssets().length == 0){
@@ -55,7 +63,7 @@ public Object download(@RequestParam(value = "token") String token, @PathVariabl
                 return "Error: "+e.getMessage();
             }
         } else {
-            return "Could not find any artifact";
+            return "Could not find any artifact with the tag '"+tag+"'";
         }
     }
 }