From 42c9a2adf08de5d684d33f76c534241745e02aee Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@est.tech>
Date: Fri, 16 Sep 2022 17:47:08 +0100
Subject: [PATCH] Fix minor warnings in code

Issue-ID: POLICY-4045
Change-Id: I08c3cb1af3dbe2051dcbb0e2726906faff4a37b3
Signed-off-by: liamfallon <liam.fallon@est.tech>
---
 main/pom.xml                                                     | 1 -
 .../policy/pap/main/service/ToscaServiceTemplateService.java     | 1 -
 .../org/onap/policy/pap/main/rest/PapRestControllerV1Test.java   | 9 +++------
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/main/pom.xml b/main/pom.xml
index 4391d223..5c3902ba 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -42,7 +42,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
-            <version>${version.springboot}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/main/src/main/java/org/onap/policy/pap/main/service/ToscaServiceTemplateService.java b/main/src/main/java/org/onap/policy/pap/main/service/ToscaServiceTemplateService.java
index ef0fc603..77c01783 100644
--- a/main/src/main/java/org/onap/policy/pap/main/service/ToscaServiceTemplateService.java
+++ b/main/src/main/java/org/onap/policy/pap/main/service/ToscaServiceTemplateService.java
@@ -33,7 +33,6 @@ import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfModelException;
 import org.onap.policy.models.base.PfModelRuntimeException;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaEntity;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyType;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaTypedEntityFilter;
diff --git a/main/src/test/java/org/onap/policy/pap/main/rest/PapRestControllerV1Test.java b/main/src/test/java/org/onap/policy/pap/main/rest/PapRestControllerV1Test.java
index f8e47ef4..1af9ff55 100644
--- a/main/src/test/java/org/onap/policy/pap/main/rest/PapRestControllerV1Test.java
+++ b/main/src/test/java/org/onap/policy/pap/main/rest/PapRestControllerV1Test.java
@@ -42,9 +42,6 @@ public class PapRestControllerV1Test {
     @Mock
     SecurityContext mockSecurityContext;
 
-    @InjectMocks
-    PapRestControllerV1 mockController;
-
     private AutoCloseable closeable;
     private BodyBuilder bldr;
 
@@ -61,7 +58,7 @@ public class PapRestControllerV1Test {
 
     @Test
     public void testAddVersionControlHeaders() {
-        ResponseEntity<Object> resp = mockController.addVersionControlHeaders(bldr).build();
+        ResponseEntity<Object> resp = PapRestControllerV1.addVersionControlHeaders(bldr).build();
         assertEquals("0", resp.getHeaders().get(PapRestControllerV1.VERSION_MINOR_NAME).get(0));
         assertEquals("0", resp.getHeaders().get(PapRestControllerV1.VERSION_PATCH_NAME).get(0));
         assertEquals("1.0.0", resp.getHeaders().get(PapRestControllerV1.VERSION_LATEST_NAME).get(0));
@@ -69,14 +66,14 @@ public class PapRestControllerV1Test {
 
     @Test
     public void testAddLoggingHeaders_Null() {
-        ResponseEntity<Object> resp = mockController.addLoggingHeaders(bldr, null).build();
+        ResponseEntity<Object> resp = PapRestControllerV1.addLoggingHeaders(bldr, null).build();
         assertNotNull(resp.getHeaders().get(PapRestControllerV1.REQUEST_ID_NAME));
     }
 
     @Test
     public void testAddLoggingHeaders_NonNull() {
         UUID uuid = UUID.randomUUID();
-        ResponseEntity<Object> resp = mockController.addLoggingHeaders(bldr, uuid).build();
+        ResponseEntity<Object> resp = PapRestControllerV1.addLoggingHeaders(bldr, uuid).build();
         assertEquals(uuid.toString(), resp.getHeaders().get(PapRestControllerV1.REQUEST_ID_NAME).get(0));
     }
 
-- 
2.16.6