1 files changed, 9 insertions, 15 deletions

diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/DataModelConvertUtil.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/DataModelConvertUtil.java
index 0a2437588f..1d9befb6ca 100644
--- a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/DataModelConvertUtil.java
+++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/DataModelConvertUtil.java
@@ -7,9 +7,9 @@
  * 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.
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.sdc.tosca.services;
 
 import java.util.ArrayList;
@@ -27,7 +26,6 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-
 import org.apache.commons.collections4.CollectionUtils;
 import org.onap.sdc.tosca.datatypes.model.Import;
 import org.onap.sdc.tosca.error.ToscaRuntimeException;
@@ -53,9 +51,10 @@ public class DataModelConvertUtil {
     }
 
     private static void convertToscaImportEntry(List<Map<String, Import>> convertedImport, Object importEntry,
-                                         ToscaExtensionYamlUtil toscaExtensionYamlUtil) {
+                                                ToscaExtensionYamlUtil toscaExtensionYamlUtil) {
         if (importEntry instanceof String) {
             //Support for import short notation
+
             /*
             imports:
               - <file_URI_1>
@@ -68,12 +67,11 @@ public class DataModelConvertUtil {
     }
 
     private static void handleImportMultiLineGrammar(List<Map<String, Import>> convertedImport, Object importEntry,
-                                              ToscaExtensionYamlUtil toscaExtensionYamlUtil) {
+                                                     ToscaExtensionYamlUtil toscaExtensionYamlUtil) {
         try {
             if (((Map) importEntry).containsKey("file")) {
                 //Support for import entry of the format - file: <file_uri> or - file: <import object>
-                Import importObject = toscaExtensionYamlUtil
-                        .yamlToObject(toscaExtensionYamlUtil.objectToYaml(importEntry), Import.class);
+                Import importObject = toscaExtensionYamlUtil.yamlToObject(toscaExtensionYamlUtil.objectToYaml(importEntry), Import.class);
                 convertImportExtendedNotation(convertedImport, importObject);
             } else {
                 convertImportMultiLineGrammar(convertedImport, (Map) importEntry, toscaExtensionYamlUtil);
@@ -97,8 +95,7 @@ public class DataModelConvertUtil {
                           namespace_uri: http://test.xyz/uri
                           namespace_prefix: pref
                  */
-                Import importObject = toscaExtensionYamlUtil
-                        .yamlToObject(toscaExtensionYamlUtil.objectToYaml(importValue), Import.class);
+                Import importObject = toscaExtensionYamlUtil.yamlToObject(toscaExtensionYamlUtil.objectToYaml(importValue), Import.class);
                 Map<String, Import> convertedToscaImport = new HashMap<>();
                 convertedToscaImport.put(key, importObject);
                 convertedImport.add(convertedToscaImport);
@@ -111,8 +108,7 @@ public class DataModelConvertUtil {
 
     private static void convertImportExtendedNotation(List<Map<String, Import>> convertedImport, Import importEntry) {
         Map<String, Import> importMap = new HashMap<>();
-        Optional<String> fileNameWithoutExtension =
-                getFileNameWithoutExtension(getFileName(importEntry.getFile()).replaceAll("/", "_"));
+        Optional<String> fileNameWithoutExtension = getFileNameWithoutExtension(getFileName(importEntry.getFile()).replaceAll("/", "_"));
         if (fileNameWithoutExtension.isPresent()) {
             importMap.put(fileNameWithoutExtension.get(), importEntry);
             convertedImport.add(importMap);
@@ -134,11 +130,9 @@ public class DataModelConvertUtil {
         if (Objects.isNull(fileName)) {
             return Optional.empty();
         }
-        return !fileName.contains(".") ? Optional.of(fileName)
-                : Optional.of(fileName.substring(0, fileName.lastIndexOf('.')));
+        return !fileName.contains(".") ? Optional.of(fileName) : Optional.of(fileName.substring(0, fileName.lastIndexOf('.')));
     }
 
-
     private static String getFileName(String relativeFileName) {
         if (relativeFileName.contains("../")) {
             return relativeFileName.replace("../", "");