refactor: rename api proxy parameters

zebrunner · Jun 15, 2023 · 4409619 · 4409619
1 parent 2f69e6d
commit 4409619
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 26 deletions.
diff --git a/src/main/java/com/zebrunner/carina/api/http/HttpClient.java b/src/main/java/com/zebrunner/carina/api/http/HttpClient.java
@@ -15,7 +15,6 @@
  *******************************************************************************/
 package com.zebrunner.carina.api.http;
 
-import com.zebrunner.carina.utils.Configuration;
 import com.zebrunner.carina.utils.R;
 import com.zebrunner.carina.utils.commons.SpecialKeywords;
 import com.zebrunner.carina.utils.exception.InvalidConfigurationException;
@@ -28,8 +27,6 @@
 import org.slf4j.LoggerFactory;
 
 import java.lang.invoke.MethodHandles;
-import java.util.Arrays;
-import java.util.List;
 
 /*
  * HttpClient - sends HTTP request with specified parameters and returns response.
@@ -77,32 +74,21 @@ private static void addProxy(RequestSpecification requestSpecification) {
             LOGGER.debug("Request specification already contains proxy specification, so we will not add global proxy settings.");
             return;
         }
-        String proxyType = getConfigurationValue("proxy_type");
-        if (proxyType.isEmpty()) {
-            throw new InvalidConfigurationException("'proxy_type' should not be empty.");
-        }
-        if (!"MANUAL".equals(proxyType)) {
+        boolean isEnabled = Boolean.parseBoolean(getConfigurationValue("carina.api.proxy.enable"));
+        if (!isEnabled) {
             return;
         }
 
-        String proxyHost = Configuration.get(Configuration.Parameter.PROXY_HOST);
-        Integer proxyPort = !Configuration.get(Configuration.Parameter.PROXY_PORT).isBlank() ?
-                Configuration.getInt(Configuration.Parameter.PROXY_HOST) : null;
-        List<String> protocols = Arrays.asList(Configuration.get(Configuration.Parameter.PROXY_PROTOCOLS)
-                .split("[\\s,]+"));
-
-        String proxyUsername = getConfigurationValue("proxy_username");
-        String proxyPassword = getConfigurationValue("proxy_password");
+        String proxyHost = getConfigurationValue("carina.api.proxy.host");
+        Integer proxyPort = !getConfigurationValue("carina.api.proxy.port").isEmpty() ?
+                Integer.parseInt(getConfigurationValue("carina.api.proxy.port")) : null;
 
-        if (proxyHost.isEmpty() ||
-                proxyPort == null ||
-                protocols.isEmpty()) {
-            throw new InvalidConfigurationException("Cannot create proxy for API. 'proxy_host' or 'proxy_port' or 'proxy_protocols' are empty.");
-        }
+        String proxyUsername = getConfigurationValue("carina.api.proxy.username");
+        String proxyPassword = getConfigurationValue("carina.api.proxy.password");
 
-        if (!(protocols.contains("http") || protocols.contains("https"))) {
-            LOGGER.debug("proxy_protocols do not contains http/https, so we will not add proxy settings.");
-            return;
+        if (proxyHost.isEmpty() || proxyPort == null) {
+            throw new InvalidConfigurationException(
+                    "Cannot create proxy for API. 'carina.api.proxy.host' or 'proxy_port' or 'carina.api.proxy.port' are empty.");
         }
 
         ProxySpecification proxySpecification = ProxySpecification.host(proxyHost)

diff --git a/src/main/resources/config.properties b/src/main/resources/config.properties
@@ -4,5 +4,7 @@ ignore_ssl=NULL
 #================ Report configuration ===============#
 log_all_json=true
 #================ Proxy configuration ===============#
-proxy_username=NULL
-proxy_password=NULL
+carina.api.proxy.host=NULL
+carina.api.proxy.port=NULL
+carina.api.proxy.username=NULL
+carina.api.proxy.password=NULL