From 51f2cd1898d2fbb4f9579de337d48dcd78f74a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Prante?= Date: Fri, 13 Nov 2020 14:27:32 +0100 Subject: [PATCH] move to https on xbib.org --- gradle.properties | 8 ++++---- .../xbib/netty/http/client/rest/RestClientTest.java | 2 +- .../http/client/test/hacks/SimpleHttp1Test.java | 4 ++-- .../xbib/netty/http/client/test/http1/Http1Test.java | 8 ++++---- .../xbib/netty/http/client/test/http1/XbibTest.java | 12 ++++++------ 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/gradle.properties b/gradle.properties index 559f289..91f4971 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,11 @@ group = org.xbib name = netty-http -version = 4.1.53.1 +version = 4.1.54.1 gradle.wrapper.version = 6.6.1 -netty.version = 4.1.53.Final +netty.version = 4.1.54.Final tcnative.version = 2.0.34.Final -bouncycastle.version = 1.66 +bouncycastle.version = 1.67 reactivestreams.version = 1.0.2 reactivex.version = 1.3.8 conscrypt.version = 2.5.1 @@ -15,5 +15,5 @@ mockito.version = 3.4.4 xbib.net.version = 2.1.0 xbib-guice.version = 4.4.2 # uuhh, too many tests to update to jupiter in rx... -junit.version = 5.6.2 +junit.version = 5.7.0 junit4.version = 4.13 diff --git a/netty-http-client-rest/src/test/java/org/xbib/netty/http/client/rest/RestClientTest.java b/netty-http-client-rest/src/test/java/org/xbib/netty/http/client/rest/RestClientTest.java index 77a4e86..fe0880e 100644 --- a/netty-http-client-rest/src/test/java/org/xbib/netty/http/client/rest/RestClientTest.java +++ b/netty-http-client-rest/src/test/java/org/xbib/netty/http/client/rest/RestClientTest.java @@ -13,7 +13,7 @@ class RestClientTest { @Test void testSimpleGet() throws IOException { - String result = RestClient.get("http://xbib.org").asString(); + String result = RestClient.get("https://xbib.org").asString(); logger.info(result); } } diff --git a/netty-http-client/src/test/java/org/xbib/netty/http/client/test/hacks/SimpleHttp1Test.java b/netty-http-client/src/test/java/org/xbib/netty/http/client/test/hacks/SimpleHttp1Test.java index 5512749..d577d47 100644 --- a/netty-http-client/src/test/java/org/xbib/netty/http/client/test/hacks/SimpleHttp1Test.java +++ b/netty-http-client/src/test/java/org/xbib/netty/http/client/test/hacks/SimpleHttp1Test.java @@ -62,7 +62,7 @@ class SimpleHttp1Test { void testHttp1() throws Exception { Client client = new Client(); try { - HttpTransport transport = client.newTransport("xbib.org", 80); + HttpTransport transport = client.newTransport("google.de", 80); transport.onResponse(msg -> logger.log(Level.INFO, "got response: " + msg.status().code() + " headers=" + msg.headers().entries())); transport.connect(); @@ -92,7 +92,7 @@ class SimpleHttp1Test { } } - private AttributeKey TRANSPORT_ATTRIBUTE_KEY = AttributeKey.valueOf("transport"); + private final AttributeKey TRANSPORT_ATTRIBUTE_KEY = AttributeKey.valueOf("transport"); interface ResponseWriter { void write(FullHttpResponse msg); diff --git a/netty-http-client/src/test/java/org/xbib/netty/http/client/test/http1/Http1Test.java b/netty-http-client/src/test/java/org/xbib/netty/http/client/test/http1/Http1Test.java index 90cb6d7..9259412 100644 --- a/netty-http-client/src/test/java/org/xbib/netty/http/client/test/http1/Http1Test.java +++ b/netty-http-client/src/test/java/org/xbib/netty/http/client/test/http1/Http1Test.java @@ -22,7 +22,7 @@ class Http1Test { Client client = Client.builder() .build(); try { - Request request = Request.get().url("http://xbib.org") + Request request = Request.get().url("https://xbib.org") .setResponseListener(resp -> logger.log(Level.FINE, "got response: " + resp.getHeaders() + resp.getBodyAsString(StandardCharsets.UTF_8) + @@ -39,7 +39,7 @@ class Http1Test { Client client = Client.builder() .build(); try { - Request request1 = Request.get().url("http://xbib.org") + Request request1 = Request.get().url("https://xbib.org") .setResponseListener(resp -> logger.log(Level.FINE, "got response: " + resp.getBodyAsString(StandardCharsets.UTF_8))) .build(); @@ -60,12 +60,12 @@ class Http1Test { .build(); try { Request request1 = Request.builder(HttpMethod.GET) - .url("http://xbib.org").setVersion("HTTP/1.1") + .url("https://xbib.org").setVersion("HTTP/1.1") .setResponseListener(resp -> logger.log(Level.FINE, "got response: " + resp.getHeaders() + " status=" +resp.getStatus())) .build(); Request request2 = Request.builder(HttpMethod.GET) - .url("http://xbib.org").setVersion("HTTP/1.1") + .url("https://xbib.org").setVersion("HTTP/1.1") .setResponseListener(resp -> logger.log(Level.FINE, "got response: " + resp.getHeaders() + " status=" +resp.getStatus())) .build(); diff --git a/netty-http-client/src/test/java/org/xbib/netty/http/client/test/http1/XbibTest.java b/netty-http-client/src/test/java/org/xbib/netty/http/client/test/http1/XbibTest.java index 15156f2..81a7f5a 100644 --- a/netty-http-client/src/test/java/org/xbib/netty/http/client/test/http1/XbibTest.java +++ b/netty-http-client/src/test/java/org/xbib/netty/http/client/test/http1/XbibTest.java @@ -22,7 +22,7 @@ class XbibTest { void testXbibOrgWithDefaults() throws IOException { Client client = new Client(); try { - Request request = Request.get().url("http://xbib.org") + Request request = Request.get().url("https://xbib.org") .setResponseListener(resp -> { logger.log(Level.INFO, "status = " + resp.getStatus() + " response = " + resp.getBodyAsString(StandardCharsets.UTF_8)); @@ -42,7 +42,7 @@ class XbibTest { try { final Function stringFunction = response -> response.getBodyAsString(StandardCharsets.UTF_8); - Request request = Request.get().url("http://xbib.org") + Request request = Request.get().url("https://xbib.org") .build(); final CompletableFuture completableFuture = httpClient.execute(request, stringFunction) .exceptionally(Throwable::getMessage) @@ -73,7 +73,7 @@ class XbibTest { .build(); try { httpClient.execute(Request.get() - .url("http://xbib.org") + .url("https://xbib.org") .setResponseListener(resp -> logger.log(Level.INFO, "status = " + resp.getStatus() + " response body = " + resp.getBodyAsString(StandardCharsets.UTF_8))) .build()) @@ -89,7 +89,7 @@ class XbibTest { .build(); try { httpClient.execute(Request.get() - .url("http://xbib.org") + .url("https://xbib.org") .setTimeoutInMillis(10) .setResponseListener(resp -> logger.log(Level.INFO, "status = " + resp.getStatus() + @@ -107,7 +107,7 @@ class XbibTest { try { httpClient.execute(Request.get() .setVersion("HTTP/1.1") - .url("http://xbib.org") + .url("https://xbib.org") .setResponseListener(resp -> { logger.log(Level.INFO, "status = " + resp.getStatus() + " response body = " + resp.getBodyAsString(StandardCharsets.UTF_8)); @@ -116,7 +116,7 @@ class XbibTest { .get(); httpClient.execute(Request.get() .setVersion("HTTP/1.1") - .url("http://xbib.org") + .url("https://xbib.org") .setResponseListener(resp -> { logger.log(Level.INFO, "status = " + resp.getStatus() + " response body = " + resp.getBodyAsString(StandardCharsets.UTF_8));