diff options
Diffstat (limited to 'common')
4 files changed, 57 insertions, 55 deletions
diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/RequestStatus.java b/common/src/main/java/org/onap/so/serviceinstancebeans/RequestStatus.java index 4c3597b2c1..710c820148 100644 --- a/common/src/main/java/org/onap/so/serviceinstancebeans/RequestStatus.java +++ b/common/src/main/java/org/onap/so/serviceinstancebeans/RequestStatus.java @@ -21,18 +21,22 @@ package org.onap.so.serviceinstancebeans; import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonInclude.Include; import org.apache.commons.lang3.builder.ToStringBuilder; @JsonInclude(Include.NON_DEFAULT) public class RequestStatus { - protected String requestState; + @JsonProperty("requestState") + protected String requestState; + @JsonProperty("statusMessage") protected String statusMessage; + @JsonProperty("percentProgress") protected Integer percentProgress; + @JsonProperty("timestamp") protected String timeStamp; - public String getRequestState() { return requestState; } @@ -60,6 +64,6 @@ public class RequestStatus { @Override public String toString() { return new ToStringBuilder(this).append("requestState", requestState).append("statusMessage", statusMessage) - .append("percentProgress", percentProgress).append("timeStamp", timeStamp).toString(); + .append("percentProgress", percentProgress).append("timestamp", timeStamp).toString(); } } 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/serviceinstancebeans/RequestStatusTest.java b/common/src/test/java/org/onap/so/serviceinstancebeans/RequestStatusTest.java new file mode 100644 index 0000000000..fa4d2f772d --- /dev/null +++ b/common/src/test/java/org/onap/so/serviceinstancebeans/RequestStatusTest.java @@ -0,0 +1,43 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.so.serviceinstancebeans; + +import org.skyscreamer.jsonassert.JSONAssert; +import org.junit.Test; +import com.fasterxml.jackson.databind.ObjectMapper; + +public class RequestStatusTest { + + @Test + public void requestStatusDefaultValues() throws Exception { + RequestStatus requestStatus = new RequestStatus(); + requestStatus.setRequestState("COMPLETE"); + requestStatus.setStatusMessage("STATUS: COMPLETED"); + requestStatus.setPercentProgress(100); + requestStatus.setTimeStamp("Fri, 08 Mar 2019 04:41:42 GMT"); + String expectedResponse = "{\"requestState\":\"COMPLETE\",\"statusMessage\":\"STATUS: COMPLETED\",\"percentProgress\":100,\"timestamp\":\"Fri, 08 Mar 2019 04:41:42 GMT\"}"; + + ObjectMapper mapper = new ObjectMapper(); + String realResponse = mapper.writeValueAsString(requestStatus); + + JSONAssert.assertEquals(expectedResponse, realResponse, false); + } +} 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)); - - } } |