Updated from 'timeStamp' to 'timestamp'

Updated from 'timeStamp' to 'timestamp' in RequestStatus

Change-Id: I863c87126e4a58179d82e6fe5d524d72ef57b4f1
Issue-ID: SO-1643
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

2 files changed, 50 insertions, 3 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/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);
+	}
+}