diff --git a/ribbon-examples/src/main/java/com/netflix/ribbon/examples/netty/http/SimpleGet.java b/ribbon-examples/src/main/java/com/netflix/ribbon/examples/netty/http/SimpleGet.java index 4e034049e575b9706734f316973c7c8fef7ff343..f36fcc84d18e1e2ce0ef0cdf727d5e02247d28f7 100644 --- a/ribbon-examples/src/main/java/com/netflix/ribbon/examples/netty/http/SimpleGet.java +++ b/ribbon-examples/src/main/java/com/netflix/ribbon/examples/netty/http/SimpleGet.java @@ -11,12 +11,11 @@ import java.util.concurrent.TimeUnit; import rx.functions.Action1; import com.netflix.client.netty.http.NettyHttpClient; -import com.netflix.client.netty.http.NettyHttpClientBuilder; public class SimpleGet { @edu.umd.cs.findbugs.annotations.SuppressWarnings public static void main(String[] args) throws Exception { - NettyHttpClient client = NettyHttpClientBuilder.newBuilder().buildHttpClient(); + NettyHttpClient client = NettyHttpClient.createDefaultHttpClient(); HttpClientRequest request = HttpClientRequest.createGet("/"); final CountDownLatch latch = new CountDownLatch(1); diff --git a/ribbon-loadbalancer/src/main/java/com/netflix/utils/RxUtils.java b/ribbon-loadbalancer/src/main/java/com/netflix/utils/RxUtils.java index 3e2ef6be8de492667a93e2ef8213904cb4ac2583..354aa43152dc9387e8ebe2a052d578dec7fedca1 100644 --- a/ribbon-loadbalancer/src/main/java/com/netflix/utils/RxUtils.java +++ b/ribbon-loadbalancer/src/main/java/com/netflix/utils/RxUtils.java @@ -1,7 +1,7 @@ package com.netflix.utils; import rx.Observable; -import rx.util.functions.Func1; +import rx.functions.Func1; public class RxUtils { diff --git a/ribbon-rxnetty/src/test/java/com/netflix/client/netty/NettyClientTest.java b/ribbon-rxnetty/src/test/java/com/netflix/client/netty/NettyClientTest.java index 1faff1149043939352a6ec116b0cefc11ec2d916..6c04128c3c81524559c3973b819d57c91ac2945e 100644 --- a/ribbon-rxnetty/src/test/java/com/netflix/client/netty/NettyClientTest.java +++ b/ribbon-rxnetty/src/test/java/com/netflix/client/netty/NettyClientTest.java @@ -38,6 +38,8 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicReference; +import org.apache.log4j.Level; +import org.apache.log4j.LogManager; import org.codehaus.jackson.map.ObjectMapper; import org.junit.BeforeClass; import org.junit.Test; @@ -97,7 +99,7 @@ public class NettyClientTest { e.printStackTrace(); fail("Unable to start server"); } - // LogManager.getRootLogger().setLevel((Level)Level.DEBUG); + LogManager.getRootLogger().setLevel((Level)Level.DEBUG); } private static Observable getPersonObservable(Observable> response) {