Merge pull request #61 from aliyun/fix_gen_url

fix gen url

Author: baiyubin2020

src/main/java/com/aliyun/oss/common/parser/RequestMarshallers.java

@@ -141,8 +141,8 @@ public FixedLengthInputStream marshall(ImageProcess imageProcessConf) {
             xmlBody.append("<SourceFileProtectSuffix>" + imageProcessConf.getSourceFileProtectSuffix() 
                     + "</SourceFileProtectSuffix>");
             xmlBody.append("<StyleDelimiters>" + imageProcessConf.getStyleDelimiters() + "</StyleDelimiters>");
-            if (imageProcessConf.isDomainSupportAt() != null && 
-            		imageProcessConf.isDomainSupportAt().booleanValue()) {
+            if (imageProcessConf.isSupportAtStyle() != null && 
+            		imageProcessConf.isSupportAtStyle().booleanValue()) {
                 xmlBody.append("<OssDomainSupportAtProcess>Enabled</OssDomainSupportAtProcess>");
             } else {
                 xmlBody.append("<OssDomainSupportAtProcess>Disabled</OssDomainSupportAtProcess>");

src/main/java/com/aliyun/oss/model/ImageProcess.java

@@ -27,17 +27,17 @@ public ImageProcess(String compliedHost, Boolean sourceFileProtect,
         this.sourceFileProtect = sourceFileProtect;
         this.sourceFileProtectSuffix = sourceFileProtectSuffix;
         this.styleDelimiters = styleDelimiters;
-        this.domainSupportAt = null;
+        this.supportAtStyle = null;
     }
 
     public ImageProcess(String compliedHost, Boolean sourceFileProtect,
             String sourceFileProtectSuffix, String styleDelimiters, 
-            Boolean domainSupportAt) {
+            Boolean supportAtStyle) {
         this.compliedHost = compliedHost;
         this.sourceFileProtect = sourceFileProtect;
         this.sourceFileProtectSuffix = sourceFileProtectSuffix;
         this.styleDelimiters = styleDelimiters;
-        this.domainSupportAt = domainSupportAt;
+        this.supportAtStyle = supportAtStyle;
     }
 
     public String getCompliedHost() {
@@ -80,12 +80,12 @@ public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public Boolean isDomainSupportAt() {
-		return domainSupportAt;
+	public Boolean isSupportAtStyle() {
+		return supportAtStyle;
 	}
 
-	public void setDomainSupportAt(Boolean domainSupportAt) {
-		this.domainSupportAt = domainSupportAt;
+	public void setSupportAtStyle(Boolean supportAtStyle) {
+		this.supportAtStyle = supportAtStyle;
 	}
 
 	// Img表示设置的样式分隔符，只有Img能用；Both表示oss也能用Img的样式分隔符
@@ -99,6 +99,6 @@ public void setDomainSupportAt(Boolean domainSupportAt) {
     // 图片服务的版本目前是2，只能读取不能设置
     private Integer version;
     // 用户是否能够通过OSS域名使用老版图片处理接口，@格式。默认Disabled
-    private Boolean domainSupportAt;
+    private Boolean supportAtStyle;
 
 }

src/test/java/com/aliyun/oss/integrationtests/BucketProcesTest.java

@@ -42,7 +42,7 @@ public void testBucketImageProcessConf() {
             Assert.assertEquals(bucketProcess.getImageProcess().getSourceFileProtectSuffix(), "");
             Assert.assertEquals(bucketProcess.getImageProcess().getStyleDelimiters(), "");
             Assert.assertEquals(bucketProcess.getImageProcess().getVersion().intValue(), 2);
-            Assert.assertEquals(bucketProcess.getImageProcess().isDomainSupportAt(), null);
+            Assert.assertEquals(bucketProcess.getImageProcess().isSupportAtStyle(), null);
 
             // put 1
             ImageProcess imageProcess = new ImageProcess("Img", true, "jpg,png", "/,-");
@@ -56,7 +56,7 @@ public void testBucketImageProcessConf() {
             Assert.assertEquals(bucketProcess.getImageProcess().getSourceFileProtectSuffix(), "jpg,png");
             Assert.assertEquals(bucketProcess.getImageProcess().getStyleDelimiters(), "-,/");
             Assert.assertEquals(bucketProcess.getImageProcess().getVersion().intValue(), 2);
-            Assert.assertEquals(bucketProcess.getImageProcess().isDomainSupportAt(), null);
+            Assert.assertEquals(bucketProcess.getImageProcess().isSupportAtStyle(), null);
 
             // put 2
             imageProcess = new ImageProcess("Both", false, "gif", "-");
@@ -70,7 +70,7 @@ public void testBucketImageProcessConf() {
             Assert.assertEquals(bucketProcess.getImageProcess().getSourceFileProtectSuffix(), "");
             Assert.assertEquals(bucketProcess.getImageProcess().getStyleDelimiters(), "-");
             Assert.assertEquals(bucketProcess.getImageProcess().getVersion().intValue(), 2);
-            Assert.assertEquals(bucketProcess.getImageProcess().isDomainSupportAt(), null);
+            Assert.assertEquals(bucketProcess.getImageProcess().isSupportAtStyle(), null);
 
             // put 3
             imageProcess = new ImageProcess("Img", true, "*", "/", true);
@@ -84,7 +84,7 @@ public void testBucketImageProcessConf() {
             Assert.assertEquals(bucketProcess.getImageProcess().getSourceFileProtectSuffix(), "*");
             Assert.assertEquals(bucketProcess.getImageProcess().getStyleDelimiters(), "/");
             Assert.assertEquals(bucketProcess.getImageProcess().getVersion().intValue(), 2);
-            Assert.assertEquals(bucketProcess.getImageProcess().isDomainSupportAt(), null);
+            Assert.assertEquals(bucketProcess.getImageProcess().isSupportAtStyle(), null);
 
         } catch (Exception e) {
             Assert.fail(e.getMessage());