From c72d565bb58226b20625b2bce5f0019046bee649 Mon Sep 17 00:00:00 2001
From: "Sonsino, Ofir (os0695)" <os0695@intl.att.com>
Date: Tue, 10 Jul 2018 14:20:54 +0300
Subject: Merge 1806 code of vid-common

Change-Id: I75d52abed4a24dfe3827d79edc4a2938726aa87a
Issue-ID: VID-208
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>
---
 .../src/main/java/org/onap/vid/model/Node.java     | 83 +++++++++++-----------
 1 file changed, 43 insertions(+), 40 deletions(-)

(limited to 'vid-app-common/src/main/java/org/onap/vid/model/Node.java')

diff --git a/vid-app-common/src/main/java/org/onap/vid/model/Node.java b/vid-app-common/src/main/java/org/onap/vid/model/Node.java
index 474dfb55a..3b7abd39b 100644
--- a/vid-app-common/src/main/java/org/onap/vid/model/Node.java
+++ b/vid-app-common/src/main/java/org/onap/vid/model/Node.java
@@ -60,7 +60,7 @@ public class Node {
 	private String customizationUuid;
 	
 	/** The inputs. */
-	private Map<String, Input> inputs;
+	private Map<String, Input> inputs = new HashMap<>();
 	
 	/** The get_input or other constructs from node template properties. */
 	private Map<String, CommandProperty> commands;
@@ -271,45 +271,10 @@ public class Node {
 
 		try {
 			// nodeTemplate.getProperties() map of String->Object
-			for (Entry<String, Object> e : nodeTemplate.getProperties().entrySet()) {
-				
-				String k = e.getKey();
-				
-				LOG.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + methodName + " node template property: " + k );
-				
-				if ( e.getValue() != null ) {
-					LOG.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + methodName + "  property: " + 
-							k + "=" + e.getValue());
-					//LOG.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + methodName + " V class name: " +
-					//	 e.getValue().getClass().getName());
-					Class<?> c = e.getValue().getClass();
-					if ( c.getName().equalsIgnoreCase(java.lang.String.class.getName())) {
-						getProperties().put (k, (String)e.getValue());
-					}
-					else {
-						Class<?>[] interfaces = e.getValue().getClass().getInterfaces();
-
-						for(Class<?> ifc: interfaces ) {
-							//LOG.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + methodName + " ifc name: " +
-							//	 ifc.getName());
-							if ( ifc.getName().equalsIgnoreCase(java.util.Map.class.getName()) ) {
-								// only extract get_input for now
-								@SuppressWarnings("unchecked")
-								HashMap<String,String> v = (HashMap<String,String>)e.getValue();
-								for (Entry<String, String> entry : v.entrySet()) {
-									// only include get_input for now
-									if ( ModelConstants.GET_INPUT_TAG.equalsIgnoreCase ( entry.getKey() ) ) {
-										CommandProperty cp = new CommandProperty();
-										cp.setCommand(entry.getKey());
-										cp.setInputName(entry.getValue());
-										cp.setDisplayName(k);
-										getCommands().put(k,cp);
-									}
-								}
-							}
-						}
-
-					}
+			for (Entry<String, Object> entrySet : nodeTemplate.getProperties().entrySet()) {
+				LOG.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + methodName + " node template property: " + entrySet.getKey());
+				if ( entrySet.getValue() != null ) {
+					readStringAndCommandsProperties(entrySet);
 				}
 			}
 		}
@@ -319,4 +284,42 @@ public class Node {
 		}
 	}
 
+	private void readStringAndCommandsProperties(Entry<String, Object> entrySet) {
+		String key = entrySet.getKey();
+		String methodName = "readStringAndCommandsProperties";
+		LOG.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + methodName + "  property: " +
+				key + "=" + entrySet.getValue());
+		Class<?> c = entrySet.getValue().getClass();
+		if ( c.getName().equalsIgnoreCase(String.class.getName())) {
+            getProperties().put (key, (String) entrySet.getValue());
+        }
+        else {
+            Class<?>[] interfaces = entrySet.getValue().getClass().getInterfaces();
+
+            for(Class<?> ifc: interfaces ) {
+                if ( ifc.getName().equalsIgnoreCase(Map.class.getName()) ) {
+                    readGetInputAsCommands(entrySet, key);
+
+                }
+            }
+
+        }
+	}
+
+    private void readGetInputAsCommands(Entry<String, Object> entrySet, String key) {
+        // only extract get_input for now
+        @SuppressWarnings("unchecked")
+        HashMap<String,String> v = (HashMap<String,String>) entrySet.getValue();
+        for (Entry<String, String> entry : v.entrySet()) {
+            // only include get_input for now
+            if ( ModelConstants.GET_INPUT_TAG.equalsIgnoreCase ( entry.getKey() ) ) {
+                CommandProperty cp = new CommandProperty();
+                cp.setCommand(entry.getKey());
+                cp.setInputName(entry.getValue());
+                cp.setDisplayName(key);
+                getCommands().put(key,cp);
+            }
+        }
+    }
+
 }
-- 
cgit 1.2.3-korg