From 865c628bb281981ba28ab31114b5f9f4a78d3970 Mon Sep 17 00:00:00 2001 From: Nicholas Caughey Date: Wed, 21 Jun 2023 12:56:02 +0100 Subject: [PATCH] fixed the pom and other issues from a bad merge --- pom.xml | 4 ++-- src/main/java/rest/CreateGetResource.java | 2 ++ src/main/java/rest/CreateScanRequest.java | 5 ++++- src/main/java/rest/CreateScanResource.java | 3 ++- src/main/java/rest/CreateStartScan.java | 3 +++ 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index f44d73c..ab6b239 100644 --- a/pom.xml +++ b/pom.xml @@ -168,13 +168,13 @@ 3.0.1 - + diff --git a/src/main/java/rest/CreateGetResource.java b/src/main/java/rest/CreateGetResource.java index 67d9bea..1e3f820 100644 --- a/src/main/java/rest/CreateGetResource.java +++ b/src/main/java/rest/CreateGetResource.java @@ -17,6 +17,8 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; +import io.quarkus.security.Authenticated; + // @Path("/api/v1/[osh-scan]") @Path("/scanGet") @Authenticated diff --git a/src/main/java/rest/CreateScanRequest.java b/src/main/java/rest/CreateScanRequest.java index c3ac64c..4e2f346 100644 --- a/src/main/java/rest/CreateScanRequest.java +++ b/src/main/java/rest/CreateScanRequest.java @@ -14,6 +14,9 @@ import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.net.URISyntaxException; +import io.quarkus.security.Authenticated; + import javax.validation.Valid; import javax.ws.rs.Consumes; import javax.ws.rs.POST; @@ -53,7 +56,7 @@ public class CreateScanRequest { } catch (SQLException e) { logger.error(e.getMessage()); } - greetingResource.invokeScanTask(brewObj.brewNvr); + greetingResource.invokeScanTask(brewObj.getBrewNvr()); return brewObj; } diff --git a/src/main/java/rest/CreateScanResource.java b/src/main/java/rest/CreateScanResource.java index 6eb12aa..5602898 100644 --- a/src/main/java/rest/CreateScanResource.java +++ b/src/main/java/rest/CreateScanResource.java @@ -12,7 +12,8 @@ import org.json.JSONException; import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - +import java.net.URISyntaxException; +import io.quarkus.security.Authenticated; import javax.validation.Valid; import javax.ws.rs.Consumes; import javax.ws.rs.POST; diff --git a/src/main/java/rest/CreateStartScan.java b/src/main/java/rest/CreateStartScan.java index 87083a3..26c5342 100644 --- a/src/main/java/rest/CreateStartScan.java +++ b/src/main/java/rest/CreateStartScan.java @@ -5,6 +5,9 @@ import dto.ScanObj; import io.quarkus.security.Authenticated; import org.eclipse.microprofile.rest.client.inject.RestClient; +import java.net.URISyntaxException; +import io.quarkus.security.Authenticated; + import org.eclipse.microprofile.rest.client.inject.RestClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory;