[FAB-16655] Warnings as errors for Java chaincode

Enable warnings as errors using -Werror, enable all
linting checks with -Xlint:all,-try, and fix all the
resulting errors.

The -try part is needed to disable an error on the
iterators, which cannot be fixed. It basically says
"you're implementing AutoCloseable, don't you dare
throw InterruptedException!" - which we don't.

Signed-off-by: Simon Stone <[email protected]>
Change-Id: Id1b34b4683fa66039c09905fd3607baeb4292f20

Author: Simon Stone

build.gradle

@@ -39,8 +39,10 @@ subprojects {
         testCompile 'com.github.stefanbirkner:system-rules:1.17.0'
     }
 
-    tasks.withType(JavaCompile) {
-        options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
+    if (!it.name.equals('fabric-chaincode-protos')) {
+        tasks.withType(JavaCompile) {
+            options.compilerArgs << "-Xlint:all,-try" << "-Werror"
+        }
     }
 
 }

fabric-chaincode-example-maven/src/main/java/org/hyperledger/fabric/example/SimpleChaincode.java

@@ -100,7 +100,7 @@ private Response invoke(ChaincodeStub stub, List<String> args) {
 
         _logger.info("Transfer complete");
 
-        return newSuccessResponse("invoke finished successfully", ByteString.copyFrom(accountFromKey + ": " + accountFromValue + " " + accountToKey + ": " + accountToValue, UTF_8).toByteArray());
+        return newSuccessResponse(null, ByteString.copyFrom(accountFromKey + ": " + accountFromValue + " " + accountToKey + ": " + accountToValue, UTF_8).toByteArray());
     }
 
     // Deletes an entity from state
@@ -126,7 +126,7 @@ private Response query(ChaincodeStub stub, List<String> args) {
             return newErrorResponse(String.format("Error: state for %s is null", key));
         }
         _logger.info(String.format("Query Response:\nName: %s, Amount: %s\n", key, val));
-        return newSuccessResponse(val, ByteString.copyFrom(val, UTF_8).toByteArray());
+        return newSuccessResponse(null, ByteString.copyFrom(val, UTF_8).toByteArray());
     }
 
     public static void main(String[] args) {

fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/FirstNetworkIntegrationTest.java

@@ -47,7 +47,7 @@
 public class FirstNetworkIntegrationTest {
 
     @ClassRule
-    public static DockerComposeContainer env = new DockerComposeContainer(
+    public static DockerComposeContainer<?> env = new DockerComposeContainer<>(
             new File("src/test/resources/first-network/docker-compose-cli.yaml")
     )
             .withLocalCompose(false)
@@ -224,11 +224,11 @@ private void testSACCChaincodeInstallInstantiateInvokeQuery(HFClient client, Ins
 
         // Creating proposal for query
         final TransactionProposalRequest queryAProposalRequest = generateSACCQueryRequest(client, installProposalRequest.getChaincodeName(), "a");
-        Utils.sendTransactionProposalQuery(queryAProposalRequest, myChannel, peer1org1, Matchers.is(200), Matchers.anything(), Matchers.is(ByteString.copyFromUtf8("100")));
+        Utils.sendTransactionProposalQuery(queryAProposalRequest, myChannel, peer1org1, Matchers.is(200), Matchers.isEmptyString(), Matchers.is(ByteString.copyFromUtf8("100")));
 
         // Creating proposal for query
         final TransactionProposalRequest queryBProposalRequest = generateSACCQueryRequest(client, installProposalRequest.getChaincodeName(), "b");
-        Utils.sendTransactionProposalQuery(queryBProposalRequest, myChannel, org1peers, Matchers.is(200), Matchers.anything(), Matchers.is(ByteString.copyFromUtf8("200")));
+        Utils.sendTransactionProposalQuery(queryBProposalRequest, myChannel, org1peers, Matchers.is(200), Matchers.isEmptyString(), Matchers.is(ByteString.copyFromUtf8("200")));
 
     }
 
@@ -276,60 +276,60 @@ void RunSBE(HFClient client, Channel channel,  String mode) throws NoSuchAlgorit
         Utils.sendTransactionProposalInvoke(proposal, channel, peer0org1, channel.getOrderers());
 
         proposal = generateSBECCTransactionRequest(client, "getval", mode);
-        Utils.sendTransactionProposalQuery(proposal, channel, peer0org1, Matchers.is(200), Matchers.anything(), Matchers.is(ByteString.copyFrom("foo", StandardCharsets.UTF_8)));
+        Utils.sendTransactionProposalQuery(proposal, channel, peer0org1, Matchers.is(200), Matchers.isEmptyString(), Matchers.is(ByteString.copyFrom("foo", StandardCharsets.UTF_8)));
 
         proposal = generateSBECCTransactionRequest(client, "addorgs", mode, "Org1MSP");
         Utils.sendTransactionProposalInvoke(proposal, channel, peer0org1, channel.getOrderers());
 
         proposal = generateSBECCTransactionRequest(client, "listorgs", mode);
-        Utils.sendTransactionProposalQuery(proposal, channel, peer0org1, Matchers.is(200), Matchers.anything(), Matchers.is(ByteString.copyFrom("[\"Org1MSP\"]", StandardCharsets.UTF_8)));
+        Utils.sendTransactionProposalQuery(proposal, channel, peer0org1, Matchers.is(200), Matchers.isEmptyString(), Matchers.is(ByteString.copyFrom("[\"Org1MSP\"]", StandardCharsets.UTF_8)));
 
         proposal = generateSBECCTransactionRequest(client, "setval", mode, "val1");
         Utils.sendTransactionProposalInvoke(proposal, channel, peer0org1, channel.getOrderers());
 
         proposal = generateSBECCTransactionRequest(client, "getval", mode);
-        Utils.sendTransactionProposalQuery(proposal, channel, peer0org1, Matchers.is(200), Matchers.anything(), Matchers.is(ByteString.copyFrom("val1", StandardCharsets.UTF_8)));
+        Utils.sendTransactionProposalQuery(proposal, channel, peer0org1, Matchers.is(200), Matchers.isEmptyString(), Matchers.is(ByteString.copyFrom("val1", StandardCharsets.UTF_8)));
 
         client.setUserContext(Utils.getUser1Org2TLS());
         proposal = generateSBECCTransactionRequest(client, "setval", mode, "val2");
         Utils.sendTransactionProposalInvoke(proposal, channel, peer0org2, channel.getOrderers(), true);
 
         proposal = generateSBECCTransactionRequest(client, "getval", mode);
-        Utils.sendTransactionProposalQuery(proposal, channel, peer0org2, Matchers.is(200), Matchers.anything(), Matchers.is(ByteString.copyFrom("val1", StandardCharsets.UTF_8)));
+        Utils.sendTransactionProposalQuery(proposal, channel, peer0org2, Matchers.is(200), Matchers.isEmptyString(), Matchers.is(ByteString.copyFrom("val1", StandardCharsets.UTF_8)));
 
         client.setUserContext(Utils.getUser1Org1TLS());
         proposal = generateSBECCTransactionRequest(client, "addorgs", mode, "Org2MSP");
         Utils.sendTransactionProposalInvoke(proposal, channel, peer0org1, channel.getOrderers());
 
         proposal = generateSBECCTransactionRequest(client, "listorgs", mode);
-        Utils.sendTransactionProposalQuery(proposal, channel, peer0org1, Matchers.is(200), Matchers.anything(), Matchers.anyOf(Matchers.is(ByteString.copyFrom("[\"Org1MSP\",\"Org2MSP\"]", StandardCharsets.UTF_8)),Matchers.is(ByteString.copyFrom("[\"Org2MSP\",\"Org1MSP\"]", StandardCharsets.UTF_8))));
+        Utils.sendTransactionProposalQuery(proposal, channel, peer0org1, Matchers.is(200), Matchers.isEmptyString(), Matchers.anyOf(Matchers.is(ByteString.copyFrom("[\"Org1MSP\",\"Org2MSP\"]", StandardCharsets.UTF_8)),Matchers.is(ByteString.copyFrom("[\"Org2MSP\",\"Org1MSP\"]", StandardCharsets.UTF_8))));
 
         client.setUserContext(Utils.getUser1Org2TLS());
         proposal = generateSBECCTransactionRequest(client, "setval", mode, "val3");
         Utils.sendTransactionProposalInvoke(proposal, channel, peer0org2, channel.getOrderers(), true);
 
         proposal = generateSBECCTransactionRequest(client, "getval", mode);
-        Utils.sendTransactionProposalQuery(proposal, channel, peer0org2, Matchers.is(200), Matchers.anything(), Matchers.is(ByteString.copyFrom("val1", StandardCharsets.UTF_8)));
+        Utils.sendTransactionProposalQuery(proposal, channel, peer0org2, Matchers.is(200), Matchers.isEmptyString(), Matchers.is(ByteString.copyFrom("val1", StandardCharsets.UTF_8)));
 
         proposal = generateSBECCTransactionRequest(client, "setval", mode, "val4");
         Utils.sendTransactionProposalInvoke(proposal, channel, allpeers0, channel.getOrderers());
 
         client.setUserContext(Utils.getUser1Org1TLS());
         proposal = generateSBECCTransactionRequest(client, "getval", mode);
-        Utils.sendTransactionProposalQuery(proposal, channel, peer0org1, Matchers.is(200), Matchers.anything(), Matchers.is(ByteString.copyFrom("val4", StandardCharsets.UTF_8)));
+        Utils.sendTransactionProposalQuery(proposal, channel, peer0org1, Matchers.is(200), Matchers.isEmptyString(), Matchers.is(ByteString.copyFrom("val4", StandardCharsets.UTF_8)));
 
         client.setUserContext(Utils.getUser1Org2TLS());
         proposal = generateSBECCTransactionRequest(client, "delorgs", mode, "Org1MSP");
         Utils.sendTransactionProposalInvoke(proposal, channel, peer0org2, channel.getOrderers(), true);
 
         proposal = generateSBECCTransactionRequest(client, "listorgs", mode);
-        Utils.sendTransactionProposalQuery(proposal, channel, peer0org2, Matchers.is(200), Matchers.anything(), Matchers.anyOf(Matchers.is(ByteString.copyFrom("[\"Org1MSP\",\"Org2MSP\"]", StandardCharsets.UTF_8)),Matchers.is(ByteString.copyFrom("[\"Org2MSP\",\"Org1MSP\"]", StandardCharsets.UTF_8))));
+        Utils.sendTransactionProposalQuery(proposal, channel, peer0org2, Matchers.is(200), Matchers.isEmptyString(), Matchers.anyOf(Matchers.is(ByteString.copyFrom("[\"Org1MSP\",\"Org2MSP\"]", StandardCharsets.UTF_8)),Matchers.is(ByteString.copyFrom("[\"Org2MSP\",\"Org1MSP\"]", StandardCharsets.UTF_8))));
 
         proposal = generateSBECCTransactionRequest(client, "delorgs", mode, "Org1MSP");
         Utils.sendTransactionProposalInvoke(proposal, channel, allpeers0, channel.getOrderers());
 
         proposal = generateSBECCTransactionRequest(client, "listorgs", mode);
-        Utils.sendTransactionProposalQuery(proposal, channel, peer0org2, Matchers.is(200), Matchers.anything(), Matchers.is(ByteString.copyFrom("[\"Org2MSP\"]", StandardCharsets.UTF_8)));
+        Utils.sendTransactionProposalQuery(proposal, channel, peer0org2, Matchers.is(200), Matchers.isEmptyString(), Matchers.is(ByteString.copyFrom("[\"Org2MSP\"]", StandardCharsets.UTF_8)));
 
     }
 
@@ -383,7 +383,7 @@ private void executeAndValidateQueryOnAccount(HFClient client, Channel channel,
                         .filter(peer -> peer.getName().contains(peerName))
                         .collect(Collectors.toList()),
                 Matchers.is(ChaincodeResponse.Status.SUCCESS.getStatus()),
-                Matchers.anything(),
+                Matchers.isEmptyString(),
                 Matchers.is(ByteString.copyFrom(expectedAmount, StandardCharsets.UTF_8))
         );
     }
@@ -439,7 +439,7 @@ private void executeAndValidateQueryOnAccountNewPM(HFClient client, Channel chan
                         .filter(peer -> peer.getName().contains(peerName))
                         .collect(Collectors.toList()),
                 Matchers.is(ChaincodeResponse.Status.SUCCESS.getStatus()),
-                Matchers.anything(),
+                Matchers.isEmptyString(),
                 Matchers.is(ByteString.copyFrom(expectedAmount, StandardCharsets.UTF_8))
         );
     }

fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/Utils.java

@@ -42,6 +42,7 @@
 
 import com.github.dockerjava.api.model.Container;
 import com.github.dockerjava.api.model.Image;
+import com.google.protobuf.ByteString;
 
 import org.apache.commons.compress.archivers.ArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
@@ -175,14 +176,11 @@ public static InputStream generateTarGzInputStream(File src, String pathPrefix)
 
         String sourcePath = sourceDirectory.getAbsolutePath();
 
-        TarArchiveOutputStream archiveOutputStream = new TarArchiveOutputStream(new GzipCompressorOutputStream(new BufferedOutputStream(bos)));
-        archiveOutputStream.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU);
-
-        try {
+        try (TarArchiveOutputStream archiveOutputStream = new TarArchiveOutputStream(new GzipCompressorOutputStream(new BufferedOutputStream(bos)))) {
+            archiveOutputStream.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU);
             Collection<File> childrenFiles = org.apache.commons.io.FileUtils.listFiles(sourceDirectory, null, true);
 
             ArchiveEntry archiveEntry;
-            FileInputStream fileInputStream;
             for (File childFile : childrenFiles) {
                 String childPath = childFile.getAbsolutePath();
                 String relativePath = childPath.substring((sourcePath.length() + 1), childPath.length());
@@ -194,18 +192,12 @@ public static InputStream generateTarGzInputStream(File src, String pathPrefix)
                 relativePath = FilenameUtils.separatorsToUnix(relativePath);
 
                 archiveEntry = new TarArchiveEntry(childFile, relativePath);
-                fileInputStream = new FileInputStream(childFile);
-                archiveOutputStream.putArchiveEntry(archiveEntry);
-
-                try {
+                try (FileInputStream fileInputStream = new FileInputStream(childFile)) {
+                    archiveOutputStream.putArchiveEntry(archiveEntry);
                     IOUtils.copy(fileInputStream, archiveOutputStream);
-                } finally {
-                    IOUtils.closeQuietly(fileInputStream);
                     archiveOutputStream.closeArchiveEntry();
                 }
             }
-        } finally {
-            IOUtils.closeQuietly(archiveOutputStream);
         }
 
         return new ByteArrayInputStream(bos.toByteArray());
@@ -473,7 +465,7 @@ static public void sendTransactionProposalInvoke(TransactionProposalRequest prop
         }
     }
 
-    static public void sendTransactionProposalQuery(TransactionProposalRequest proposal, Channel channel, Collection<Peer> peers, Matcher statusMatcher, Matcher messageMatcher, Matcher payloadMatcher) throws InvalidArgumentException, ProposalException {
+    static public void sendTransactionProposalQuery(TransactionProposalRequest proposal, Channel channel, Collection<Peer> peers, Matcher<Integer> statusMatcher, Matcher<String> messageMatcher, Matcher<ByteString> payloadMatcher) throws InvalidArgumentException, ProposalException {
         // Send proposal and wait for responses
         System.out.println("Sending proposal for " + proposal.getFcn() + "(" + String.join(", ", proposal.getArgs()) + ") to peers: " + String.join(", ", peers.stream().map(p -> p.getName()).collect(Collectors.toList())));
         final Collection<ProposalResponse> queryAResponses = channel.sendTransactionProposal(proposal, peers);

fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/JSONTransactionSerializer.java

@@ -10,6 +10,7 @@
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 import java.nio.charset.StandardCharsets;
 import java.util.Iterator;
 import java.util.Map;
@@ -154,8 +155,8 @@ Object createComponentInstance(String format, String jsonString, TypeSchema ts)
         DataTypeDefinition dtd = this.typeRegistry.getDataType(format);
         Object obj;
         try {
-            obj = dtd.getTypeClass().newInstance();
-        } catch (InstantiationException | IllegalAccessException e1) {
+            obj = dtd.getTypeClass().getDeclaredConstructor().newInstance();
+        } catch (IllegalAccessException | InstantiationException | InvocationTargetException | NoSuchMethodException e1) {
             throw new ContractRuntimeException("Unable to to create new instance of type", e1);
         }
 

fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/impl/ContractExecutionService.java

@@ -63,7 +63,7 @@ public Chaincode.Response executeRequest(TxFunction txFn, InvocationRequest req,
                 response = ResponseUtils.newSuccessResponse(convertReturn(value, txFn));
             }
 
-        } catch (IllegalAccessException | InstantiationException e) {
+        } catch (IllegalAccessException | InstantiationException | NoSuchMethodException e) {
             String message = String.format("Could not execute contract method: %s", rd.toString());
             throw new ContractRuntimeException(message, e);
         } catch (InvocationTargetException e) {

fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/TxFunction.java

@@ -5,6 +5,7 @@
 */
 package org.hyperledger.fabric.contract.routing;
 
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.List;
 
@@ -19,7 +20,7 @@ interface Routing {
 
         Class<? extends ContractInterface> getContractClass();
 
-        ContractInterface getContractInstance() throws InstantiationException, IllegalAccessException;
+        ContractInterface getContractInstance() throws IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException;
 
     }
 

fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/RoutingRegistryImpl.java

@@ -141,6 +141,7 @@ public Collection<ContractDefinition> getAllDefinitions() {
      * org.hyperledger.fabric.contract.routing.RoutingRegistry#findAndSetContracts()
      */
     @Override
+    @SuppressWarnings("unchecked")
     public void findAndSetContracts(TypeRegistry typeRegistry) {
 
         // Find all classes that are valid contract or data type instances.
@@ -197,7 +198,7 @@ public void findAndSetContracts(TypeRegistry typeRegistry) {
         for (Class<ContractInterface> contractClass : contractClasses) {
             String className = contractClass.getCanonicalName();
             if (!seenClass.contains(className)) {
-                ContractDefinition contract = addNewContract((Class<ContractInterface>) contractClass);
+                ContractDefinition contract = addNewContract(contractClass);
 
                 logger.debug("Searching annotated methods");
                 for (Method m : contractClass.getMethods()) {

fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/TxFunctionImpl.java

@@ -5,6 +5,7 @@
 */
 package org.hyperledger.fabric.contract.routing.impl;
 
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -54,10 +55,8 @@ public Class<? extends ContractInterface> getContractClass() {
         }
 
         @Override
-        public ContractInterface getContractInstance() throws InstantiationException, IllegalAccessException {
-
-            return clazz.newInstance();
-
+        public ContractInterface getContractInstance() throws IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException {
+            return clazz.getDeclaredConstructor().newInstance();
         }
 
         @Override

fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/execution/ContractExecutionServiceTest.java

@@ -14,6 +14,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 
 import org.hyperledger.fabric.contract.ChaincodeStubNaiveImpl;
@@ -36,10 +37,9 @@ public class ContractExecutionServiceTest {
     @Rule
     public ExpectedException thrown = ExpectedException.none();
 
-    @SuppressWarnings("rawtypes")
     @Test
     public void noReturnValue()
-            throws InstantiationException, IllegalAccessException, NoSuchMethodException, SecurityException {
+            throws IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException, SecurityException {
         TypeRegistry typeRegistry = new TypeRegistryImpl();
 
         ContractExecutionService ces = new ContractExecutionService(typeRegistry);
@@ -52,20 +52,18 @@ public void noReturnValue()
         ChaincodeStub stub = new ChaincodeStubNaiveImpl();
 
         when(txFn.getRouting()).thenReturn(routing);
-        when(req.getArgs()).thenReturn(new ArrayList() {
-        });
-        when(routing.getMethod()).thenReturn(SampleContract.class.getMethod("noReturn", new Class[] { Context.class }));
+        when(req.getArgs()).thenReturn(new ArrayList<byte[]>());
+        when(routing.getMethod()).thenReturn(SampleContract.class.getMethod("noReturn", new Class<?>[] { Context.class }));
         when(routing.getContractInstance()).thenReturn(contract);
         ces.executeRequest(txFn, req, stub);
 
         verify(contract).beforeTransaction(any());
 
     }
 
-    @SuppressWarnings("rawtypes")
     @Test()
     public void failureToInvoke()
-            throws InstantiationException, IllegalAccessException, NoSuchMethodException, SecurityException {
+            throws IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException, SecurityException {
         TypeRegistry typeRegistry = new TypeRegistryImpl();
 
         ContractExecutionService ces = new ContractExecutionService(typeRegistry);
@@ -78,8 +76,7 @@ public void failureToInvoke()
         ChaincodeStub stub = mock(ChaincodeStub.class);
 
         when(txFn.getRouting()).thenReturn(routing);
-        when(req.getArgs()).thenReturn(new ArrayList() {
-        });
+        when(req.getArgs()).thenReturn(new ArrayList<byte[]>());
 
         when(routing.getContractInstance()).thenThrow(IllegalAccessException.class);
         when(routing.toString()).thenReturn("MockMethodName:MockClassName");