Skip to content

Commit 1f969dd

Browse files
Fix java doc errors and warning.
Co-authored-by: zxl01071856 <[email protected]>
1 parent 35bfac9 commit 1f969dd

File tree

64 files changed

+757
-156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+757
-156
lines changed

pom.xml

-4
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,6 @@
182182
<goals>
183183
<goal>jar</goal>
184184
</goals>
185-
<configuration>
186-
<!-- <additionalparam>-Xdoclint:none</additionalparam> -->
187-
<additionalJOption>-Xdoclint:none</additionalJOption>
188-
</configuration>
189185
</execution>
190186
</executions>
191187
</plugin>

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

+12-10
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,6 @@ public interface OSS {
552552
* <li>{@link BucketVersioningConfiguration#ENABLED}</li>
553553
* <li>{@link BucketVersioningConfiguration#SUSPENDED}</li>
554554
* </ul>
555-
* </p>
556555
* <p>
557556
* By default, new buckets are in the
558557
* {@link BucketVersioningConfiguration#OFF off} state. Once versioning is
@@ -604,7 +603,6 @@ public interface OSS {
604603
* <li>{@link BucketVersioningConfiguration#ENABLED}</li>
605604
* <li>{@link BucketVersioningConfiguration#SUSPENDED}</li>
606605
* </ul>
607-
* </p>
608606
* <p>
609607
* By default, new buckets are in the
610608
* {@link BucketVersioningConfiguration#OFF off} state. Once versioning is
@@ -657,7 +655,6 @@ public BucketVersioningConfiguration getBucketVersioning(GenericRequest genericR
657655
* <li>{@link BucketVersioningConfiguration#ENABLED}
658656
* <li>{@link BucketVersioningConfiguration#SUSPENDED}
659657
* </ul>
660-
* </p>
661658
* <p>
662659
* By default, new buckets are in the
663660
* {@link BucketVersioningConfiguration#OFF off} state. Once versioning is
@@ -975,11 +972,10 @@ public VersionListing listVersions(String bucketName, String prefix)
975972
* If calling <code>listVersions</code> with
976973
* a <code>prefix</code> value of "foo/" and a <code>delimiter</code> value of "/"
977974
* on this bucket, a <code>VersionListing</code> is returned that contains:
978-
* <ul>
979-
* <li>all the versions for one key ("foo/boo")</li>
980-
* <li>one entry in the common prefixes list ("foo/bar/")</li>
981-
* </ul>
982-
* </p>
975+
* <ul>
976+
* <li>all the versions for one key ("foo/boo")</li>
977+
* <li>one entry in the common prefixes list ("foo/bar/")</li>
978+
* </ul>
983979
* <p>
984980
* To see deeper into the virtual hierarchy, make
985981
* another call to <code>listVersions</code> setting the prefix parameter to any
@@ -1111,7 +1107,6 @@ public VersionListing listVersions(String bucketName, String prefix,
11111107
* <li>all the versions for one key ("foo/boo")</li>
11121108
* <li>one entry in the common prefixes list ("foo/bar/")</li>
11131109
* </ul>
1114-
* </p>
11151110
* <p>
11161111
* To see deeper into the virtual hierarchy, make
11171112
* another call to <code>listVersions</code> setting the prefix parameter to any
@@ -1122,7 +1117,7 @@ public VersionListing listVersions(String bucketName, String prefix,
11221117
* For more information about enabling versioning for a bucket, see
11231118
* {@link #setBucketVersioning(SetBucketVersioningRequest)}.
11241119
* </p>
1125-
*
1120+
*
11261121
* @param listVersionsRequest
11271122
* The request object containing all options for listing the
11281123
* versions in a specified bucket.
@@ -4247,6 +4242,7 @@ public String generateRtmpUri(GenerateRtmpUriRequest generatePushflowUrlRequest)
42474242
*
42484243
* @param bucketName
42494244
* The bucket name.
4245+
* @return A {@link GetBucketRequestPaymentResult} instance.
42504246
* @throws OSSException
42514247
* If any errors are encountered in the client while making the
42524248
* request or handling the response.
@@ -4260,6 +4256,7 @@ public String generateRtmpUri(GenerateRtmpUriRequest generatePushflowUrlRequest)
42604256
*
42614257
* @param genericRequest
42624258
* {@link GenericRequest} instance that has the bucket name.
4259+
* @return A {@link GetBucketRequestPaymentResult} instance.
42634260
* @throws OSSException
42644261
* If any errors are encountered in the client while making the
42654262
* request or handling the response.
@@ -4505,6 +4502,8 @@ public GetAsyncFetchTaskResult getAsyncFetchTask(GetAsyncFetchTaskRequest getAsy
45054502
/**
45064503
* Returns all {@link VpcPolicy} instances of the Bucket.
45074504
*
4505+
* @param genericRequest
4506+
* A {@link GenericRequest} instance that include the bucket name.
45084507
* @return A list of {@link VpcPolicy} instances. If there's no list, the
45094508
* list will be empty (instead of null).
45104509
* @throws OSSException
@@ -4915,6 +4914,7 @@ public DeleteDirectoryResult deleteDirectory(String bucketName, String dirName,
49154914
*
49164915
* @param bucketName
49174916
* The bucket name.
4917+
* @return A {@link GetBucketResourceGroupResult} instance.
49184918
* @throws OSSException
49194919
* If any errors are encountered in the client while making the
49204920
* request or handling the response.
@@ -5021,6 +5021,7 @@ public UdfApplicationLog getUdfApplicationLog(GetUdfApplicationLogRequest getUdf
50215021
* @param bucketName
50225022
* The bucket name.
50235023
* @param status
5024+
* The bucket access monitor status.
50245025
*
50255026
* @return A {@link VoidResult} instance wrapped void return and
50265027
* contains some basic response options, such as requestId.
@@ -5077,6 +5078,7 @@ public UdfApplicationLog getUdfApplicationLog(GetUdfApplicationLogRequest getUdf
50775078
/**
50785079
* Query files that meet the specified criteria from the OSS Server
50795080
* @param doMetaQueryRequest
5081+
* The {@link DoMetaQueryRequest} instance
50805082
* @return A {@link DoMetaQueryResult} instance.
50815083
* @throws OSSException
50825084
* If any errors are encountered in the client while making the

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

+14-7
Original file line numberDiff line numberDiff line change
@@ -77,22 +77,32 @@ public class OSSClient implements OSS {
7777
private OSSDownloadOperation downloadOperation;
7878
private LiveChannelOperation liveChannelOperation;
7979

80-
/**Gets the inner multipartOperation, used for subclass to do implement opreation.*/
80+
/**Gets the inner multipartOperation, used for subclass to do implement opreation.
81+
* @return the {@link OSSMultipartOperation} instance.
82+
*/
8183
public OSSMultipartOperation getMultipartOperation() {
8284
return multipartOperation;
8385
}
8486

85-
/**Gets the inner objectOperation, used for subclass to do implement opreation.*/
87+
/**Gets the inner objectOperation, used for subclass to do implement opreation.
88+
* @return the {@link OSSObjectOperation} instance.
89+
*/
8690
public OSSObjectOperation getObjectOperation() {
8791
return objectOperation;
8892
}
8993

90-
/**Sets the inner downloadOperation.*/
94+
/**Sets the inner downloadOperation.
95+
* @param downloadOperation
96+
* the {@link OSSDownloadOperation} instance.
97+
*/
9198
public void setDownloadOperation(OSSDownloadOperation downloadOperation) {
9299
this.downloadOperation = downloadOperation;
93100
}
94101

95-
/**Sets the inner uploadOperation.*/
102+
/**Sets the inner uploadOperation.
103+
* @param uploadOperation
104+
* the {@link OSSUploadOperation} instance.
105+
*/
96106
public void setUploadOperation(OSSUploadOperation uploadOperation) {
97107
this.uploadOperation = uploadOperation;
98108
}
@@ -515,9 +525,6 @@ public boolean doesBucketExist(GenericRequest genericRequest) throws OSSExceptio
515525
return bucketOperation.doesBucketExists(genericRequest);
516526
}
517527

518-
/**
519-
* Deprecated. Please use {@link OSSClient#doesBucketExist(String)} instead.
520-
*/
521528
@Deprecated
522529
public boolean isBucketExist(String bucketName) throws OSSException, ClientException {
523530
return this.doesBucketExist(bucketName);

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

-4
Original file line numberDiff line numberDiff line change
@@ -223,10 +223,6 @@ public UploadPartCopyResult uploadPartCopy(UploadPartCopyRequest request) throws
223223

224224
/**
225225
* Note: This method is disabled in encryption client.
226-
*
227-
* @deprecated please use normal oss client method
228-
* {@link OSSClient}#putObject(URL signedUrl, InputStream requestContent, long contentLength,
229-
* Map<String, String> requestHeaders, boolean useChunkEncoding).
230226
*/
231227
@Override
232228
@Deprecated

src/main/java/com/aliyun/oss/common/comm/HttpDeleteWithBody.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ public HttpDeleteWithBody(final URI uri) {
3535
setURI(uri);
3636
}
3737

38-
/**
39-
* @throws IllegalArgumentException if the uri is invalid.
40-
*/
38+
// throws IllegalArgumentException if the uri is invalid.
4139
public HttpDeleteWithBody(final String uri) {
4240
super();
4341
setURI(URI.create(uri));

src/main/java/com/aliyun/oss/common/utils/HttpUtil.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ public class HttpUtil {
3737
private static final String[] ENCODED_CHARACTERS_WITHOUT_SLASHES = new String[]{"+", "*", "%7E"};
3838
private static final String[] ENCODED_CHARACTERS_WITHOUT_SLASHES_REPLACEMENTS = new String[]{"%20", "%2A", "~"};
3939

40-
/**
41-
* Encode a URL segment with special chars replaced.
42-
*/
40+
// Encode a URL segment with special chars replaced.
4341
public static String urlEncode(String value, String encoding) {
4442
if (value == null) {
4543
return "";
@@ -80,9 +78,7 @@ public static String urlEncode(String value, boolean ignoreSlashes) {
8078
}
8179
}
8280

83-
/**
84-
* Encode request parameters to URL segment.
85-
*/
81+
// Encode request parameters to URL segment.
8682
public static String paramToQueryString(Map<String, String> params, String charset) {
8783

8884
if (params == null || params.isEmpty()) {

src/main/java/com/aliyun/oss/crypto/ContentCryptoMaterialRW.java

+21
Original file line numberDiff line numberDiff line change
@@ -30,48 +30,69 @@
3030
public class ContentCryptoMaterialRW extends ContentCryptoMaterial {
3131
/**
3232
* Sets the content crypto algorithm to the specified algorithm.
33+
*
34+
* @param cententCryptoAlgorithm
35+
* crypto algorithm.
3336
*/
3437
public void setContentCryptoAlgorithm(String cententCryptoAlgorithm) {
3538
this.contentCryptoAlgorithm = cententCryptoAlgorithm;
3639
}
3740

3841
/**
3942
* Sets the content encryption key to the specified key.
43+
*
44+
* @param cek
45+
* secret key.
4046
*/
4147
public void setCEK(SecretKey cek) {
4248
this.cek = cek;
4349
}
4450

4551
/**
4652
* Sets the content crypto cipher start counter to the specified counter.
53+
*
54+
* @param iv
55+
* initialize vector.
4756
*/
4857
public void setIV(byte[] iv) {
4958
this.iv = iv;
5059
}
5160

5261
/**
5362
* Sets the encrypted content encryption key to the specified array.
63+
*
64+
* @param encryptedCEK
65+
* encrypted secret key.
5466
*/
5567
public void setEncryptedCEK(byte[] encryptedCEK) {
5668
this.encryptedCEK = encryptedCEK.clone();
5769
}
5870

5971
/**
6072
* Sets the encrypted content crypto cipher start counter to the specified array.
73+
*
74+
* @param encryptedIV
75+
* encrypted initialize vector.
6176
*/
6277
public void setEncryptedIV(byte[] encryptedIV) {
6378
this.encryptedIV = encryptedIV.clone();
6479
}
6580

6681
/**
6782
* Sets the key wrap algorithm to the specified algorithm.
83+
*
84+
* @param keyWrapAlgorithm
85+
* key wrap algorithm.
6886
*/
6987
public void setKeyWrapAlgorithm(String keyWrapAlgorithm) {
7088
this.keyWrapAlgorithm = keyWrapAlgorithm;
7189
}
7290

7391
/**
7492
* Sets the description of the encryption materials
93+
*
94+
* @param matdesc
95+
* description of the encryption materials.
7596
*/
7697
public void setMaterialsDescription(Map<String, String> matdesc) {
7798
this.matdesc = Collections.unmodifiableMap(new TreeMap<String, String>(matdesc));

0 commit comments

Comments
 (0)