Merge remote-tracking branch 'openshift-ping/master' into HEAD

# Conflicts:
#	activemq/pom.xml
#	common/pom.xml
#	common/src/main/java/org/jgroups/ping/common/OpenshiftPing.java
#	common/src/main/java/org/openshift/ping/common/server/JBossServer.java
#	common/src/main/java/org/openshift/ping/common/server/JBossServerFactory.java
#	dist/eap/build/pom.xml
#	dist/eap/download/pom.xml
#	dist/eap/pom.xml
#	dist/pom.xml
#	dist/wildfly/build/pom.xml
#	dist/wildfly/download/pom.xml
#	dist/wildfly/pom.xml
#	dns/pom.xml
#	examples/apps/basic-app-cache/pom.xml
#	examples/apps/basic-web-session/pom.xml
#	examples/apps/hello-servlet/pom.xml
#	examples/apps/pom.xml
#	kube/pom.xml
#	kube/src/test/java/org/jgroups/ping/kube/test/PingTestBase.java
#	kube/src/test/java/org/jgroups/ping/kube/test/ServerTestBase.java
#	pom.xml

Author: slaskawi

common/src/main/java/org/jgroups/ping/common/OpenshiftPing.java

@@ -68,6 +68,7 @@ public abstract class OpenshiftPing extends PING {
     private String _serverName;
 
     private static Method sendMethod; //handled via reflection due to JGroups 3/4 incompatibility
+    private static Method setSrcMethod;
 
     public OpenshiftPing(String systemEnvPrefix) {
         super();
@@ -81,6 +82,12 @@ public OpenshiftPing(String systemEnvPrefix) {
         } catch (Exception e) {
             throw new CompatibilityException("Could not find suitable 'up' method.", e);
         }
+        try {
+            //the return parameter changed in JGroups 3/4 :D
+            setSrcMethod = Message.class.getMethod("setSrc", Address.class);
+        } catch (Exception e) {
+            throw new CompatibilityException("Could not find suitable 'setSrc' method.", e);
+        }
     }
 
     protected final String getSystemEnvName(String systemEnvSuffix) {
@@ -195,26 +202,14 @@ protected void sendMcastDiscoveryRequest(Message msg) {
             return;
         }
         if (msg.getSrc() == null) {
-            setMessageSourceAddress(msg);
-
+            setSrc(msg);
         }
         for (InetSocketAddress node : nodes) {
             // forward the request to each node
             timer.execute(new SendDiscoveryRequest(node, msg));
         }
     }
 
-    private void setMessageSourceAddress(Message msg) {
-        //public void    setSrc(Address new_src)   {src_addr=new_src;} - JGroups 3.6.13
-        //public Message setSrc(Address new_src)   {src_addr=new_src; return this;} - JGroups 4.0.1
-        //unfortunately need to use reflections
-        try {
-            msg.getClass().getMethod("setSrc", Address.class).invoke(msg, local_addr);
-        } catch (Exception e) {
-            log.warn("Setting local address for discovery failed.");
-        }
-    }
-
     public void handlePingRequest(InputStream stream) throws Exception {
         DataInputStream dataInput = new DataInputStream(stream);
         Message msg = new Message();
@@ -226,6 +221,16 @@ public void handlePingRequest(InputStream stream) throws Exception {
         }
     }
 
+    private void setSrc(Message msg) {
+        try {
+            setSrcMethod.invoke(msg, local_addr);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            throw new CompatibilityException("Could not invoke 'setSrc' method.", e);
+        }
+    }
+
     private void sendUp(Message msg) {
         try {
             if(CompatibilityUtils.isJGroups4()) {

common/src/main/java/org/jgroups/ping/common/server/JDKServerFactory.java

@@ -29,6 +29,7 @@ public boolean isAvailable() {
         }
     }
 
+    @Override
     public Server createServer(int port) {
         return new JDKServer(port);
     }

common/src/main/java/org/jgroups/ping/common/server/UndertowServer.java

@@ -20,6 +20,10 @@
 
 import org.jgroups.JChannel;
 
+import java.io.InputStream;
+
+import org.jgroups.JChannel;
+
 import io.undertow.Undertow;
 import io.undertow.server.HttpHandler;
 import io.undertow.server.HttpServerExchange;

common/src/main/java/org/jgroups/ping/common/server/UndertowServerFactory.java

@@ -29,6 +29,7 @@ public boolean isAvailable() {
         }
     }
 
+    @Override
     public Server createServer(int port) {
         return new UndertowServer(port);
     }

kube/src/test/java/org/jgroups/ping/kube/test/PingTestBase.java

@@ -16,22 +16,47 @@
 
 package org.jgroups.ping.kube.test;
 
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.TimeoutException;
 
+import org.jgroups.Channel;
 import org.jgroups.JChannel;
 import org.jgroups.View;
 import org.jgroups.util.Util;
 import org.junit.Assert;
 import org.junit.Test;
+import org.openshift.ping.common.compatibility.CompatibilityException;
+import org.openshift.ping.common.compatibility.CompatibilityUtils;
 
 /**
  * @author <a href="mailto:[email protected]">Ales Justin</a>
  */
 public abstract class PingTestBase extends TestBase {
 
+    //handles via reflection because of JGroups 3/4 incompatibility.
+    private static final Method waitForViewMethod;
+
+    static {
+        try {
+            if (CompatibilityUtils.isJGroups4()) {
+                waitForViewMethod = Util.class.getMethod("waitUntilAllChannelsHaveSameView", long.class, long.class, JChannel[].class);
+            } else {
+                Method m;
+                try {
+                    m = Util.class.getMethod("waitUntilAllChannelsHaveSameSize", long.class, long.class, Channel[].class);
+                } catch (NoSuchMethodException e) {
+                    m = Util.class.getMethod("waitUntilAllChannelsHaveSameView", long.class, long.class, Channel[].class);
+                }
+                waitForViewMethod = m;
+            }
+        } catch (NoSuchMethodException e) {
+            throw new CompatibilityException("Could not find proper 'waitUntilAllChannelsHaveSame*' method.", e);
+        }
+    }
+
     @Test
     public void testCluster() throws Exception {
         doTestCluster();

kube/src/test/java/org/jgroups/ping/kube/test/ServerTestBase.java

@@ -19,6 +19,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.Arrays;
@@ -74,12 +75,11 @@ protected Protocol createPing() {
     public void testResponse() throws Exception {
         Address local_addr = pinger.getLocalAddress();
         PhysicalAddress physical_addr = (PhysicalAddress) pinger
-                .down(new Event(Event.GET_PHYSICAL_ADDRESS, local_addr));
-        PingHeader hdr = new TestPingHeader();
+              .down(new Event(Event.GET_PHYSICAL_ADDRESS, local_addr));
         PingData data = createPingData(local_addr, physical_addr);
+        final PingHeader hdr = getPingHeader(data);
         Message msg = new Message(null).setFlag(Message.Flag.DONT_BUNDLE)
-                .putHeader(pinger.getId(), hdr).setBuffer(streamableToBuffer(data));
-
+              .putHeader(pinger.getId(), hdr).setBuffer(streamableToBuffer(data));
         URL url = new URL("http://localhost:8888");
         HttpURLConnection conn = (HttpURLConnection) url.openConnection();
         conn.addRequestProperty(Server.CLUSTER_NAME, TestBase.CLUSTER_NAME);
@@ -93,6 +93,34 @@ public void testResponse() throws Exception {
         Assert.assertEquals(200, conn.getResponseCode());
     }
 
+    private static Buffer streamableToBuffer(Streamable obj) {
+        final ByteArrayOutputStream out_stream = new ByteArrayOutputStream(1024);
+        DataOutputStream out = new DataOutputStream(out_stream);
+        try {
+            Util.writeStreamable(obj, out);
+            return new Buffer(out_stream.toByteArray());
+        } catch (Exception ex) {
+            return null;
+        }
+    }
+
+    private PingHeader getPingHeader(PingData data) {
+        try {
+            if(CompatibilityUtils.isJGroups4()) {
+                Constructor<PingHeader> constructor = PingHeader.class.getConstructor(null);
+                PingHeader header = constructor.newInstance(null);
+                Method clusterName = header.getClass().getMethod("clusterName", String.class);
+                clusterName.invoke(header, TestBase.CLUSTER_NAME);
+                return header;
+            } else {
+                Constructor<PingHeader> constructor = PingHeader.class.getConstructor(byte.class, PingData.class, String.class);
+                return constructor.newInstance(PingHeader.GET_MBRS_RSP, data, TestBase.CLUSTER_NAME);
+            }
+        } catch (Exception e) {
+            throw new CompatibilityException("Could not find or invoke proper 'PingHeader' constructor");
+        }
+    }
+
     /*
      * Handled via reflection because of JGroups 3/4 incompatibility.
      */
@@ -112,17 +140,6 @@ private PingData createPingData(Address local_addr, PhysicalAddress physical_add
         }
     }
 
-    private static Buffer streamableToBuffer(Streamable obj) {
-        final ByteArrayOutputStream out_stream = new ByteArrayOutputStream(512);
-        DataOutputStream out = new DataOutputStream(out_stream);
-        try {
-            Util.writeStreamable(obj, out);
-            return new Buffer(out_stream.toByteArray());
-        } catch (Exception ex) {
-            return null;
-        }
-    }
-
     private static final class TestKubePing extends KubePing {
         static {
             ClassConfigurator.addProtocol(JGROUPS_KUBE_PING_ID, TestKubePing.class);
@@ -141,11 +158,4 @@ protected Client getClient() {
             }
         }
     }
-    
-    private static final class TestPingHeader extends PingHeader {
-        private TestPingHeader() {
-            cluster_name = TestBase.CLUSTER_NAME;
-            type = PingHeader.GET_MBRS_REQ;
-        }
-    }
 }