Merge pull request #42 from robinroos/codeformat

Automatic refactorings. These DO need to be reviewed.
bitsofinfo · Mar 16, 2019 · aa5670d · aa5670d
2 parents 53ca593 + e9b9e85
commit aa5670d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/src/main/java/org/bitsofinfo/hazelcast/discovery/docker/swarm/DiscoveredContainer.java b/src/main/java/org/bitsofinfo/hazelcast/discovery/docker/swarm/DiscoveredContainer.java
@@ -64,7 +64,7 @@ public int hashCode() {
     @Override
     public boolean equals(Object o) {
         if (o instanceof DiscoveredContainer) {
-            return ((DiscoveredContainer) o).hashCode() == this.hashCode();
+            return o.hashCode() == this.hashCode();
         }
 
         return false;

diff --git a/.../org/bitsofinfo/hazelcast/discovery/docker/swarm/DockerSwarmDiscoveryStrategyFactory.java b/.../org/bitsofinfo/hazelcast/discovery/docker/swarm/DockerSwarmDiscoveryStrategyFactory.java
@@ -13,15 +13,14 @@
 public class DockerSwarmDiscoveryStrategyFactory implements DiscoveryStrategyFactory {
 
     private static final Collection<PropertyDefinition> PROPERTIES =
-            Arrays.asList(new PropertyDefinition[]{
-                    DockerSwarmDiscoveryConfiguration.DOCKER_SERVICE_LABELS,
+            Arrays.asList(DockerSwarmDiscoveryConfiguration.DOCKER_SERVICE_LABELS,
                     DockerSwarmDiscoveryConfiguration.DOCKER_NETWORK_NAMES,
                     DockerSwarmDiscoveryConfiguration.DOCKER_SERVICE_NAMES,
                     DockerSwarmDiscoveryConfiguration.HAZELCAST_PEER_PORT,
                     DockerSwarmDiscoveryConfiguration.SWARM_MGR_URI,
                     DockerSwarmDiscoveryConfiguration.SKIP_VERIFY_SSL,
-                    DockerSwarmDiscoveryConfiguration.LOG_ALL_SERVICE_NAMES_ON_FAILED_DISCOVERY
-            });
+                    DockerSwarmDiscoveryConfiguration.LOG_ALL_SERVICE_NAMES_ON_FAILED_DISCOVERY,
+                    DockerSwarmDiscoveryConfiguration.STRICT_DOCKER_SERVICE_NAME_COMPARISON);
 
     public Class<? extends DiscoveryStrategy> getDiscoveryStrategyType() {
         // Returns the actual class type of the DiscoveryStrategy

diff --git a/src/main/java/org/bitsofinfo/hazelcast/discovery/docker/swarm/test/DockerTestRunner.java b/src/main/java/org/bitsofinfo/hazelcast/discovery/docker/swarm/test/DockerTestRunner.java
@@ -55,7 +55,7 @@ public AddressPicker createAddressPicker(Node node) {
         }
 
 
-        Thread.currentThread().sleep(400000);
+        Thread.sleep(400000);
 
         System.exit(0);
     }

diff --git a/...sofinfo/hazelcast/spi/docker/swarm/dnsrr/discovery/DockerDNSRRDiscoveryConfiguration.java b/...sofinfo/hazelcast/spi/docker/swarm/dnsrr/discovery/DockerDNSRRDiscoveryConfiguration.java
@@ -39,10 +39,5 @@ public class DockerDNSRRDiscoveryConfiguration {
     /**
      * Full list of all properties referenced by this configuration
      */
-    public static final Collection<PropertyDefinition> PROPERTIES =
-            Arrays.asList(
-                    new PropertyDefinition[]{
-                            SERVICESCSV
-                    }
-            );
+    public static final Collection<PropertyDefinition> PROPERTIES = Arrays.asList(SERVICESCSV);
 }