fixes for #11 upgrade to hz 3.6.4, consul 0.12.5

Author: bitsofinfo

README.md

@@ -20,12 +20,14 @@ This is an easy to configure plug-and-play Hazlecast DiscoveryStrategy that will
 
 ## <a id="status"></a>Status
 
-This is beta code, tested against Hazelcast 3.6-EA+ through 3.6 Stable releases.
+This is release candidate code, tested against Hazelcast 3.6-EA+ through 3.6.x Stable releases.
 
 ## <a id="releases"></a>Releases
 
 * MASTER - in progress, this README refers to what is in the master tag. Switch to relevant RELEASE tag above to see that versions README
 
+* [1.0-RC5](https://github.com/bitsofinfo/hazelcast-consul-discovery-spi/releases/tag/1.0-RC5): Upgrade to latest consul-client [#11](https://github.com/bitsofinfo/hazelcast-consul-discovery-spi/issues/11) Tested against Hazelcast 3.6-EA+ through 3.6.4+ Stable releases
+
 * [1.0-RC4](https://github.com/bitsofinfo/hazelcast-consul-discovery-spi/releases/tag/1.0-RC4): Adds support for TCP/HTTP checks [#3](https://github.com/bitsofinfo/hazelcast-consul-discovery-spi/issues/3) Tested against Hazelcast 3.6-EA+ through 3.6 Stable releases
 
 * [1.0-RC3](https://github.com/bitsofinfo/hazelcast-consul-discovery-spi/releases/tag/1.0-RC3): Adds support for TLS [#2](https://github.com/bitsofinfo/hazelcast-consul-discovery-spi/issues/2) and Consul ACLs [#4](https://github.com/bitsofinfo/hazelcast-consul-discovery-spi/issues/4) Tested against Hazelcast 3.6-EA+ through 3.6 Stable releases
@@ -52,7 +54,7 @@ repositories {
 }
 
 dependencies {
-	compile 'org.bitsofinfo:hazelcast-consul-discovery-spi:1.0-RC4'
+	compile 'org.bitsofinfo:hazelcast-consul-discovery-spi:1.0-RC5'
 
     // include your preferred javax.ws.rs-api implementation
     // (for the OrbitzWorldwide/consul-client dependency)
@@ -69,7 +71,7 @@ dependencies {
     <dependency>
         <groupId>org.bitsofinfo</groupId>
         <artifactId>hazelcast-consul-discovery-spi</artifactId>
-        <version>1.0-RC4</version>
+        <version>1.0-RC5</version>
     </dependency>
 
     <!-- include your preferred javax.ws.rs-api

build.gradle

@@ -24,14 +24,14 @@ targetCompatibility = 1.6
 
 dependencies {
 
-    compile group: 'com.hazelcast', name: 'hazelcast', version:'3.6'
-    compile group: 'com.orbitz.consul', name: 'consul-client', version:'0.10.0'
+    compile group: 'com.hazelcast', name: 'hazelcast', version:'3.6.4'
+    compile group: 'com.orbitz.consul', name: 'consul-client', version:'0.12.5'
 
     // for consul-client
     testCompile 'org.apache.cxf:cxf-rt-rs-client:3.0.3'
     testCompile 'org.apache.cxf:cxf-rt-transports-http-hc:3.0.3'
     testCompile 'junit:junit:4.12'
-
+    
 }
 
 bintray {

gradle.properties

@@ -1,2 +1,2 @@
-version=1.0-RC4
+version=1.0-RC5
 description=hazelcast-consul-discovery-spi - Consul based discovery strategy SPI for Hazelcast enabled applications

src/main/java/org/bitsofinfo/hazelcast/discovery/consul/ConsulClientBuilder.java

@@ -13,7 +13,6 @@
 import javax.net.ssl.SSLSession;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
-import javax.ws.rs.client.ClientBuilder;
 
 import com.google.common.net.HostAndPort;
 import com.hazelcast.logging.ILogger;
@@ -55,12 +54,13 @@ public Consul buildConsul(
 				}
 
 				if (!consulServerHostnameVerify) {
+
 					//We don't want verify host name, so we will mark host name as verified
-					consulBuilder.withClientBuilder(ClientBuilder.newBuilder().hostnameVerifier(new HostnameVerifier() {
-					            public boolean verify(String s, SSLSession sslSession) {
-					                return true;
-					            }
-					        }));
+					consulBuilder.withHostnameVerifier(new HostnameVerifier() {
+			            public boolean verify(String s, SSLSession sslSession) {
+			                return true;
+			            }
+			        });
 				}
 			} else {
 				//Normal http without TLS

src/main/java/org/bitsofinfo/hazelcast/discovery/consul/ConsulDiscoveryStrategy.java

@@ -5,9 +5,9 @@
 import java.util.List;
 import java.util.Map;
 
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.orbitz.fasterxml.jackson.core.JsonFactory;
+import com.orbitz.fasterxml.jackson.core.type.TypeReference;
+import com.orbitz.fasterxml.jackson.databind.ObjectMapper;
 import com.hazelcast.logging.ILogger;
 import com.hazelcast.nio.Address;
 import com.hazelcast.spi.discovery.AbstractDiscoveryStrategy;
@@ -20,6 +20,7 @@
 import com.orbitz.consul.model.catalog.CatalogService;
 import com.orbitz.consul.model.health.ServiceHealth;
 
+
 /**
  * DiscoveryStrategy for Consul
  * 
@@ -99,6 +100,7 @@ public ConsulDiscoveryStrategy(DiscoveryNode localDiscoveryNode, ILogger logger,
 		Map<String,Object> registratorConfig = null;
 		if (registratorConfigJSON != null && !registratorConfigJSON.trim().isEmpty()) {
 			try {
+				
 				JsonFactory factory = new JsonFactory(); 
 			    ObjectMapper mapper = new ObjectMapper(factory); 
 			    TypeReference<HashMap<String,Object>> typeRef 

src/main/resources/explicitIpPortRegistrator-example.xml

@@ -46,7 +46,7 @@
                       <property name="consul-registrator">org.bitsofinfo.hazelcast.discovery.consul.ExplicitIpPortRegistrator</property>
                       <property name="consul-registrator-config"><![CDATA[
                                                                       {
-                                                                        "registerWithIpAddress":"192.168.0.208",
+                                                                        "registerWithIpAddress":"192.168.1.102",
                                                                         "registerWithPort":5701, 
                                                                         "healthCheckProvider":"org.bitsofinfo.hazelcast.discovery.consul.ScriptHealthCheckBuilder",
                                                                         "healthCheckScript":"exec 6<>/dev/tcp/#MYIP/#MYPORT || (exit 3)",

src/main/resources/hazelcast-consul-discovery-spi-example.xml

@@ -256,10 +256,10 @@
                                     			       this node's IP/PORT (port being hazelcast port)
                                     
                                     - healthCheckTcpIntervalSeconds: self explanatory
-                     -->
+                    
                       <property name="consul-registrator-config"><![CDATA[
                                                                       {
-                                                                        "registerWithIpAddress":"192.168.0.208",
+                                                                        "registerWithIpAddress":"192.168.1.102",
                                                                         "registerWithPort":5701, 
                                                                         "healthCheckProvider":"org.bitsofinfo.hazelcast.discovery.consul.HttpHealthCheckBuilder",
                                                                         "healthCheckScript":"exec 6<>/dev/tcp/#MYIP/#MYPORT || (exit 3)",
@@ -270,8 +270,8 @@
 																		"healthCheckTcpIntervalSeconds":30
                                                                       }
                                                                   ]]></property>
-                     -->
-                     
+                    
+                      -->
 
                  </properties>
                </discovery-strategy>