Changes for Checkstyle 8.32

[policy/models.git] / models-interactions / model-impl / so / src / main / java / org / onap / policy / so / SoResponseWrapper.java

diff --git a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoResponseWrapper.java b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoResponseWrapper.java
index 1ecba5f..beb8528 100644 (file)
--- a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoResponseWrapper.java
+++ b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoResponseWrapper.java
@@ -22,9 +22,12 @@
 package org.onap.policy.so;
 
 import com.google.gson.annotations.SerializedName;
-
 import java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class SoResponseWrapper implements Serializable {
 
     private static final long serialVersionUID = 7673023687132889069L;
@@ -55,27 +58,14 @@ public class SoResponseWrapper implements Serializable {
             if (other.soResponse != null) {
                 return false;
             }
-        }
-        else if (!soResponse.equals(other.soResponse)) {
+        } else if (!soResponse.equals(other.soResponse)) {
             return false;
         }
         if (requestId == null) {
-            if (other.requestId != null) {
-                return false;
-            }
+            return other.requestId == null;
+        } else {
+            return requestId.equals(other.requestId);
         }
-        else if (!requestId.equals(other.requestId)) {
-            return false;
-        }
-        return true;
-    }
-
-    public String getRequestId() {
-        return requestId;
-    }
-
-    public SoResponse getSoResponse() {
-        return soResponse;
     }
 
     @Override
@@ -87,14 +77,6 @@ public class SoResponseWrapper implements Serializable {
         return result;
     }
 
-    public void setRequestId(String requestId) {
-        this.requestId = requestId;
-    }
-
-    public void setSoResponse(SoResponse response) {
-        soResponse = response;
-    }
-
     @Override
     public String toString() {
         return "SOResponseWrapper [SOResponse=" + soResponse + ", RequestId=" + requestId + "]";