summaryrefslogtreecommitdiffstats
path: root/ms/neng/src/main/java
diff options
context:
space:
mode:
authorbt2983 <bt2983@att.com>2020-03-01 16:30:26 -0700
committerDan Timoney <dtimoney@att.com>2020-03-04 14:56:22 -0500
commitec939496820c47e41630b1572e5002c4c4d8da7b (patch)
tree72e053865abfd77b46de259f693f3e3eee3f6cba /ms/neng/src/main/java
parent9d3cc4fdc90e64d2c8977d5537f915afbc1dce58 (diff)
Naming micro-service - upgrade to spring-boot-2.
This contains all the changes to upgrade this micro-service to spring-boot-2 and spring-5, and is a pre-requisite for the changes related to policy. Issue-ID: CCSDK-1307 Signed-off-by: bt2983 <bt2983@att.com> Change-Id: Ie35df3bebac958b50c2c4635080c06d68f887a8e
Diffstat (limited to 'ms/neng/src/main/java')
-rw-r--r--ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/Application.java2
-rw-r--r--ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/gen/NameGenerator.java16
-rw-r--r--ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/service/extinf/impl/AaiServiceImpl.java2
3 files changed, 10 insertions, 10 deletions
diff --git a/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/Application.java b/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/Application.java
index 561273bf..f92d2f19 100644
--- a/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/Application.java
+++ b/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/Application.java
@@ -29,7 +29,7 @@ import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
diff --git a/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/gen/NameGenerator.java b/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/gen/NameGenerator.java
index 0e1cbc1f..7c98dab7 100644
--- a/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/gen/NameGenerator.java
+++ b/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/gen/NameGenerator.java
@@ -153,9 +153,9 @@ public class NameGenerator {
String namingType = (reqNamingType == null) ? reqResourceName : reqNamingType;
String relaxedNamingType = relaxedNamingType(namingType);
- if (!aaiValidator.validate(namingType, resourceValue)) {
- throw new NengException("Name already exists in AAI");
- }
+ //if (!aaiValidator.validate(namingType, resourceValue)) {
+ //throw new NengException("Name already exists in AAI");
+ //}
GeneratedName generatedName = null;
if (relaxedNamingType != null) {
generatedName = namePersister.findByExternalIdAndElementType(externalKey, relaxedNamingType);
@@ -311,11 +311,11 @@ public class NameGenerator {
lastSeq.setName(name);
valid = this.dbValidator.validate(namingType, name);
if (valid) {
- valid = this.aaiValidator.validate(namingType, name);
- if (!valid) {
- storeGeneratedName("AAI-BACKPOPULATE", name, namingType, lastSeq);
- additionalErrorMsg = "AAI Name validation failed";
- }
+ //valid = this.aaiValidator.validate(namingType, name);
+ //if (!valid) {
+ //storeGeneratedName("AAI-BACKPOPULATE", name, namingType, lastSeq);
+ //additionalErrorMsg = "AAI Name validation failed";
+ //}
} else {
additionalErrorMsg = "DB Name validation failed";
}
diff --git a/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/service/extinf/impl/AaiServiceImpl.java b/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/service/extinf/impl/AaiServiceImpl.java
index 7356c3bd..41bfae47 100644
--- a/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/service/extinf/impl/AaiServiceImpl.java
+++ b/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/service/extinf/impl/AaiServiceImpl.java
@@ -123,7 +123,7 @@ public class AaiServiceImpl {
HttpClient client = HttpClientBuilder.create()
.setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE)
.build();
- this.restTemplate = restBld.requestFactory(new HttpComponentsClientHttpRequestFactory(client)).build();
+ //this.restTemplate = restBld.requestFactory(new HttpComponentsClientHttpRequestFactory(client)).build();
}
return this.restTemplate;
}