Make ContentFormat and ResponseCode toString() prettier.

eclipse-leshan · Jun 25, 2021 · afc22f3 · afc22f3
1 parent baa10b4
commit afc22f3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/leshan-core-cf/src/test/java/org/eclipse/leshan/core/californium/ResponseCodeUtilTest.java b/leshan-core-cf/src/test/java/org/eclipse/leshan/core/californium/ResponseCodeUtilTest.java
@@ -23,10 +23,11 @@ public class ResponseCodeUtilTest {
 
     @Test
     public void known_coap_code_to_known_lwm2m_Code() {
-        org.eclipse.leshan.core.ResponseCode lwM2mResponseCode = ResponseCodeUtil.toLwM2mResponseCode(ResponseCode.CREATED);
+        org.eclipse.leshan.core.ResponseCode lwM2mResponseCode = ResponseCodeUtil
+                .toLwM2mResponseCode(ResponseCode.CREATED);
 
         Assert.assertEquals(org.eclipse.leshan.core.ResponseCode.CREATED, lwM2mResponseCode);
-        Assert.assertEquals("CREATED", lwM2mResponseCode.toString());
+        Assert.assertEquals("CREATED(201)", lwM2mResponseCode.toString());
     }
 
     @Test
@@ -49,7 +50,8 @@ public void known_lwm2m_code_to_known_coap_code() {
 
     @Test
     public void unknown_lwm2m_code_to_known_coap_code() {
-        ResponseCode coapResponseCode = ResponseCodeUtil.toCoapResponseCode(new org.eclipse.leshan.core.ResponseCode(503));
+        ResponseCode coapResponseCode = ResponseCodeUtil
+                .toCoapResponseCode(new org.eclipse.leshan.core.ResponseCode(503));
 
         Assert.assertEquals(ResponseCode.SERVICE_UNAVAILABLE, coapResponseCode);
     }
@@ -69,7 +71,8 @@ public void unknown_lwm2m_code_to_unknown_coap_code() {
         // californium behavior is not really consistent
 
         // for success : code value is lost but we know we use an unknown code
-        ResponseCode coapResponseCode = ResponseCodeUtil.toCoapResponseCode(new org.eclipse.leshan.core.ResponseCode(206));
+        ResponseCode coapResponseCode = ResponseCodeUtil
+                .toCoapResponseCode(new org.eclipse.leshan.core.ResponseCode(206));
         Assert.assertEquals(ResponseCode._UNKNOWN_SUCCESS_CODE, coapResponseCode);
 
         // for client error,: unknown code is replace by BAD REQUEST ...

diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/ResponseCode.java b/leshan-core/src/main/java/org/eclipse/leshan/core/ResponseCode.java
@@ -141,10 +141,7 @@ public static ResponseCode fromCode(int code) {
 
     @Override
     public String toString() {
-        if (UNKNOWN.equals(name))
-            return String.format("%s(%d)", name, code);
-        else
-            return name;
+        return String.format("%s(%d)", name, code);
     }
 
     @Override

diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/ContentFormat.java b/leshan-core/src/main/java/org/eclipse/leshan/core/request/ContentFormat.java
@@ -161,7 +161,7 @@ public static ContentFormat fromName(String name) {
 
     @Override
     public String toString() {
-        return String.format("ContentFormat [name=%s, code=%s]", name, code);
+        return String.format("%s(%s)", name, code);
     }
 
     @Override