aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/onap/aai/auth/AAIAuthException.java2
-rw-r--r--src/main/java/org/onap/aai/auth/AAIMicroServiceAuth.java2
-rw-r--r--src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java6
-rw-r--r--src/main/java/org/onap/aai/auth/FileWatcher.java2
-rw-r--r--src/main/java/org/onap/aai/babel/BabelApplication.java49
-rw-r--r--src/main/java/org/onap/aai/babel/JerseyConfiguration.java38
-rw-r--r--src/main/java/org/onap/aai/babel/config/BabelAuthConfig.java2
-rw-r--r--src/main/java/org/onap/aai/babel/csar/CsarConverterException.java2
-rw-r--r--src/main/java/org/onap/aai/babel/csar/CsarToXmlConverter.java7
-rw-r--r--src/main/java/org/onap/aai/babel/csar/extractor/InvalidArchiveException.java2
-rw-r--r--src/main/java/org/onap/aai/babel/csar/extractor/YamlExtractor.java2
-rw-r--r--src/main/java/org/onap/aai/babel/csar/vnfcatalog/ConfigurationsToBabelArtifactConverter.java2
-rw-r--r--src/main/java/org/onap/aai/babel/csar/vnfcatalog/InvalidNumberOfNodesException.java2
-rw-r--r--src/main/java/org/onap/aai/babel/csar/vnfcatalog/ToscaToCatalogException.java2
-rw-r--r--src/main/java/org/onap/aai/babel/csar/vnfcatalog/VendorImageConfiguration.java2
-rw-r--r--src/main/java/org/onap/aai/babel/csar/vnfcatalog/VnfVendorImageExtractor.java5
-rw-r--r--src/main/java/org/onap/aai/babel/logging/ApplicationMsgs.java2
-rw-r--r--src/main/java/org/onap/aai/babel/logging/LogHelper.java4
-rw-r--r--src/main/java/org/onap/aai/babel/parser/ArtifactGeneratorToscaParser.java17
-rw-r--r--src/main/java/org/onap/aai/babel/request/RequestHeaders.java2
-rw-r--r--src/main/java/org/onap/aai/babel/service/GenerateArtifactsService.java4
-rw-r--r--src/main/java/org/onap/aai/babel/service/GenerateArtifactsServiceImpl.java14
-rw-r--r--src/main/java/org/onap/aai/babel/service/InfoService.java4
-rw-r--r--src/main/java/org/onap/aai/babel/service/data/BabelArtifact.java2
-rw-r--r--src/main/java/org/onap/aai/babel/service/data/BabelRequest.java2
-rw-r--r--src/main/java/org/onap/aai/babel/util/RequestValidationException.java2
-rw-r--r--src/main/java/org/onap/aai/babel/util/RequestValidator.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/ArtifactGenerator.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/ModelGenerator.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/XmlArtifactGenerationException.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java5
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGenerator.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGeneratorImpl.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/api/ArtifactGenerator.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/data/AdditionalParams.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/data/Artifact.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/data/ArtifactType.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/data/GenerationData.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/data/GeneratorConstants.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/data/GeneratorUtil.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/data/GroupType.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/data/WidgetConfigurationUtil.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/error/IllegalAccessException.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/logging/CategoryLogLevel.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/model/AllotedResource.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/model/AllotedResourceWidget.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/model/FlavorWidget.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/model/ImageWidget.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/model/L3Network.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/model/L3NetworkWidget.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/model/LIntfWidget.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/model/Model.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/model/OamNetwork.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/model/ProvidingService.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/model/Resource.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/model/ResourceWidget.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/model/Service.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/model/ServiceWidget.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/model/TenantWidget.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/model/TunnelXconnectWidget.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/model/VServerWidget.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/model/VfModule.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/model/VfModuleWidget.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/model/VfWidget.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/model/VfcWidget.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/model/VirtualFunction.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/model/VolumeGroupWidget.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/model/VolumeWidget.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/model/Widget.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/types/Cardinality.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/types/Model.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/types/ModelType.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/types/ModelWidget.java2
73 files changed, 183 insertions, 94 deletions
diff --git a/src/main/java/org/onap/aai/auth/AAIAuthException.java b/src/main/java/org/onap/aai/auth/AAIAuthException.java
index a29ee98..641dd4e 100644
--- a/src/main/java/org/onap/aai/auth/AAIAuthException.java
+++ b/src/main/java/org/onap/aai/auth/AAIAuthException.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/auth/AAIMicroServiceAuth.java b/src/main/java/org/onap/aai/auth/AAIMicroServiceAuth.java
index e4367f1..67eee9a 100644
--- a/src/main/java/org/onap/aai/auth/AAIMicroServiceAuth.java
+++ b/src/main/java/org/onap/aai/auth/AAIMicroServiceAuth.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java b/src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java
index 6f000b8..648d9d0 100644
--- a/src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java
+++ b/src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -46,7 +46,7 @@ public class AAIMicroServiceAuthCore {
public static final String FILESEP =
(System.getProperty("file.separator") == null) ? "/" : System.getProperty("file.separator");
public static final String APPCONFIG_DIR = (System.getProperty("CONFIG_HOME") == null)
- ? System.getProperty("AJSC_HOME") + FILESEP + "appconfig" : System.getProperty("CONFIG_HOME");
+ ? System.getProperty("APP_HOME") + FILESEP + "appconfig" : System.getProperty("CONFIG_HOME");
private static String appConfigAuthDir = APPCONFIG_DIR + FILESEP + "auth";
private static String defaultAuthFileName = appConfigAuthDir + FILESEP + "auth_policy.json";
@@ -85,7 +85,7 @@ public class AAIMicroServiceAuthCore {
throw new AAIAuthException(e.getMessage());
}
if (policyAuthFileName == null) {
- throw new AAIAuthException("Auth policy file could not be found");
+ throw new AAIAuthException("Auth policy file could not be found" + System.getProperty("CONFIG_HOME") + APPCONFIG_DIR);
}
AAIMicroServiceAuthCore.reloadUsers();
diff --git a/src/main/java/org/onap/aai/auth/FileWatcher.java b/src/main/java/org/onap/aai/auth/FileWatcher.java
index d974e66..57afc71 100644
--- a/src/main/java/org/onap/aai/auth/FileWatcher.java
+++ b/src/main/java/org/onap/aai/auth/FileWatcher.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/BabelApplication.java b/src/main/java/org/onap/aai/babel/BabelApplication.java
new file mode 100644
index 0000000..cc3ca4b
--- /dev/null
+++ b/src/main/java/org/onap/aai/babel/BabelApplication.java
@@ -0,0 +1,49 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 European Software Marketing Ltd.
+ * ================================================================================
+ * 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.aai.babel;
+
+import java.util.HashMap;
+import org.eclipse.jetty.util.security.Password;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.context.annotation.ImportResource;
+
+@SpringBootApplication
+@ImportResource("classpath:babel-beans.xml")
+public class BabelApplication extends SpringBootServletInitializer {
+
+ /**
+ * Spring Boot Initialization.
+ *
+ * @param args main args
+ */
+ public static void main(String[] args) {
+ String keyStorePassword = System.getProperty("KEY_STORE_PASSWORD");
+ if (keyStorePassword == null || keyStorePassword.isEmpty()) {
+ throw new IllegalArgumentException("Env property KEY_STORE_PASSWORD not set");
+ }
+ HashMap<String, Object> props = new HashMap<>();
+ props.put("server.ssl.key-store-password", Password.deobfuscate(keyStorePassword));
+ new BabelApplication().configure(new SpringApplicationBuilder(BabelApplication.class).properties(props))
+ .run(args);
+ }
+}
diff --git a/src/main/java/org/onap/aai/babel/JerseyConfiguration.java b/src/main/java/org/onap/aai/babel/JerseyConfiguration.java
new file mode 100644
index 0000000..a963774
--- /dev/null
+++ b/src/main/java/org/onap/aai/babel/JerseyConfiguration.java
@@ -0,0 +1,38 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 European Software Marketing Ltd.
+ * ================================================================================
+ * 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.aai.babel;
+
+import javax.ws.rs.ApplicationPath;
+import org.glassfish.jersey.server.ResourceConfig;
+import org.onap.aai.babel.service.GenerateArtifactsServiceImpl;
+import org.onap.aai.babel.service.InfoService;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ApplicationPath("/v1")
+public class JerseyConfiguration extends ResourceConfig {
+
+ public JerseyConfiguration() {
+ register(GenerateArtifactsServiceImpl.class);
+ register(InfoService.class);
+ }
+
+}
diff --git a/src/main/java/org/onap/aai/babel/config/BabelAuthConfig.java b/src/main/java/org/onap/aai/babel/config/BabelAuthConfig.java
index 21525a1..44b9882 100644
--- a/src/main/java/org/onap/aai/babel/config/BabelAuthConfig.java
+++ b/src/main/java/org/onap/aai/babel/config/BabelAuthConfig.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/csar/CsarConverterException.java b/src/main/java/org/onap/aai/babel/csar/CsarConverterException.java
index eb81014..03c485e 100644
--- a/src/main/java/org/onap/aai/babel/csar/CsarConverterException.java
+++ b/src/main/java/org/onap/aai/babel/csar/CsarConverterException.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/csar/CsarToXmlConverter.java b/src/main/java/org/onap/aai/babel/csar/CsarToXmlConverter.java
index 1322c9c..be6ef58 100644
--- a/src/main/java/org/onap/aai/babel/csar/CsarToXmlConverter.java
+++ b/src/main/java/org/onap/aai/babel/csar/CsarToXmlConverter.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -22,7 +22,8 @@ package org.onap.aai.babel.csar;
import java.util.List;
import java.util.Objects;
-import org.apache.commons.lang.time.StopWatch;
+
+import org.apache.commons.lang3.time.StopWatch;
import org.onap.aai.babel.csar.extractor.InvalidArchiveException;
import org.onap.aai.babel.csar.extractor.YamlExtractor;
import org.onap.aai.babel.logging.ApplicationMsgs;
@@ -45,7 +46,7 @@ public class CsarToXmlConverter {
* @param csarArchive the artifact that contains the csar archive to generate xml artifacts from
* @param name the name of the archive file
* @param version the version of the archive file
- * @return List<org.openecomp.sdc.generator.data.Artifact> a list of generated xml artifacts
+ * @return List<org.onap.sdc.generator.data.Artifact> a list of generated xml artifacts
* @throws CsarConverterException if there is an error either extracting the yaml files or generating xml artifacts
*/
public List<BabelArtifact> generateXmlFromCsar(byte[] csarArchive, String name, String version)
diff --git a/src/main/java/org/onap/aai/babel/csar/extractor/InvalidArchiveException.java b/src/main/java/org/onap/aai/babel/csar/extractor/InvalidArchiveException.java
index 97d72d4..4b63371 100644
--- a/src/main/java/org/onap/aai/babel/csar/extractor/InvalidArchiveException.java
+++ b/src/main/java/org/onap/aai/babel/csar/extractor/InvalidArchiveException.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/csar/extractor/YamlExtractor.java b/src/main/java/org/onap/aai/babel/csar/extractor/YamlExtractor.java
index 7700a54..73d364e 100644
--- a/src/main/java/org/onap/aai/babel/csar/extractor/YamlExtractor.java
+++ b/src/main/java/org/onap/aai/babel/csar/extractor/YamlExtractor.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/ConfigurationsToBabelArtifactConverter.java b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/ConfigurationsToBabelArtifactConverter.java
index 983c810..c6a81d8 100644
--- a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/ConfigurationsToBabelArtifactConverter.java
+++ b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/ConfigurationsToBabelArtifactConverter.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/InvalidNumberOfNodesException.java b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/InvalidNumberOfNodesException.java
index 425982b..5ba1aba 100644
--- a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/InvalidNumberOfNodesException.java
+++ b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/InvalidNumberOfNodesException.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/ToscaToCatalogException.java b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/ToscaToCatalogException.java
index 2ef9dc8..edf7771 100644
--- a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/ToscaToCatalogException.java
+++ b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/ToscaToCatalogException.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VendorImageConfiguration.java b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VendorImageConfiguration.java
index bd9aac7..2d419e2 100644
--- a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VendorImageConfiguration.java
+++ b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VendorImageConfiguration.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VnfVendorImageExtractor.java b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VnfVendorImageExtractor.java
index e76c0c1..9836e2a 100644
--- a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VnfVendorImageExtractor.java
+++ b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VnfVendorImageExtractor.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -30,8 +30,9 @@ import java.util.Map.Entry;
import java.util.Objects;
import java.util.function.Consumer;
import java.util.stream.Collectors;
+
import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.time.StopWatch;
+import org.apache.commons.lang3.time.StopWatch;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.onap.aai.babel.logging.ApplicationMsgs;
diff --git a/src/main/java/org/onap/aai/babel/logging/ApplicationMsgs.java b/src/main/java/org/onap/aai/babel/logging/ApplicationMsgs.java
index 84b426b..0113aa5 100644
--- a/src/main/java/org/onap/aai/babel/logging/ApplicationMsgs.java
+++ b/src/main/java/org/onap/aai/babel/logging/ApplicationMsgs.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/logging/LogHelper.java b/src/main/java/org/onap/aai/babel/logging/LogHelper.java
index 54c5361..2e54be7 100644
--- a/src/main/java/org/onap/aai/babel/logging/LogHelper.java
+++ b/src/main/java/org/onap/aai/babel/logging/LogHelper.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -37,7 +37,7 @@ import java.util.function.Consumer;
import javax.servlet.ServletRequest;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response.Status;
-import org.apache.commons.lang.time.StopWatch;
+import org.apache.commons.lang3.time.StopWatch;
import org.onap.aai.babel.request.RequestHeaders;
import org.onap.aai.cl.api.LogFields;
import org.onap.aai.cl.api.Logger;
diff --git a/src/main/java/org/onap/aai/babel/parser/ArtifactGeneratorToscaParser.java b/src/main/java/org/onap/aai/babel/parser/ArtifactGeneratorToscaParser.java
index 3bccebe..70e78ec 100644
--- a/src/main/java/org/onap/aai/babel/parser/ArtifactGeneratorToscaParser.java
+++ b/src/main/java/org/onap/aai/babel/parser/ArtifactGeneratorToscaParser.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -33,6 +33,7 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.stream.Collectors;
+
import org.onap.aai.babel.logging.LogHelper;
import org.onap.aai.babel.xml.generator.data.GeneratorConstants;
import org.onap.aai.babel.xml.generator.data.WidgetConfigurationUtil;
@@ -64,7 +65,7 @@ public class ArtifactGeneratorToscaParser {
/**
* Constructs using csarHelper
- *
+ *
* @param csarHelper The csar helper
*/
public ArtifactGeneratorToscaParser(ISdcCsarHelper csarHelper) {
@@ -73,7 +74,7 @@ public class ArtifactGeneratorToscaParser {
/**
* Returns the artifact description
- *
+ *
* @param model the artifact model
* @return the artifact model's description
*/
@@ -89,7 +90,7 @@ public class ArtifactGeneratorToscaParser {
/**
* Initialises the widget configuration.
- *
+ *
* @throws IOException
*/
public static void initWidgetConfiguration() throws IOException {
@@ -111,7 +112,7 @@ public class ArtifactGeneratorToscaParser {
/**
* Generates a Resource List using input Service Node Templates
- *
+ *
* @param serviceNodes input Service Node Templates
* @param idTypeStore ID->Type mapping
* @return the processed resource models
@@ -213,11 +214,11 @@ public class ArtifactGeneratorToscaParser {
/**
* Process the service tosca
- *
+ *
* @param service model of the service artifact
* @param idTypeStore ID->Type mapping
* @param nodeTemplates a list of service nodes
- *
+ *
*/
public void processServiceTosca(Service service, Map<String, String> idTypeStore,
List<NodeTemplate> nodeTemplates) {
@@ -262,7 +263,7 @@ public class ArtifactGeneratorToscaParser {
/**
* Create a Map of property name against String property value from the input Map
- *
+ *
* @param inputMap The input Map
* @return Map of property name against String property value
*/
diff --git a/src/main/java/org/onap/aai/babel/request/RequestHeaders.java b/src/main/java/org/onap/aai/babel/request/RequestHeaders.java
index f0d960c..0d1dbdc 100644
--- a/src/main/java/org/onap/aai/babel/request/RequestHeaders.java
+++ b/src/main/java/org/onap/aai/babel/request/RequestHeaders.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/service/GenerateArtifactsService.java b/src/main/java/org/onap/aai/babel/service/GenerateArtifactsService.java
index 7034149..33f6f1a 100644
--- a/src/main/java/org/onap/aai/babel/service/GenerateArtifactsService.java
+++ b/src/main/java/org/onap/aai/babel/service/GenerateArtifactsService.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -33,7 +33,7 @@ import javax.ws.rs.core.UriInfo;
import org.onap.aai.auth.AAIAuthException;
/** Generate artifacts from the specified request content */
-@Path("/")
+@Path("/app")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
public interface GenerateArtifactsService {
diff --git a/src/main/java/org/onap/aai/babel/service/GenerateArtifactsServiceImpl.java b/src/main/java/org/onap/aai/babel/service/GenerateArtifactsServiceImpl.java
index eef7476..17d0b65 100644
--- a/src/main/java/org/onap/aai/babel/service/GenerateArtifactsServiceImpl.java
+++ b/src/main/java/org/onap/aai/babel/service/GenerateArtifactsServiceImpl.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -20,9 +20,9 @@
*/
package org.onap.aai.babel.service;
-import com.att.aft.dme2.internal.gson.Gson;
-import com.att.aft.dme2.internal.gson.GsonBuilder;
-import com.att.aft.dme2.internal.gson.JsonSyntaxException;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonSyntaxException;
import java.util.Base64;
import java.util.List;
import java.util.UUID;
@@ -33,7 +33,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import javax.ws.rs.core.UriInfo;
-import org.apache.commons.lang.time.StopWatch;
+import org.apache.commons.lang3.time.StopWatch;
import org.onap.aai.auth.AAIMicroServiceAuth;
import org.onap.aai.auth.AAIMicroServiceAuthCore;
import org.onap.aai.babel.csar.CsarConverterException;
@@ -56,9 +56,7 @@ public class GenerateArtifactsServiceImpl implements GenerateArtifactsService {
private AAIMicroServiceAuth aaiMicroServiceAuth;
- /**
- * @param authorization
- */
+ /** @param authorization */
@Inject
public GenerateArtifactsServiceImpl(final AAIMicroServiceAuth authorization) {
this.aaiMicroServiceAuth = authorization;
diff --git a/src/main/java/org/onap/aai/babel/service/InfoService.java b/src/main/java/org/onap/aai/babel/service/InfoService.java
index 107c6d1..c993746 100644
--- a/src/main/java/org/onap/aai/babel/service/InfoService.java
+++ b/src/main/java/org/onap/aai/babel/service/InfoService.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -37,7 +37,7 @@ import javax.ws.rs.QueryParam;
*
* @exclude
*/
-@Path("/core-service")
+@Path("/core/core-service")
public class InfoService {
private Clock clock = Clock.systemDefaultZone();
diff --git a/src/main/java/org/onap/aai/babel/service/data/BabelArtifact.java b/src/main/java/org/onap/aai/babel/service/data/BabelArtifact.java
index 81c237e..3aa9f8c 100644
--- a/src/main/java/org/onap/aai/babel/service/data/BabelArtifact.java
+++ b/src/main/java/org/onap/aai/babel/service/data/BabelArtifact.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/service/data/BabelRequest.java b/src/main/java/org/onap/aai/babel/service/data/BabelRequest.java
index 47241b4..9c73277 100644
--- a/src/main/java/org/onap/aai/babel/service/data/BabelRequest.java
+++ b/src/main/java/org/onap/aai/babel/service/data/BabelRequest.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/util/RequestValidationException.java b/src/main/java/org/onap/aai/babel/util/RequestValidationException.java
index cf5322a..ce19ed1 100644
--- a/src/main/java/org/onap/aai/babel/util/RequestValidationException.java
+++ b/src/main/java/org/onap/aai/babel/util/RequestValidationException.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/util/RequestValidator.java b/src/main/java/org/onap/aai/babel/util/RequestValidator.java
index 499a5c8..c0d2c98 100644
--- a/src/main/java/org/onap/aai/babel/util/RequestValidator.java
+++ b/src/main/java/org/onap/aai/babel/util/RequestValidator.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/ArtifactGenerator.java b/src/main/java/org/onap/aai/babel/xml/generator/ArtifactGenerator.java
index 46d5ea4..3d07a7a 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/ArtifactGenerator.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/ArtifactGenerator.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/ModelGenerator.java b/src/main/java/org/onap/aai/babel/xml/generator/ModelGenerator.java
index 65e0ada..dcd0f3e 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/ModelGenerator.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/ModelGenerator.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/XmlArtifactGenerationException.java b/src/main/java/org/onap/aai/babel/xml/generator/XmlArtifactGenerationException.java
index 5e5304b..940de43 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/XmlArtifactGenerationException.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/XmlArtifactGenerationException.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java b/src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java
index bdcd71c..c6ca460 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -26,6 +26,7 @@ import java.nio.file.Path;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
import org.apache.commons.io.FileUtils;
import org.onap.aai.babel.logging.ApplicationMsgs;
import org.onap.aai.babel.logging.LogHelper;
@@ -132,7 +133,7 @@ public class AaiArtifactGenerator implements ArtifactGenerator {
/**
* Method to generate the artifact label for AAI model
- *
+ *
* @param model
* @return the artifact label as String
*/
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGenerator.java b/src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGenerator.java
index f8571f3..409dbc2 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGenerator.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGenerator.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGeneratorImpl.java b/src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGeneratorImpl.java
index 488faae..156a8b6 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGeneratorImpl.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGeneratorImpl.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/api/ArtifactGenerator.java b/src/main/java/org/onap/aai/babel/xml/generator/api/ArtifactGenerator.java
index b5c8f5b..0dc64bf 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/api/ArtifactGenerator.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/api/ArtifactGenerator.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/data/AdditionalParams.java b/src/main/java/org/onap/aai/babel/xml/generator/data/AdditionalParams.java
index 00b276c..ee52868 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/data/AdditionalParams.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/data/AdditionalParams.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/data/Artifact.java b/src/main/java/org/onap/aai/babel/xml/generator/data/Artifact.java
index 50dfc89..690305f 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/data/Artifact.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/data/Artifact.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/data/ArtifactType.java b/src/main/java/org/onap/aai/babel/xml/generator/data/ArtifactType.java
index 572342a..27f3b23 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/data/ArtifactType.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/data/ArtifactType.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/data/GenerationData.java b/src/main/java/org/onap/aai/babel/xml/generator/data/GenerationData.java
index f59cb66..d73d56d 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/data/GenerationData.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/data/GenerationData.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/data/GeneratorConstants.java b/src/main/java/org/onap/aai/babel/xml/generator/data/GeneratorConstants.java
index 40e8eb9..b9d8cb2 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/data/GeneratorConstants.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/data/GeneratorConstants.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/data/GeneratorUtil.java b/src/main/java/org/onap/aai/babel/xml/generator/data/GeneratorUtil.java
index 905c859..2405d4d 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/data/GeneratorUtil.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/data/GeneratorUtil.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/data/GroupType.java b/src/main/java/org/onap/aai/babel/xml/generator/data/GroupType.java
index b2bc3f9..caeed0e 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/data/GroupType.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/data/GroupType.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/data/WidgetConfigurationUtil.java b/src/main/java/org/onap/aai/babel/xml/generator/data/WidgetConfigurationUtil.java
index d36982d..e3a0f2c 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/data/WidgetConfigurationUtil.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/data/WidgetConfigurationUtil.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/error/IllegalAccessException.java b/src/main/java/org/onap/aai/babel/xml/generator/error/IllegalAccessException.java
index 3c907cb..491e2c5 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/error/IllegalAccessException.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/error/IllegalAccessException.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/logging/CategoryLogLevel.java b/src/main/java/org/onap/aai/babel/xml/generator/logging/CategoryLogLevel.java
index b6ca2d3..424db94 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/logging/CategoryLogLevel.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/logging/CategoryLogLevel.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/AllotedResource.java b/src/main/java/org/onap/aai/babel/xml/generator/model/AllotedResource.java
index cecf7bd..c22228f 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/AllotedResource.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/AllotedResource.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/AllotedResourceWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/AllotedResourceWidget.java
index 740ca62..59e7b4f 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/AllotedResourceWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/AllotedResourceWidget.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/FlavorWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/FlavorWidget.java
index 26dde9b..0d6302c 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/FlavorWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/FlavorWidget.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/ImageWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/ImageWidget.java
index 60656b2..269ea25 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/ImageWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/ImageWidget.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/L3Network.java b/src/main/java/org/onap/aai/babel/xml/generator/model/L3Network.java
index 105c3a1..bc6ece2 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/L3Network.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/L3Network.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/L3NetworkWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/L3NetworkWidget.java
index f737b82..87edd65 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/L3NetworkWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/L3NetworkWidget.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/LIntfWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/LIntfWidget.java
index fb07ef6..98bac09 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/LIntfWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/LIntfWidget.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/Model.java b/src/main/java/org/onap/aai/babel/xml/generator/model/Model.java
index 262d29a..0a8f0b1 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/Model.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/Model.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/OamNetwork.java b/src/main/java/org/onap/aai/babel/xml/generator/model/OamNetwork.java
index e9076a9..35c893d 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/OamNetwork.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/OamNetwork.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/ProvidingService.java b/src/main/java/org/onap/aai/babel/xml/generator/model/ProvidingService.java
index e25274e..8e3f3e0 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/ProvidingService.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/ProvidingService.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/Resource.java b/src/main/java/org/onap/aai/babel/xml/generator/model/Resource.java
index 9d4feab..2dfe2fb 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/Resource.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/Resource.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/ResourceWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/ResourceWidget.java
index a0f84c7..c537343 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/ResourceWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/ResourceWidget.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/Service.java b/src/main/java/org/onap/aai/babel/xml/generator/model/Service.java
index 9d22e41..7469c38 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/Service.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/Service.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/ServiceWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/ServiceWidget.java
index 7c2229d..d3088a7 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/ServiceWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/ServiceWidget.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/TenantWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/TenantWidget.java
index a0a4392..473a80a 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/TenantWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/TenantWidget.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/TunnelXconnectWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/TunnelXconnectWidget.java
index 548cd6f..9f1857f 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/TunnelXconnectWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/TunnelXconnectWidget.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/VServerWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/VServerWidget.java
index 7de0f5b..86f255f 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/VServerWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/VServerWidget.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/VfModule.java b/src/main/java/org/onap/aai/babel/xml/generator/model/VfModule.java
index 8b8913d..43915b2 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/VfModule.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/VfModule.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/VfModuleWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/VfModuleWidget.java
index cc27ca9..3cee38c 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/VfModuleWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/VfModuleWidget.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/VfWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/VfWidget.java
index 614244e..6a6d431 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/VfWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/VfWidget.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/VfcWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/VfcWidget.java
index abfa49f..07172fe 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/VfcWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/VfcWidget.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/VirtualFunction.java b/src/main/java/org/onap/aai/babel/xml/generator/model/VirtualFunction.java
index be75d65..aa7ef06 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/VirtualFunction.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/VirtualFunction.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/VolumeGroupWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/VolumeGroupWidget.java
index 3a0aa37..2649c06 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/VolumeGroupWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/VolumeGroupWidget.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/VolumeWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/VolumeWidget.java
index d18a723..0aa9658 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/VolumeWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/VolumeWidget.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/Widget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/Widget.java
index 545ad79..2a85e27 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/Widget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/Widget.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/types/Cardinality.java b/src/main/java/org/onap/aai/babel/xml/generator/types/Cardinality.java
index 9cdb93b..11b7e15 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/types/Cardinality.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/types/Cardinality.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/types/Model.java b/src/main/java/org/onap/aai/babel/xml/generator/types/Model.java
index f69c3ea..69dae3f 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/types/Model.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/types/Model.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/types/ModelType.java b/src/main/java/org/onap/aai/babel/xml/generator/types/ModelType.java
index 7dd86c6..e92af8a 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/types/ModelType.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/types/ModelType.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/types/ModelWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/types/ModelWidget.java
index 307524e..ed52ace 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/types/ModelWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/types/ModelWidget.java
@@ -1,5 +1,5 @@
/**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
* Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.