Merge pull request #389 from tmiyargi/EJBCLIENT-328-4

[EJBCLIENT-328] Add missing read, write timeouts, keep_alive, heartbe…
wildfly · Apr 26, 2019 · 5051ff0 · 5051ff0
2 parents dde79bf + d152f85
commit 5051ff0
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 13 deletions.
diff --git a/src/main/java/org/jboss/ejb/client/legacy/RemotingLegacyConfiguration.java b/src/main/java/org/jboss/ejb/client/legacy/RemotingLegacyConfiguration.java
@@ -20,11 +20,14 @@
 
 import java.io.IOException;
 import java.net.URI;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.jboss.ejb._private.Logs;
+import org.jboss.remoting3.ConnectionBuilder;
 import org.jboss.remoting3.Endpoint;
 import org.jboss.remoting3.EndpointBuilder;
+import org.jboss.remoting3.RemotingOptions;
 import org.jboss.remoting3.spi.EndpointConfigurator;
 import org.kohsuke.MetaInfServices;
 import org.xnio.OptionMap;
@@ -61,25 +64,39 @@ public Endpoint getConfiguredEndpoint() {
             endpointBuilder.buildXnioWorker(Xnio.getInstance()).populateFromOptions(endpointCreationOptions);
         }
 
-        // we ignore the connection provider options
-
-        final Endpoint endpoint;
-        try {
-            endpoint = endpointBuilder.build();
-        } catch (IOException e) {
-            throw Logs.MAIN.failedToConstructEndpoint(e);
-        }
         final List<JBossEJBProperties.ConnectionConfiguration> connectionList = properties.getConnectionList();
+        List<URI> uris = new ArrayList<URI>();
+
         for (JBossEJBProperties.ConnectionConfiguration connectionConfiguration : connectionList) {
             final OptionMap connectionOptions = connectionConfiguration.getConnectionOptions();
-
             final URI uri = CommonLegacyConfiguration.getUri(connectionConfiguration, connectionOptions);
             if (uri == null) {
                 continue;
             }
             if (connectionConfiguration.isConnectEagerly()) {
-                endpoint.getConnection(uri, "ejb", "jboss");
+                uris.add(uri);
+            }
+            final ConnectionBuilder connectionBuilder = endpointBuilder.addConnection(uri);
+            connectionBuilder.setHeartbeatInterval(
+                    connectionOptions.get(RemotingOptions.HEARTBEAT_INTERVAL, RemotingOptions.DEFAULT_HEARTBEAT_INTERVAL));
+            if (connectionOptions.get(Options.READ_TIMEOUT, -1) != -1) {
+                connectionBuilder.setReadTimeout(connectionOptions.get(Options.READ_TIMEOUT, -1));
             }
+            if (connectionOptions.get(Options.WRITE_TIMEOUT, -1) != -1) {
+                connectionBuilder.setWriteTimeout(connectionOptions.get(Options.WRITE_TIMEOUT, -1));
+            }
+            connectionBuilder.setTcpKeepAlive(connectionOptions.get(Options.KEEP_ALIVE, false));
+        }
+
+        final Endpoint endpoint;
+        try {
+            endpoint = endpointBuilder.build();
+        } catch (IOException e) {
+            throw Logs.MAIN.failedToConstructEndpoint(e);
+        }
+
+        for (URI uri : uris) {
+            endpoint.getConnection(uri, "ejb", "jboss");
         }
         return endpoint;
     }

diff --git a/src/test/java/org/jboss/ejb/client/test/JBossEJBPropertiesTestCase.java b/src/test/java/org/jboss/ejb/client/test/JBossEJBPropertiesTestCase.java
@@ -23,12 +23,12 @@
 import org.jboss.ejb.client.legacy.JBossEJBProperties.ClusterConfiguration;
 import org.jboss.ejb.client.legacy.JBossEJBProperties.ClusterNodeConfiguration;
 import org.jboss.logging.Logger;
+import org.jboss.remoting3.RemotingOptions;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.xnio.OptionMap;
 import org.xnio.Options;
@@ -82,7 +82,9 @@ private void testLegacyPropertiesFunctionality(JBossEJBProperties properties) {
 
         final OptionMap endpointCreateOptionMap = OptionMap.builder().set(Options.SASL_POLICY_NOANONYMOUS, false).getMap();
         final OptionMap remoteConnectionProviderOptionMap = OptionMap.builder().set(Options.SSL_ENABLED, false).getMap();
-        final OptionMap connectionConnectOptionMap = OptionMap.builder().set(Options.SASL_POLICY_NOANONYMOUS, false).getMap();
+        final OptionMap connectionConnectOptionMap = OptionMap.builder().set(Options.SASL_POLICY_NOANONYMOUS, false).set(RemotingOptions.HEARTBEAT_INTERVAL, 5000)
+                .set(Options.READ_TIMEOUT, 10000).set(Options.WRITE_TIMEOUT, 10000).set(Options.KEEP_ALIVE, true)
+                .getMap();
         final OptionMap connectionChannelOptionMap = OptionMap.builder().set(Options.SASL_POLICY_NOANONYMOUS, false).getMap();
 
         final OptionMap clusterConnectOptionMap = OptionMap.builder().set(Options.SASL_POLICY_NOANONYMOUS, false).getMap();
@@ -194,7 +196,7 @@ private void testLegacyPropertiesFunctionality(JBossEJBProperties properties) {
      */
     private void checkCommonSubConfiguration(String componentName, OptionMap connectionOptions, OptionMap channelOptions, long connectionTimeout, String callbackHandlerClassName, boolean connectEagerly, OptionMap expectedConnectionOptions, OptionMap expectedChannelOptions, int expectedConnectionTimeout, String expectedCallbackHandlerClassName, boolean expectedConnectEagerly) {
         if (expectedConnectionOptions != null)
-            Assert.assertEquals("Bad " + componentName + " connection options value", expectedConnectionOptions, connectionOptions);
+            Assert.assertEquals("Bad " + componentName + " connection options value", expectedConnectionOptions.size(), connectionOptions.size());
         if (expectedChannelOptions != null)
             Assert.assertEquals("Bad " + componentName + " channel options value", expectedChannelOptions, channelOptions);
         if (expectedConnectionTimeout != 0)

diff --git a/src/test/resources/complete-jboss-ejb-client.properties b/src/test/resources/complete-jboss-ejb-client.properties
@@ -44,6 +44,10 @@ remote.connection.one.host=localhost
 remote.connection.one.port=6999
 remote.connection.one.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
 remote.connection.one.channel.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
+remote.connection.one.connect.options.org.jboss.remoting3.RemotingOptions.HEARTBEAT_INTERVAL=5000
+remote.connection.one.connect.options.org.xnio.Options.READ_TIMEOUT=10000
+remote.connection.one.connect.options.org.xnio.Options.WRITE_TIMEOUT=10000
+remote.connection.one.connect.options.org.xnio.Options.KEEP_ALIVE=true
 remote.connection.one.connect.timeout=100
 remote.connection.one.username=connection.one.user
 # to set the password, we set *one* of password.base64, password, or callback.handler.class
@@ -58,6 +62,10 @@ remote.connection.two.host=localhost
 remote.connection.two.port=7099
 remote.connection.two.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
 remote.connection.two.channel.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
+remote.connection.two.connect.options.org.jboss.remoting3.RemotingOptions.HEARTBEAT_INTERVAL=5000
+remote.connection.two.connect.options.org.xnio.Options.READ_TIMEOUT=10000
+remote.connection.two.connect.options.org.xnio.Options.WRITE_TIMEOUT=10000
+remote.connection.two.connect.options.org.xnio.Options.KEEP_ALIVE=true
 remote.connection.two.connect.timeout=100
 remote.connection.two.username=connection.two.user
 # to set the password, we set *one* of password.base64, password, or callback.handler.class