Configure default cname

Author: baiyubin2020

src/main/java/com/aliyun/oss/ClientBuilderConfiguration.java

@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.aliyun.oss;
+
+public class ClientBuilderConfiguration extends ClientConfiguration {
+
+    public ClientBuilderConfiguration() {
+        super();
+        this.supportCname = false;
+    }
+
+}

src/main/java/com/aliyun/oss/ClientConfiguration.java

@@ -40,9 +40,9 @@
  */
 public class ClientConfiguration {
 
-    private static final String DEFAULT_USER_AGENT = VersionInfoUtils.getDefaultUserAgent();
+    public static final String DEFAULT_USER_AGENT = VersionInfoUtils.getDefaultUserAgent();
 
-    private static final int DEFAULT_MAX_RETRIES = 3;
+    public static final int DEFAULT_MAX_RETRIES = 3;
 
     public static final int DEFAULT_CONNECTION_REQUEST_TIMEOUT = -1;
     public static final int DEFAULT_CONNECTION_TIMEOUT = 50 * 1000;
@@ -59,40 +59,40 @@ public class ClientConfiguration {
 
     public static final String DEFAULT_CNAME_EXCLUDE_LIST = "aliyuncs.com,aliyun-inc.com,aliyun.com";
 
-    private String userAgent = DEFAULT_USER_AGENT;
-    private int maxErrorRetry = DEFAULT_MAX_RETRIES;
-    private int connectionRequestTimeout = DEFAULT_CONNECTION_REQUEST_TIMEOUT;
-    private int connectionTimeout = DEFAULT_CONNECTION_TIMEOUT;
-    private int socketTimeout = DEFAULT_SOCKET_TIMEOUT;
-    private int maxConnections = DEFAULT_MAX_CONNECTIONS;
-    private long connectionTTL = DEFAULT_CONNECTION_TTL;
-    private boolean useReaper = DEFAULT_USE_REAPER;
-    private long idleConnectionTime = DEFAULT_IDLE_CONNECTION_TIME;
+    protected String userAgent = DEFAULT_USER_AGENT;
+    protected int maxErrorRetry = DEFAULT_MAX_RETRIES;
+    protected int connectionRequestTimeout = DEFAULT_CONNECTION_REQUEST_TIMEOUT;
+    protected int connectionTimeout = DEFAULT_CONNECTION_TIMEOUT;
+    protected int socketTimeout = DEFAULT_SOCKET_TIMEOUT;
+    protected int maxConnections = DEFAULT_MAX_CONNECTIONS;
+    protected long connectionTTL = DEFAULT_CONNECTION_TTL;
+    protected boolean useReaper = DEFAULT_USE_REAPER;
+    protected long idleConnectionTime = DEFAULT_IDLE_CONNECTION_TIME;
 
-    private Protocol protocol = Protocol.HTTP;
+    protected Protocol protocol = Protocol.HTTP;
 
-    private String proxyHost = null;
-    private int proxyPort = -1;
-    private String proxyUsername = null;
-    private String proxyPassword = null;
-    private String proxyDomain = null;
-    private String proxyWorkstation = null;
+    protected String proxyHost = null;
+    protected int proxyPort = -1;
+    protected String proxyUsername = null;
+    protected String proxyPassword = null;
+    protected String proxyDomain = null;
+    protected String proxyWorkstation = null;
 
-    private boolean supportCname = true;
-    private List<String> cnameExcludeList = new ArrayList<String>();
-    private Lock rlock = new ReentrantLock();
+    protected boolean supportCname = true;
+    protected List<String> cnameExcludeList = new ArrayList<String>();
+    protected Lock rlock = new ReentrantLock();
 
-    private boolean sldEnabled = false;
+    protected boolean sldEnabled = false;
 
-    private int requestTimeout = DEFAULT_REQUEST_TIMEOUT;
-    private boolean requestTimeoutEnabled = false;
-    private long slowRequestsThreshold = DEFAULT_SLOW_REQUESTS_THRESHOLD;
+    protected int requestTimeout = DEFAULT_REQUEST_TIMEOUT;
+    protected boolean requestTimeoutEnabled = false;
+    protected long slowRequestsThreshold = DEFAULT_SLOW_REQUESTS_THRESHOLD;
 
-    private Map<String, String> defaultHeaders = new LinkedHashMap<String, String>();
+    protected Map<String, String> defaultHeaders = new LinkedHashMap<String, String>();
 
-    private boolean crcCheckEnabled = true;
+    protected boolean crcCheckEnabled = true;
 
-    private List<RequestSigner> signerHandlers = new LinkedList<RequestSigner>();
+    protected List<RequestSigner> signerHandlers = new LinkedList<RequestSigner>();
 
     /**
      * Gets the user agent string.

src/main/java/com/aliyun/oss/OSSBuilder.java

@@ -66,10 +66,10 @@ public interface OSSBuilder {
      * @param secretAccessKey
      *            Secret Access Key.
      * @param config
-     *            A {@link ClientConfiguration} instance. The method would use
+     *            A {@link ClientBuilderConfiguration} instance. The method would use
      *            default configuration if it's null.
      */
-    public OSS build(String endpoint, String accessKeyId, String secretAccessKey, ClientConfiguration config);
+    public OSS build(String endpoint, String accessKeyId, String secretAccessKey, ClientBuilderConfiguration config);
 
     /**
      * Uses specified OSS Endpoint, the temporary (Access Id/Access Key/Security
@@ -85,11 +85,11 @@ public interface OSSBuilder {
      * @param securityToken
      *            Security token provided by STS.
      * @param config
-     *            A {@link ClientConfiguration} instance. The method would use
+     *            A {@link ClientBuilderConfiguration} instance. The method would use
      *            default configuration if it's null.
      */
     public OSS build(String endpoint, String accessKeyId, String secretAccessKey, String securityToken,
-            ClientConfiguration config);
+            ClientBuilderConfiguration config);
 
     /**
      * Uses the specified {@link CredentialsProvider} and OSS Endpoint to create
@@ -114,6 +114,6 @@ public OSS build(String endpoint, String accessKeyId, String secretAccessKey, St
      * @param config
      *            client configuration.
      */
-    public OSS build(String endpoint, CredentialsProvider credsProvider, ClientConfiguration config);
+    public OSS build(String endpoint, CredentialsProvider credsProvider, ClientBuilderConfiguration config);
 
 }

src/main/java/com/aliyun/oss/OSSClientBuilder.java

@@ -31,49 +31,46 @@ public class OSSClientBuilder implements OSSBuilder {
     @Override
     public OSS build(String endpoint, String accessKeyId, String secretAccessKey) {
         return new OSSClient(endpoint, getDefaultCredentialProvider(accessKeyId, secretAccessKey),
-                getDefaultClientConfiguration());
+                getClientConfiguration());
     }
 
     @Override
     public OSS build(String endpoint, String accessKeyId, String secretAccessKey, String securityToken) {
         return new OSSClient(endpoint, getDefaultCredentialProvider(accessKeyId, secretAccessKey, securityToken),
-                getDefaultClientConfiguration());
+                getClientConfiguration());
     }
 
     @Override
-    public OSS build(String endpoint, String accessKeyId, String secretAccessKey, ClientConfiguration config) {
-        if (config == null) {
-            config = getDefaultClientConfiguration();
-        }
-        return new OSSClient(endpoint, getDefaultCredentialProvider(accessKeyId, secretAccessKey), config);
+    public OSS build(String endpoint, String accessKeyId, String secretAccessKey, ClientBuilderConfiguration config) {
+        return new OSSClient(endpoint, getDefaultCredentialProvider(accessKeyId, secretAccessKey),
+                getClientConfiguration(config));
     }
 
     @Override
     public OSS build(String endpoint, String accessKeyId, String secretAccessKey, String securityToken,
-            ClientConfiguration config) {
-        if (config == null) {
-            config = getDefaultClientConfiguration();
-        }
+            ClientBuilderConfiguration config) {
         return new OSSClient(endpoint, getDefaultCredentialProvider(accessKeyId, secretAccessKey, securityToken),
-                config);
+                getClientConfiguration(config));
     }
 
     @Override
     public OSS build(String endpoint, CredentialsProvider credsProvider) {
-        return new OSSClient(endpoint, credsProvider, getDefaultClientConfiguration());
+        return new OSSClient(endpoint, credsProvider, getClientConfiguration());
     }
 
     @Override
-    public OSS build(String endpoint, CredentialsProvider credsProvider, ClientConfiguration config) {
-        if (config == null) {
-            config = getDefaultClientConfiguration();
-        }
-        return new OSSClient(endpoint, credsProvider, config);
+    public OSS build(String endpoint, CredentialsProvider credsProvider, ClientBuilderConfiguration config) {
+        return new OSSClient(endpoint, credsProvider, getClientConfiguration(config));
+    }
+
+    private static ClientBuilderConfiguration getClientConfiguration() {
+        return new ClientBuilderConfiguration();
     }
 
-    private static ClientConfiguration getDefaultClientConfiguration() {
-        ClientConfiguration config = new ClientConfiguration();
-        config.setSupportCname(false);
+    private static ClientBuilderConfiguration getClientConfiguration(ClientBuilderConfiguration config) {
+        if (config == null) {
+            config = new ClientBuilderConfiguration();
+        }
         return config;
     }
 

src/samples/MultipartUploadSample.java

@@ -34,7 +34,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-import com.aliyun.oss.ClientConfiguration;
+import com.aliyun.oss.ClientBuilderConfiguration;
 import com.aliyun.oss.ClientException;
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
@@ -73,7 +73,7 @@ public static void main(String[] args) throws IOException {
         /*
          * Constructs a client instance with your account for accessing OSS
          */
-        ClientConfiguration conf = new ClientConfiguration();
+        ClientBuilderConfiguration conf = new ClientBuilderConfiguration();
         conf.setIdleConnectionTime(1000);
         client = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret, conf);
 

src/test/java/com/aliyun/oss/common/comm/OSSClientTest.java

@@ -29,8 +29,7 @@
 
 import org.junit.Ignore;
 import org.junit.Test;
-
-import com.aliyun.oss.ClientConfiguration;
+import com.aliyun.oss.ClientBuilderConfiguration;
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
 import com.aliyun.oss.model.GeneratePresignedUrlRequest;
@@ -78,7 +77,7 @@ public void testProxyHost() {
         String accessKeyId = "accessKeyId";
         String accessKeySecret = "accessKeySecret";
 
-        ClientConfiguration conf = new ClientConfiguration();
+        ClientBuilderConfiguration conf = new ClientBuilderConfiguration();
         conf.setProxyHost(endpoint);
         conf.setProxyPort(80);
         conf.setProxyUsername("user");