[FAB-13802] Return types update

Change-Id: Ib4be076c2bc31a363485eb8080c4501a0fb106f2 Signed-off-by: Matthew B. White <[email protected]>
hyperledger · Apr 29, 2019 · 526f36d · 526f36d
1 parent 8d34b20
commit 526f36d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/ContextFactory.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/ContextFactory.java
@@ -45,7 +45,7 @@ static class ContextInvocationHandler implements InvocationHandler {
 
         @Override
         public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-            Method m = stub.getClass().getMethod(method.getName(), method.getParameterTypes());
+            Method m = ChaincodeStub.class.getMethod(method.getName(), method.getParameterTypes());
             return m.invoke(stub, args);
         }
     }

diff --git a/...rc/main/java/org/hyperledger/fabric/contract/execution/impl/ContractExecutionService.java b/...rc/main/java/org/hyperledger/fabric/contract/execution/impl/ContractExecutionService.java
@@ -29,6 +29,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import static java.nio.charset.StandardCharsets.UTF_8;
 
 public class ContractExecutionService implements ExecutionService {
 
@@ -54,7 +55,13 @@ public Chaincode.Response executeRequest(Routing rd, InvocationRequest req, Chai
 
         Chaincode.Response response;
         try {
-            response = (Chaincode.Response)rd.getMethod().invoke(proxyObject, args.toArray());
+            Object value = rd.getMethod().invoke(proxyObject, args.toArray());
+            if (value==null){
+                response = ResponseUtils.newSuccessResponse();
+            } else {
+                String str = value.toString();
+                response = ResponseUtils.newSuccessResponse(str.getBytes(UTF_8));
+            }
         } catch (IllegalAccessException|InvocationTargetException e) {
             logger.warn("Error during contract method invocation", e);
             response = ResponseUtils.newErrorResponse(e);

diff --git a/fabric-chaincode-shim/src/test/java/contract/SampleContract.java b/fabric-chaincode-shim/src/test/java/contract/SampleContract.java
@@ -30,18 +30,18 @@ public class SampleContract implements ContractInterface {
     static public int i1Invoked = 0;
 
     @Init
-    public Chaincode.Response i1() {
+    public String i1() {
         i1Invoked++;
-        return ResponseUtils.newSuccessResponse("Init done");
+        return "Init done";
     }
 
     @Transaction
-    public Chaincode.Response t1(String arg1) {
+    public String t1(String arg1) {
         t1Invoked++;
         Context context = getContext();
         List<String> args = context.getStringArgs();
         doSomeWork();
-        return ResponseUtils.newSuccessResponse(args.get(1));
+        return args.get(1);
     }
 
     @Override

diff --git a/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ContractRouterTest.java b/fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ContractRouterTest.java
@@ -23,7 +23,7 @@
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
-
+import static java.nio.charset.StandardCharsets.UTF_8;
 public class ContractRouterTest {
     @Rule
     public ExpectedException thrown = ExpectedException.none();
@@ -81,7 +81,7 @@ public void testInit() {
         SampleContract.i1Invoked = 0;
         Chaincode.Response response = r.init(s);
         assertThat(response, is(notNullValue()));
-        assertThat(response.getMessage(), is(equalTo("Init done")));
+        assertThat(response.getStringPayload(), is(equalTo("Init done")));
         assertThat(SampleContract.beforeInvoked, is(1));
         assertThat(SampleContract.afterInvoked, is(1));
         assertThat(SampleContract.i1Invoked, is(1));
@@ -118,7 +118,7 @@ public void testInvoke() {
 
         Chaincode.Response response = r.invoke(s);
         assertThat(response, is(notNullValue()));
-        assertThat(response.getMessage(), is(equalTo("asdf")));
+        assertThat(response.getStringPayload(), is(equalTo("asdf")));
         assertThat(SampleContract.beforeInvoked, is(1));
         assertThat(SampleContract.afterInvoked, is(1));
         assertThat(SampleContract.doWorkInvoked, is(1));