Merge "Updated from 'timeStamp' to 'timestamp'"

5 files changed, 58 insertions, 11 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);
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolationbeans/RequestStatus.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolationbeans/RequestStatus.java
index 7ef712e124..6fd765b76f 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolationbeans/RequestStatus.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolationbeans/RequestStatus.java
@@ -38,7 +38,7 @@ public class RequestStatus implements Serializable {
     protected String statusMessage;
 	@JsonProperty("percentProgress")
     protected String percentProgress;
-	@JsonProperty("timeStamp")
+	@JsonProperty("timestamp")
     protected String timeStamp;
 
 
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationFilterResponse.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationFilterResponse.json
index dde4392c38..3b2eca7ce2 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationFilterResponse.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationFilterResponse.json
@@ -29,7 +29,7 @@
           "requestState": "COMPLETE",
           "statusMessage": "STATUS: COMPLETED",
           "percentProgress": 100,
-          "timeStamp": "Fri, 01 Jul 2016 04:41:42 GMT"
+          "timestamp": "Fri, 01 Jul 2016 04:41:42 GMT"
         }
       }
     },
@@ -63,7 +63,7 @@
           "requestState": "COMPLETE",
           "statusMessage": "STATUS: Vf Module has been deleted successfully. FLOW STATUS: Building blocks 1 of 3 completed. ROLLBACK STATUS: Rollback has been completed successfully.",
           "percentProgress": 100,
-          "timeStamp": "Thu, 22 Dec 2016 08:30:28 GMT"
+          "timestamp": "Thu, 22 Dec 2016 08:30:28 GMT"
         }
       }
     },
@@ -97,7 +97,7 @@
           "requestState": "PENDING",
           "statusMessage": "STATUS: Vf Module deletion pending.",
           "percentProgress": 0,
-          "timeStamp": "Thu, 22 Dec 2016 08:30:28 GMT"
+          "timestamp": "Thu, 22 Dec 2016 08:30:28 GMT"
         }
       }
     },
@@ -181,7 +181,7 @@
           "requestState": "UNLOCKED",
           "statusMessage": "STATUS: Vf Module deletion pending.",
           "percentProgress": 0,
-          "timeStamp": "Mon, 30 Jul 2018 06:09:01 GMT"
+          "timestamp": "Mon, 30 Jul 2018 06:09:01 GMT"
         }
       }
     }
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationList.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationList.json
index ecbf7a92a4..90089c0c7e 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationList.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationList.json
@@ -28,7 +28,7 @@
                "requestState":"COMPLETE",
                "statusMessage":"STATUS: Vf Module has been deleted successfully.",
                "percentProgress":100,
-               "timeStamp": "Thu, 22 Dec 2016 08:30:28 GMT"
+               "timestamp": "Thu, 22 Dec 2016 08:30:28 GMT"
             }
          }
       },
@@ -60,7 +60,7 @@
                "requestState":"PENDING",
                "statusMessage":"FLOW STATUS: Building blocks 1 of 3 completed. RETRY STATUS: Retry 2/5 will be started in 8 min. ROLLBACK STATUS: Rollback has been completed successfully.",
                "percentProgress":0,
-               "timeStamp": "Thu, 22 Dec 2016 08:30:28 GMT"
+               "timestamp": "Thu, 22 Dec 2016 08:30:28 GMT"
             }
          }
       },
@@ -323,7 +323,7 @@
                "requestState":"PENDING",
                "statusMessage":"STATUS: Adding members. FLOW STATUS: Building blocks 1 of 3 completed. RETRY STATUS: Retry 2/5 will be started in 8 min. ROLLBACK STATUS: Rollback has been completed successfully.",
                "percentProgress":0,
-               "timeStamp": "Thu, 22 Dec 2016 08:30:28 GMT"
+               "timestamp": "Thu, 22 Dec 2016 08:30:28 GMT"
             }
          }
       }