aboutsummaryrefslogtreecommitdiffstats
path: root/controlloop/common/model-impl/appclcm/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'controlloop/common/model-impl/appclcm/src/main')
-rw-r--r--controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMResponseStatus.java107
-rw-r--r--controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LcmCommonHeader.java (renamed from controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMCommonHeader.java)59
-rw-r--r--controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LcmRequest.java (renamed from controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMRequest.java)42
-rw-r--r--controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LcmRequestWrapper.java (renamed from controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMRequestWrapper.java)27
-rw-r--r--controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LcmResponse.java (renamed from controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMResponse.java)45
-rw-r--r--controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LcmResponseCode.java (renamed from controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMResponseCode.java)37
-rw-r--r--controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LcmResponseStatus.java116
-rw-r--r--controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LcmResponseWrapper.java (renamed from controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMResponseWrapper.java)29
-rw-r--r--controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LcmWrapper.java (renamed from controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMWrapper.java)51
-rw-r--r--controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/util/Serialization.java121
10 files changed, 357 insertions, 277 deletions
diff --git a/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMResponseStatus.java b/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMResponseStatus.java
deleted file mode 100644
index 1db4e8ef7..000000000
--- a/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMResponseStatus.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * appclcm
- * ================================================================================
- * Copyright (C) 2017 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.policy.appclcm;
-
-import com.google.gson.annotations.SerializedName;
-import java.io.Serializable;
-
-public class LCMResponseStatus implements Serializable {
-
- private static final long serialVersionUID = 974891505135467199L;
-
- @SerializedName(value="code")
- private int code;
-
- @SerializedName(value="message")
- private String message;
-
- public LCMResponseStatus() {
- // Create a default LCMResponseStatus instance
- }
-
- /**
- * @return the code
- */
- public int getCode() {
- return code;
- }
-
- /**
- * @param code the code to set
- */
- public void setCode(int code) {
- this.code = code;
- }
-
- /**
- * @return the message
- */
- public String getMessage() {
- return message;
- }
-
- /**
- * @param message the message to set
- */
- public void setMessage(String message) {
- this.message = message;
- }
-
- @Override
- public String toString() {
- return "ResponseStatus [code=" + code + ", message=" + message + "]";
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + code;
- result = prime * result + ((message == null) ? 0 : message.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- LCMResponseStatus other = (LCMResponseStatus) obj;
- if (code != other.code) {
- return false;
- }
- if (message == null) {
- if (other.message != null) {
- return false;
- }
- } else if (!message.equals(other.message)) {
- return false;
- }
- return true;
- }
-
-}
diff --git a/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMCommonHeader.java b/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LcmCommonHeader.java
index a9392b468..dbf8dd0cd 100644
--- a/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMCommonHeader.java
+++ b/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LcmCommonHeader.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* appclcm
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-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.
@@ -20,57 +20,58 @@
package org.onap.policy.appclcm;
+import com.google.gson.annotations.SerializedName;
+
import java.io.Serializable;
import java.time.Instant;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
-import com.google.gson.annotations.SerializedName;
-
-public class LCMCommonHeader implements Serializable {
+public class LcmCommonHeader implements Serializable {
private static final long serialVersionUID = 6581963539127062114L;
- @SerializedName(value="timestamp")
+ @SerializedName(value = "timestamp")
private Instant timeStamp = Instant.now();
- @SerializedName(value="api-ver")
- private String apiVer="2.00";
+ @SerializedName(value = "api-ver")
+ private String apiVer = "2.00";
- @SerializedName(value="originator-id")
+ @SerializedName(value = "originator-id")
private String originatorId;
- @SerializedName(value="request-id")
+ @SerializedName(value = "request-id")
private UUID requestId;
- @SerializedName(value="sub-request-id")
+ @SerializedName(value = "sub-request-id")
private String subRequestId;
- @SerializedName(value="flags")
+ @SerializedName(value = "flags")
private Map<String, String> flags = new HashMap<>();
- public LCMCommonHeader() {
+ public LcmCommonHeader() {
}
/**
* Used to copy a common header.
*
- * @param commonHeader
- * a header that is defined by the lcm api guide that contains
- * information about the request (requestId, flags, etc.)
+ * @param commonHeader a header that is defined by the lcm api guide that contains information
+ * about the request (requestId, flags, etc.)
*/
- public LCMCommonHeader(LCMCommonHeader commonHeader) {
+ public LcmCommonHeader(LcmCommonHeader commonHeader) {
this.originatorId = commonHeader.originatorId;
this.requestId = commonHeader.requestId;
this.subRequestId = commonHeader.subRequestId;
if (commonHeader.flags != null) {
this.flags.putAll(commonHeader.flags);
}
- }
+ }
/**
+ * Get the timestamp.
+ *
* @return the timeStamp
*/
public Instant getTimeStamp() {
@@ -78,6 +79,8 @@ public class LCMCommonHeader implements Serializable {
}
/**
+ * Set the timestamp.
+ *
* @param timeStamp the timeStamp to set
*/
public void setTimeStamp(Instant timeStamp) {
@@ -85,6 +88,8 @@ public class LCMCommonHeader implements Serializable {
}
/**
+ * Get the API version.
+ *
* @return the apiVer
*/
public String getApiVer() {
@@ -92,6 +97,8 @@ public class LCMCommonHeader implements Serializable {
}
/**
+ * Set the API version.
+ *
* @param apiVer the apiVer to set
*/
public void setApiVer(String apiVer) {
@@ -99,6 +106,8 @@ public class LCMCommonHeader implements Serializable {
}
/**
+ * Get the originator Id.
+ *
* @return the originatorId
*/
public String getOriginatorId() {
@@ -106,6 +115,8 @@ public class LCMCommonHeader implements Serializable {
}
/**
+ * Set the originator Id.
+ *
* @param originatorId the originatorId to set
*/
public void setOriginatorId(String originatorId) {
@@ -113,6 +124,8 @@ public class LCMCommonHeader implements Serializable {
}
/**
+ * Get the request Id.
+ *
* @return the requestId
*/
public UUID getRequestId() {
@@ -120,6 +133,8 @@ public class LCMCommonHeader implements Serializable {
}
/**
+ * Set the request Id.
+ *
* @param requestId the requestId to set
*/
public void setRequestId(UUID requestId) {
@@ -127,6 +142,8 @@ public class LCMCommonHeader implements Serializable {
}
/**
+ * Get the sub request Id.
+ *
* @return the subRequestId
*/
public String getSubRequestId() {
@@ -134,6 +151,8 @@ public class LCMCommonHeader implements Serializable {
}
/**
+ * Set the sub request Id.
+ *
* @param subRequestId the subRequestId to set
*/
public void setSubRequestId(String subRequestId) {
@@ -141,6 +160,8 @@ public class LCMCommonHeader implements Serializable {
}
/**
+ * Get the flags.
+ *
* @return the flags
*/
public Map<String, String> getFlags() {
@@ -148,6 +169,8 @@ public class LCMCommonHeader implements Serializable {
}
/**
+ * Set the flags.
+ *
* @param flags the flags to set
*/
public void setFlags(Map<String, String> flags) {
@@ -184,7 +207,7 @@ public class LCMCommonHeader implements Serializable {
if (getClass() != obj.getClass()) {
return false;
}
- LCMCommonHeader other = (LCMCommonHeader) obj;
+ LcmCommonHeader other = (LcmCommonHeader) obj;
if (apiVer == null) {
if (other.apiVer != null) {
return false;
diff --git a/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMRequest.java b/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LcmRequest.java
index 83442d9bf..afac0dece 100644
--- a/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMRequest.java
+++ b/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LcmRequest.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* appclcm
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-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.
@@ -20,36 +20,38 @@
package org.onap.policy.appclcm;
+import com.google.gson.annotations.SerializedName;
+
import java.io.Serializable;
import java.util.Map;
-import com.google.gson.annotations.SerializedName;
-
-public class LCMRequest implements Serializable {
+public class LcmRequest implements Serializable {
private static final long serialVersionUID = 219375564922846624L;
- @SerializedName(value="common-header")
- private LCMCommonHeader commonHeader;
+ @SerializedName(value = "common-header")
+ private LcmCommonHeader commonHeader;
- @SerializedName(value="action")
+ @SerializedName(value = "action")
private String action;
- @SerializedName(value="action-identifiers")
+ @SerializedName(value = "action-identifiers")
private Map<String, String> actionIdentifiers;
- @SerializedName(value="payload")
+ @SerializedName(value = "payload")
private String payload;
- public LCMRequest() {
- // Create a default LCM request
+ public LcmRequest() {
+ // Create a default LCM request
}
- public LCMCommonHeader getCommonHeader() {
+ public LcmCommonHeader getCommonHeader() {
return commonHeader;
}
/**
+ * Get the action.
+ *
* @return the action
*/
public String getAction() {
@@ -57,6 +59,8 @@ public class LCMRequest implements Serializable {
}
/**
+ * Set the action.
+ *
* @param action the action to set
*/
public void setAction(String action) {
@@ -64,6 +68,8 @@ public class LCMRequest implements Serializable {
}
/**
+ * Get the action identifiers.
+ *
* @return the actionIdentifiers
*/
public Map<String, String> getActionIdentifiers() {
@@ -71,6 +77,8 @@ public class LCMRequest implements Serializable {
}
/**
+ * Set the action identifiers.
+ *
* @param actionIdentifiers the actionIdentifiers to set
*/
public void setActionIdentifiers(Map<String, String> actionIdentifiers) {
@@ -78,6 +86,8 @@ public class LCMRequest implements Serializable {
}
/**
+ * Get the payload.
+ *
* @return the payload
*/
public String getPayload() {
@@ -85,6 +95,8 @@ public class LCMRequest implements Serializable {
}
/**
+ * Set the payload.
+ *
* @param payload the payload to set
*/
public void setPayload(String payload) {
@@ -92,9 +104,11 @@ public class LCMRequest implements Serializable {
}
/**
+ * Get the common header.
+ *
* @param commonHeader the commonHeader to set
*/
- public void setCommonHeader(LCMCommonHeader commonHeader) {
+ public void setCommonHeader(LcmCommonHeader commonHeader) {
this.commonHeader = commonHeader;
}
@@ -126,7 +140,7 @@ public class LCMRequest implements Serializable {
if (getClass() != obj.getClass()) {
return false;
}
- LCMRequest other = (LCMRequest) obj;
+ LcmRequest other = (LcmRequest) obj;
if (commonHeader == null) {
if (other.commonHeader != null) {
return false;
diff --git a/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMRequestWrapper.java b/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LcmRequestWrapper.java
index ea7e6762f..b77303ad0 100644
--- a/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMRequestWrapper.java
+++ b/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LcmRequestWrapper.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* appclcm
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-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.
@@ -21,34 +21,39 @@
package org.onap.policy.appclcm;
import com.google.gson.annotations.SerializedName;
+
import java.io.Serializable;
-public class LCMRequestWrapper extends LCMWrapper implements Serializable {
+public class LcmRequestWrapper extends LcmWrapper implements Serializable {
private static final long serialVersionUID = 424866914715980798L;
-
- @SerializedName(value="body")
- private LCMRequest body;
- public LCMRequestWrapper() {
+ @SerializedName(value = "body")
+ private LcmRequest body;
+
+ public LcmRequestWrapper() {
super();
}
- public LCMRequestWrapper(LCMRequest request) {
+ public LcmRequestWrapper(LcmRequest request) {
body = request;
}
-
+
/**
+ * Get the body.
+ *
* @return the body
*/
- public LCMRequest getBody() {
+ public LcmRequest getBody() {
return body;
}
/**
+ * Set the body.
+ *
* @param body the body to set
*/
- public void setBody(LCMRequest body) {
+ public void setBody(LcmRequest body) {
this.body = body;
}
@@ -76,7 +81,7 @@ public class LCMRequestWrapper extends LCMWrapper implements Serializable {
if (getClass() != obj.getClass()) {
return false;
}
- LCMRequestWrapper other = (LCMRequestWrapper) obj;
+ LcmRequestWrapper other = (LcmRequestWrapper) obj;
if (body == null) {
if (other.body != null) {
return false;
diff --git a/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMResponse.java b/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LcmResponse.java
index 82f374868..2a65c9a14 100644
--- a/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMResponse.java
+++ b/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LcmResponse.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* appclcm
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-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.
@@ -21,34 +21,33 @@
package org.onap.policy.appclcm;
import com.google.gson.annotations.SerializedName;
+
import java.io.Serializable;
-public class LCMResponse implements Serializable {
+public class LcmResponse implements Serializable {
private static final long serialVersionUID = 6332508597287669750L;
@SerializedName(value = "common-header")
- private LCMCommonHeader commonHeader;
+ private LcmCommonHeader commonHeader;
@SerializedName(value = "status")
- private LCMResponseStatus status = new LCMResponseStatus();
+ private LcmResponseStatus status = new LcmResponseStatus();
@SerializedName(value = "payload")
private String payload;
- public LCMResponse() {
- // EMPTY
+ public LcmResponse() {
+ // EMPTY
}
/**
- * Constructs a response using the common header of the request since they
- * will be the same.
+ * Constructs a response using the common header of the request since they will be the same.
*
- * @param request
- * an appc lcm request object specified by the lcm api guide
+ * @param request an appc lcm request object specified by the lcm api guide
*/
- public LCMResponse(LCMRequest request) {
- this.commonHeader = new LCMCommonHeader(request.getCommonHeader());
+ public LcmResponse(LcmRequest request) {
+ this.commonHeader = new LcmCommonHeader(request.getCommonHeader());
String requestPayload = request.getPayload();
if (requestPayload != null) {
this.payload = requestPayload;
@@ -56,34 +55,44 @@ public class LCMResponse implements Serializable {
}
/**
+ * Get the common header.
+ *
* @return the commonHeader
*/
- public LCMCommonHeader getCommonHeader() {
+ public LcmCommonHeader getCommonHeader() {
return commonHeader;
}
/**
+ * Set the common header.
+ *
* @param commonHeader the commonHeader to set
*/
- public void setCommonHeader(LCMCommonHeader commonHeader) {
+ public void setCommonHeader(LcmCommonHeader commonHeader) {
this.commonHeader = commonHeader;
}
/**
+ * Get the status.
+ *
* @return the status
*/
- public LCMResponseStatus getStatus() {
+ public LcmResponseStatus getStatus() {
return status;
}
/**
+ * Set the status.
+ *
* @param status the status to set
*/
- public void setStatus(LCMResponseStatus status) {
+ public void setStatus(LcmResponseStatus status) {
this.status = status;
}
/**
+ * Get the payload.
+ *
* @return the payload
*/
public String getPayload() {
@@ -91,6 +100,8 @@ public class LCMResponse implements Serializable {
}
/**
+ * Set the payload.
+ *
* @param payload the payload to set
*/
public void setPayload(String payload) {
@@ -123,7 +134,7 @@ public class LCMResponse implements Serializable {
if (getClass() != obj.getClass()) {
return false;
}
- LCMResponse other = (LCMResponse) obj;
+ LcmResponse other = (LcmResponse) obj;
if (commonHeader == null) {
if (other.commonHeader != null) {
return false;
diff --git a/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMResponseCode.java b/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LcmResponseCode.java
index 8a7c36d2b..cca69b132 100644
--- a/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMResponseCode.java
+++ b/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LcmResponseCode.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* appclcm
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-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.
@@ -20,8 +20,8 @@
package org.onap.policy.appclcm;
-public class LCMResponseCode {
-
+public class LcmResponseCode {
+
/* These fields define the key to the response code value. */
public static final String ACCEPTED = "ACCEPTED";
public static final String ERROR = "ERROR";
@@ -30,13 +30,13 @@ public class LCMResponseCode {
public static final String FAILURE = "FAILURE";
public static final String PARTIAL_SUCCESS = "PARTIAL SUCCESS";
public static final String PARTIAL_FAILURE = "PARTIAL FAILURE";
-
+
private Integer code;
- protected LCMResponseCode(final int code) {
- this.code = code;
+ protected LcmResponseCode(final int code) {
+ this.code = code;
}
-
+
public int getCode() {
return this.code;
}
@@ -49,31 +49,24 @@ public class LCMResponseCode {
/**
* Translates the code to a string value that represents the meaning of the code.
*
- * @param code
- * the numeric value that is returned by APPC based on success,
- * failure, etc. of the action requested
+ * @param code the numeric value that is returned by APPC based on success, failure, etc. of the
+ * action requested
* @return the string value equivalent of the APPC response code
*/
public static String toResponseValue(int code) {
if (code == 100) {
return ACCEPTED;
- }
- else if (code == 200) {
+ } else if (code == 200) {
return ERROR;
- }
- else if (code >= 300 && code <= 313) {
+ } else if (code >= 300 && code <= 313) {
return REJECT;
- }
- else if (code == 400) {
+ } else if (code == 400) {
return SUCCESS;
- }
- else if (code == 450 || (code >= 401 && code <= 406)) {
+ } else if (code == 450 || (code >= 401 && code <= 406)) {
return FAILURE;
- }
- else if (code == 500) {
+ } else if (code == 500) {
return PARTIAL_SUCCESS;
- }
- else if (code >= 501 && code <= 599) {
+ } else if (code >= 501 && code <= 599) {
return PARTIAL_FAILURE;
}
return null;
diff --git a/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LcmResponseStatus.java b/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LcmResponseStatus.java
new file mode 100644
index 000000000..4c044a0a8
--- /dev/null
+++ b/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LcmResponseStatus.java
@@ -0,0 +1,116 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * appclcm
+ * ================================================================================
+ * Copyright (C) 2017-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.policy.appclcm;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.io.Serializable;
+
+public class LcmResponseStatus implements Serializable {
+
+ private static final long serialVersionUID = 974891505135467199L;
+
+ @SerializedName(value = "code")
+ private int code;
+
+ @SerializedName(value = "message")
+ private String message;
+
+ public LcmResponseStatus() {
+ // Create a default LCMResponseStatus instance
+ }
+
+ /**
+ * Get the code.
+ *
+ * @return the code
+ */
+ public int getCode() {
+ return code;
+ }
+
+ /**
+ * Set the code.
+ *
+ * @param code the code to set
+ */
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+ /**
+ * Get the message.
+ *
+ * @return the message
+ */
+ public String getMessage() {
+ return message;
+ }
+
+ /**
+ * Set the message.
+ *
+ * @param message the message to set
+ */
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ @Override
+ public String toString() {
+ return "ResponseStatus [code=" + code + ", message=" + message + "]";
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + code;
+ result = prime * result + ((message == null) ? 0 : message.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ LcmResponseStatus other = (LcmResponseStatus) obj;
+ if (code != other.code) {
+ return false;
+ }
+ if (message == null) {
+ if (other.message != null) {
+ return false;
+ }
+ } else if (!message.equals(other.message)) {
+ return false;
+ }
+ return true;
+ }
+
+}
diff --git a/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMResponseWrapper.java b/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LcmResponseWrapper.java
index 7d9062979..43cc32511 100644
--- a/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMResponseWrapper.java
+++ b/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LcmResponseWrapper.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* appclcm
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-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.
@@ -21,30 +21,35 @@
package org.onap.policy.appclcm;
import com.google.gson.annotations.SerializedName;
+
import java.io.Serializable;
-public class LCMResponseWrapper extends LCMWrapper implements Serializable {
+public class LcmResponseWrapper extends LcmWrapper implements Serializable {
private static final long serialVersionUID = 463937813781086802L;
-
- @SerializedName(value="body")
- private LCMResponse body;
-
- public LCMResponseWrapper() {
+
+ @SerializedName(value = "body")
+ private LcmResponse body;
+
+ public LcmResponseWrapper() {
super();
}
-
+
/**
+ * Get the body.
+ *
* @return the body
*/
- public LCMResponse getBody() {
+ public LcmResponse getBody() {
return body;
}
/**
+ * Set the body.
+ *
* @param body the body to set
*/
- public void setBody(LCMResponse body) {
+ public void setBody(LcmResponse body) {
this.body = body;
}
@@ -52,7 +57,7 @@ public class LCMResponseWrapper extends LCMWrapper implements Serializable {
public String toString() {
return "ResponseWrapper [body=" + body + ", toString()=" + super.toString() + "]";
}
-
+
@Override
public int hashCode() {
final int prime = 31;
@@ -72,7 +77,7 @@ public class LCMResponseWrapper extends LCMWrapper implements Serializable {
if (getClass() != obj.getClass()) {
return false;
}
- LCMResponseWrapper other = (LCMResponseWrapper) obj;
+ LcmResponseWrapper other = (LcmResponseWrapper) obj;
if (body == null) {
if (other.body != null) {
return false;
diff --git a/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMWrapper.java b/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LcmWrapper.java
index c70e7423a..322abb015 100644
--- a/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMWrapper.java
+++ b/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LcmWrapper.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* appclcm
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-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.
@@ -21,32 +21,35 @@
package org.onap.policy.appclcm;
import com.google.gson.annotations.SerializedName;
+
import java.io.Serializable;
-public class LCMWrapper implements Serializable {
+public class LcmWrapper implements Serializable {
private static final long serialVersionUID = 753005805432396532L;
- @SerializedName(value="version")
+ @SerializedName(value = "version")
private String version;
-
- @SerializedName(value="cambria-partition")
+
+ @SerializedName(value = "cambria-partition")
private String cambriaPartition;
-
- @SerializedName(value="rpc-name")
+
+ @SerializedName(value = "rpc-name")
private String rpcName;
-
- @SerializedName(value="correlation-id")
+
+ @SerializedName(value = "correlation-id")
private String correlationId;
-
- @SerializedName(value="type")
+
+ @SerializedName(value = "type")
private String type;
- public LCMWrapper() {
- // Create a default LCMWrapper instance
+ public LcmWrapper() {
+ // Create a default LCMWrapper instance
}
-
+
/**
+ * Get the version.
+ *
* @return the version
*/
public String getVersion() {
@@ -54,6 +57,8 @@ public class LCMWrapper implements Serializable {
}
/**
+ * Set the version.
+ *
* @param version the version to set
*/
public void setVersion(String version) {
@@ -61,6 +66,8 @@ public class LCMWrapper implements Serializable {
}
/**
+ * Get the cambria partition.
+ *
* @return the cambriaPartition
*/
public String getCambriaPartition() {
@@ -68,6 +75,8 @@ public class LCMWrapper implements Serializable {
}
/**
+ * Set the cambria partition.
+ *
* @param cambriaPartition the cambriaPartition to set
*/
public void setCambriaPartition(String cambriaPartition) {
@@ -75,6 +84,8 @@ public class LCMWrapper implements Serializable {
}
/**
+ * Get the RPN name.
+ *
* @return the rpcName
*/
public String getRpcName() {
@@ -82,6 +93,8 @@ public class LCMWrapper implements Serializable {
}
/**
+ * Set the RPC name.
+ *
* @param rpcName the rpcName to set
*/
public void setRpcName(String rpcName) {
@@ -89,6 +102,8 @@ public class LCMWrapper implements Serializable {
}
/**
+ * Get the correlation Id.
+ *
* @return the correlationId
*/
public String getCorrelationId() {
@@ -96,6 +111,8 @@ public class LCMWrapper implements Serializable {
}
/**
+ * Set the correclation Id.
+ *
* @param correlationId the correlationId to set
*/
public void setCorrelationId(String correlationId) {
@@ -103,6 +120,8 @@ public class LCMWrapper implements Serializable {
}
/**
+ * Get the type.
+ *
* @return the type
*/
public String getType() {
@@ -110,6 +129,8 @@ public class LCMWrapper implements Serializable {
}
/**
+ * Set the type.
+ *
* @param type the type to set
*/
public void setType(String type) {
@@ -145,7 +166,7 @@ public class LCMWrapper implements Serializable {
if (getClass() != obj.getClass()) {
return false;
}
- LCMWrapper other = (LCMWrapper) obj;
+ LcmWrapper other = (LcmWrapper) obj;
if (cambriaPartition == null) {
if (other.cambriaPartition != null) {
return false;
diff --git a/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/util/Serialization.java b/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/util/Serialization.java
index 5a5e2e2e6..944d56846 100644
--- a/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/util/Serialization.java
+++ b/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/util/Serialization.java
@@ -20,12 +20,6 @@
package org.onap.policy.appclcm.util;
-import java.lang.reflect.Type;
-import java.time.Instant;
-
-import org.onap.policy.appclcm.LCMRequest;
-import org.onap.policy.appclcm.LCMResponse;
-
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonDeserializationContext;
@@ -36,79 +30,84 @@ import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
+import java.lang.reflect.Type;
+import java.time.Instant;
+
+import org.onap.policy.appclcm.LcmRequest;
+import org.onap.policy.appclcm.LcmResponse;
+
public final class Serialization {
- private Serialization() {
- }
+ private Serialization() {}
- public static class RequestAdapter implements JsonSerializer<LCMRequest>, JsonDeserializer<LCMRequest> {
+ public static class RequestAdapter implements JsonSerializer<LcmRequest>, JsonDeserializer<LcmRequest> {
- @Override
- public JsonElement serialize(LCMRequest src, Type typeOfSrc, JsonSerializationContext context) {
- JsonElement requestJson = gsonPretty.toJsonTree(src, LCMRequest.class);
- JsonObject input = new JsonObject();
- input.add("input", requestJson);
+ @Override
+ public JsonElement serialize(LcmRequest src, Type typeOfSrc, JsonSerializationContext context) {
+ JsonElement requestJson = gsonPretty.toJsonTree(src, LcmRequest.class);
+ JsonObject input = new JsonObject();
+ input.add("input", requestJson);
- return input;
- }
+ return input;
+ }
- @Override
- public LCMRequest deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) {
- return gsonPretty.fromJson(json.getAsJsonObject().get("input"), LCMRequest.class);
- }
- }
+ @Override
+ public LcmRequest deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) {
+ return gsonPretty.fromJson(json.getAsJsonObject().get("input"), LcmRequest.class);
+ }
+ }
- public static class ResponseAdapter implements JsonSerializer<LCMResponse>, JsonDeserializer<LCMResponse> {
+ public static class ResponseAdapter implements JsonSerializer<LcmResponse>, JsonDeserializer<LcmResponse> {
- @Override
- public JsonElement serialize(LCMResponse src, Type typeOfSrc, JsonSerializationContext context) {
- JsonElement responseJson = gsonPretty.toJsonTree(src, LCMResponse.class);
- JsonObject output = new JsonObject();
- output.add("output", responseJson);
- return output;
- }
+ @Override
+ public JsonElement serialize(LcmResponse src, Type typeOfSrc, JsonSerializationContext context) {
+ JsonElement responseJson = gsonPretty.toJsonTree(src, LcmResponse.class);
+ JsonObject output = new JsonObject();
+ output.add("output", responseJson);
+ return output;
+ }
- @Override
- public LCMResponse deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) {
- return gsonPretty.fromJson(json.getAsJsonObject().get("output"), LCMResponse.class);
- }
- }
+ @Override
+ public LcmResponse deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) {
+ return gsonPretty.fromJson(json.getAsJsonObject().get("output"), LcmResponse.class);
+ }
+ }
- public static class InstantAdapter implements JsonSerializer<Instant>, JsonDeserializer<Instant> {
+ public static class InstantAdapter implements JsonSerializer<Instant>, JsonDeserializer<Instant> {
- @Override
- public Instant deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) {
- return Instant.parse(json.getAsString());
- }
+ @Override
+ public Instant deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) {
+ return Instant.parse(json.getAsString());
+ }
- @Override
- public JsonElement serialize(Instant src, Type typeOfSrc, JsonSerializationContext context) {
- return new JsonPrimitive(src.toString());
- }
+ @Override
+ public JsonElement serialize(Instant src, Type typeOfSrc, JsonSerializationContext context) {
+ return new JsonPrimitive(src.toString());
+ }
- }
+ }
- public static class InstantJunitAdapter implements JsonSerializer<Instant>, JsonDeserializer<Instant> {
+ public static class InstantJunitAdapter implements JsonSerializer<Instant>, JsonDeserializer<Instant> {
- @Override
- public Instant deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) {
- return Instant.ofEpochMilli(json.getAsLong());
- }
+ @Override
+ public Instant deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) {
+ return Instant.ofEpochMilli(json.getAsLong());
+ }
- @Override
- public JsonElement serialize(Instant src, Type typeOfSrc, JsonSerializationContext context) {
- return new JsonPrimitive(src.toEpochMilli());
- }
+ @Override
+ public JsonElement serialize(Instant src, Type typeOfSrc, JsonSerializationContext context) {
+ return new JsonPrimitive(src.toEpochMilli());
+ }
- }
+ }
- public static final Gson gsonPretty = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting()
- .registerTypeAdapter(Instant.class, new InstantAdapter()).create();
+ public static final Gson gsonPretty = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting()
+ .registerTypeAdapter(Instant.class, new InstantAdapter()).create();
- public static final Gson gson = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting()
- .registerTypeAdapter(LCMRequest.class, new RequestAdapter())
- .registerTypeAdapter(LCMResponse.class, new ResponseAdapter()).create();
+ public static final Gson gson = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting()
+ .registerTypeAdapter(LcmRequest.class, new RequestAdapter())
+ .registerTypeAdapter(LcmResponse.class, new ResponseAdapter()).create();
- public static final Gson gsonJunit = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting()
- .registerTypeAdapter(Instant.class, new InstantJunitAdapter()).create();
+ public static final Gson gsonJunit = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting()
+ .registerTypeAdapter(Instant.class, new InstantJunitAdapter()).create();
}