remove EnvironmentUtils

aliyun · Jun 12, 2024 · f6c47bd · f6c47bd
1 parent b6a07ef
commit f6c47bd
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 91 deletions.
diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/DefaultAcsClient.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/DefaultAcsClient.java
@@ -319,7 +319,6 @@ private <T extends AcsResponse> HttpResponse doRealAction(AcsRequest<T> request,
  String regionId, AlibabaCloudCredentials credentials, Signer signer, FormatType format)
  throws ClientException, ServerException {
 
-
  doActionWithProxy(request.getSysProtocol(), System.getenv("HTTPS_PROXY"), System.getenv("HTTP_PROXY"));
  doActionWithIgnoreSSL(request, X509TrustAll.ignoreSSLCerts);
 

diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/clients/ApacheHttpClient.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/clients/ApacheHttpClient.java
@@ -2,7 +2,7 @@
 
 import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.http.*;
-import com.aliyuncs.utils.EnvironmentUtils;
+import com.aliyuncs.utils.EnvHelper;
 import com.aliyuncs.utils.IOUtils;
 import com.aliyuncs.utils.StringUtils;
 import org.apache.http.Header;
@@ -271,16 +271,16 @@ private HttpUriRequest parseToHttpRequest(HttpRequest apiReq) throws IOException
  }
 
  private HttpHost calcProxy(HttpRequest apiReq) throws MalformedURLException, ClientException {
- boolean needProxy = HttpUtil.needProxy(new URL(apiReq.getSysUrl()).getHost(), clientConfig.getNoProxy(), EnvironmentUtils.getNoProxy());
+ boolean needProxy = HttpUtil.needProxy(new URL(apiReq.getSysUrl()).getHost(), clientConfig.getNoProxy(), EnvHelper.getenv("NO_PROXY"));
  if (!needProxy) {
  return null;
  }
  URL url = new URL(apiReq.getSysUrl());
  HttpHost proxy = null;
  if ("https".equalsIgnoreCase(url.getProtocol())) {
- proxy = HttpUtil.getApacheProxy(clientConfig.getHttpsProxy(), EnvironmentUtils.getHttpsProxy(), apiReq);
+ proxy = HttpUtil.getApacheProxy(clientConfig.getHttpsProxy(), EnvHelper.getenv("HTTPS_PROXY"), apiReq);
  } else {
- proxy = HttpUtil.getApacheProxy(clientConfig.getHttpProxy(), EnvironmentUtils.getHttpProxy(), apiReq);
+ proxy = HttpUtil.getApacheProxy(clientConfig.getHttpProxy(), EnvHelper.getenv("HTTP_PROXY"), apiReq);
  }
  return proxy;
  }

diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/clients/CompatibleUrlConnClient.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/clients/CompatibleUrlConnClient.java
@@ -2,7 +2,7 @@
 
 import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.http.*;
-import com.aliyuncs.utils.EnvironmentUtils;
+import com.aliyuncs.utils.EnvHelper;
 import org.apache.http.conn.ssl.DefaultHostnameVerifier;
 import org.apache.http.conn.ssl.NoopHostnameVerifier;
 
@@ -165,16 +165,16 @@ private void checkHttpRequest(HttpRequest request) {
 
  private Proxy calcProxy(URL url, HttpRequest request) throws ClientException {
  String targetHost = url.getHost();
- boolean needProxy = HttpUtil.needProxy(targetHost, clientConfig.getNoProxy(), EnvironmentUtils.getNoProxy());
+ boolean needProxy = HttpUtil.needProxy(targetHost, clientConfig.getNoProxy(), EnvHelper.getenv("NO_PROXY"));
  if (!needProxy) {
  return Proxy.NO_PROXY;
  }
  Proxy proxy;
  if ("https".equalsIgnoreCase(url.getProtocol())) {
- String httpsProxy = EnvironmentUtils.getHttpsProxy();
+ String httpsProxy = EnvHelper.getenv("HTTPS_PROXY");
  proxy = HttpUtil.getJDKProxy(clientConfig.getHttpsProxy(), httpsProxy, request);
  } else {
- String httpProxy = EnvironmentUtils.getHttpProxy();
+ String httpProxy = EnvHelper.getenv("HTTP_PROXY");
  proxy = HttpUtil.getJDKProxy(clientConfig.getHttpProxy(), httpProxy, request);
  }
  return proxy;

diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/utils/EnvironmentUtils.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/utils/EnvironmentUtils.java
diff --git a/...-sdk-core/src/test/java/com/aliyuncs/auth/EnvironmentVariableCredentialsProviderTest.java b/...-sdk-core/src/test/java/com/aliyuncs/auth/EnvironmentVariableCredentialsProviderTest.java
@@ -3,7 +3,6 @@
 import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.utils.AuthUtils;
 import com.aliyuncs.utils.EnvHelper;
-import com.aliyuncs.utils.EnvironmentUtils;
 
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/aliyun-java-sdk-core/src/test/java/com/aliyuncs/utils/EnvironmentUtilsTest.java b/aliyun-java-sdk-core/src/test/java/com/aliyuncs/utils/EnvironmentUtilsTest.java