ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [12/31] incubator-ignite git commit: review
Date Wed, 29 Apr 2015 13:21:52 GMT
review


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ae8d0176
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ae8d0176
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ae8d0176

Branch: refs/heads/ignite-286
Commit: ae8d0176a840a743afa0eda73639bd4f48160323
Parents: fc44a5e
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Tue Apr 28 12:02:06 2015 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Tue Apr 28 12:02:06 2015 +0300

----------------------------------------------------------------------
 .../cloud/TcpDiscoveryCloudNodesIpFinder.java    | 19 ++++++++-----------
 .../TcpDiscoveryCloudNodesIpFinderSelfTest.java  |  7 +++----
 2 files changed, 11 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae8d0176/modules/cloud/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudNodesIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/cloud/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudNodesIpFinder.java
b/modules/cloud/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudNodesIpFinder.java
index 4ef0a0c..d5bb699 100644
--- a/modules/cloud/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudNodesIpFinder.java
+++ b/modules/cloud/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudNodesIpFinder.java
@@ -18,23 +18,19 @@
 package org.apache.ignite.spi.discovery.tcp.ipfinder.cloud;
 
 import com.google.common.base.*;
-import com.google.common.collect.*;
 import com.google.common.io.*;
-import com.google.inject.*;
-
-import org.jclouds.*;
-import org.jclouds.compute.*;
-import org.jclouds.compute.domain.*;
-import org.jclouds.domain.*;
-import org.jclouds.location.reference.LocationConstants;
-
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.spi.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.internal.util.typedef.*;
+import org.jclouds.*;
+import org.jclouds.compute.*;
+import org.jclouds.compute.domain.*;
+import org.jclouds.domain.*;
+import org.jclouds.location.reference.*;
 
 import java.io.*;
 import java.net.*;
@@ -348,7 +344,8 @@ public class TcpDiscoveryCloudNodesIpFinder extends TcpDiscoveryIpFinderAdapter
                 if (discoveryPort == null)
                     discoveryPort = TcpDiscoverySpi.DFLT_PORT;
 
-            } finally {
+            }
+            finally {
                 initLatch.countDown();
             }
         else

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae8d0176/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudNodesIpFinderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudNodesIpFinderSelfTest.java
b/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudNodesIpFinderSelfTest.java
index bf0e93d..9202ac6 100644
--- a/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudNodesIpFinderSelfTest.java
+++ b/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudNodesIpFinderSelfTest.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.spi.discovery.tcp.ipfinder.cloud;
 
 import com.google.common.collect.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.testsuites.*;
@@ -56,7 +55,7 @@ public class TcpDiscoveryCloudNodesIpFinderSelfTest extends
         String[] providers = {"google-compute-engine", "aws-ec2", "rackspace-cloudservers-us"};
 
         for (String provider : providers) {
-            U.log(log, "Testing provider: " + provider);
+            info("Testing provider: " + provider);
 
             ipFinder = new TcpDiscoveryCloudNodesIpFinder();
             injectLogger(ipFinder);
@@ -79,13 +78,13 @@ public class TcpDiscoveryCloudNodesIpFinderSelfTest extends
             assert addresses.size() > 0;
 
             for (InetSocketAddress addr: addresses)
-                U.log(log, "Registered instance: " + addr.getAddress().getHostAddress() +
":" + addr.getPort());
+                info("Registered instance: " + addr.getAddress().getHostAddress() + ":" +
addr.getPort());
 
             ipFinder.unregisterAddresses(addresses);
 
             assert addresses.size() == ipFinder.getRegisteredAddresses().size();
 
-            ipFinder.registerAddresses(ImmutableList.<InetSocketAddress>of(
+            ipFinder.registerAddresses(ImmutableList.of(
                 new InetSocketAddress("192.168.0.1", TcpDiscoverySpi.DFLT_PORT)));
 
             assert addresses.size() == ipFinder.getRegisteredAddresses().size();


Mime
View raw message