summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/pom.xml2
-rw-r--r--main/src/main/java/org/onap/policy/api/main/rest/NodeTemplateController.java4
-rw-r--r--main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java2
-rw-r--r--main/src/test/java/org/onap/policy/api/main/service/TestToscaServiceTemplateForNodeTemplate.java2
4 files changed, 1 insertions, 9 deletions
diff --git a/main/pom.xml b/main/pom.xml
index 4e787cf4..0ffe56c5 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -98,7 +98,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
- <version>${version.springboot}</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
@@ -114,7 +113,6 @@
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
- <version>${version.springfox}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
diff --git a/main/src/main/java/org/onap/policy/api/main/rest/NodeTemplateController.java b/main/src/main/java/org/onap/policy/api/main/rest/NodeTemplateController.java
index 19b37980..6010f8e1 100644
--- a/main/src/main/java/org/onap/policy/api/main/rest/NodeTemplateController.java
+++ b/main/src/main/java/org/onap/policy/api/main/rest/NodeTemplateController.java
@@ -47,8 +47,6 @@ import org.onap.policy.models.base.PfModelException;
import org.onap.policy.models.base.PfModelRuntimeException;
import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate;
import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -81,8 +79,6 @@ import org.springframework.web.bind.annotation.RestController;
@RequiredArgsConstructor
public class NodeTemplateController extends CommonRestController {
- private static final Logger LOGGER = LoggerFactory.getLogger(NodeTemplateController.class);
-
private final ToscaServiceTemplateService toscaServiceTemplateService;
/**
diff --git a/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java b/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java
index bf35d27b..4f4dd6b8 100644
--- a/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java
+++ b/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java
@@ -45,7 +45,6 @@ import org.onap.policy.api.main.rest.provider.statistics.StatisticsReport;
import org.onap.policy.api.main.rest.utils.CommonTestRestController;
import org.onap.policy.common.endpoints.report.HealthCheckReport;
import org.onap.policy.common.utils.coder.StandardCoder;
-import org.onap.policy.common.utils.coder.StandardYamlCoder;
import org.onap.policy.common.utils.network.NetworkUtil;
import org.onap.policy.common.utils.resources.ResourceUtils;
import org.onap.policy.common.utils.resources.TextFileUtils;
@@ -155,7 +154,6 @@ public class TestApiRestServer extends CommonTestRestController {
// @formatter:on
private static final StandardCoder standardCoder = new StandardCoder();
- private static StandardYamlCoder standardYamlCoder = new StandardYamlCoder();
private static SelfSignedKeyStore keystore;
@LocalServerPort
diff --git a/main/src/test/java/org/onap/policy/api/main/service/TestToscaServiceTemplateForNodeTemplate.java b/main/src/test/java/org/onap/policy/api/main/service/TestToscaServiceTemplateForNodeTemplate.java
index 6c6f0162..8f8fc464 100644
--- a/main/src/test/java/org/onap/policy/api/main/service/TestToscaServiceTemplateForNodeTemplate.java
+++ b/main/src/test/java/org/onap/policy/api/main/service/TestToscaServiceTemplateForNodeTemplate.java
@@ -117,7 +117,7 @@ public class TestToscaServiceTemplateForNodeTemplate extends TestCommonToscaServ
assertThatThrownBy(() -> {
toscaServiceTemplateService.updateToscaNodeTemplates(null);
- }).hasMessageMatching("^serviceTemplate is marked non-null but is null$");
+ }).hasMessageMatching("^serviceTemplate is marked .*on.*ull but is null$");
JpaToscaNodeTemplate jpaNodeTemplate = new JpaToscaNodeTemplate();
PfConceptKey key = new PfConceptKey("apexMetadata_grpc", "1.0.0");