jonny
/
covscanrest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

removed a bunch of currently not used code that was accidently pushed

exception_work
Nicholas Caughey 3 years ago
parent
19a82c1280
commit
64e8c67fd2
14 changed files with 28 additions and 264 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      pom.xml
  2. 22
      src/main/java/dto/AnalysisReportCouchDbDoc.java
  3. 25
      src/main/java/dto/AnalyzeResponse.java
  4. 21
      src/main/java/dto/CouchDbReportDatabase.java
  5. 41
      src/main/java/dto/ScanAnalyzePayload.java
  6. 1
      src/main/java/dto/ScanObj.java
  7. 8
      src/main/java/dto/ScanObjPayload.java
  8. 9
      src/main/java/rest/CreateGetResource.java
  9. 17
      src/main/java/rest/CreateScanResource.java
  10. 2
      src/main/java/rest/CreateScanService.java
  11. 48
      src/main/java/rest/Scan.java
  12. 54
      src/main/java/rest/ScanResource.java
  13. 19
      src/main/java/rest/ScanService
  14. 17
      src/main/java/rest/sendScan.java

8
pom.xml
Unescape View File

@ -33,6 +33,9 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.json/json -->
<!-- https://mvnrepository.com/artifact/org.json/json -->
<!-- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
@ -46,6 +49,11 @@
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20220320</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-reactive-jackson</artifactId>

22
src/main/java/dto/AnalysisReportCouchDbDoc.java
Unescape View File

@ -1,22 +0,0 @@
// package dto;
// import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
// import io.smallrye.common.constraint.NotNull;
// import lombok.Builder;
// import lombok.Data;
// import lombok.extern.jackson.Jacksonized;
// import org.jboss.pnc.api.deliverablesanalyzer.dto.AnalysisReport;
// import javax.validation.Valid;
// import java.util.Set;
// @Data
// @Jacksonized
// @Builder(builderClassName = "Builder")
// @JsonIgnoreProperties(ignoreUnknown = true)
// public class AnalysisReportCouchDbDoc {
// @NotNull
// @Valid
// private final AnalysisReport doc;
// }

25
src/main/java/dto/AnalyzeResponse.java
Unescape View File

@ -1,25 +0,0 @@
// package dto;
// import lombok.AllArgsConstructor;
// import lombok.Builder;
// import lombok.Getter;
// import lombok.ToString;
// import lombok.extern.jackson.Jacksonized;
// import org.jboss.pnc.api.dto.Request;
// import java.io.Serializable;
// @ToString
// @Getter
// @AllArgsConstructor
// @Jacksonized
// @Builder
// public class AnalyzeResponse implements Serializable {
// // private static final long serialVersionUID = -2043312712105992478L;
// private String id;
// private Request cancelRequest;
// }

21
src/main/java/dto/CouchDbReportDatabase.java
Unescape View File

@ -1,21 +0,0 @@
// package dto;
// import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
// import io.smallrye.common.constraint.NotNull;
// import lombok.Builder;
// import lombok.Data;
// import lombok.extern.jackson.Jacksonized;
// import javax.validation.Valid;
// import java.util.Set;
// @Data
// @Jacksonized
// @Builder(builderClassName = "Builder")
// @JsonIgnoreProperties(ignoreUnknown = true)
// public class CouchDbReportDatabase {
// @NotNull
// @Valid
// private final Set<AnalysisReportCouchDbDoc> rows;
// }

41
src/main/java/dto/ScanAnalyzePayload.java
Unescape View File

@ -1,41 +0,0 @@
// package dto;
// import org.eclipse.microprofile.config.ConfigProvider;
// // // import org.jboss.pnc.api.deliverablesanalyzer.dto.AnalyzePayload;
// // import org.jboss.pnc.api.dto.HeartbeatConfig;
// // import org.jboss.pnc.api.dto.Request;
// import java.net.URI;
// import java.net.URISyntaxException;
// import java.nio.charset.StandardCharsets;
// import java.sql.Struct;
// import java.util.*;
// import static constants.HttpHeaders.AUTHORIZATION_STRING;
// public class ScanAnalyzePayload {
// private static final String COUCHDB_USERNAME = ConfigProvider.getConfig().getValue("couchdb.username", String.class);
// private static final String COUCHDB_PASSWORD = ConfigProvider.getConfig().getValue("couchdb.password", String.class);
// private static final String COUCHDB_DATABASE_NAME = ConfigProvider.getConfig().getValue("couchdb.name", String.class);
// private static final String COUCHDB_DATABASE_URL = ConfigProvider.getConfig().getValue("couchdb.url", String.class);
// private ScanAnalyzePayload() {
// }
// public static AnalyzePayload getAnalyzePayload(List<String> urls) throws URISyntaxException {
// return constructAnalyzePayload(urls);
// }
// private static AnalyzePayload constructAnalyzePayload(List<String> urls) throws URISyntaxException {
// String operationId = UUID.randomUUID().toString();
// List<Request.Header> headers = new ArrayList<>(Arrays.asList(new Request.Header(AUTHORIZATION_STRING, getEncodedCredentials())));
// Request callbackRequest = new Request(Request.Method.PUT, new URI(COUCHDB_DATABASE_URL + "/" + COUCHDB_DATABASE_NAME + "/" + operationId), headers);
// return new AnalyzePayload(operationId, urls, null, callbackRequest, null);
// }
// public static String getEncodedCredentials() {
// return "Basic " + Base64.getEncoder().encodeToString((COUCHDB_USERNAME + ":" + COUCHDB_PASSWORD).getBytes());
// }
// }

1
src/main/java/dto/ScanObj.java
Unescape View File

@ -27,6 +27,5 @@ public class ScanObj implements Serializable {
private String owner;
private String release;
private String base;
// private String id;
}

8
src/main/java/dto/ScanObjPayload.java
Unescape View File

@ -1,9 +1,9 @@
// package dto;
// import org.eclipse.microprofile.config.ConfigProvider;
// // // import org.jboss.pnc.api.deliverablesanalyzer.dto.AnalyzePayload;
// // import org.jboss.pnc.api.dto.HeartbeatConfig;
// // import org.jboss.pnc.api.dto.Request;
// // import org.jboss.pnc.api.deliverablesanalyzer.dto.AnalyzePayload;
// import org.jboss.pnc.api.dto.HeartbeatConfig;
// import org.jboss.pnc.api.dto.Request;
// import java.net.URI;
// import java.net.URISyntaxException;
@ -19,5 +19,5 @@
// List<Request.Header> headers = new ArrayList<>(Arrays.asList(new Request.Header(AUTHORIZATION_STRING, getEncodedCredentials())));
// Request callbackRequest = new Request(Request.Method.PUT, new URI(COUCHDB_DATABASE_URL + "/" + COUCHDB_DATABASE_NAME + "/" + operationId), headers);
// return new AnalyzePayload(operationId, urls, null, callbackRequest, null);
// }
// }
// }

9
src/main/java/rest/CreateGetResource.java
Unescape View File

@ -30,15 +30,16 @@ public class CreateGetResource {
private Set<ScanObj> Scans = Collections.newSetFromMap(Collections.synchronizedMap(new LinkedHashMap<>()));
public CreateGetResource() {
//example used to show the get obviously needs deleting
Scans.add(new ScanObj("a","a","a","a","a","a","a","a","a","a"));
}
@GET
@Path("/{id}")
public Set<ScanObj> list(@PathParam("id") String id) {
//use to return specific scanIds just use usual fetch from sets
@Path("/{scanId}")
public Set<ScanObj> list(@PathParam("scanId") String scanId) {
//use to return specific scanIds just use usual fetch from sets, will be querying hte db directly here
System.out.println(Scans);
System.out.println(id);
System.out.println(scanId);
return Scans;
}
}

17
src/main/java/rest/CreateScanResource.java
Unescape View File

@ -14,6 +14,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
import org.json.JSONObject;
import org.json.JSONArray;
import static constants.HttpHeaders.AUTHORIZATION_STRING;
@ -26,14 +28,15 @@ public class CreateScanResource {
@POST
@Consumes({ "application/json" })
public ScanObj invokeScanAnalyze(@Valid Array<String> urls) throws URISyntaxException {
//in theory should take List<String> but something weird is happening, didnt want to fix it specifically before adding the DB dto
public ScanObj invokeScanAnalyze(@Valid String scanInvocation) throws URISyntaxException {
System.out.println(urls);
ScanObj scanObj = new ScanObj("a","a","a","a","a","a","a","a","a","a");
System.out.println(scanObj);
System.out.println("test");
// return createScanService.invokeScanAnalysis(scanObj);
//weird work around is currently being fixed
JSONObject jsonData = new JSONObject(scanInvocation);
System.out.println(jsonData);
String [] workAround = scanInvocation.split("\n");
//ignore all of this, temporary for testing purposes, "parser" will be in ScanObjPayload
ScanObj scanObj = new ScanObj(jsonData.getString("hub"),jsonData.getString("source"),jsonData.getString("username"),jsonData.getString("password"),jsonData.getString("scanUrl"),jsonData.getString("scanId"),jsonData.getString("advisoryId"),jsonData.getString("owner"),jsonData.getString("release"),jsonData.getString("base"));
return scanObj;
}
}

2
src/main/java/rest/CreateScanService.java
Unescape View File

@ -10,7 +10,7 @@ import javax.ws.rs.Path;
@Path("/")
@RegisterRestClient
public interface CreateScanService {
//should be used for fixing the incoming data from post requests but not yet implemented
@POST
ScanObj invokeScanAnalysis(ScanObj scanObj);

48
src/main/java/rest/Scan.java
Unescape View File

@ -1,48 +0,0 @@
// org.acme.rest.json;
// import com.fasterxml.jackson.databind.ObjectMapper;
// import com.fasterxml.jackson.databind.ObjectWriter;
// public class Scan {
// public String source;
// public String hub;
// public String username;
// public String password;
// public String scanUrl;
// public String scanId;
// public String advisoryId;
// public String owner;
// public String release;
// public String base;
// public Scan() {
// }
// public Scan(String hub, String source, String username, String password, String scanUrl, String scanId, String advisoryId, String owner, String release, String base) {
// this.hub = hub;
// this.source = source;
// this.username = username;
// this.password = password;
// this.scanUrl = scanUrl;
// this.scanId = scanId;
// this.advisoryId = advisoryId;
// this.owner = owner;
// this.release = release;
// this.base = base;
// }
// public String toJson(){
// ObjectMapper mapper = new ObjectMapper();
// String test = "aaa";
// try {
// String jsonInString = mapper.writeValueAsString(this);
// System.out.println(jsonInString);
// return jsonInString;
// } catch (Exception ex){
// // throw ex;
// }
// return test;
// }
// }

54
src/main/java/rest/ScanResource.java
Unescape View File

@ -1,54 +0,0 @@
// org.acme.rest.json;
// import java.util.Collections;
// import java.util.LinkedHashMap;
// import java.util.Set;
// import javax.ws.rs.DELETE;
// import javax.ws.rs.GET;
// import javax.ws.rs.POST;
// import javax.ws.rs.Path;
// import javax.inject.Inject;
// import javax.ws.rs.GET;
// import javax.ws.rs.Path;
// import javax.ws.rs.PathParam;
// import java.util.Set;
// import java.util.stream.Collectors;
// import javax.inject.Inject;
// import javax.ws.rs.Consumes;
// import com.fasterxml.jackson.databind.ObjectMapper;
// import com.fasterxml.jackson.databind.ObjectWriter;
// // @Path("/api/v1/[osh-scan]")
// @Path("/scanGet")
// public class ScanResource {
// // ScansService scanServuce;
// private Set<Scan> Scans = Collections.newSetFromMap(Collections.synchronizedMap(new LinkedHashMap<>()));
// public ScanResource() {
// Scans.add(new Scan("a","a","a","a","a","a","a","a","a","a"));
// }
// @GET
// @Path("/{id}")
// public Set<Scan> list(@PathParam("id") String id) {
// // CouchDbReportDatabase couchDbReportDatabase = delaResultsService.getAllReports(true);
// // Set<AnalysisReport> analysisReports = couchDbReportDatabase.getRows().stream().filter(analysisDoc -> analysisDoc.getDoc().isSuccess()).collect(Collectors.mapping(analysisDoc -> analysisDoc.getDoc(), Collectors.toSet()));
// // return analysisReports;
// //use to return specific scanIds
// System.out.println(Scans);
// System.out.println(id);
// return Scans;
// }
// @POST
// @Consumes({ "application/json"})
// public Set<Scan> add(Scan Scan) {
// Scans.add(Scan);
// return Scans;
// }
// }

19
src/main/java/rest/ScanService
Unescape View File

@ -1,19 +0,0 @@
// org.acme.rest.json;
// import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
// import org.jboss.resteasy.annotations.jaxrs.QueryParam;
// import javax.ws.rs.GET;
// import javax.ws.rs.Path;
// import javax.ws.rs.QueryParam;
// import java.util.Set;
// @Path("/scans")
// @RegisterRestClient
// public interface ScansService {
// @GET
// @Path("/{scanId}");
// @ClientHeaderParam(name=AUTHORIZATION_STRING, value = "{getAuthorizationHeader}" )
// Set<Scan> getById(@QueryParam String scanId);
// }

17
src/main/java/rest/sendScan.java
Unescape View File

@ -1,17 +0,0 @@
// package rest;
// import dto.AnalyzeResponse;
// 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;
// @Path("/")
// @RegisterRestClient
// public interface sendScan {
// @POST
// AnalyzeResponse invokeDelaAnalysis(AnalyzePayload analyzePayload);
// }
Write Preview
Loading…
Cancel
Save