diff options
Diffstat (limited to 'ms/neng')
8 files changed, 92 insertions, 21 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 6efa94de..0edc38a3 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 @@ -21,6 +21,9 @@ package org.onap.ccsdk.apps.ms.neng.core; import java.util.Arrays; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -38,6 +41,9 @@ import org.springframework.scheduling.annotation.EnableAsync; @ComponentScan(basePackages = "org.onap.ccsdk") @EnableAsync public class Application extends SpringBootServletInitializer { + + private Logger logger = LoggerFactory.getLogger(Application.class); + /** * Configures the application. */ @@ -49,7 +55,7 @@ public class Application extends SpringBootServletInitializer { /** * Entry point for the application. */ - public static void main(String[] args) throws Exception { + public static void main(String[] args) { SpringApplication.run(Application.class, args); } @@ -59,14 +65,14 @@ public class Application extends SpringBootServletInitializer { @Bean public CommandLineRunner commandLineRunner(ApplicationContext ctx) { return args -> { - System.out.println("################################"); - System.out.println("Inspecting the beans provided by Spring Boot:"); + logger.info("################################"); + logger.info("Inspecting the beans provided by Spring Boot:"); String[] beanNames = ctx.getBeanDefinitionNames(); Arrays.sort(beanNames); for (String beanName : beanNames) { System.out.println(beanName); } - System.out.println("################################"); + logger.info("################################"); }; } diff --git a/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/policy/PolicyReader.java b/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/policy/PolicyReader.java index 73f46c95..09a6e49b 100644 --- a/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/policy/PolicyReader.java +++ b/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/policy/PolicyReader.java @@ -37,19 +37,23 @@ public abstract class PolicyReader implements PolicyFinder { * @param policy the policy * @return the list of naming-models found in the policy */ + private static final String NAMING_MODELS = "naming-models"; + private static final String NAMING_TYPE = "naming-type"; + public static List<Map<String, ?>> namingModels(Map<String, ?> policy) { + Set<String> keys = policy.keySet(); // TODO : retrieve naming-models at any level if (keys.contains("config")) { @SuppressWarnings("unchecked") Map<String, ?> config = (Map<String, ?>) policy.get("config"); - List<Map<String, ?>> namingModels = list(map(config, "content"), "naming-models"); + List<Map<String, ?>> namingModels = list(map(config, "content"), NAMING_MODELS); if (namingModels == null) { - namingModels = list(config, "naming-models"); + namingModels = list(config, NAMING_MODELS); } return namingModels; } else { - return list(map(map(policy, "input"), "naming-model"), "naming-models"); + return list(map(map(policy, "input"), "naming-model"), NAMING_MODELS); } } @@ -65,7 +69,7 @@ public abstract class PolicyReader implements PolicyFinder { Map<String, ?> theModel = null; if (namingModels != null) { for (Map<String, ?> model : namingModels) { - Object val = model.get("naming-type"); + Object val = model.get(NAMING_TYPE); if (namingType.equals(val)) { theModel = model; break; @@ -120,8 +124,9 @@ public abstract class PolicyReader implements PolicyFinder { * Finds the naming-operation from the given naming-model. */ public static String namingOperation(Map<String, ?> namimgModel) { - String propValue = value(namimgModel, "name-operation"); - return propValue; + //String propValue = value(namimgModel, "name-operation"); + //return propValue; + return value(namimgModel, "name-operation"); } /** @@ -294,8 +299,8 @@ public abstract class PolicyReader implements PolicyFinder { Map<String, Object> getPolicy(String jsonString) throws Exception { ObjectMapper mapper = new ObjectMapper(); - Map<String, Object> jsonObject = mapper.readValue(jsonString, new TypeReference<Map<String, Object>>() {}); - return jsonObject; + // Map<String, Object> jsonObject = mapper.readValue(jsonString, new TypeReference<Map<String, Object>>() {}); + return mapper.readValue(jsonString, new TypeReference<Map<String, Object>>() {}); } static List<Map<String, ?>> list(Map<String, ?> policy, String name) { diff --git a/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/policy/PolicySequence.java b/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/policy/PolicySequence.java index dc0b6fdc..526f67c1 100644 --- a/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/policy/PolicySequence.java +++ b/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/policy/PolicySequence.java @@ -83,11 +83,11 @@ public class PolicySequence { } } if (this.maxValue == null) { - long length = this.length; - if (length <= 0) { - length = 3; + long mlength = this.length; + if (mlength <= 0) { + mlength = 3; } - this.maxValue = (long) Math.pow(base, length) - 1; + this.maxValue = (long) Math.pow(base, mlength) - 1; } } return maxValue; diff --git a/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/policy/PropertyOperator.java b/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/policy/PropertyOperator.java index 448ee075..8fd30120 100644 --- a/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/policy/PropertyOperator.java +++ b/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/policy/PropertyOperator.java @@ -128,8 +128,8 @@ public class PropertyOperator { if (mapped == null) { mapped = camelConverted(recipeItem); } - String value = applyJavaOperation(null, recipeItem, mapped); - return value; + //String value = applyJavaOperation(null, recipeItem, mapped); + return applyJavaOperation(null, recipeItem, mapped); } static String operationFunction(String operation) throws Exception { diff --git a/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/validator/ExternalKeyValidator.java b/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/validator/ExternalKeyValidator.java index 28dde566..4b7ec79b 100644 --- a/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/validator/ExternalKeyValidator.java +++ b/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/validator/ExternalKeyValidator.java @@ -36,7 +36,7 @@ public class ExternalKeyValidator { * Tells if the given external ID is present in the DB. */ public boolean isPresent(String externalId) { - if (genNameRepo.findByExternalId(externalId).size() > 0) { + if (genNameRepo.findByExternalId(externalId).size() > 0 || genNameRepo.findByExternalId(externalId).isEmpty() ) { return true; } return false; 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 6c4ae889..7356c3bd 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 @@ -4,6 +4,8 @@ * ================================================================================ * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. * ================================================================================ + * Modifications Copyright (C) 2018 IBM. + * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -125,4 +127,8 @@ public class AaiServiceImpl { } return this.restTemplate; } + + public void setAaiProps(AaiProps aaiProps) { + this.aaiProps = aaiProps; + } } diff --git a/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/validator/ExternalKeyValidatorTest.java b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/validator/ExternalKeyValidatorTest.java new file mode 100644 index 00000000..7c6c95f3 --- /dev/null +++ b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/validator/ExternalKeyValidatorTest.java @@ -0,0 +1,44 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP : CCSDK.apps + * ================================================================================ + * Copyright (C) 2018 IBM. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.ccsdk.apps.ms.neng.core.validator; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.runners.MockitoJUnitRunner; +import org.onap.ccsdk.apps.ms.neng.persistence.repository.GeneratedNameRespository; + +@RunWith(MockitoJUnitRunner.class) +public class ExternalKeyValidatorTest { + + @InjectMocks + ExternalKeyValidator externalKeyValidator; + + @Mock + GeneratedNameRespository genNameRepo; + + @Test + public void testIsPresent() + { + externalKeyValidator.isPresent("testId"); + } +} diff --git a/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/service/extinf/impl/AaiServiceImplTest.java b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/service/extinf/impl/AaiServiceImplTest.java index b25de210..8507bf65 100644 --- a/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/service/extinf/impl/AaiServiceImplTest.java +++ b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/service/extinf/impl/AaiServiceImplTest.java @@ -4,8 +4,6 @@ * ================================================================================ * Copyright (C) 2018 IBM. * ================================================================================ - * Modifications Copyright (C) 2018 IBM. - * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -26,7 +24,9 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.onap.ccsdk.apps.ms.neng.core.resource.model.AaiResponse; +import org.onap.ccsdk.apps.ms.neng.extinf.props.AaiProps; import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.web.client.RestTemplate; public class AaiServiceImplTest { private AaiServiceImpl aaiServiceImpl; @@ -48,4 +48,14 @@ public class AaiServiceImplTest { AaiResponse aaiResponse = aaiServiceImpl.buildResponse(true); Assert.assertEquals(aaiResponse.isRecFound(), true); } + + @Test(expected= Exception.class) + public void testValidate() throws Exception { + AaiProps aaiProps=new AaiProps(); + aaiProps.setUriBase("http://"); + aaiServiceImpl.setAaiProps(aaiProps); + aaiServiceImpl.setRestTemplate(new RestTemplate()); + aaiServiceImpl.validate("testUrl/","testName"); + + } } |