[FAB-11485] Fixing empty proposal handling

Fixing empty proposal handling in ChaincodeMessage while
creating ChaincodeStubImpl

Change-Id: I13110f6b2e001defe8b2f74af73a11100df3a388
Signed-off-by: gennady <gennady@il.ibm.com>

Author: gennadylaventman

fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/ChaincodeStubImpl.java

@@ -61,7 +61,7 @@ class ChaincodeStubImpl implements ChaincodeStub {
 		this.handler = handler;
 		this.args = Collections.unmodifiableList(args);
 		this.signedProposal = signedProposal;
-		if(this.signedProposal == null) {
+		if(this.signedProposal == null || this.signedProposal.getProposalBytes().isEmpty()) {
 			this.creator = null;
 			this.txTimestamp = null;
 			this.transientMap = Collections.emptyMap();

fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/ChaincodeStubImplTest.java

@@ -351,6 +351,13 @@ public void testGetSignedProposal() {
 		assertThat(stub.getSignedProposal(), is(signedProposal));
 	}
 
+	@Test
+	public void testGetSignedProposalWithEmptyProposal() {
+		final SignedProposal signedProposal = SignedProposal.newBuilder().setProposalBytes(ByteString.EMPTY).build();
+		final ChaincodeStubImpl stub = new ChaincodeStubImpl("myc", "txId", handler, Collections.emptyList(), signedProposal);
+		assertThat(stub.getSignedProposal(), is(signedProposal));
+	}
+
 	@Test
 	public void testGetTxTimestamp() {
 		final Instant instant = Instant.now();
@@ -377,6 +384,13 @@ public void testGetTxTimestampNullSignedProposal() {
 		assertThat(stub.getTxTimestamp(), is(nullValue()));
 	}
 
+	@Test
+	public void testGetTxTimestampEmptySignedProposal() {
+		final SignedProposal signedProposal = SignedProposal.newBuilder().setProposalBytes(ByteString.EMPTY).build();
+		final ChaincodeStubImpl stub = new ChaincodeStubImpl("myc", "txid", handler, new ArrayList<>(), signedProposal);
+		assertThat(stub.getTxTimestamp(), is(nullValue()));
+	}
+
 	@Test
 	public void testGetCreator() {
 		final Instant instant = Instant.now();
@@ -453,4 +467,10 @@ public void testGetBinding() {
 		assertThat(stub.getBinding(), is(expectedDigest));
 	}
 
+	@Test
+	public void testGetBindingEmptyProposal() {
+		final SignedProposal signedProposal = SignedProposal.newBuilder().setProposalBytes(ByteString.EMPTY).build();
+		final ChaincodeStubImpl stub = new ChaincodeStubImpl("myc", "txid", handler, new ArrayList<>(), signedProposal);
+		assertThat(stub.getBinding(), is((byte[])null));
+	}
 }