From ea665ab53f0a5975e53227f5855a7dd0fd4936e3 Mon Sep 17 00:00:00 2001
From: Nicholas Caughey <ncaughey@redhat.com>
Date: Mon, 17 Apr 2023 14:28:30 +0100
Subject: [PATCH] some code cleanup

---
 src/main/java/rest/CreateGetResource.java  | 8 ++------
 src/main/java/rest/CreateScanRequest.java  | 5 ++---
 src/main/java/rest/CreateScanResource.java | 2 --
 src/main/java/rest/CreateScanService.java  | 1 -
 src/main/java/rest/CreateStartScan.java    | 3 +--
 src/main/java/rest/RemoveScan.java         | 3 ---
 6 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/main/java/rest/CreateGetResource.java b/src/main/java/rest/CreateGetResource.java
index f5a02e3..49cac68 100644
--- a/src/main/java/rest/CreateGetResource.java
+++ b/src/main/java/rest/CreateGetResource.java
@@ -59,12 +59,8 @@ public class CreateGetResource {
             ResultSet rs = stmt.executeQuery(sql);
 
             while (rs.next()) {
-                String a = rs.getString("scanid");
-                String b = rs.getString("productid");
-                String c = rs.getString("eventid");
-                String d = rs.getString("ismanagedservice");
-                String e = rs.getString("componentlist");
-                Scans.add(new ScanObj(a,b,c,d,e));
+                //very ugly solution needs some change to where we put the query
+                Scans.add(new ScanObj(rs.getString("scanid"),rs.getString("productid"),rs.getString("eventid"),rs.getString("ismanagedservice"),rs.getString("componentlist")));
             }
         } catch (SQLException e){
             System.out.println(e);
diff --git a/src/main/java/rest/CreateScanRequest.java b/src/main/java/rest/CreateScanRequest.java
index 686d69e..fc9d8e5 100644
--- a/src/main/java/rest/CreateScanRequest.java
+++ b/src/main/java/rest/CreateScanRequest.java
@@ -38,11 +38,10 @@ import java.sql.Statement;
 
 @Path("/scanRequest")
 public class CreateScanRequest {
-
-    // @Inject
+    
+    //all of these need cleaning up to be a more sensible soution
     @RestClient
     CreateScanService createScanService;
-    // ScanObjPayload scanObjPayload;
 
     @POST
     @Path("/brew")
diff --git a/src/main/java/rest/CreateScanResource.java b/src/main/java/rest/CreateScanResource.java
index 5741582..d229b46 100644
--- a/src/main/java/rest/CreateScanResource.java
+++ b/src/main/java/rest/CreateScanResource.java
@@ -33,10 +33,8 @@ import java.sql.Statement;
 @Path("/")
 public class CreateScanResource {
 
-    // @Inject
     @RestClient
     CreateScanService createScanService;
-    // ScanObjPayload scanObjPayload;
 
     @POST
     @Consumes({ "application/json" })
diff --git a/src/main/java/rest/CreateScanService.java b/src/main/java/rest/CreateScanService.java
index 2d27cbf..30b85d4 100644
--- a/src/main/java/rest/CreateScanService.java
+++ b/src/main/java/rest/CreateScanService.java
@@ -2,7 +2,6 @@ package rest;
 
 import dto.ScanObj;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
-// import org.jboss.pnc.api.deliverablesanalyzer.dto.AnalyzePayload;
 
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
diff --git a/src/main/java/rest/CreateStartScan.java b/src/main/java/rest/CreateStartScan.java
index cd6a826..e8a7190 100644
--- a/src/main/java/rest/CreateStartScan.java
+++ b/src/main/java/rest/CreateStartScan.java
@@ -36,10 +36,8 @@ import java.sql.Statement;
 @Path("/startScan")
 public class CreateStartScan {
 
-    // @Inject
     @RestClient
     CreateScanService createScanService;
-    // ScanObjPayload scanObjPayload;
 
     @PUT
     @Path("/{scanId}")
@@ -63,6 +61,7 @@ public class CreateStartScan {
             String c = null;
             String d = null;
             String e = null;
+            //still kind of needed for now since theres no established primary key, needs to be do
             while (rs.next()) {
                 a = rs.getString("scanid");
                 b = rs.getString("productid");
diff --git a/src/main/java/rest/RemoveScan.java b/src/main/java/rest/RemoveScan.java
index 51c73f3..21a7718 100644
--- a/src/main/java/rest/RemoveScan.java
+++ b/src/main/java/rest/RemoveScan.java
@@ -56,13 +56,10 @@ public class RemoveScan {
         //need to add figure out an archieve system and wether its nessacery (archieve value??)
         try{
             stmt = conn.createStatement();
-            
             //TODO add proper checks
             stmt.executeUpdate(sql);
-
             //send task to the actual interface here using the resultset returned (should multiple scanids be allowed):
             //once the task is complete AND we have confirmation that the scan is done run the following sql
-
         } catch (SQLException e){
             System.out.println(e);
         }