Version 6.3.4

Site updated:
- Removed MYTHICALBOTS_XYZ

Improve logging of empty/null Body

Author: Andre601

build.gradle

@@ -9,7 +9,7 @@ plugins{
     id 'net.kyori.blossom' version '1.1.0'
 }
 
-def ver = new Version(major: 6, minor: 3, patch: 3)
+def ver = new Version(major: 6, minor: 3, patch: 4)
 
 allprojects {
     apply plugin: 'com.jfrog.bintray'
@@ -52,7 +52,7 @@ allprojects {
             jDocConfig.options {
                 it.author()
                 it.encoding = 'UTF-8'
-                it.memberLevel = JavadocMemberLevel.PROTECTED
+                it.memberLevel = JavadocMemberLevel.PUBLIC
 
                 if (it instanceof StandardJavadocDocletOptions) {
                     def opt = it as StandardJavadocDocletOptions

core/src/main/java/org/botblock/javabotblockapi/core/Site.java

@@ -18,9 +18,6 @@
 
 package org.botblock.javabotblockapi.core;
 
-import org.botblock.javabotblockapi.core.annotations.DeprecatedSince;
-import org.botblock.javabotblockapi.core.annotations.PlannedRemoval;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -142,16 +139,6 @@ public class Site{
      */
     public static final Site INFINITYBOTLIST_COM = new Site("infinitybotlist.com", HttpMethod.GET, HttpMethod.POST);
 
-    /**
-     * <a href="https://mythicalbots.xyz" target="_blank">mythicalbots.xyz</a>
-     * 
-     * @deprecated Renamed to {@link #BOTS_IDLEDEV_ORG bots.idledev.org}
-     */
-    @Deprecated
-    @DeprecatedSince(major = 6, minor = 3, patch = 2)
-    @PlannedRemoval(major = 6, minor = 3, patch = 4)
-    public static final Site MYTHICALBOTS_XYZ = new Site("mythicalbots.xyz");
-    
     /**
      * <a href="https://space-bot-list.xyz" target="_blank">space-bot-list.xyz</a>
      */

request/src/main/java/org/botblock/javabotblockapi/requests/handler/RequestHandler.java

@@ -115,7 +115,7 @@ public void performPOST(@Nonnull JSONObject json, int sites) throws IOException{
         CheckUtil.condition(sites < 1, "The POST action requires at least 1 site!");
 
         String url = BASE_URL + "count";
-        final long timeout = sites * 10;
+        final long timeout = sites * 10L;
 
         OkHttpClient postClient = CLIENT.newBuilder()
                 .callTimeout(timeout, TimeUnit.SECONDS)
@@ -135,12 +135,26 @@ public void performPOST(@Nonnull JSONObject json, int sites) throws IOException{
             ResponseBody responseBody = response.body();
             if(responseBody == null){
                 LOG.error("Received empty Response from BotBlock API!");
+                LOG.error(
+                        "Response{protocol={}, code={}, message={}, headers={}}",
+                        response.protocol(),
+                        response.code(),
+                        response.message(),
+                        response.headers().toString()
+                );
                 return;
             }
 
             String bodyString = responseBody.string();
             if(bodyString.isEmpty()){
                 LOG.error("Received empty Response from BotBlock API!");
+                LOG.error(
+                        "Response{protocol={}, code={}, message={}, headers={}}",
+                        response.protocol(),
+                        response.code(),
+                        response.message(),
+                        response.headers().toString()
+                );
                 return;
             }
 
@@ -171,7 +185,7 @@ public void performPOST(@Nonnull JSONObject json, int sites) throws IOException{
                     }
                 }
 
-                LOG.warn("One or more post requests returned a non-successful response. JSON with failed sites below.");
+                LOG.warn("One or more POST requests returned a non-successful response. JSON with failed sites below.");
                 LOG.warn(failures.toString());
             }
         }
@@ -189,12 +203,30 @@ private JSONObject performGET(@Nonnull String url, String header) throws IOExcep
 
         try(Response response = CLIENT.newCall(request).execute()){
             ResponseBody body = response.body();
-            if(body == null)
-                throw new NullPointerException("Received empty response body.");
+            if(body == null){
+                LOG.error("Received empty Response from BotBlock API!");
+                LOG.error(
+                        "Response{protocol={}, code={}, message={}, headers={}}",
+                        response.protocol(),
+                        response.code(),
+                        response.message(),
+                        response.headers().toString()
+                );
+                return null;
+            }
 
             String bodyString = body.string();
-            if(bodyString.isEmpty())
-                throw new NullPointerException("Received empty response body.");
+            if(bodyString.isEmpty()){
+                LOG.error("Received empty Response from BotBlock API!");
+                LOG.error(
+                        "Response{protocol={}, code={}, message={}, headers={}}",
+                        response.protocol(),
+                        response.code(),
+                        response.message(),
+                        response.headers().toString()
+                );
+                return null;
+            }
 
             if(!response.isSuccessful()){
                 if(response.code() == 429){