Merge pull request #700 from aledsage/Issue-1004

Issue 1004: changes default SocketOpen impl

core/src/main/java/org/jclouds/predicates/SocketOpen.java

@@ -28,7 +28,7 @@ import com.google.inject.ImplementedBy;
  * 
  * @author Adrian Cole
  */
-@ImplementedBy(SocketOpenUnsupported.class)
+@ImplementedBy(InetSocketAddressConnect.class)
 public interface SocketOpen extends Predicate<HostAndPort> {
 
 }

drivers/gae/src/main/java/org/jclouds/gae/config/GoogleAppEngineConfigurationModule.java

@@ -27,6 +27,8 @@ import org.jclouds.http.HttpCommandExecutorService;
 import org.jclouds.http.TransformingHttpCommandExecutorService;
 import org.jclouds.http.TransformingHttpCommandExecutorServiceImpl;
 import org.jclouds.http.config.ConfiguresHttpCommandExecutorService;
+import org.jclouds.predicates.SocketOpen;
+import org.jclouds.predicates.SocketOpenUnsupported;
 
 import com.google.appengine.api.urlfetch.URLFetchService;
 import com.google.appengine.api.urlfetch.URLFetchServiceFactory;
@@ -35,6 +37,7 @@ import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.inject.AbstractModule;
 import com.google.inject.Module;
 import com.google.inject.Provides;
+import com.google.inject.Scopes;
 
 /**
  * Configures {@link GaeHttpCommandExecutorService}.
@@ -75,6 +78,7 @@ public class GoogleAppEngineConfigurationModule extends AbstractModule {
    protected void configure() {
       install(executorServiceModule);
       bind(TransformingHttpCommandExecutorService.class).to(TransformingHttpCommandExecutorServiceImpl.class);
+      bind(SocketOpen.class).to(SocketOpenUnsupported.class).in(Scopes.SINGLETON);
       bindHttpCommandExecutorService();
    }
 

drivers/gae/src/test/java/org/jclouds/gae/GaeSocketOpenTest.java

@@ -0,0 +1,28 @@
+package org.jclouds.gae;
+
+import org.jclouds.Context;
+import org.jclouds.ContextBuilder;
+import org.jclouds.gae.config.GoogleAppEngineConfigurationModule;
+import org.jclouds.http.IntegrationTestAsyncClient;
+import org.jclouds.http.IntegrationTestClient;
+import org.jclouds.predicates.SocketOpen;
+import org.jclouds.providers.AnonymousProviderMetadata;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.common.net.HostAndPort;
+
+public class GaeSocketOpenTest {
+
+   @Test(expectedExceptions=UnsupportedOperationException.class)
+   public void testSocketOpenThrowsUnsupported() {
+      Context context = ContextBuilder.newBuilder(
+                  AnonymousProviderMetadata.forClientMappedToAsyncClientOnEndpoint(IntegrationTestClient.class, IntegrationTestAsyncClient.class,
+                        "dummyurl"))
+            .modules(ImmutableSet.of(new GoogleAppEngineConfigurationModule()))
+            .build();
+
+      SocketOpen socketOpen = context.getUtils().getInjector().getInstance(SocketOpen.class);
+      socketOpen.apply(HostAndPort.fromParts("localhost", 22));
+   }
+}

drivers/jsch/src/main/java/org/jclouds/ssh/jsch/config/JschSshClientModule.java

@@ -24,8 +24,6 @@ import org.jclouds.Constants;
 import org.jclouds.domain.Credentials;
 import org.jclouds.domain.LoginCredentials;
 import org.jclouds.http.handlers.BackoffLimitedRetryHandler;
-import org.jclouds.predicates.InetSocketAddressConnect;
-import org.jclouds.predicates.SocketOpen;
 import org.jclouds.ssh.ConfiguresSshClient;
 import org.jclouds.ssh.SshClient;
 import org.jclouds.ssh.jsch.JschSshClient;
@@ -45,7 +43,6 @@ public class JschSshClientModule extends AbstractModule {
 
    protected void configure() {
       bind(SshClient.Factory.class).to(Factory.class).in(Scopes.SINGLETON);
-      bind(SocketOpen.class).to(InetSocketAddressConnect.class).in(Scopes.SINGLETON);
    }
 
    private static class Factory implements SshClient.Factory {

drivers/sshj/src/main/java/org/jclouds/sshj/config/SshjSshClientModule.java

@@ -24,8 +24,6 @@ import org.jclouds.Constants;
 import org.jclouds.domain.Credentials;
 import org.jclouds.domain.LoginCredentials;
 import org.jclouds.http.handlers.BackoffLimitedRetryHandler;
-import org.jclouds.predicates.InetSocketAddressConnect;
-import org.jclouds.predicates.SocketOpen;
 import org.jclouds.ssh.ConfiguresSshClient;
 import org.jclouds.ssh.SshClient;
 import org.jclouds.sshj.SshjSshClient;
@@ -45,7 +43,6 @@ public class SshjSshClientModule extends AbstractModule {
 
    protected void configure() {
       bind(SshClient.Factory.class).to(Factory.class).in(Scopes.SINGLETON);
-      bind(SocketOpen.class).to(InetSocketAddressConnect.class).in(Scopes.SINGLETON);
    }
 
    private static class Factory implements SshClient.Factory {