Modify HttpRequestTemplate and HttpResourceGroup to be DI friendly

build.gradle

@@ -20,6 +20,7 @@ apply from: file('gradle/maven.gradle')
 apply from: file('gradle/check.gradle')
 apply from: file('gradle/license.gradle')
 apply from: file('gradle/release.gradle')
+apply plugin: 'idea'
 
 subprojects {
     group = "com.netflix.${githubProjectName}" // TEMPLATE: Set to organization of project
@@ -46,7 +47,7 @@ project(':ribbon-loadbalancer') {
     dependencies {
         compile project(':ribbon-core')
         compile 'com.netflix.netflix-commons:netflix-statistics:0.1.1'
-        compile 'com.netflix.rxjava:rxjava-core:0.18+'
+        compile 'com.netflix.rxjava:rxjava-core:0.19+'
     }
 }
 
@@ -105,14 +106,28 @@ project(':ribbon-test') {
         compile project(':ribbon-eureka')
         compile 'org.powermock:powermock-easymock-release-full:1.5.4'
         compile 'org.easymock:easymock:3.2'
-        compile 'com.netflix.rxjava:rxjava-core:0.18+'
+        compile 'com.netflix.rxjava:rxjava-core:0.19+'
         compile 'com.sun.jersey:jersey-server:1.11'
         compile 'javax.ws.rs:jsr311-api:1.1.1' 
         compile 'com.sun.jersey:jersey-core:1.11'    
         compile 'junit:junit:4.10'
     }
 }
 
+project(':ribbon-guice') {
+    dependencies {
+        compile project(':ribbon')
+        compile project(':ribbon-core')
+        compile project(':ribbon-httpclient')
+        compile project(':ribbon-loadbalancer')
+
+        compile 'com.google.inject:guice:3.0'
+        compile 'com.google.inject.extensions:guice-multibindings:3.0'
+
+        testCompile project(':ribbon-examples')        
+    }
+}
+
 project(':ribbon') {
     configurations {
         // add new configuration
@@ -152,6 +167,15 @@ project(':ribbon') {
     }
 }
 
+project(':ribbon-guice') {
+    dependencies {
+        compile project(':ribbon')
+        compile 'com.google.inject:guice:3.0'
+        compile 'com.google.inject.extensions:guice-multibindings:3.0'
+        testCompile project(':ribbon-examples')
+    }
+}
+
 task wrapper(type: Wrapper) {
     gradleVersion = '1.12'
 }

ribbon-core/src/main/java/com/netflix/client/config/ClientConfigFactory.java

@@ -0,0 +1,21 @@
+package com.netflix.client.config;
+
+
+/**
+ * Created by awang on 7/18/14.
+ */
+public interface ClientConfigFactory {
+    IClientConfig newConfig();
+
+    public static class DefaultClientConfigFactory implements ClientConfigFactory {
+        @Override
+        public IClientConfig newConfig() {
+            IClientConfig config = new DefaultClientConfigImpl();
+            config.loadDefaultValues();
+            return config;
+
+        }        
+    }
+
+    public static final ClientConfigFactory DEFAULT = new DefaultClientConfigFactory();
+}

ribbon-examples/src/main/java/com/netflix/ribbon/examples/netty/http/SimpleGet.java

@@ -21,7 +21,7 @@ public static void main(String[] args) throws Exception {
 
         final CountDownLatch latch = new CountDownLatch(1);
         client.submit("www.google.com", 80, request)
-            .toBlockingObservable()
+            .toBlocking()
             .forEach(new Action1<HttpClientResponse<ByteBuf>>() {
                 @Override
                 public void call(HttpClientResponse<ByteBuf> t1) {

ribbon-examples/src/main/java/com/netflix/ribbon/examples/rx/proxy/RxMovieProxyExample.java

@@ -16,12 +16,12 @@
 
 package com.netflix.ribbon.examples.rx.proxy;
 
-import com.netflix.ribbon.ClientOptions;
+import com.netflix.client.config.CommonClientConfigKey;
+import com.netflix.config.ConfigurationManager;
 import com.netflix.ribbon.Ribbon;
 import com.netflix.ribbon.examples.rx.AbstractRxMovieClient;
 import com.netflix.ribbon.examples.rx.RxMovieServer;
 import com.netflix.ribbon.examples.rx.common.Movie;
-import com.netflix.ribbon.http.HttpResourceGroup;
 import com.netflix.ribbon.proxy.ProxyLifeCycle;
 import io.netty.buffer.ByteBuf;
 import rx.Observable;
@@ -36,11 +36,9 @@ public class RxMovieProxyExample extends AbstractRxMovieClient {
     private final MovieService movieService;
 
     public RxMovieProxyExample(int port) {
-        HttpResourceGroup httpResourceGroup = Ribbon.createHttpResourceGroup("movieServiceClient",
-                ClientOptions.create()
-                        .withMaxAutoRetriesNextServer(3)
-                        .withConfigurationBasedServerList("localhost:" + port));
-        movieService = Ribbon.from(MovieService.class, httpResourceGroup);
+        ConfigurationManager.getConfigInstance().setProperty("MovieService.ribbon." + CommonClientConfigKey.MaxAutoRetriesNextServer, "3");
+        ConfigurationManager.getConfigInstance().setProperty("MovieService.ribbon." + CommonClientConfigKey.ListOfServers, "localhost:" + port);
+        movieService = Ribbon.from(MovieService.class);
     }
 
     @SuppressWarnings("unchecked")

ribbon-examples/src/test/java/com/netflix/ribbon/examples/rx/RxMovieClientTestBase.java

@@ -1,18 +1,31 @@
+/*
+ * Copyright 2014 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.netflix.ribbon.examples.rx;
 
 import io.netty.buffer.ByteBuf;
 import io.reactivex.netty.protocol.http.server.HttpServer;
+
 import org.junit.After;
 import org.junit.Before;
 
-import java.util.Random;
-
 /**
  * @author Tomasz Bak
  */
 public class RxMovieClientTestBase {
-    private static final Random RANDOM = new Random();
-    protected int port = RANDOM.nextInt(1000) + 8000;
+    protected int port = 0;
 
     private RxMovieServer movieServer;
 
@@ -22,6 +35,7 @@ public class RxMovieClientTestBase {
     public void setUp() throws Exception {
         movieServer = new RxMovieServer(port);
         httpServer = movieServer.createServer().start();
+        port = httpServer.getServerPort();
     }
 
     @After

ribbon-examples/src/test/java/com/netflix/ribbon/examples/rx/proxy/RxMovieProxyExampleTest.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2014 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.netflix.ribbon.examples.rx.proxy;
 
 import com.netflix.ribbon.examples.rx.RxMovieClientTestBase;

ribbon-examples/src/test/java/com/netflix/ribbon/examples/rx/template/RxMovieTemplateExampleTest.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2014 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.netflix.ribbon.examples.rx.template;
 
 import com.netflix.ribbon.examples.rx.RxMovieClientTestBase;

ribbon-guice/src/main/java/com/netflix/ribbon/guice/RibbonModule.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2014 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.netflix.ribbon.guice;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Scopes;
+import com.netflix.client.config.ClientConfigFactory;
+import com.netflix.client.config.ClientConfigFactory.DefaultClientConfigFactory;
+import com.netflix.ribbon.DefaultResourceFactory;
+import com.netflix.ribbon.RibbonResourceFactory;
+import com.netflix.ribbon.RibbonTransportFactory;
+import com.netflix.ribbon.RibbonTransportFactory.DefaultRibbonTransportFactory;
+
+/**
+ * Default bindings for Ribbon
+ * 
+ * @author elandau
+ *
+ */
+public class RibbonModule extends AbstractModule {
+    @Override
+    protected void configure() {
+        bind(RibbonResourceFactory.class).to(DefaultResourceFactory.class).in(Scopes.SINGLETON);
+        bind(RibbonTransportFactory.class).to(DefaultRibbonTransportFactory.class).in(Scopes.SINGLETON);
+        bind(ClientConfigFactory.class).to(DefaultClientConfigFactory.class).in(Scopes.SINGLETON);
+    }
+}

ribbon-guice/src/main/java/com/netflix/ribbon/guice/RibbonResourceProvider.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2014 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.netflix.ribbon.guice;
+
+import com.google.inject.Inject;
+import com.google.inject.spi.BindingTargetVisitor;
+import com.google.inject.spi.ProviderInstanceBinding;
+import com.google.inject.spi.ProviderWithExtensionVisitor;
+import com.google.inject.spi.Toolable;
+import com.netflix.ribbon.RibbonResourceFactory;
+
+/**
+ * Guice Provider extension to create a ribbon resource from an injectable
+ * RibbonResourceFactory.
+ * 
+ * @author elandau
+ *
+ * @param <T> Type of the client API interface class
+ */
+public class RibbonResourceProvider<T> implements ProviderWithExtensionVisitor<T> {
+
+    private RibbonResourceFactory factory;
+    private final Class<T> contract;
+
+    public RibbonResourceProvider(Class<T> contract) {
+        this.contract = contract;
+    }
+
+    @Override
+    public T get() {
+        // TODO: Get name from annotations (not only class name of contract)
+        return factory.from(contract);
+    }
+
+    /**
+     * This is needed for 'initialize(injector)' below to be called so the provider
+     * can get the injector after it is instantiated.
+     */
+    @Override
+    public <B, V> V acceptExtensionVisitor(
+            BindingTargetVisitor<B, V> visitor,
+            ProviderInstanceBinding<? extends B> binding) {
+        return visitor.visit(binding);
+    }
+
+    @Inject
+    @Toolable
+    void initialize(RibbonResourceFactory factory) {
+        this.factory = factory;
+    }
+}