fix: name of properties

Author: florianepitech

README.md

@@ -19,8 +19,8 @@ Your client can be used with [brightData](brightdata.com) proxy.
 If you want to use this proxy, you have to configure it.
 
 ```java
-System.setProperty("httpClientWrapperBrightDataHost", "YOUR_HOST");
-System.setProperty("httpClientWrapperBrightDataPort", "YOUR_PORT");
-System.setProperty("httpClientWrapperBrightDataUsername", "YOUR_USERNAME");
-System.setProperty("httpClientWrapperBrightDataPassword", "YOUR_PASSWORD");
+System.setProperty("httpclient.wrapper.proxy.bright-data.host", "YOUR_HOST");
+System.setProperty("httpclient.wrapper.proxy.bright-data.port", "YOUR_PORT");
+System.setProperty("httpclient.wrapper.proxy.bright-data.username", "YOUR_USERNAME");
+System.setProperty("httpclient.wrapper.proxy.bright-data.password", "YOUR_PASSWORD");
 ```

src/main/java/net/httpclient/wrapper/HttpClientWrapper.java

@@ -15,10 +15,10 @@ public class HttpClientWrapper {
      */
     public static boolean hasValidBrightDataProperty() {
         String[] properties = new String[] {
-            "httpClientWrapperBrightDataHost",
-            "httpClientWrapperBrightDataPort",
-            "httpClientWrapperBrightDataUsername",
-            "httpClientWrapperBrightDataPassword"
+            "httpclient.wrapper.proxy.bright-data.host",
+            "httpclient.wrapper.proxy.bright-data.port",
+            "httpclient.wrapper.proxy.bright-data.username",
+            "httpclient.wrapper.proxy.bright-data.password"
         };
         for (String property : properties) {
             if (System.getProperty(property) == null) {
@@ -33,31 +33,31 @@ public static boolean hasValidBrightDataProperty() {
      * @return The brightdata host property set.
      */
     public static String getBrightDataHost() {
-        return (System.getProperty("httpClientWrapperBrightDataHost"));
+        return (System.getProperty("httpclient.wrapper.proxy.bright-data.host"));
     }
 
     /**
      * This function will return the brightdata port property set.
      * @return The brightdata port property set.
      */
     public static int getBrightDataPort() {
-        return (Integer.parseInt(System.getProperty("httpClientWrapperBrightDataPort")));
+        return (Integer.parseInt(System.getProperty("httpclient.wrapper.proxy.bright-data.port")));
     }
 
     /**
      * This function will return the brightdata username property set.
      * @return The brightdata username property set.
      */
     public static String getBrightDataUsername() {
-        return (System.getProperty("httpClientWrapperBrightDataUsername"));
+        return (System.getProperty("httpclient.wrapper.proxy.bright-data.username"));
     }
 
     /**
      * This function will return the brightdata password property set.
      * @return The brightdata password property set.
      */
     public static String getBrightDataPassword() {
-        return (System.getProperty("httpClientWrapperBrightDataPassword"));
+        return (System.getProperty("httpclient.wrapper.proxy.bright-data.password"));
     }
 
 }

src/main/java/net/httpclient/wrapper/session/HttpClientSession.java

@@ -29,6 +29,7 @@
 import org.apache.http.impl.client.LaxRedirectStrategy;
 import org.apache.http.ssl.SSLContextBuilder;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.json.JSONObject;
 
 import javax.net.ssl.SSLContext;
@@ -162,13 +163,38 @@ public HttpClient newHttpClient() throws NoSuchAlgorithmException, KeyManagement
      */
 
     public RequestResponse sendPost(String url, String content, ContentType contentType) throws IOException, HttpClientException, HttpServerException {
+        return (sendPost(url, content, contentType, null));
+    }
+
+    public RequestResponse sendPost(@NotNull String url,
+                                    @NotNull JSONObject content,
+                                    @NotNull ContentType contentType) throws HttpClientException, IOException, HttpServerException {
+        return (sendPost(url, content.toString(), contentType, null));
+    }
+
+    public RequestResponse sendPost(@NotNull String url,
+                                    @NotNull JSONObject content,
+                                    @NotNull ContentType contentType,
+                                    @Nullable List<Header> headers) throws HttpClientException, IOException, HttpServerException {
+        return (sendPost(url, content.toString(), contentType, headers));
+    }
+
+    public RequestResponse sendPost(@NotNull String url,
+                                    @NotNull String content,
+                                    @NotNull ContentType contentType,
+                                    @Nullable List<Header> headers) throws IOException,
+            HttpClientException, HttpServerException {
         Date start = new Date();
         String oldCookieStoreSerialized = BasicCookieStoreSerializerUtils.serializableToBase64(httpCookieStore);
 
         HttpPost httpPost = new HttpPost(url);
         httpPost.setConfig(getRequestConfig().build());
         httpPost.addHeader(HttpHeaders.CONTENT_TYPE, contentType.getMimeType());
         httpPost.addHeader(HttpHeaders.ACCEPT, "application/json, text/plain, */*");
+        if (headers != null) {
+            for (Header header : headers)
+                httpPost.addHeader(header);
+        }
         httpPost.setEntity(new StringEntity(content));
         HttpResponse httpResponse = getHttpClient().execute(httpPost);
 

src/test/java/net/httpclient/wrapper/ratelimiter/RateLimiterTest.java

@@ -29,7 +29,7 @@ public void acquireTest() {
     }
 
     @Test
-    public void getRemainingTimeTest() throws InterruptedException {
+    public void getRemainingTimeTest() {
         int durationInSeconds = 3;
         RateLimiter rateLimiter = new RateLimiter(Duration.ofSeconds(durationInSeconds));
         rateLimiter.acquire();