Merge pull request #3 from botlify-net/dev

fix: plan when creating new zone throw a JSON error

Author: florianepitech

pom.xml

@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.botlify.brightdata</groupId>
 	<artifactId>bright-data-api</artifactId>
-	<version>1.1</version>
+	<version>1.2</version>
 
 	<name>BrightData API</name>
 	<url>https://github.com/botlify-io/bright-data-api</url>
@@ -107,9 +107,9 @@
 	</profiles>
 
 	<scm>
+		<url>https://github.com/botlify-net/bright-data-api</url>
 		<connection>scm:github:https://github.com/botlify-net/bright-data-api</connection>
 		<developerConnection>scm:github:https://github.com/botlify-net/bright-data-api</developerConnection>
-		<url>https://github.com/botlify-net/bright-data-api</url>
 		<tag>master</tag>
 	</scm>
 

src/main/java/net/botlify/brightdata/BrightDataAPI.java

@@ -140,8 +140,12 @@ public boolean testProxyValidity(@NotNull final String host,
                 .build();
 
         try (Response response = client.newCall(request).execute()) {
-            final String body = response.body().string();
             final int code = response.code();
+            if (code == 407) {
+                log.trace("Fail to test the proxy validity because of a proxy authentication error.");
+                return (false);
+            }
+            final String body = response.body().string();
             assertResponse(code, body);
             return (response.code() == 200);
         } catch (Exception e) {

src/main/java/net/botlify/brightdata/object/Plan.java

@@ -6,6 +6,7 @@
 import lombok.Getter;
 import lombok.ToString;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.json.JSONObject;
 
 import java.time.Instant;
@@ -39,8 +40,8 @@ public class Plan {
     /**
      * The ip fallback number of the plan.
      */
-    @Getter
-    private final int ipFallback;
+    @Getter @Nullable
+    private final Integer ipFallback;
 
     /**
      * The type of ips of the plan.
@@ -69,8 +70,8 @@ public class Plan {
     /**
      * The number of new ips of the plan.
      */
-    @Getter
-    private final int ips_new;
+    @Getter @Nullable
+    private final Integer ips_new;
 
     /**
      * Constructor of the plan from the JSON object.
@@ -80,12 +81,20 @@ public Plan(@NotNull final JSONObject jsonObject) {
         this.start = Instant.parse(jsonObject.getString("start"));
         this.product = jsonObject.getString("product");
         this.type = Objects.requireNonNull(PlanType.fromString(jsonObject.getString("type")));
-        this.ipFallback = jsonObject.getInt("ip_fallback");
         this.ipsType = Objects.requireNonNull(IpType.fromString(jsonObject.getString("ips_type")));
         this.ips = jsonObject.getInt("ips");
         this.country = jsonObject.getString("country");
         this.bandwidth = jsonObject.getString("bandwidth");
-        this.ips_new = jsonObject.getInt("ips_new");
+        // Ip fallback
+        if (jsonObject.has("ip_fallback"))
+            this.ipFallback = jsonObject.getInt("ip_fallback");
+        else
+            this.ipFallback = null;
+        // Ips new
+        if (jsonObject.has("ips_new"))
+            this.ips_new = jsonObject.getInt("ips_new");
+        else
+            this.ips_new = null;
     }
 
     /**
@@ -130,12 +139,12 @@ public Plan(@NotNull final Instant start,
         jsonObject.put("start", start.toString());
         jsonObject.put("product", product);
         jsonObject.put("type", type.toString());
-        jsonObject.put("ip_fallback", ipFallback);
+        jsonObject.put("ip_fallback", (ipFallback == null) ? JSONObject.NULL : ipFallback);
         jsonObject.put("ips_type", ipsType.toString());
         jsonObject.put("ips", ips);
         jsonObject.put("country", country);
         jsonObject.put("bandwidth", bandwidth);
-        jsonObject.put("ips_new", ips_new);
+        jsonObject.put("ips_new", (ips_new == null) ? JSONObject.NULL : ips_new);
         return jsonObject;
     }