Skip to content

Commit 379a276

Browse files
baiyubin2020baiyubin2020
authored
Merge pull request aliyun#26 from aliyun/fix_img_process
Fix img process
2 parents a7ec681 + 3813fa4 commit 379a276

File tree

10 files changed

+250
-191
lines changed

10 files changed

+250
-191
lines changed

‎src/main/java/com/aliyun/oss/OSS.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import com.aliyun.oss.model.BucketInfo;
3737
import com.aliyun.oss.model.BucketList;
3838
import com.aliyun.oss.model.BucketLoggingResult;
39+
import com.aliyun.oss.model.BucketProcess;
3940
import com.aliyun.oss.model.BucketReferer;
4041
import com.aliyun.oss.model.BucketReplicationProgress;
4142
import com.aliyun.oss.model.BucketWebsiteResult;
@@ -60,7 +61,6 @@
6061
import com.aliyun.oss.model.GenericRequest;
6162
import com.aliyun.oss.model.GetBucketImageResult;
6263
import com.aliyun.oss.model.GetBucketReplicationProgressRequest;
63-
import com.aliyun.oss.model.ImageProcessConf;
6464
import com.aliyun.oss.model.ListLiveChannelsRequest;
6565
import com.aliyun.oss.model.LiveChannel;
6666
import com.aliyun.oss.model.LiveChannelGenericRequest;
@@ -69,7 +69,6 @@
6969
import com.aliyun.oss.model.LiveChannelStat;
7070
import com.aliyun.oss.model.LiveChannelStatus;
7171
import com.aliyun.oss.model.LiveRecord;
72-
import com.aliyun.oss.model.PutImageProcessConfRequest;
7372
import com.aliyun.oss.model.ReplicationRule;
7473
import com.aliyun.oss.model.GetImageStyleResult;
7574
import com.aliyun.oss.model.GetObjectRequest;
@@ -96,6 +95,7 @@
9695
import com.aliyun.oss.model.SetBucketAclRequest;
9796
import com.aliyun.oss.model.SetBucketCORSRequest;
9897
import com.aliyun.oss.model.AddBucketCnameRequest;
98+
import com.aliyun.oss.model.SetBucketProcessRequest;
9999
import com.aliyun.oss.model.SetBucketRefererRequest;
100100
import com.aliyun.oss.model.AddBucketReplicationRequest;
101101
import com.aliyun.oss.model.SetBucketStorageCapacityRequest;
@@ -890,11 +890,11 @@ public List<Style> listImageStyle(String bucketName, GenericRequest genericReque
890890

891891
/**
892892
* 创建图片处理属性
893-
* @param putImageProcessConfRequest 请求信息。
893+
* @param setBucketProcessRequest 请求信息。
894894
* @throws OSSException OSS Server异常信息。
895895
* @throws ClientException OSS Client异常信息。
896896
*/
897-
public void putBucketImageProcessConf(PutImageProcessConfRequest putImageProcessConfRequest)
897+
public void setBucketProcess(SetBucketProcessRequest setBucketProcessRequest)
898898
throws OSSException, ClientException;
899899

900900
/**
@@ -904,7 +904,7 @@ public void putBucketImageProcessConf(PutImageProcessConfRequest putImageProcess
904904
* @throws OSSException OSS Server异常信息。
905905
* @throws ClientException OSS Client异常信息。
906906
*/
907-
public ImageProcessConf getBucketImageProcessConf(String bucketName)
907+
public BucketProcess getBucketProcess(String bucketName)
908908
throws OSSException, ClientException;
909909

910910
/**
@@ -914,7 +914,7 @@ public ImageProcessConf getBucketImageProcessConf(String bucketName)
914914
* @throws OSSException OSS Server异常信息。
915915
* @throws ClientException OSS Client异常信息。
916916
*/
917-
public ImageProcessConf getBucketImageProcessConf(GenericRequest genericRequest)
917+
public BucketProcess getBucketProcess(GenericRequest genericRequest)
918918
throws OSSException, ClientException;
919919

920920
/**

‎src/main/java/com/aliyun/oss/OSSClient.java

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,15 @@
7474
import com.aliyun.oss.internal.SignUtils;
7575
import com.aliyun.oss.model.AbortMultipartUploadRequest;
7676
import com.aliyun.oss.model.AccessControlList;
77+
import com.aliyun.oss.model.AddBucketCnameRequest;
78+
import com.aliyun.oss.model.AddBucketReplicationRequest;
7779
import com.aliyun.oss.model.AppendObjectRequest;
7880
import com.aliyun.oss.model.AppendObjectResult;
7981
import com.aliyun.oss.model.Bucket;
8082
import com.aliyun.oss.model.BucketInfo;
8183
import com.aliyun.oss.model.BucketList;
8284
import com.aliyun.oss.model.BucketLoggingResult;
85+
import com.aliyun.oss.model.BucketProcess;
8386
import com.aliyun.oss.model.BucketReferer;
8487
import com.aliyun.oss.model.BucketReplicationProgress;
8588
import com.aliyun.oss.model.BucketWebsiteResult;
@@ -104,27 +107,24 @@
104107
import com.aliyun.oss.model.GenericRequest;
105108
import com.aliyun.oss.model.GetBucketImageResult;
106109
import com.aliyun.oss.model.GetBucketReplicationProgressRequest;
107-
import com.aliyun.oss.model.ImageProcessConf;
108-
import com.aliyun.oss.model.ListLiveChannelsRequest;
109-
import com.aliyun.oss.model.LiveChannel;
110-
import com.aliyun.oss.model.LiveChannelGenericRequest;
111-
import com.aliyun.oss.model.LiveChannelInfo;
112-
import com.aliyun.oss.model.LiveChannelListing;
113-
import com.aliyun.oss.model.LiveChannelStat;
114-
import com.aliyun.oss.model.LiveChannelStatus;
115-
import com.aliyun.oss.model.LiveRecord;
116-
import com.aliyun.oss.model.PutImageProcessConfRequest;
117-
import com.aliyun.oss.model.ReplicationRule;
118110
import com.aliyun.oss.model.GetImageStyleResult;
119111
import com.aliyun.oss.model.GetObjectRequest;
120112
import com.aliyun.oss.model.HeadObjectRequest;
121113
import com.aliyun.oss.model.InitiateMultipartUploadRequest;
122114
import com.aliyun.oss.model.InitiateMultipartUploadResult;
123115
import com.aliyun.oss.model.LifecycleRule;
124116
import com.aliyun.oss.model.ListBucketsRequest;
117+
import com.aliyun.oss.model.ListLiveChannelsRequest;
125118
import com.aliyun.oss.model.ListMultipartUploadsRequest;
126119
import com.aliyun.oss.model.ListObjectsRequest;
127120
import com.aliyun.oss.model.ListPartsRequest;
121+
import com.aliyun.oss.model.LiveChannel;
122+
import com.aliyun.oss.model.LiveChannelGenericRequest;
123+
import com.aliyun.oss.model.LiveChannelInfo;
124+
import com.aliyun.oss.model.LiveChannelListing;
125+
import com.aliyun.oss.model.LiveChannelStat;
126+
import com.aliyun.oss.model.LiveChannelStatus;
127+
import com.aliyun.oss.model.LiveRecord;
128128
import com.aliyun.oss.model.MultipartUploadListing;
129129
import com.aliyun.oss.model.OSSObject;
130130
import com.aliyun.oss.model.ObjectAcl;
@@ -137,24 +137,24 @@
137137
import com.aliyun.oss.model.PutImageStyleRequest;
138138
import com.aliyun.oss.model.PutObjectRequest;
139139
import com.aliyun.oss.model.PutObjectResult;
140+
import com.aliyun.oss.model.ReplicationRule;
140141
import com.aliyun.oss.model.SetBucketAclRequest;
141142
import com.aliyun.oss.model.SetBucketCORSRequest;
142-
import com.aliyun.oss.model.SetLiveChannelRequest;
143-
import com.aliyun.oss.model.UploadFileRequest;
144-
import com.aliyun.oss.model.UploadFileResult;
145143
import com.aliyun.oss.model.SetBucketCORSRequest.CORSRule;
146-
import com.aliyun.oss.model.AddBucketCnameRequest;
147144
import com.aliyun.oss.model.SetBucketLifecycleRequest;
148145
import com.aliyun.oss.model.SetBucketLoggingRequest;
146+
import com.aliyun.oss.model.SetBucketProcessRequest;
149147
import com.aliyun.oss.model.SetBucketRefererRequest;
150-
import com.aliyun.oss.model.AddBucketReplicationRequest;
151148
import com.aliyun.oss.model.SetBucketStorageCapacityRequest;
152149
import com.aliyun.oss.model.SetBucketTaggingRequest;
153150
import com.aliyun.oss.model.SetBucketWebsiteRequest;
151+
import com.aliyun.oss.model.SetLiveChannelRequest;
154152
import com.aliyun.oss.model.SetObjectAclRequest;
155153
import com.aliyun.oss.model.SimplifiedObjectMeta;
156-
import com.aliyun.oss.model.TagSet;
157154
import com.aliyun.oss.model.Style;
155+
import com.aliyun.oss.model.TagSet;
156+
import com.aliyun.oss.model.UploadFileRequest;
157+
import com.aliyun.oss.model.UploadFileResult;
158158
import com.aliyun.oss.model.UploadPartCopyRequest;
159159
import com.aliyun.oss.model.UploadPartCopyResult;
160160
import com.aliyun.oss.model.UploadPartRequest;
@@ -1018,21 +1018,21 @@ public List<Style> listImageStyle(String bucketName, GenericRequest genericReque
10181018
}
10191019

10201020
@Override
1021-
public void putBucketImageProcessConf(PutImageProcessConfRequest putImageProcessConfRequest)
1021+
public void setBucketProcess(SetBucketProcessRequest setBucketProcessRequest)
10221022
throws OSSException, ClientException {
1023-
bucketOperation.putBucketImageProcessConf(putImageProcessConfRequest);
1023+
bucketOperation.setBucketProcess(setBucketProcessRequest);
10241024
}
10251025

10261026
@Override
1027-
public ImageProcessConf getBucketImageProcessConf(String bucketName)
1027+
public BucketProcess getBucketProcess(String bucketName)
10281028
throws OSSException, ClientException {
1029-
return this.getBucketImageProcessConf(new GenericRequest(bucketName));
1029+
return this.getBucketProcess(new GenericRequest(bucketName));
10301030
}
10311031

10321032
@Override
1033-
public ImageProcessConf getBucketImageProcessConf(GenericRequest genericRequest)
1033+
public BucketProcess getBucketProcess(GenericRequest genericRequest)
10341034
throws OSSException, ClientException {
1035-
return bucketOperation.getBucketImageProcessConf(genericRequest);
1035+
return bucketOperation.getBucketProcess(genericRequest);
10361036
}
10371037

10381038
@Override

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import com.aliyun.oss.model.CreateLiveChannelRequest;
3737
import com.aliyun.oss.model.DeleteBucketCnameRequest;
3838
import com.aliyun.oss.model.DeleteObjectsRequest;
39-
import com.aliyun.oss.model.ImageProcessConf;
39+
import com.aliyun.oss.model.ImageProcess;
4040
import com.aliyun.oss.model.LifecycleRule;
4141
import com.aliyun.oss.model.LifecycleRule.AbortMultipartUpload;
4242
import com.aliyun.oss.model.LifecycleRule.RuleStatus;
@@ -124,10 +124,10 @@ public FixedLengthInputStream marshall(PutImageStyleRequest request) {
124124
}
125125
}
126126

127-
public static final class BucketImageProcessConfMarshaller implements RequestMarshaller<ImageProcessConf> {
127+
public static final class BucketImageProcessConfMarshaller implements RequestMarshaller<ImageProcess> {
128128

129129
@Override
130-
public FixedLengthInputStream marshall(ImageProcessConf imageProcessConf) {
130+
public FixedLengthInputStream marshall(ImageProcess imageProcessConf) {
131131
StringBuffer xmlBody = new StringBuffer();
132132
xmlBody.append("<BucketProcessConfiguration>");
133133
xmlBody.append("<CompliedHost>" + imageProcessConf.getCompliedHost() + "</CompliedHost>");

‎src/main/java/com/aliyun/oss/internal/OSSBucketOperation.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
import com.aliyun.oss.model.BucketInfo;
9393
import com.aliyun.oss.model.BucketList;
9494
import com.aliyun.oss.model.BucketLoggingResult;
95+
import com.aliyun.oss.model.BucketProcess;
9596
import com.aliyun.oss.model.BucketReferer;
9697
import com.aliyun.oss.model.BucketReplicationProgress;
9798
import com.aliyun.oss.model.BucketWebsiteResult;
@@ -103,8 +104,7 @@
103104
import com.aliyun.oss.model.GenericRequest;
104105
import com.aliyun.oss.model.GetBucketImageResult;
105106
import com.aliyun.oss.model.GetBucketReplicationProgressRequest;
106-
import com.aliyun.oss.model.ImageProcessConf;
107-
import com.aliyun.oss.model.PutImageProcessConfRequest;
107+
import com.aliyun.oss.model.ImageProcess;
108108
import com.aliyun.oss.model.ReplicationRule;
109109
import com.aliyun.oss.model.GetImageStyleResult;
110110
import com.aliyun.oss.model.LifecycleRule;
@@ -117,6 +117,7 @@
117117
import com.aliyun.oss.model.AddBucketCnameRequest;
118118
import com.aliyun.oss.model.SetBucketLifecycleRequest;
119119
import com.aliyun.oss.model.SetBucketLoggingRequest;
120+
import com.aliyun.oss.model.SetBucketProcessRequest;
120121
import com.aliyun.oss.model.SetBucketRefererRequest;
121122
import com.aliyun.oss.model.AddBucketReplicationRequest;
122123
import com.aliyun.oss.model.SetBucketStorageCapacityRequest;
@@ -601,15 +602,15 @@ public List<Style> listImageStyle(String bucketName, GenericRequest genericReque
601602
return doOperation(request, listImageStyleResponseParser, bucketName, null, true);
602603
}
603604

604-
public void putBucketImageProcessConf(PutImageProcessConfRequest putImageProcessConfRequest)
605+
public void setBucketProcess(SetBucketProcessRequest setBucketProcessRequest)
605606
throws OSSException, ClientException {
606607

607-
assertParameterNotNull(putImageProcessConfRequest, "putImageProcessConfRequest");
608+
assertParameterNotNull(setBucketProcessRequest, "setBucketProcessRequest");
608609

609-
ImageProcessConf imageProcessConf = putImageProcessConfRequest.getImageProcessConf();
610+
ImageProcess imageProcessConf = setBucketProcessRequest.getImageProcess();
610611
assertParameterNotNull(imageProcessConf, "imageProcessConf");
611612

612-
String bucketName = putImageProcessConfRequest.getBucketName();
613+
String bucketName = setBucketProcessRequest.getBucketName();
613614
assertParameterNotNull(bucketName, "bucketName");
614615
ensureBucketNameValid(bucketName);
615616

@@ -622,13 +623,13 @@ public void putBucketImageProcessConf(PutImageProcessConfRequest putImageProcess
622623
.setBucket(bucketName)
623624
.setParameters(params)
624625
.setInputStreamWithLength(bucketImageProcessConfMarshaller.marshall(imageProcessConf))
625-
.setOriginalRequest(putImageProcessConfRequest)
626+
.setOriginalRequest(setBucketProcessRequest)
626627
.build();
627628

628629
doOperation(request, emptyResponseParser, bucketName, null);
629630
}
630631

631-
public ImageProcessConf getBucketImageProcessConf(GenericRequest genericRequest)
632+
public BucketProcess getBucketProcess(GenericRequest genericRequest)
632633
throws OSSException, ClientException {
633634

634635
assertParameterNotNull(genericRequest, "genericRequest");

‎src/main/java/com/aliyun/oss/internal/ResponseParsers.java

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import static com.aliyun.oss.common.utils.CodingUtils.isNullOrEmpty;
2323
import static com.aliyun.oss.internal.OSSUtils.safeCloseResponse;
2424
import static com.aliyun.oss.internal.OSSUtils.trimQuotes;
25+
2526
import java.io.InputStream;
2627
import java.math.BigInteger;
2728
import java.text.ParseException;
@@ -46,6 +47,7 @@
4647
import com.aliyun.oss.model.BucketInfo;
4748
import com.aliyun.oss.model.BucketList;
4849
import com.aliyun.oss.model.BucketLoggingResult;
50+
import com.aliyun.oss.model.BucketProcess;
4951
import com.aliyun.oss.model.BucketReferer;
5052
import com.aliyun.oss.model.BucketReplicationProgress;
5153
import com.aliyun.oss.model.BucketWebsiteResult;
@@ -57,7 +59,7 @@
5759
import com.aliyun.oss.model.DeleteObjectsResult;
5860
import com.aliyun.oss.model.GenericResult;
5961
import com.aliyun.oss.model.GetBucketImageResult;
60-
import com.aliyun.oss.model.ImageProcessConf;
62+
import com.aliyun.oss.model.ImageProcess;
6163
import com.aliyun.oss.model.LiveChannel;
6264
import com.aliyun.oss.model.LiveChannelInfo;
6365
import com.aliyun.oss.model.LiveChannelListing;
@@ -261,10 +263,10 @@ public GetImageStyleResult parse(ResponseMessage response)
261263
}
262264
}
263265

264-
public static final class GetBucketImageProcessConfResponseParser implements ResponseParser<ImageProcessConf> {
266+
public static final class GetBucketImageProcessConfResponseParser implements ResponseParser<BucketProcess> {
265267

266268
@Override
267-
public ImageProcessConf parse(ResponseMessage response)
269+
public BucketProcess parse(ResponseMessage response)
268270
throws ResponseParseException {
269271
try {
270272
return parseGetBucketImageProcessConf(response.getContent());
@@ -1403,9 +1405,9 @@ public static GetImageStyleResult parseImageStyle(InputStream responseBody)
14031405

14041406

14051407
/**
1406-
* Unmarshall get bucket image process conf response body to image process conf.
1408+
* Unmarshall get bucket process response body to bucket process.
14071409
*/
1408-
public static ImageProcessConf parseGetBucketImageProcessConf(InputStream responseBody)
1410+
public static BucketProcess parseGetBucketImageProcessConf(InputStream responseBody)
14091411
throws ResponseParseException {
14101412

14111413
try {
@@ -1419,8 +1421,13 @@ public static ImageProcessConf parseGetBucketImageProcessConf(InputStream respon
14191421
String sourceFileProtectSuffix = root.getChildText("SourceFileProtectSuffix");
14201422
String styleDelimiters = root.getChildText("StyleDelimiters");
14211423

1422-
return new ImageProcessConf(compliedHost, sourceFileProtect, sourceFileProtectSuffix,
1424+
ImageProcess imageProcess = new ImageProcess(compliedHost, sourceFileProtect, sourceFileProtectSuffix,
14231425
styleDelimiters);
1426+
if (root.getChildText("Version") != null) {
1427+
imageProcess.setVersion(Integer.parseInt(root.getChildText("Version")));
1428+
}
1429+
1430+
return new BucketProcess(imageProcess);
14241431
} catch (Exception e) {
14251432
throw new ResponseParseException(e.getMessage(), e);
14261433
}

‎src/main/java/com/aliyun/oss/model/BucketProcess.java

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
package com.aliyun.oss.model;
21+
22+
public class BucketProcess {
23+
24+
public BucketProcess(ImageProcess imageProcess) {
25+
this.imageProcess = imageProcess;
26+
}
27+
28+
public ImageProcess getImageProcess() {
29+
return imageProcess;
30+
}
31+
32+
public void setImageProcess(ImageProcess imageProcess) {
33+
this.imageProcess = imageProcess;
34+
}
35+
36+
private ImageProcess imageProcess;
37+
}

‎src/main/java/com/aliyun/oss/model/ImageProcessConf.java renamed to ‎src/main/java/com/aliyun/oss/model/ImageProcess.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
package com.aliyun.oss.model;
2121

22-
public class ImageProcessConf {
22+
public class ImageProcess {
2323

24-
public ImageProcessConf(String compliedHost, boolean sourceFileProtect,
24+
public ImageProcess(String compliedHost, boolean sourceFileProtect,
2525
String sourceFileProtectSuffix, String styleDelimiters) {
2626
this.compliedHost = compliedHost;
2727
this.sourceFileProtect = sourceFileProtect;
@@ -61,8 +61,17 @@ public void setStyleDelimiters(String styleDelimiters) {
6161
this.styleDelimiters = styleDelimiters;
6262
}
6363

64+
public Integer getVersion() {
65+
return version;
66+
}
67+
68+
public void setVersion(Integer version) {
69+
this.version = version;
70+
}
71+
6472
private String compliedHost;
6573
private boolean sourceFileProtect;
6674
private String sourceFileProtectSuffix;
6775
private String styleDelimiters;
76+
private Integer version;
6877
}

0 commit comments

Comments
 (0)