FGJ-36 set sensible defaults for grpc

Unless otherwise specified, the grpc time/timeout properties will default to more realistic values for the orderers and peers

Change-Id: I686ab93da926daa28109beeed97f6697e7660b2d
Signed-off-by: andrew-coleman <andrew_coleman@uk.ibm.com>

Author: andrew-coleman

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

@@ -151,6 +151,26 @@ public static HFClient createNewInstance() {
         return new HFClient();
     }
 
+    /**
+     * Set sensible default grpc properties for newPeer and newOrderer.  Only sets values
+     * if they don't already exist.
+     * @param props The properties object to apply defaults to
+     */
+    private void setDefaultProperties(Properties props) {
+        if (!props.containsKey("grpc.NettyChannelBuilderOption.keepAliveTime")) {
+            props.put("grpc.NettyChannelBuilderOption.keepAliveTime", new Object[] {2L, TimeUnit.MINUTES});
+        }
+        if (!props.containsKey("grpc.NettyChannelBuilderOption.keepAliveTimeout")) {
+            props.put("grpc.NettyChannelBuilderOption.keepAliveTimeout", new Object[] {20L, TimeUnit.SECONDS});
+        }
+        if (!props.containsKey("grpc.NettyChannelBuilderOption.keepAliveTime")) {
+            props.put("grpc.NettyChannelBuilderOption.keepAliveTime", new Object[] {2L, TimeUnit.MINUTES});
+        }
+        if (!props.containsKey("grpc.NettyChannelBuilderOption.keepAliveWithoutCalls")) {
+            props.put("grpc.NettyChannelBuilderOption.keepAliveWithoutCalls",  new Object[] {true});
+        }
+    }
+
     /**
      * Configures a channel based on information loaded from a Network Config file.
      * Note that it is up to the caller to initialize the returned channel.
@@ -394,6 +414,7 @@ public Channel deSerializeChannel(byte[] channelBytes)
 
     public Peer newPeer(String name, String grpcURL, Properties properties) throws InvalidArgumentException {
         clientCheck();
+        setDefaultProperties(properties);
         return Peer.createNewInstance(name, grpcURL, properties);
     }
 
@@ -408,7 +429,7 @@ public Peer newPeer(String name, String grpcURL, Properties properties) throws I
 
     public Peer newPeer(String name, String grpcURL) throws InvalidArgumentException {
         clientCheck();
-        return Peer.createNewInstance(name, grpcURL, null);
+        return Peer.createNewInstance(name, grpcURL, new Properties());
     }
 
     /**
@@ -696,7 +717,7 @@ public User setUserContext(User userContext) throws InvalidArgumentException {
 
     public Orderer newOrderer(String name, String grpcURL) throws InvalidArgumentException {
         clientCheck();
-        return newOrderer(name, grpcURL, null);
+        return newOrderer(name, grpcURL, new Properties());
     }
 
     /**
@@ -745,6 +766,7 @@ public Orderer newOrderer(String name, String grpcURL) throws InvalidArgumentExc
 
     public Orderer newOrderer(String name, String grpcURL, Properties properties) throws InvalidArgumentException {
         clientCheck();
+        setDefaultProperties(properties);
         return Orderer.createNewInstance(name, grpcURL, properties);
     }
 

src/test/java/org/hyperledger/fabric/sdk/NetworkConfigTest.java

@@ -299,10 +299,15 @@ public void testLoadFromConfigFileYamlNOOverrides() throws Exception {
             Properties properties = peer.getProperties();
 
             assertNotNull(properties);
-            assertNull(properties.get("grpc.NettyChannelBuilderOption.keepAliveTime"));
-            assertNull(properties.get("grpc.NettyChannelBuilderOption.keepAliveTimeout"));
-            assertNull(properties.get("grpc.NettyChannelBuilderOption.keepAliveWithoutCalls"));
+            // check for default properties
+            Object[] o = (Object[]) properties.get("grpc.NettyChannelBuilderOption.keepAliveTime");
+            assertEquals(o[0], 120000L);
+
+            o = (Object[]) properties.get("grpc.NettyChannelBuilderOption.keepAliveTimeout");
+            assertEquals(o[0], 20000L);
 
+            o = (Object[]) properties.get("grpc.NettyChannelBuilderOption.keepAliveWithoutCalls");
+            assertEquals(o[0], true);
         }
 
     }