From 6395962b153816a24eeada88a01449ce0c59dcbb Mon Sep 17 00:00:00 2001 From: ojasdubey Date: Wed, 13 Dec 2017 16:23:43 +0530 Subject: Simplified the return condition Note: Sonar violations will be handled as a separate task Change-Id: I862247f5c693f4d64dff4ce18f2f71e42c85355a Issue-ID: SDC-749 Signed-off-by: ojasdubey --- .../services/ManualVspToscaGenerationService.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'openecomp-be/lib/openecomp-sdc-tosca-generator-lib') diff --git a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/src/main/java/org/openecomp/sdc/generator/core/services/ManualVspToscaGenerationService.java b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/src/main/java/org/openecomp/sdc/generator/core/services/ManualVspToscaGenerationService.java index 8234179017..ab5750684d 100644 --- a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/src/main/java/org/openecomp/sdc/generator/core/services/ManualVspToscaGenerationService.java +++ b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/src/main/java/org/openecomp/sdc/generator/core/services/ManualVspToscaGenerationService.java @@ -1,7 +1,24 @@ +/* + * Copyright © 2016-2017 European Support Limited + * + * 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. + */ + package org.openecomp.sdc.generator.core.services; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; +import org.openecomp.core.utilities.orchestration.OnboardingTypesEnum; import org.openecomp.sdc.generator.core.utils.GeneratorUtils; import org.openecomp.sdc.generator.datatypes.tosca.MultiFlavorVfcImage; import org.openecomp.sdc.generator.datatypes.tosca.VspModelInfo; @@ -69,7 +86,7 @@ public class ManualVspToscaGenerationService { ToscaServiceModel toscaServiceModel = new ToscaServiceModel(); ToscaAnalyzerService toscaAnalyzerService = new ToscaAnalyzerServiceImpl(); Map serviceTemplates = new HashMap<>(GlobalTypesGenerator - .getGlobalTypesServiceTemplate()); + .getGlobalTypesServiceTemplate(OnboardingTypesEnum.MANUAL)); toscaServiceModel.setServiceTemplates(serviceTemplates); toscaServiceModel.setEntryDefinitionServiceTemplate(Constants.MAIN_TEMPLATE_NAME + TOSCA_SERVICE_TEMPLATE_FILE_NAME_SUFFIX); -- cgit 1.2.3-korg