Merge "Removed MsoLogger from UUIDChecker"

3 files changed, 8 insertions, 53 deletions

diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/ScaleCustomE2EServiceInstance.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/ScaleCustomE2EServiceInstance.groovy
index 010f3d77f3..2c573c8223 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/ScaleCustomE2EServiceInstance.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/ScaleCustomE2EServiceInstance.groovy
@@ -94,7 +94,7 @@ public class ScaleCustomE2EServiceInstance extends AbstractServiceTaskProcessor
             execution.setVariable("resources", resources)
 
             // node template UUID
-            String nodeTemplateUUID = UUIDChecker.generateUUID(msoLogger)
+            String nodeTemplateUUID = UUIDChecker.getUUID();
             execution.setVariable("nodeTemplateUUID", nodeTemplateUUID)
 
             //subscriberInfo
diff --git a/common/src/main/java/org/onap/so/utils/UUIDChecker.java b/common/src/main/java/org/onap/so/utils/UUIDChecker.java
index 36fa3d09ab..19a92b834c 100644
--- a/common/src/main/java/org/onap/so/utils/UUIDChecker.java
+++ b/common/src/main/java/org/onap/so/utils/UUIDChecker.java
@@ -4,6 +4,7 @@
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
+ * ================================================================================
  * Modifications Copyright (c) 2019 Samsung
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,7 +26,6 @@ package org.onap.so.utils;
 import java.util.UUID;
 
 import org.onap.so.logger.MessageEnum;
-import org.onap.so.logger.MsoLogger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -35,9 +35,7 @@ public class UUIDChecker {
 
     private static final Logger logger = LoggerFactory.getLogger(UUIDChecker.class);
 
-
     private UUIDChecker() {
-
     }
 
     public static boolean isValidUUID (String id) {
@@ -54,31 +52,8 @@ public class UUIDChecker {
     }
 
     public static String getUUID () {
-        return UUID.randomUUID().toString();
-    }
-
-    public static String verifyOldUUID (String oldId, MsoLogger msoLogger) {
-        if (!UUIDChecker.isValidUUID(oldId)) {
-            String newId = UUIDChecker.getUUID();
-            MsoLogger.setLogContext(newId, null);
-            msoLogger.info(MessageEnum.APIH_REPLACE_REQUEST_ID, oldId, "", "");
-            return newId;
-        }
-        MsoLogger.setLogContext(oldId, null);
-        return oldId;
-    }
-
-    public static String generateUUID (MsoLogger msoLogger) {
-        String newId = UUIDChecker.getUUID();
-        MsoLogger.setLogContext(newId, null);
-        msoLogger.info(MessageEnum.APIH_GENERATED_REQUEST_ID, newId, "", "");
-        return newId;
-    }
-
-    public static String generateServiceInstanceID (MsoLogger msoLogger) {
-        String newId = UUIDChecker.getUUID();
-        MsoLogger.setLogContext(null, newId);
-        msoLogger.info(MessageEnum.APIH_GENERATED_SERVICE_INSTANCE_ID, newId, "", "");
-        return newId;
+        String result = UUID.randomUUID().toString();
+        logger.info("{} {}", MessageEnum.APIH_GENERATED_REQUEST_ID, result);
+        return result;
     }
 }
diff --git a/common/src/test/java/org/onap/so/utils/UUIDCheckerTest.java b/common/src/test/java/org/onap/so/utils/UUIDCheckerTest.java
index b4058a7ba8..9c9f58710e 100644
--- a/common/src/test/java/org/onap/so/utils/UUIDCheckerTest.java
+++ b/common/src/test/java/org/onap/so/utils/UUIDCheckerTest.java
@@ -4,6 +4,8 @@
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ================================================================================
  * 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
@@ -23,11 +25,9 @@ package org.onap.so.utils;
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.onap.so.logger.MsoLogger;
 
 public class UUIDCheckerTest {
-	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.GENERAL, UUIDCheckerTest.class);
-	
+
 	@Test
 	public void isValidUUIDTest(){
 		String nullID = null;
@@ -37,24 +37,4 @@ public class UUIDCheckerTest {
 		assertFalse(UUIDChecker.isValidUUID(badID));
 		assertTrue(UUIDChecker.isValidUUID(id));
 	}
-
-	@Test
-	public void verifyOldUUIDTest(){
-		String oldID = UUIDChecker.getUUID();
-		String invalidID = "This is not a UUID";
-		assertEquals(UUIDChecker.verifyOldUUID(oldID,LOGGER),oldID);
-		assertNotEquals(UUIDChecker.verifyOldUUID(invalidID,LOGGER),invalidID);
-	}
-	
-	@Test
-	public void generateTest(){
-		String id = UUIDChecker.generateUUID(LOGGER);
-		assertNotNull(id);
-		assertTrue(UUIDChecker.isValidUUID(id));
-		
-		id = UUIDChecker.generateServiceInstanceID(LOGGER);
-		assertNotNull(id);
-		assertTrue(UUIDChecker.isValidUUID(id));
-		
-	}
 }