Skip to content

Commit b813beb

Browse files
yegor256yegor256
committed
#451: Update qulice-maven-plugin version to 0.25.1.
1 parent 75c2748 commit b813beb

22 files changed

+298
-296
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
<plugin>
172172
<groupId>com.qulice</groupId>
173173
<artifactId>qulice-maven-plugin</artifactId>
174-
<version>0.24.0</version>
174+
<version>0.25.1</version>
175175
<configuration>
176176
<excludes combine.children="append">
177177
<exclude>findbugs:.*</exclude>

‎src/main/java/com/jcabi/s3/AwsBucket.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
*/
2323
@EqualsAndHashCode(of = { "regn", "bkt" })
2424
@Loggable(Loggable.DEBUG)
25-
@SuppressWarnings("PMD.TooManyMethods")
2625
final class AwsBucket implements Bucket {
2726

2827
/**
@@ -91,21 +90,18 @@ public boolean exists() throws IOException {
9190
}
9291

9392
@Override
94-
@SuppressWarnings("PMD.GuardLogStatement")
9593
public void remove(final String key) throws IOException {
9694
try {
97-
final S3Client aws = this.regn.aws();
98-
final long start = System.currentTimeMillis();
99-
aws.deleteObject(
95+
this.regn.aws().deleteObject(
10096
DeleteObjectRequest.builder()
10197
.bucket(this.bkt)
10298
.key(key)
10399
.build()
104100
);
105101
Logger.info(
106102
this,
107-
"ocket '%s' removed in bucket '%s' in %[ms]s",
108-
key, this.bkt, System.currentTimeMillis() - start
103+
"ocket '%s' removed in bucket '%s'",
104+
key, this.bkt
109105
);
110106
} catch (final S3Exception ex) {
111107
throw new IOException(

‎src/main/java/com/jcabi/s3/AwsListIterator.java‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@
44
*/
55
package com.jcabi.s3;
66

7-
import com.jcabi.log.Logger;
87
import java.util.Iterator;
98
import java.util.LinkedList;
109
import java.util.List;
1110
import java.util.NoSuchElementException;
12-
import software.amazon.awssdk.services.s3.S3Client;
1311
import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;
1412
import software.amazon.awssdk.services.s3.model.ListObjectsV2Response;
1513
import software.amazon.awssdk.services.s3.model.S3Exception;
@@ -93,21 +91,17 @@ public final void remove() {
9391
* Loads next portion of data from S3.
9492
* @return A list with next portion of data from S3
9593
*/
96-
@SuppressWarnings("PMD.GuardLogStatement")
9794
private List<String> load() {
9895
try {
99-
final S3Client aws = this.region.aws();
100-
final long start = System.currentTimeMillis();
10196
final ListObjectsV2Request.Builder req =
10297
ListObjectsV2Request.builder()
10398
.bucket(this.bucket)
10499
.prefix(this.prefix);
105100
if (this.token != null) {
106101
req.continuationToken(this.token);
107102
}
108-
final ListObjectsV2Response listing = aws.listObjectsV2(
109-
req.build()
110-
);
103+
final ListObjectsV2Response listing =
104+
this.region.aws().listObjectsV2(req.build());
111105
if (listing.isTruncated()) {
112106
this.token = listing.nextContinuationToken();
113107
} else {
@@ -117,12 +111,6 @@ private List<String> load() {
117111
for (final S3Object sum : listing.contents()) {
118112
list.add(sum.key());
119113
}
120-
Logger.info(
121-
this,
122-
"listed %d ocket(s) with prefix '%s' in bucket '%s' in %[ms]s",
123-
listing.contents().size(), this.prefix,
124-
this.bucket, System.currentTimeMillis() - start
125-
);
126114
return list;
127115
} catch (final S3Exception ex) {
128116
throw new IllegalStateException(

‎src/main/java/com/jcabi/s3/AwsOcket.java‎

Lines changed: 15 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,18 @@
55
package com.jcabi.s3;
66

77
import com.jcabi.aspects.Loggable;
8-
import com.jcabi.log.Logger;
98
import java.io.IOException;
109
import java.io.InputStream;
1110
import java.io.OutputStream;
1211
import lombok.EqualsAndHashCode;
1312
import org.apache.commons.io.IOUtils;
1413
import org.apache.commons.io.input.BoundedInputStream;
15-
import software.amazon.awssdk.core.ResponseInputStream;
1614
import software.amazon.awssdk.core.sync.RequestBody;
17-
import software.amazon.awssdk.services.s3.S3Client;
1815
import software.amazon.awssdk.services.s3.model.GetObjectRequest;
19-
import software.amazon.awssdk.services.s3.model.GetObjectResponse;
2016
import software.amazon.awssdk.services.s3.model.HeadObjectRequest;
2117
import software.amazon.awssdk.services.s3.model.HeadObjectResponse;
2218
import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;
23-
import software.amazon.awssdk.services.s3.model.ListObjectsV2Response;
2419
import software.amazon.awssdk.services.s3.model.PutObjectRequest;
25-
import software.amazon.awssdk.services.s3.model.PutObjectResponse;
2620
import software.amazon.awssdk.services.s3.model.S3Exception;
2721

2822
/**
@@ -32,7 +26,6 @@
3226
*/
3327
@EqualsAndHashCode(of = { "bkt", "name" })
3428
@Loggable(Loggable.DEBUG)
35-
@SuppressWarnings("PMD.GuardLogStatement")
3629
final class AwsOcket implements Ocket {
3730

3831
/**
@@ -73,23 +66,12 @@ public String key() {
7366
@Override
7467
public HeadObjectResponse meta() throws IOException {
7568
try {
76-
final S3Client aws = this.bkt.region().aws();
77-
final long start = System.currentTimeMillis();
78-
final HeadObjectResponse meta = aws.headObject(
69+
return this.bkt.region().aws().headObject(
7970
HeadObjectRequest.builder()
8071
.bucket(this.bkt.name())
8172
.key(this.name)
8273
.build()
8374
);
84-
Logger.info(
85-
this,
86-
// @checkstyle LineLength (1 line)
87-
"metadata loaded for ocket '%s' in bucket '%s' in %[ms]s (etag=%s)",
88-
this.name, this.bkt.name(),
89-
System.currentTimeMillis() - start,
90-
meta.eTag()
91-
);
92-
return meta;
9375
} catch (final S3Exception ex) {
9476
throw new OcketNotFoundException(
9577
String.format(
@@ -102,27 +84,15 @@ public HeadObjectResponse meta() throws IOException {
10284
}
10385

10486
@Override
105-
@SuppressWarnings("PMD.GuardLogStatement")
10687
public boolean exists() throws IOException {
10788
try {
108-
final S3Client aws = this.bkt.region().aws();
109-
final long start = System.currentTimeMillis();
110-
final ListObjectsV2Response listing = aws.listObjectsV2(
89+
return !this.bkt.region().aws().listObjectsV2(
11190
ListObjectsV2Request.builder()
11291
.bucket(this.bkt.name())
11392
.prefix(this.name)
11493
.maxKeys(1)
11594
.build()
116-
);
117-
final boolean exists = !listing.contents().isEmpty();
118-
Logger.info(
119-
this,
120-
"ocket '%s' existence checked in bucket '%s' in %[ms]s (%b)",
121-
this.name, this.bkt.name(),
122-
System.currentTimeMillis() - start,
123-
exists
124-
);
125-
return exists;
95+
).contents().isEmpty();
12696
} catch (final S3Exception ex) {
12797
throw new IOException(
12898
String.format(
@@ -135,28 +105,17 @@ public boolean exists() throws IOException {
135105
}
136106

137107
@Override
138-
@SuppressWarnings("PMD.GuardLogStatement")
139108
public void read(final OutputStream output) throws IOException {
140109
try {
141-
final S3Client aws = this.bkt.region().aws();
142-
final ResponseInputStream<GetObjectResponse> obj = aws.getObject(
143-
GetObjectRequest.builder()
144-
.bucket(this.bkt.name())
145-
.key(this.name)
146-
.build()
110+
IOUtils.copy(
111+
this.bkt.region().aws().getObject(
112+
GetObjectRequest.builder()
113+
.bucket(this.bkt.name())
114+
.key(this.name)
115+
.build()
116+
),
117+
output
147118
);
148-
try (InputStream input = obj) {
149-
final long start = System.currentTimeMillis();
150-
final int bytes = IOUtils.copy(input, output);
151-
Logger.info(
152-
this,
153-
// @checkstyle LineLength (1 line)
154-
"loaded %d byte(s) from ocket '%s' in bucket '%s' in %[ms]s (etag=%s)",
155-
bytes, this.name, this.bkt.name(),
156-
System.currentTimeMillis() - start,
157-
obj.response().eTag()
158-
);
159-
}
160119
} catch (final S3Exception ex) {
161120
throw new OcketNotFoundException(
162121
String.format(
@@ -169,13 +128,10 @@ public void read(final OutputStream output) throws IOException {
169128
}
170129

171130
@Override
172-
@SuppressWarnings("PMD.GuardLogStatement")
173131
public void write(final InputStream input, final HeadObjectResponse meta)
174132
throws IOException {
175133
try (BoundedInputStream cnt = BoundedInputStream.builder()
176134
.setInputStream(input).get()) {
177-
final S3Client aws = this.bkt.region().aws();
178-
final long start = System.currentTimeMillis();
179135
final PutObjectRequest.Builder req = PutObjectRequest.builder()
180136
.bucket(this.bkt.name())
181137
.key(this.name);
@@ -185,27 +141,17 @@ public void write(final InputStream input, final HeadObjectResponse meta)
185141
if (meta.contentEncoding() != null) {
186142
req.contentEncoding(meta.contentEncoding());
187143
}
188-
final PutObjectResponse result;
189144
if (meta.contentLength() != null && meta.contentLength() > 0L) {
190-
result = aws.putObject(
145+
this.bkt.region().aws().putObject(
191146
req.contentLength(meta.contentLength()).build(),
192147
RequestBody.fromInputStream(cnt, meta.contentLength())
193148
);
194149
} else {
195-
final byte[] bytes = IOUtils.toByteArray(cnt);
196-
result = aws.putObject(
197-
req.contentLength((long) bytes.length).build(),
198-
RequestBody.fromBytes(bytes)
150+
this.bkt.region().aws().putObject(
151+
req.build(),
152+
RequestBody.fromBytes(IOUtils.toByteArray(cnt))
199153
);
200154
}
201-
Logger.info(
202-
this,
203-
// @checkstyle LineLength (1 line)
204-
"saved %d byte(s) to ocket '%s' in bucket '%s' in %[ms]s (etag=%s)",
205-
cnt.getCount(), this.name, this.bkt.name(),
206-
System.currentTimeMillis() - start,
207-
result.eTag()
208-
);
209155
} catch (final S3Exception ex) {
210156
throw new IOException(
211157
String.format(

‎src/main/java/com/jcabi/s3/Bucket.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
*
2929
* @since 0.1
3030
*/
31-
@SuppressWarnings("PMD.TooManyMethods")
3231
public interface Bucket extends Comparable<Bucket> {
3332

3433
/**

‎src/main/java/com/jcabi/s3/Ocket.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
*
3636
* @since 0.1
3737
*/
38-
@SuppressWarnings("PMD.TooManyMethods")
3938
public interface Ocket extends Comparable<Ocket> {
4039

4140
/**
@@ -139,16 +138,15 @@ public void write(final String text) throws IOException {
139138
*/
140139
public void write(final String text, final String type)
141140
throws IOException {
142-
final HeadObjectResponse meta = HeadObjectResponse.builder()
143-
.contentType(type)
144-
.contentLength(
145-
(long) text.getBytes(StandardCharsets.UTF_8).length
146-
)
147-
.contentEncoding(StandardCharsets.UTF_8.displayName())
148-
.build();
149141
this.origin.write(
150142
new ByteArrayInputStream(text.getBytes(StandardCharsets.UTF_8)),
151-
meta
143+
HeadObjectResponse.builder()
144+
.contentType(type)
145+
.contentLength(
146+
(long) text.getBytes(StandardCharsets.UTF_8).length
147+
)
148+
.contentEncoding(StandardCharsets.UTF_8.displayName())
149+
.build()
152150
);
153151
}
154152

‎src/main/java/com/jcabi/s3/fake/FkOcket.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,11 @@ public String key() {
115115

116116
@Override
117117
public HeadObjectResponse meta() {
118-
final MimetypesFileTypeMap types = new MimetypesFileTypeMap();
119118
return HeadObjectResponse.builder()
120119
.contentLength(this.file().length())
121-
.contentType(types.getContentType(this.file()))
120+
.contentType(
121+
new MimetypesFileTypeMap().getContentType(this.file())
122+
)
122123
.lastModified(Instant.ofEpochMilli(this.file().lastModified()))
123124
.contentEncoding("UTF-8")
124125
.build();

‎src/main/java/com/jcabi/s3/retry/ReBucket.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
@Immutable
2323
@EqualsAndHashCode(of = "origin")
2424
@Loggable(Loggable.DEBUG)
25-
@SuppressWarnings("PMD.TooManyMethods")
2625
public final class ReBucket implements Bucket {
2726

2827
/**
@@ -77,24 +76,26 @@ public Iterable<String> list(final String pfx) throws IOException {
7776
return new Iterable<String>() {
7877
@Override
7978
public Iterator<String> iterator() {
80-
final Iterator<String> iterator = list.iterator();
8179
return new Iterator<String>() {
80+
private final Iterator<String> iter =
81+
list.iterator();
82+
8283
@Override
8384
@RetryOnFailure(verbose = false)
8485
public boolean hasNext() {
85-
return iterator.hasNext();
86+
return this.iter.hasNext();
8687
}
8788

8889
@Override
8990
@RetryOnFailure(verbose = false)
9091
public String next() {
91-
return iterator.next();
92+
return this.iter.next();
9293
}
9394

9495
@Override
9596
@RetryOnFailure(verbose = false)
9697
public void remove() {
97-
iterator.remove();
98+
this.iter.remove();
9899
}
99100
};
100101
}

0 commit comments

Comments
 (0)