FGJ-36 set sensible defaults for grpc - part2

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

Author: andrew-coleman

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

@@ -163,9 +163,6 @@ private void setDefaultProperties(Properties props) {
         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});
         }

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

@@ -301,10 +301,12 @@ public void testLoadFromConfigFileYamlNOOverrides() throws Exception {
             assertNotNull(properties);
             // check for default properties
             Object[] o = (Object[]) properties.get("grpc.NettyChannelBuilderOption.keepAliveTime");
-            assertEquals(o[0], 120000L);
+            assertEquals(o[0], 2L);
+            assertEquals(o[1], TimeUnit.MINUTES);
 
             o = (Object[]) properties.get("grpc.NettyChannelBuilderOption.keepAliveTimeout");
-            assertEquals(o[0], 20000L);
+            assertEquals(o[0], 20L);
+            assertEquals(o[1], TimeUnit.SECONDS);
 
             o = (Object[]) properties.get("grpc.NettyChannelBuilderOption.keepAliveWithoutCalls");
             assertEquals(o[0], true);