From 0173d5e9bc9b695c8146a682935e951918b189f6 Mon Sep 17 00:00:00 2001 From: Nicholas Caughey Date: Mon, 19 Jun 2023 10:22:09 +0100 Subject: [PATCH] added exceptions to unimplemented code --- src/main/java/rest/CreateScanRequest.java | 2 + src/main/java/rest/CreateScanResource.java | 2 + src/main/java/rest/CreateStartScan.java | 1 + src/main/java/rest/StoreData.java | 204 ++++++++++----------- 4 files changed, 106 insertions(+), 103 deletions(-) diff --git a/src/main/java/rest/CreateScanRequest.java b/src/main/java/rest/CreateScanRequest.java index a9b9679..bdd0c04 100644 --- a/src/main/java/rest/CreateScanRequest.java +++ b/src/main/java/rest/CreateScanRequest.java @@ -69,6 +69,7 @@ public class CreateScanRequest { @Path("/git") @Consumes({ "application/json" }) public GitObj invokeGitScanAnalyze(@Valid String scanInvocation)throws URISyntaxException { + throw new exception ("unImplemented fucntionality"); JSONObject jsonData = new JSONObject(scanInvocation); GitObj gitObj = GitObjPayload.constructScanPayload(jsonData); @@ -90,6 +91,7 @@ public class CreateScanRequest { @Path("/pnc") @Consumes({ "application/json" }) public PncObj invokePncScanAnalyze(@Valid String scanInvocation)throws URISyntaxException { + throw new exception ("unImplemented fucntionality"); JSONObject jsonData = new JSONObject(scanInvocation); PncObj pncObj = PncObjPayload.constructScanPayload(jsonData); diff --git a/src/main/java/rest/CreateScanResource.java b/src/main/java/rest/CreateScanResource.java index 107f839..740a051 100644 --- a/src/main/java/rest/CreateScanResource.java +++ b/src/main/java/rest/CreateScanResource.java @@ -40,6 +40,8 @@ public class CreateScanResource { @Consumes({ "application/json" }) //in theory should take List to clean it up public ScanObj invokeScanAnalyze(@Valid String scanInvocation) throws URISyntaxException { + throw new exception ("unImplemented fucntionality"); + JSONObject jsonData = new JSONObject(scanInvocation); ScanObj scanObj = ScanObjPayload.constructScanPayload(jsonData); ConnectDB connectDB = new ConnectDB(); diff --git a/src/main/java/rest/CreateStartScan.java b/src/main/java/rest/CreateStartScan.java index 6797f1e..72d29a9 100644 --- a/src/main/java/rest/CreateStartScan.java +++ b/src/main/java/rest/CreateStartScan.java @@ -42,6 +42,7 @@ public class CreateStartScan { @PUT @Path("/{scanId}") public ScanObj invokeScanAnalyze(@PathParam("scanId") String scanId) throws URISyntaxException { + throw new exception ("unImplemented fucntionality"); ConnectDB connectDB = new ConnectDB(); Connection conn = connectDB.connect(); //this is ugly needs to berewritten diff --git a/src/main/java/rest/StoreData.java b/src/main/java/rest/StoreData.java index ae2925e..e0bc090 100644 --- a/src/main/java/rest/StoreData.java +++ b/src/main/java/rest/StoreData.java @@ -1,124 +1,122 @@ -package rest; +// package rest; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.Set; -import dto.ScanObj; -// import dto.ConnectDB; -// import dto.Scan; +// import java.util.Collections; +// import java.util.LinkedHashMap; +// import java.util.Set; +// import dto.ScanObj; +// // import dto.ConnectDB; +// // import dto.Scan; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; +// import java.sql.Connection; +// import java.sql.DriverManager; +// import java.sql.SQLException; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.ResultSet; -import java.sql.Statement; +// import java.sql.Connection; +// import java.sql.DriverManager; +// import java.sql.ResultSet; +// import java.sql.Statement; -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 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 java.sql.*; +// import java.sql.*; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.ObjectWriter; +// import com.fasterxml.jackson.databind.ObjectMapper; +// import com.fasterxml.jackson.databind.ObjectWriter; -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.Transaction; -import org.hibernate.boot.Metadata; -import org.hibernate.boot.MetadataSources; -import org.hibernate.boot.registry.StandardServiceRegistry; -import org.hibernate.boot.registry.StandardServiceRegistryBuilder; - // import org.hibernate.EntityManager; -import jakarta.persistence.EntityManager; -import jakarta.persistence.Cacheable; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.Id; -import jakarta.persistence.NamedQuery; -import jakarta.persistence.QueryHint; -import jakarta.persistence.SequenceGenerator; -import jakarta.persistence.Table; +// import org.hibernate.Session; +// import org.hibernate.SessionFactory; +// import org.hibernate.Transaction; +// import org.hibernate.boot.Metadata; +// import org.hibernate.boot.MetadataSources; +// import org.hibernate.boot.registry.StandardServiceRegistry; +// import org.hibernate.boot.registry.StandardServiceRegistryBuilder; +// // import org.hibernate.EntityManager; +// import jakarta.persistence.EntityManager; +// import jakarta.persistence.Cacheable; +// import jakarta.persistence.Column; +// import jakarta.persistence.Entity; +// import jakarta.persistence.GeneratedValue; +// import jakarta.persistence.Id; +// import jakarta.persistence.NamedQuery; +// import jakarta.persistence.QueryHint; +// import jakarta.persistence.SequenceGenerator; +// import jakarta.persistence.Table; -import org.eclipse.microprofile.rest.client.inject.RestClient; -import dto.ScanObj; +// import org.eclipse.microprofile.rest.client.inject.RestClient; +// import dto.ScanObj; -import javax.inject.Inject; -import javax.validation.Valid; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PUT; -import java.net.URI; -import java.net.URISyntaxException; -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 dto.ScanObj; -import dto.ConnectDB; -import dto.ScanObjPayload; +// import javax.inject.Inject; +// import javax.validation.Valid; +// import javax.ws.rs.Consumes; +// import javax.ws.rs.POST; +// import javax.ws.rs.Path; +// import javax.ws.rs.PUT; +// import java.net.URI; +// import java.net.URISyntaxException; +// 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 dto.ScanObj; +// import dto.ConnectDB; +// import dto.ScanObjPayload; -import javax.ws.rs.PathParam; +// import javax.ws.rs.PathParam; -import static constants.HttpHeaders.AUTHORIZATION_STRING; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; +// import static constants.HttpHeaders.AUTHORIZATION_STRING; +// import java.sql.Connection; +// import java.sql.DriverManager; +// import java.sql.SQLException; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.ResultSet; -import java.sql.Statement; +// import java.sql.Connection; +// import java.sql.DriverManager; +// import java.sql.ResultSet; +// import java.sql.Statement; -@Path("/storeData") -public class StoreData { +// @Path("/storeData") +// public class StoreData { - //all of these need cleaning up to be a more sensible soution - // @RestClient - // CreateScanService createScanService; +// //all of these need cleaning up to be a more sensible soution +// // @RestClient +// // CreateScanService createScanService; - @GET - public void Store() { - System.out.println("hmm"); +// @GET +// public void Store() { - //Create typesafe ServiceRegistry object - StandardServiceRegistry ssr = new StandardServiceRegistryBuilder().configure("hibernate.cfg.xml").build(); +// //Create typesafe ServiceRegistry object +// StandardServiceRegistry ssr = new StandardServiceRegistryBuilder().configure("hibernate.cfg.xml").build(); - Metadata meta = new MetadataSources(ssr).getMetadataBuilder().build(); +// Metadata meta = new MetadataSources(ssr).getMetadataBuilder().build(); - SessionFactory factory = meta.getSessionFactoryBuilder().build(); - Session session = factory.openSession(); - Transaction t = session.beginTransaction(); - System.out.println("i assume we fail before here?"); - Scan e1=new Scan(); - e1.setScanId(2); - e1.setProductId("1"); - e1.setEventId("Chawla"); - e1.setIsManagedService("aa"); - e1.setComponentList("aaa"); +// SessionFactory factory = meta.getSessionFactoryBuilder().build(); +// Session session = factory.openSession(); +// Transaction t = session.beginTransaction(); +// Scan e1=new Scan(); +// e1.setScanId(2); +// e1.setProductId("1"); +// e1.setEventId("Chawla"); +// e1.setIsManagedService("aa"); +// e1.setComponentList("aaa"); - session.save(e1); - t.commit(); - System.out.println("successfully saved"); - factory.close(); - session.close(); +// session.save(e1); +// t.commit(); +// System.out.println("successfully saved"); +// factory.close(); +// session.close(); - } -} \ No newline at end of file +// } +// } \ No newline at end of file