summaryrefslogtreecommitdiffstats
path: root/common/src/main/java/org
diff options
context:
space:
mode:
Diffstat (limited to 'common/src/main/java/org')
-rw-r--r--common/src/main/java/org/onap/so/serviceinstancebeans/RequestStatus.java10
-rw-r--r--common/src/main/java/org/onap/so/utils/UUIDChecker.java33
2 files changed, 11 insertions, 32 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;
}
}