Update appc-config-generator to use onap packaging

Change-Id: Ia89d9eb8f56c8ac0e46cbe1b473f7cfced32228a
Issue-ID: APPC-13
Signed-off-by: Takamune Cho <tc012c@att.com>

1 files changed, 29 insertions, 23 deletions

diff --git a/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/MergeTool.java b/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/MergeTool.java
index 0958deebb..a7f0b9d32 100644
--- a/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/MergeTool.java
+++ b/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/MergeTool.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * 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
@@ -15,16 +17,17 @@
  * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.config.generator.tool;
+package org.onap.sdnc.config.generator.tool;
 
 import java.io.IOException;
 import java.io.StringWriter;
 import java.util.Iterator;
 import java.util.Map;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
@@ -33,8 +36,7 @@ import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.runtime.RuntimeConstants;
 import org.apache.velocity.runtime.resource.loader.StringResourceLoader;
 import org.apache.velocity.runtime.resource.util.StringResourceRepository;
-import org.openecomp.sdnc.config.generator.ConfigGeneratorConstant;
-
+import org.onap.sdnc.config.generator.ConfigGeneratorConstant;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.fasterxml.jackson.core.JsonParseException;
@@ -45,10 +47,10 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class MergeTool {
 
-    private static final  EELFLogger log = EELFManager.getInstance().getLogger(MergeTool.class);
+    private static final EELFLogger log = EELFManager.getInstance().getLogger(MergeTool.class);
 
-    public static String mergeMap2TemplateData(String template, Map< String, String> dataMap ){
-        log.info("MergeMap2TemplateData Template :"+ template + " Maps :"+ dataMap);
+    public static String mergeMap2TemplateData(String template, Map<String, String> dataMap) {
+        log.info("MergeMap2TemplateData Template :" + template + " Maps :" + dataMap);
         StringWriter writer = new StringWriter();
         VelocityEngine ve = new VelocityEngine();
         ve.setProperty(RuntimeConstants.RESOURCE_LOADER, "string");
@@ -56,13 +58,14 @@ public class MergeTool {
         ve.addProperty("string.resource.loader.repository.static", "false");
         ve.init();
 
-        StringResourceRepository repo = (StringResourceRepository)ve.getApplicationAttribute(StringResourceLoader.REPOSITORY_NAME_DEFAULT);
+        StringResourceRepository repo = (StringResourceRepository) ve
+                .getApplicationAttribute(StringResourceLoader.REPOSITORY_NAME_DEFAULT);
         repo.putStringResource("TemplateResource", template);
 
         Template t = ve.getTemplate("TemplateResource");
         VelocityContext context = new VelocityContext();
         Iterator<Map.Entry<String, String>> entries = dataMap.entrySet().iterator();
-        while (entries.hasNext())        {
+        while (entries.hasNext()) {
             Map.Entry<String, String> entry = entries.next();
             context.put(entry.getKey(), entry.getValue());
         }
@@ -71,33 +74,36 @@ public class MergeTool {
     }
 
 
-    public static String mergeJson2TemplateData(String template, String jsonData, String templateType, String doPrettyOutput) throws JsonParseException, JsonMappingException, IOException{
+    public static String mergeJson2TemplateData(String template, String jsonData,
+            String templateType, String doPrettyOutput)
+            throws JsonParseException, JsonMappingException, IOException {
         String mergedData = template;
-        if( StringUtils.isNotBlank(template) && StringUtils.isNotBlank(jsonData)){    
+        if (StringUtils.isNotBlank(template) && StringUtils.isNotBlank(jsonData)) {
             Velocity.init();
 
-            ObjectMapper mapper = new ObjectMapper();        
-            CustomJsonNodeFactory f = new CustomJsonNodeFactory();        
+            ObjectMapper mapper = new ObjectMapper();
+            CustomJsonNodeFactory f = new CustomJsonNodeFactory();
             mapper.setNodeFactory(f);
 
-            JsonNode jsonObj = mapper.readValue(jsonData, JsonNode.class);    
+            JsonNode jsonObj = mapper.readValue(jsonData, JsonNode.class);
 
-            VelocityContext context = new VelocityContext();            
+            VelocityContext context = new VelocityContext();
             Iterator<String> ii = jsonObj.fieldNames();
             while (ii.hasNext()) {
                 String key = ii.next();
                 context.put(key, jsonObj.get(key));
-            }            
+            }
 
-            StringWriter writer = new StringWriter();            
+            StringWriter writer = new StringWriter();
             Velocity.evaluate(context, writer, "TemplateData", template);
             writer.flush();
-            mergedData =  writer.toString();    
+            mergedData = writer.toString();
 
-            if(StringUtils.isNotBlank(templateType) && StringUtils.isNotBlank(doPrettyOutput)
+            if (StringUtils.isNotBlank(templateType) && StringUtils.isNotBlank(doPrettyOutput)
                     && ConfigGeneratorConstant.Y.equalsIgnoreCase(doPrettyOutput)
-                    && ( ConfigGeneratorConstant.DATA_TYPE_JSON.equalsIgnoreCase(templateType)
-                            || ConfigGeneratorConstant.DATA_TYPE_XML.equalsIgnoreCase(templateType)) ){
+                    && (ConfigGeneratorConstant.DATA_TYPE_JSON.equalsIgnoreCase(templateType)
+                            || ConfigGeneratorConstant.DATA_TYPE_XML
+                                    .equalsIgnoreCase(templateType))) {
                 // Perform Prettying
 
             }