Merge 1806 code of vid-common

Change-Id: I75d52abed4a24dfe3827d79edc4a2938726aa87a
Issue-ID: VID-208
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>

1 files changed, 3 insertions, 17 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/model/NewService.java b/vid-app-common/src/main/java/org/onap/vid/model/NewService.java
index 1346c0d9..6d525506 100644
--- a/vid-app-common/src/main/java/org/onap/vid/model/NewService.java
+++ b/vid-app-common/src/main/java/org/onap/vid/model/NewService.java
@@ -20,11 +20,11 @@
 
 package org.onap.vid.model;
 
+import org.onap.vid.asdc.beans.tosca.Input;
+
 import java.util.Map;
 import java.util.UUID;
 
-import org.onap.vid.asdc.beans.tosca.Input;
-
 /**
  * The Class Service.
  */
@@ -220,9 +220,7 @@ public class NewService {
 	 */
 	@Override
 	public int hashCode() {
-		final UUID uuid = UUID.fromString(getUuid());
-		
-		return uuid.hashCode();
+		return UUID.fromString(getUuid()).hashCode();
 	}
 	
 	/* (non-Javadoc)
@@ -237,16 +235,4 @@ public class NewService {
 		
 		return (service.getUuid().equals(getUuid()));
 	}
-	/*public static void extractVfModuleCustomizationUUID (Service s, String vnfCustomizationName, VfModule vfMod ) {
-		
-		//Look for vnfCustomizationName..vfModuleCustomizationName
-		String nameToFind = vnfCustomizationName + ".." + vfMod.getModelCustomizationName();
-		for (Entry<UUID, VfModule> vfModuleComponent : s.getVfModules().entrySet()) {
-			VfModule xMod = vfModuleComponent.getValue();
-			if ( (xMod.getModelCustomizationName() != null) && (xMod.getModelCustomizationName().equalsIgnoreCase(nameToFind)) ) {
-				vfMod.setCustomizationUuid( xMod.getCustomizationUuid());
-				return;
-			}
-		}
-	}*/
 }