Add isSuccess() and isFailure() on LwM2mResponse

eclipse-leshan · Dec 18, 2015 · c70c9d6 · c70c9d6
1 parent 23180c7
commit c70c9d6
Show file tree

Hide file tree

Showing 13 changed files with 70 additions and 1 deletion.
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/AbstractLwM2mResponse.java b/leshan-core/src/main/java/org/eclipse/leshan/core/response/AbstractLwM2mResponse.java
@@ -21,7 +21,7 @@
 /**
  * A base class for concrete LWM2M response.
  */
-public class AbstractLwM2mResponse implements LwM2mResponse {
+public abstract class AbstractLwM2mResponse implements LwM2mResponse {
 
     protected final ResponseCode code;
     protected final String errorMessage;
@@ -43,4 +43,9 @@ public final ResponseCode getCode() {
     public String getErrorMessage() {
         return errorMessage;
     }
+
+    @Override
+    public boolean isFailure() {
+        return !isSuccess();
+    }
 }
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/BootstrapResponse.java b/leshan-core/src/main/java/org/eclipse/leshan/core/response/BootstrapResponse.java
@@ -22,4 +22,9 @@ public class BootstrapResponse extends AbstractLwM2mResponse {
     public BootstrapResponse(final ResponseCode code, final String errorMessage) {
         super(code, errorMessage);
     }
+
+    @Override
+    public boolean isSuccess() {
+        return getCode() == ResponseCode.CHANGED;
+    }
 }
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/CreateResponse.java b/leshan-core/src/main/java/org/eclipse/leshan/core/response/CreateResponse.java
@@ -30,6 +30,11 @@ public String getLocation() {
         return location;
     }
 
+    @Override
+    public boolean isSuccess() {
+        return getCode() == ResponseCode.CREATED;
+    }
+
     @Override
     public String toString() {
         if (errorMessage != null)

diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/DeleteResponse.java b/leshan-core/src/main/java/org/eclipse/leshan/core/response/DeleteResponse.java
@@ -23,6 +23,11 @@ public DeleteResponse(final ResponseCode code, final String errorMessage) {
         super(code, errorMessage);
     }
 
+    @Override
+    public boolean isSuccess() {
+        return getCode() == ResponseCode.DELETED;
+    }
+
     @Override
     public String toString() {
         if (errorMessage != null)

diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/DeregisterResponse.java b/leshan-core/src/main/java/org/eclipse/leshan/core/response/DeregisterResponse.java
@@ -23,6 +23,11 @@ public DeregisterResponse(final ResponseCode code, final String errorMessage) {
         super(code, errorMessage);
     }
 
+    @Override
+    public boolean isSuccess() {
+        return getCode() == ResponseCode.DELETED;
+    }
+
     @Override
     public String toString() {
         if (errorMessage != null)

diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/DiscoverResponse.java b/leshan-core/src/main/java/org/eclipse/leshan/core/response/DiscoverResponse.java
@@ -44,6 +44,11 @@ public LinkObject[] getObjectLinks() {
         return links != null ? links.clone() : null;
     }
 
+    @Override
+    public boolean isSuccess() {
+        return getCode() == ResponseCode.CONTENT;
+    }
+
     @Override
     public String toString() {
         if (errorMessage != null)

diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/ExecuteResponse.java b/leshan-core/src/main/java/org/eclipse/leshan/core/response/ExecuteResponse.java
@@ -23,6 +23,11 @@ public ExecuteResponse(final ResponseCode code, final String errorMessage) {
         super(code, errorMessage);
     }
 
+    @Override
+    public boolean isSuccess() {
+        return getCode() == ResponseCode.CHANGED;
+    }
+
     @Override
     public String toString() {
         if (errorMessage != null)

diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/LwM2mResponse.java b/leshan-core/src/main/java/org/eclipse/leshan/core/response/LwM2mResponse.java
@@ -37,4 +37,13 @@ public interface LwM2mResponse {
      */
     String getErrorMessage();
 
+    /**
+     * @return true if the request was successfully done.
+     */
+    boolean isSuccess();
+
+    /**
+     * @return true if we get an error or unexpected code.
+     */
+    boolean isFailure();
 }
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/ReadResponse.java b/leshan-core/src/main/java/org/eclipse/leshan/core/response/ReadResponse.java
@@ -38,6 +38,11 @@ public ReadResponse(ResponseCode code, LwM2mNode content, String errorMessage) {
         this.content = content;
     }
 
+    @Override
+    public boolean isSuccess() {
+        return getCode() == ResponseCode.CONTENT;
+    }
+
     /**
      * Get the {@link LwM2mNode} value returned as response payload.
      *

diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/RegisterResponse.java b/leshan-core/src/main/java/org/eclipse/leshan/core/response/RegisterResponse.java
@@ -33,6 +33,11 @@ public String getRegistrationID() {
         return registrationID;
     }
 
+    @Override
+    public boolean isSuccess() {
+        return getCode() == ResponseCode.CREATED;
+    }
+
     @Override
     public String toString() {
         if (errorMessage != null)

diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/UpdateResponse.java b/leshan-core/src/main/java/org/eclipse/leshan/core/response/UpdateResponse.java
@@ -23,6 +23,11 @@ public UpdateResponse(final ResponseCode code, final String errorMessage) {
         super(code, errorMessage);
     }
 
+    @Override
+    public boolean isSuccess() {
+        return getCode() == ResponseCode.CHANGED;
+    }
+
     @Override
     public String toString() {
         if (errorMessage != null)

diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/WriteAttributesResponse.java b/leshan-core/src/main/java/org/eclipse/leshan/core/response/WriteAttributesResponse.java
@@ -23,6 +23,11 @@ public WriteAttributesResponse(final ResponseCode code, final String errorMessag
         super(code, errorMessage);
     }
 
+    @Override
+    public boolean isSuccess() {
+        return getCode() == ResponseCode.CHANGED;
+    }
+
     @Override
     public String toString() {
         if (errorMessage != null)

diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/WriteResponse.java b/leshan-core/src/main/java/org/eclipse/leshan/core/response/WriteResponse.java
@@ -23,6 +23,11 @@ public WriteResponse(final ResponseCode code, final String errorMessage) {
         super(code, errorMessage);
     }
 
+    @Override
+    public boolean isSuccess() {
+        return getCode() == ResponseCode.CHANGED;
+    }
+
     @Override
     public String toString() {
         if (errorMessage != null)