remove deprecated lines

jknack · jknack · commit 4df7e94601e1 · 2016-11-06T11:52:48.000-03:00
diff --git a/jooby-elasticsearch/src/test/java/org/jooby/elasticsearch/ElasticsearchTest.java b/jooby-elasticsearch/src/test/java/org/jooby/elasticsearch/ElasticsearchTest.java
@@ -1,13 +1,10 @@
 package org.jooby.elasticsearch;
 
-import com.google.common.collect.Sets;
-import com.google.inject.Binder;
-import com.google.inject.binder.AnnotatedBindingBuilder;
-import com.google.inject.multibindings.Multibinder;
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
-import com.typesafe.config.ConfigValue;
-import javaslang.control.Try.CheckedRunnable;
+import static org.easymock.EasyMock.expect;
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+
 import org.elasticsearch.client.RestClient;
 import org.jooby.Env;
 import org.jooby.test.MockUnit;
@@ -17,12 +14,13 @@
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.Set;
+import com.google.inject.Binder;
+import com.google.inject.binder.AnnotatedBindingBuilder;
+import com.google.inject.multibindings.Multibinder;
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
 
-import static org.easymock.EasyMock.expect;
-import static org.junit.Assert.assertEquals;
+import javaslang.control.Try.CheckedRunnable;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({Elasticsearch.class, Multibinder.class})
diff --git a/jooby/src/test/java/org/jooby/test/Client.java b/jooby/src/test/java/org/jooby/test/Client.java
@@ -26,8 +26,7 @@
 import org.apache.http.client.RedirectStrategy;
 import org.apache.http.client.fluent.Executor;
 import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLContexts;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.InputStreamEntity;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
@@ -37,6 +36,7 @@
 import org.apache.http.impl.client.StandardHttpRequestRetryHandler;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.protocol.HttpContext;
+import org.apache.http.ssl.SSLContexts;
 import org.apache.http.util.EntityUtils;
 import org.junit.rules.ExternalResource;
 
@@ -384,10 +384,9 @@ private Executor executor() {
         try {
           SSLContext sslContext = SSLContexts.custom()
               .loadTrustMaterial(null, (chain, authType) -> true)
-              .useTLS()
               .build();
-          builder.setSslcontext(sslContext);
-          builder.setHostnameVerifier(SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
+          builder.setSSLContext(sslContext);
+          builder.setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE);
         } catch (Exception ex) {
           Throwables.propagate(ex);
         }
