FGJ-111: Minimise explicit gRPC dependencies (#135)

The versions of transient dependencies resolved were not consistent in some consuming projects; particularly projects built with Gradle rather than Maven. This inconsistency caused errors at runtime. This change removes some explicit dependencies on packages that are also transient dependencies to avoid these dependency resolution issues.

Also update dependency versions and some minor code tidy-up.

Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>

Author: bestbeforetoday

pom.xml

@@ -27,9 +27,9 @@
         <url>http://github.com/hyperledger/fabric-sdk-java</url>
     </scm>
     <properties>
-        <grpc.version>1.35.0</grpc.version><!-- CURRENT_GRPC_VERSION -->
-        <protobuf.version>3.12.4</protobuf.version>
-        <bouncycastle.version>1.62</bouncycastle.version>
+        <grpc.version>1.38.0</grpc.version><!-- CURRENT_GRPC_VERSION -->
+        <protobuf.version>3.17.3</protobuf.version>
+        <bouncycastle.version>1.69</bouncycastle.version>
         <httpclient.version>4.5.13</httpclient.version>
         <javadoc.version>3.2.0</javadoc.version>
         <skipITs>true</skipITs>
@@ -81,9 +81,14 @@
             <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-tcnative-boringssl-static</artifactId>
+            <version>2.0.39.Final</version>
+        </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
-            <artifactId>grpc-netty</artifactId>
+            <artifactId>grpc-netty-shaded</artifactId>
             <version>${grpc.version}</version>
         </dependency>
         <dependency>
@@ -96,17 +101,12 @@
             <artifactId>grpc-stub</artifactId>
             <version>${grpc.version}</version>
         </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-tcnative-boringssl-static</artifactId>
-            <version>2.0.34.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-codec-http2</artifactId>
-            <version>4.1.60.Final</version>
+        <dependency> <!-- necessary for Java 9+ -->
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>annotations-api</artifactId>
+            <version>6.0.53</version>
+            <scope>provided</scope>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java -->
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
@@ -117,7 +117,6 @@
             <artifactId>protobuf-java-util</artifactId>
             <version>${protobuf.version}</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk15on -->
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>

src/main/java/org/hyperledger/fabric/sdk/BlockDeserializer.java

@@ -29,7 +29,7 @@
 
 class BlockDeserializer {
     private final Block block;
-    private final Map<Integer, WeakReference<EnvelopeDeserializer>> envelopes = Collections.synchronizedMap(new WeakHashMap<Integer, WeakReference<EnvelopeDeserializer>>());
+    private final Map<Integer, WeakReference<EnvelopeDeserializer>> envelopes = Collections.synchronizedMap(new WeakHashMap<>());
 
     public Block getBlock() {
         return block;

src/main/java/org/hyperledger/fabric/sdk/BlockEvent.java

@@ -88,7 +88,7 @@ public Peer getPeer() {
     }
 
     List<TransactionEvent> getTransactionEventsList() {
-        ArrayList<TransactionEvent> ret = new ArrayList<TransactionEvent>(getTransactionCount());
+        ArrayList<TransactionEvent> ret = new ArrayList<>(getTransactionCount());
         for (TransactionEvent transactionEvent : getTransactionEvents()) {
             ret.add(transactionEvent);
         }

src/main/java/org/hyperledger/fabric/sdk/ChaincodeEndorsementPolicy.java

@@ -29,7 +29,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import io.netty.util.internal.StringUtil;
+import io.grpc.netty.shaded.io.netty.util.internal.StringUtil;
 import org.apache.commons.io.IOUtils;
 import org.hyperledger.fabric.protos.common.MspPrincipal.MSPPrincipal;
 import org.hyperledger.fabric.protos.common.MspPrincipal.MSPRole;

src/main/java/org/hyperledger/fabric/sdk/Channel.java

@@ -697,7 +697,7 @@ private void addPeerMSPIDMap(final Peer peer) {
             if (!isNullOrEmpty(mspid)) {
                 logger.debug(format("Channel %s mapping peer %s to mspid %s", name, peer, mspid));
                 synchronized (peerMSPIDMap) {
-                    peerMSPIDMap.computeIfAbsent(mspid, k -> new HashSet<Peer>()).add(peer);
+                    peerMSPIDMap.computeIfAbsent(mspid, k -> new HashSet<>()).add(peer);
                 }
             }
         }

src/main/java/org/hyperledger/fabric/sdk/Endpoint.java

@@ -26,24 +26,24 @@
 import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
 import java.util.AbstractMap;
+import java.util.Arrays;
 import java.util.Base64;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import javax.net.ssl.SSLException;
 
 import com.google.common.collect.ImmutableMap;
 import io.grpc.ManagedChannelBuilder;
-import io.grpc.netty.GrpcSslContexts;
-import io.grpc.netty.NegotiationType;
-import io.grpc.netty.NettyChannelBuilder;
-import io.netty.handler.ssl.SslContext;
-import io.netty.handler.ssl.SslContextBuilder;
-import io.netty.handler.ssl.SslProvider;
+import io.grpc.netty.shaded.io.grpc.netty.GrpcSslContexts;
+import io.grpc.netty.shaded.io.grpc.netty.NegotiationType;
+import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
+import io.grpc.netty.shaded.io.netty.handler.ssl.SslContext;
+import io.grpc.netty.shaded.io.netty.handler.ssl.SslContextBuilder;
+import io.grpc.netty.shaded.io.netty.handler.ssl.SslProvider;
 import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -73,7 +73,7 @@ class Endpoint {
     private final String url;
     private byte[] clientTLSCertificateDigest;
     private byte[] tlsClientCertificatePEMBytes;
-    private NettyChannelBuilder channelBuilder = null;
+    private NettyChannelBuilder channelBuilder;
 
     private static final Map<String, String> CN_CACHE = Collections.synchronizedMap(new HashMap<>());
 
@@ -392,15 +392,8 @@ private void addNettyBuilderProps(NettyChannelBuilder channelBuilder, Properties
             method.invoke(channelBuilder, parmsArray);
 
             if (logger.isTraceEnabled()) {
-                StringBuilder sb = new StringBuilder(200);
-                String sep = "";
-                for (Object p : parmsArray) {
-                    sb.append(sep).append(p + "");
-                    sep = ", ";
-
-                }
                 logger.trace(format("Endpoint with url: %s set managed channel builder method %s (%s) ", url,
-                        method, sb.toString()));
+                        method, Arrays.toString(parmsArray)));
 
             }
 

src/main/java/org/hyperledger/fabric/sdk/HFClient.java

@@ -72,7 +72,7 @@ ExecutorService getExecutorService() {
                 if (null == executorService) { // no other thread has done it ...
                     executorService = new ThreadPoolExecutor(CLIENT_THREAD_EXECUTOR_COREPOOLSIZE, CLIENT_THREAD_EXECUTOR_MAXIMUMPOOLSIZE,
                             CLIENT_THREAD_EXECUTOR_KEEPALIVETIME, CLIENT_THREAD_EXECUTOR_KEEPALIVETIMEUNIT,
-                            new SynchronousQueue<Runnable>(),
+                            new SynchronousQueue<>(),
                             r -> {
                                 Thread t = threadFactory.newThread(r);
                                 t.setDaemon(true);

src/main/java/org/hyperledger/fabric/sdk/LifecycleChaincodeEndorsementPolicy.java

@@ -20,7 +20,7 @@
 import java.util.regex.Pattern;
 
 import com.google.protobuf.ByteString;
-import io.netty.util.internal.StringUtil;
+import io.grpc.netty.shaded.io.netty.util.internal.StringUtil;
 import org.apache.commons.io.IOUtils;
 import org.hyperledger.fabric.protos.common.MspPrincipal.MSPPrincipal;
 import org.hyperledger.fabric.protos.common.MspPrincipal.MSPRole;

src/main/java/org/hyperledger/fabric/sdk/Orderer.java

@@ -19,7 +19,6 @@
 import java.io.Serializable;
 import java.util.Properties;
 
-import io.netty.util.internal.StringUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hyperledger.fabric.protos.common.Common;
@@ -54,7 +53,7 @@ public class Orderer implements Serializable {
 
     Orderer(String name, String url, Properties properties) throws InvalidArgumentException {
 
-        if (StringUtil.isNullOrEmpty(name)) {
+        if (isNullOrEmpty(name)) {
             throw new InvalidArgumentException("Invalid name for orderer");
         }
         Exception e = checkGrpcUrl(url);

src/main/java/org/hyperledger/fabric/sdk/Peer.java

@@ -25,7 +25,6 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicLong;
 
-import io.netty.util.internal.StringUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hyperledger.fabric.protos.discovery.Protocol;
@@ -93,7 +92,7 @@ boolean hasConnected() {
 
         }
 
-        if (StringUtil.isNullOrEmpty(name)) {
+        if (isNullOrEmpty(name)) {
             throw new InvalidArgumentException("Invalid name for peer");
         }