[FAB-12426] Fix java chaincode return status.

Java chaincode should be able to return any status it wants, not limited to SUCCESS(200) and INTERNAL_SERVER_ERROR(500)
Direct integer codes are also supported.

Change-Id: Iacbed9ab30f7c0f61301a9af45759359855c4fcb
Signed-off-by: Albert Lacambra Basil <albert@lacambra.tech>

Author: alacambra

fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/Chaincode.java

@@ -31,20 +31,34 @@ public interface Chaincode {
      * Wrapper around protobuf Response, contains status, message and payload. Object returned by
      * call to {@link #init(ChaincodeStub)} and{@link #invoke(ChaincodeStub)}
      */
-    public static class Response {
+    class Response {
 
-        private final Status status;
+        private final int statusCode;
         private final String message;
         private final byte[] payload;
 
         public Response(Status status, String message, byte[] payload) {
-            this.status = status;
+            this.statusCode = status.getCode();
+            this.message = message;
+            this.payload = payload;
+        }
+
+        public Response(int statusCode, String message, byte[] payload) {
+            this.statusCode = statusCode;
             this.message = message;
             this.payload = payload;
         }
 
         public Status getStatus() {
-            return status;
+            if (Status.hasStatusForCode(statusCode)) {
+                return Status.forCode(statusCode);
+            } else {
+                return null;
+            }
+        }
+
+        public int getStatusCode() {
+            return statusCode;
         }
 
         public String getMessage() {
@@ -64,6 +78,7 @@ public String getStringPayload() {
          */
         public enum Status {
             SUCCESS(200),
+            ERROR_THRESHOLD(400),
             INTERNAL_SERVER_ERROR(500);
 
             private static final Map<Integer, Status> codeToStatus = new HashMap<>();
@@ -83,6 +98,10 @@ public static Status forCode(int code) {
                 return result;
             }
 
+            public static boolean hasStatusForCode(int code) {
+                return codeToStatus.containsKey(code);
+            }
+
             static {
                 for (Status status : Status.values()) {
                     codeToStatus.put(status.code, status);

fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ChaincodeTest.java

@@ -11,7 +11,7 @@
 
 import java.nio.charset.StandardCharsets;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 public class ChaincodeTest {
 
@@ -26,9 +26,31 @@ public void testResponse() {
         assertEquals("Incorrect payload", "no payload", resp.getStringPayload());
     }
 
+
+    @Test
+    public void testResponseWithCode() {
+        Chaincode.Response resp = new Chaincode.Response(200, "No message", "no payload".getBytes(StandardCharsets.UTF_8));
+        assertEquals("Incorrect status", Chaincode.Response.Status.SUCCESS, resp.getStatus());
+        assertEquals("Incorrect status", 200, resp.getStatusCode());
+        assertEquals("Incorrect message", "No message", resp.getMessage());
+        assertEquals("Incorrect payload", "no payload", resp.getStringPayload());
+
+        resp = new Chaincode.Response(404, "No message", "no payload".getBytes(StandardCharsets.UTF_8));
+        assertEquals("Incorrect status", 404, resp.getStatusCode());
+        assertEquals("Incorrect message", "No message", resp.getMessage());
+        assertEquals("Incorrect payload", "no payload", resp.getStringPayload());
+
+        resp = new Chaincode.Response(Chaincode.Response.Status.ERROR_THRESHOLD, "No message", "no payload".getBytes(StandardCharsets.UTF_8));
+        assertEquals("Incorrect status", Chaincode.Response.Status.ERROR_THRESHOLD, resp.getStatus());
+        assertEquals("Incorrect status", 400, resp.getStatusCode());
+        assertEquals("Incorrect message", "No message", resp.getMessage());
+        assertEquals("Incorrect payload", "no payload", resp.getStringPayload());
+    }
+
     @Test
     public void testStatus() {
         assertEquals("Wrong status", Chaincode.Response.Status.SUCCESS, Chaincode.Response.Status.forCode(200));
+        assertEquals("Wrong status", Chaincode.Response.Status.ERROR_THRESHOLD, Chaincode.Response.Status.forCode(400));
         assertEquals("Wrong status", Chaincode.Response.Status.INTERNAL_SERVER_ERROR, Chaincode.Response.Status.forCode(500));
 
         thrown.expect(IllegalArgumentException.class);