diff options
Diffstat (limited to 'ms/neng/src/main/java')
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; } |