Browse Source

some code cleanup

exception_work
Nicholas Caughey 3 years ago
parent
commit
ea665ab53f
  1. 8
      src/main/java/rest/CreateGetResource.java
  2. 5
      src/main/java/rest/CreateScanRequest.java
  3. 2
      src/main/java/rest/CreateScanResource.java
  4. 1
      src/main/java/rest/CreateScanService.java
  5. 3
      src/main/java/rest/CreateStartScan.java
  6. 3
      src/main/java/rest/RemoveScan.java

8
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);

5
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")

2
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" })

1
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;

3
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");

3
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);
}

Loading…
Cancel
Save