improve environment variable implements

aliyun-java-sdk-core/src/main/java/com/aliyuncs/utils/AuthUtils.java

@@ -4,43 +4,43 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 
-
 public class AuthUtils {
- private static volatile String clientType = System.getenv("ALIBABA_CLOUD_PROFILE");
- private static volatile String environmentAccessKeyId;
- private static volatile String environmentAccesskeySecret;
- private static volatile String environmentECSMetaData;
- private static volatile String environmentCredentialsFile;
+ private static volatile String clientType = EnvHelper.getenv("ALIBABA_CLOUD_PROFILE");
  private static volatile String privateKey;
 
  public static String getPrivateKey(String filePath) {
  if (null == privateKey) {
  synchronized (AuthUtils.class) {
  if (null == privateKey) {
- FileInputStream in = null;
- byte[] buffer;
- try {
- in = new FileInputStream(new File(filePath));
- buffer = new byte[in.available()];
- in.read(buffer);
- privateKey = new String(buffer, "UTF-8");
- } catch (IOException e) {
- e.printStackTrace();
- } finally {
- if (in != null) {
- try {
- in.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
+ privateKey = readFileContent(filePath);
  }
  }
  }
  return privateKey;
  }
 
+ public static String readFileContent(String filePath) {
+ FileInputStream in = null;
+ byte[] buffer;
+ try {
+ in = new FileInputStream(new File(filePath));
+ buffer = new byte[in.available()];
+ in.read(buffer);
+ return new String(buffer, "UTF-8");
+ } catch (IOException e) {
+ e.printStackTrace();
+ return null;
+ } finally {
+ if (in != null) {
+ try {
+ in.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+
  public static void setPrivateKey(String key) {
  privateKey = key;
  }
@@ -57,52 +57,4 @@ public static String getClientType() {
  public static void setClientType(String clientType) {
  AuthUtils.clientType = clientType;
  }
-
- public static String getEnvironmentAccessKeyId() {
- if (null == AuthUtils.environmentAccessKeyId) {
- return System.getenv("ALIBABA_CLOUD_ACCESS_KEY_ID");
- } else {
- return AuthUtils.environmentAccessKeyId;
- }
- }
-
- public static void setEnvironmentAccessKeyId(String environmentAccessKeyId) {
- AuthUtils.environmentAccessKeyId = environmentAccessKeyId;
- }
-
- public static String getEnvironmentAccessKeySecret() {
- if (null == AuthUtils.environmentAccesskeySecret) {
- return System.getenv("ALIBABA_CLOUD_ACCESS_KEY_SECRET");
- } else {
- return AuthUtils.environmentAccesskeySecret;
- }
- }
-
- public static void setEnvironmentAccessKeySecret(String environmentAccesskeySecret) {
- AuthUtils.environmentAccesskeySecret = environmentAccesskeySecret;
- }
-
- public static String getEnvironmentECSMetaData() {
- if (null == AuthUtils.environmentECSMetaData) {
- return System.getenv("ALIBABA_CLOUD_ECS_METADATA");
- } else {
- return AuthUtils.environmentECSMetaData;
- }
- }
-
- public static void setEnvironmentECSMetaData(String environmentECSMetaData) {
- AuthUtils.environmentECSMetaData = environmentECSMetaData;
- }
-
- public static String getEnvironmentCredentialsFile() {
- if (null == AuthUtils.environmentCredentialsFile) {
- return System.getenv("ALIBABA_CLOUD_CREDENTIALS_FILE");
- } else {
- return AuthUtils.environmentCredentialsFile;
- }
- }
-
- public static void setEnvironmentCredentialsFile(String environmentCredentialsFile) {
- AuthUtils.environmentCredentialsFile = environmentCredentialsFile;
- }
 }