Update Square libs and fix nullability issues

Author: rubengees

build.gradle

@@ -8,9 +8,9 @@ ext {
 
 def jetbrainsAnnotationsVersion = '13.0'
 
-def retrofitVersion = '2.2.0'
-def okhttpVersion = '3.7.0'
-def moshiVersion = '1.4.0'
+def retrofitVersion = '2.3.0'
+def okHttpVersion = '3.8.0'
+def moshiVersion = '1.5.0'
 
 def lombokVersion = '1.16.16'
 
@@ -24,15 +24,15 @@ ext.deps = [
 
         retrofit            : "com.squareup.retrofit2:retrofit:$retrofitVersion",
         retrofitMoshi       : "com.squareup.retrofit2:converter-moshi:$retrofitVersion",
-        okhttp              : "com.squareup.okhttp3:okhttp:$okhttpVersion",
+        okHttp              : "com.squareup.okhttp3:okhttp:$okHttpVersion",
         moshi               : "com.squareup.moshi:moshi:$moshiVersion",
 
         lombok              : "org.projectlombok:lombok:$lombokVersion",
 
         junit               : "junit:junit:$junitVersion",
         assertj             : "org.assertj:assertj-core:$assertjVersion",
 
-        mockwebserver       : "com.squareup.okhttp3:mockwebserver:$okhttpVersion",
+        mockwebserver       : "com.squareup.okhttp3:mockwebserver:$okHttpVersion",
         privateConstructor  : "com.pushtorefresh.java-private-constructor-checker:checker:$privateConstructorVersion"
 ]
 

library/build.gradle

@@ -21,7 +21,7 @@ dependencies {
 
     api deps.retrofit
     api deps.retrofitMoshi
-    api deps.okhttp
+    api deps.okHttp
     api deps.moshi
 
     compileOnly deps.lombok

library/src/main/java/me/proxer/library/api/LoggingInterceptor.java

@@ -5,6 +5,7 @@
 import me.proxer.library.util.ProxerUrls;
 import okhttp3.Interceptor;
 import okhttp3.Request;
+import okhttp3.RequestBody;
 import okhttp3.Response;
 import okio.Buffer;
 import org.jetbrains.annotations.NotNull;
@@ -49,13 +50,14 @@ private String buildHeaderMessage(@NotNull final Request requestCopy) {
 
     @NotNull
     private String buildBodyMessage(@NotNull final Request requestCopy) throws IOException {
+        final RequestBody body = requestCopy.body();
         final Buffer bodyBuffer = new Buffer();
         final String bodyContent;
 
-        if (requestCopy.body() == null) {
+        if (body == null) {
             bodyContent = null;
         } else {
-            requestCopy.body().writeTo(bodyBuffer);
+            body.writeTo(bodyBuffer);
 
             bodyContent = bodyBuffer.readUtf8();
         }

library/src/main/java/me/proxer/library/api/ProxerCall.java

@@ -116,6 +116,10 @@ private T processResponse(@NotNull final Response<ProxerResponse<T>> response) t
         if (response.isSuccessful()) {
             final ProxerResponse<T> proxerResponse = response.body();
 
+            if (proxerResponse == null) {
+                throw new ProxerException(ProxerException.ErrorType.PARSING);
+            }
+
             if (proxerResponse.isSuccessful()) {
                 return proxerResponse.getData();
             } else {

library/src/main/java/me/proxer/library/api/list/InternalApi.java

@@ -12,7 +12,7 @@
 /**
  * @author Desnoo
  */
-public interface InternalApi {
+interface InternalApi {
 
     @GET("list/entrylist")
     ProxerCall<List<MediaListEntry>> mediaList(@Query("kat") Category category, @Query("medium") Medium medium,

library/src/test/java/me/proxer/library/api/DelimitedEnumSetAdapterFactoryTest.java

@@ -64,24 +64,28 @@ public void testCreateNoParameterType() {
 
     @Test
     public void testFromJsonSingle() throws IOException {
+        //noinspection ConstantConditions
         assertThat(moshi.adapter(TestClass.class).fromJson("{\"genre\":\"Abenteuer\"}").genre)
                 .containsExactly(Genre.ADVENTURE);
     }
 
     @Test
     public void testFromJsonMultiple() throws IOException {
+        //noinspection ConstantConditions
         assertThat(moshi.adapter(TestClass.class).fromJson("{\"genre\":\"Abenteuer Action\"}").genre)
                 .containsExactly(Genre.ADVENTURE, Genre.ACTION);
     }
 
     @Test
     public void testFromJsonInvalidDelimiter() throws IOException {
+        //noinspection ConstantConditions
         assertThat(moshi.adapter(TestClass.class).fromJson("{\"genre\":\"Abenteuer;Action\"}").genre)
                 .isEmpty();
     }
 
     @Test
     public void testFromJsonNull() throws IOException {
+        //noinspection ConstantConditions
         assertThat(moshi.adapter(TestClass.class).fromJson("{\"genre\":null}").genre)
                 .isEmpty();
     }

library/src/test/java/me/proxer/library/api/HeaderInterceptorTest.java

@@ -50,6 +50,8 @@ public void testCustomUserAgent() throws IOException, ProxerException, Interrupt
     @Test
     public void testHeadersOnlyForProxerHost() throws Exception {
         server.enqueue(new MockResponse());
+
+        //noinspection ConstantConditions
         api.client().newCall(new Request.Builder().url(HttpUrl.parse("http://example.com" + server.getPort() + "test"))
                 .build()).execute();
 

library/src/test/java/me/proxer/library/api/ucp/UcpTopTenEndpointTest.java

@@ -42,7 +42,7 @@ public void testPath() throws ProxerException, IOException, InterruptedException
         assertThat(server.takeRequest().getPath()).isEqualTo("/api/v1/ucp/topten");
     }
 
-    private UcpTopTenEntry buildTestEntry() throws ParseException {
+    private UcpTopTenEntry buildTestEntry() {
         return new UcpTopTenEntry("640467", "2357", "High School DxD", Medium.ANIMESERIES,
                 Category.ANIME);
     }

library/src/test/java/me/proxer/library/util/ProxerUrlsTest.java

@@ -136,21 +136,25 @@ public void testCaptchaWebWithDevice() {
 
     @Test
     public void testHasProxerHost() {
+        //noinspection ConstantConditions
         assertThat(ProxerUrls.hasProxerHost(HttpUrl.parse("https://proxer.me/test"))).isTrue();
     }
 
     @Test
     public void testHasProxerHostCdn() {
+        //noinspection ConstantConditions
         assertThat(ProxerUrls.hasProxerHost(HttpUrl.parse("https://cdn.proxer.me/test"))).isTrue();
     }
 
     @Test
     public void testHasProxerHostManga() {
+        //noinspection ConstantConditions
         assertThat(ProxerUrls.hasProxerHost(HttpUrl.parse("https://manga1.proxer.me/f/test"))).isTrue();
     }
 
     @Test
     public void testHasProxerHostFalse() {
+        //noinspection ConstantConditions
         assertThat(ProxerUrls.hasProxerHost(HttpUrl.parse("https://example.me/test"))).isFalse();
     }