Skip to content

Commit 7714391

Browse files
alanmcdadealanmcdade
committed
Fixed no wild card imports
Fixed unused local variable Fixed missing an @OverRide annotation Fixed Array initialization can be written shorter Formatting from mvn
1 parent e321917 commit 7714391

File tree

42 files changed

+349
-71
lines changed

Some content is hidden

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

42 files changed

+349
-71
lines changed

‎geowebcache/s3storage/src/main/java/org/geowebcache/s3/S3BlobStore.java‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,29 @@
1818

1919
import com.amazonaws.AmazonServiceException;
2020
import com.amazonaws.services.s3.AmazonS3Client;
21-
import com.amazonaws.services.s3.model.*;
21+
import com.amazonaws.services.s3.model.AccessControlList;
22+
import com.amazonaws.services.s3.model.BucketPolicy;
23+
import com.amazonaws.services.s3.model.CannedAccessControlList;
24+
import com.amazonaws.services.s3.model.Grant;
25+
import com.amazonaws.services.s3.model.ObjectMetadata;
26+
import com.amazonaws.services.s3.model.PutObjectRequest;
27+
import com.amazonaws.services.s3.model.S3Object;
28+
import com.amazonaws.services.s3.model.S3ObjectInputStream;
29+
import com.amazonaws.services.s3.model.S3ObjectSummary;
2230
import com.google.common.io.ByteStreams;
2331
import java.io.ByteArrayInputStream;
2432
import java.io.ByteArrayOutputStream;
2533
import java.io.IOException;
2634
import java.nio.channels.Channels;
2735
import java.nio.channels.WritableByteChannel;
28-
import java.util.*;
36+
import java.util.ArrayList;
37+
import java.util.Arrays;
38+
import java.util.List;
39+
import java.util.Map;
40+
import java.util.Objects;
41+
import java.util.Optional;
42+
import java.util.Properties;
43+
import java.util.Set;
2944
import java.util.logging.Level;
3045
import java.util.logging.Logger;
3146
import java.util.stream.Collectors;
@@ -39,9 +54,25 @@
3954
import org.geowebcache.locks.LockProvider;
4055
import org.geowebcache.mime.MimeException;
4156
import org.geowebcache.mime.MimeType;
42-
import org.geowebcache.s3.callback.*;
43-
import org.geowebcache.s3.delete.*;
44-
import org.geowebcache.storage.*;
57+
import org.geowebcache.s3.callback.Callback;
58+
import org.geowebcache.s3.callback.LockingDecorator;
59+
import org.geowebcache.s3.callback.MarkPendingDeleteDecorator;
60+
import org.geowebcache.s3.callback.NotificationDecorator;
61+
import org.geowebcache.s3.callback.StatisticCallbackDecorator;
62+
import org.geowebcache.s3.delete.CompositeDeleteTileParameterId;
63+
import org.geowebcache.s3.delete.CompositeDeleteTileRange;
64+
import org.geowebcache.s3.delete.CompositeDeleteTilesInRange;
65+
import org.geowebcache.s3.delete.DeleteTileGridSet;
66+
import org.geowebcache.s3.delete.DeleteTileLayer;
67+
import org.geowebcache.s3.delete.DeleteTileObject;
68+
import org.geowebcache.s3.delete.DeleteTileRange;
69+
import org.geowebcache.storage.BlobStore;
70+
import org.geowebcache.storage.BlobStoreListener;
71+
import org.geowebcache.storage.BlobStoreListenerList;
72+
import org.geowebcache.storage.CompositeBlobStore;
73+
import org.geowebcache.storage.StorageException;
74+
import org.geowebcache.storage.TileObject;
75+
import org.geowebcache.storage.TileRange;
4576
import org.geowebcache.util.TMSKeyBuilder;
4677

4778
public class S3BlobStore implements BlobStore {
@@ -275,7 +306,6 @@ public boolean delete(final TileRange tileRange) {
275306
public boolean delete(String layerName) {
276307
checkNotNull(layerName, "layerName");
277308

278-
final String metadataKey = keyBuilder.layerMetadata(layerName);
279309
final String layerId = keyBuilder.layerId(layerName);
280310

281311
DeleteTileRange deleteLayer = new DeleteTileLayer(keyBuilder.getPrefix(), bucketName, layerId, layerName);

‎geowebcache/s3storage/src/main/java/org/geowebcache/s3/S3BlobStoreInfo.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@
1818

1919
import com.amazonaws.ClientConfiguration;
2020
import com.amazonaws.Protocol;
21-
import com.amazonaws.auth.*;
21+
import com.amazonaws.auth.AWSCredentials;
22+
import com.amazonaws.auth.AWSCredentialsProvider;
23+
import com.amazonaws.auth.AnonymousAWSCredentials;
24+
import com.amazonaws.auth.BasicAWSCredentials;
25+
import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
2226
import com.amazonaws.services.s3.AmazonS3Client;
2327
import com.amazonaws.services.s3.S3ClientOptions;
2428
import com.amazonaws.services.s3.model.CannedAccessControlList;

‎geowebcache/s3storage/src/main/java/org/geowebcache/s3/S3Ops.java‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,18 @@
1717

1818
import com.amazonaws.services.s3.AmazonS3Client;
1919
import com.amazonaws.services.s3.iterable.S3Objects;
20-
import com.amazonaws.services.s3.model.*;
20+
import com.amazonaws.services.s3.model.AmazonS3Exception;
21+
import com.amazonaws.services.s3.model.ObjectMetadata;
22+
import com.amazonaws.services.s3.model.PutObjectRequest;
23+
import com.amazonaws.services.s3.model.S3Object;
24+
import com.amazonaws.services.s3.model.S3ObjectInputStream;
25+
import com.amazonaws.services.s3.model.S3ObjectSummary;
2126
import com.google.common.util.concurrent.ThreadFactoryBuilder;
22-
import java.io.*;
27+
import java.io.ByteArrayInputStream;
28+
import java.io.ByteArrayOutputStream;
29+
import java.io.IOException;
30+
import java.io.InputStream;
31+
import java.io.InputStreamReader;
2332
import java.nio.charset.StandardCharsets;
2433
import java.util.Map;
2534
import java.util.Map.Entry;

‎geowebcache/s3storage/src/main/java/org/geowebcache/s3/callback/MarkPendingDeleteDecorator.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
import static com.google.common.base.Preconditions.checkNotNull;
44
import static java.lang.String.format;
5-
import static org.geowebcache.s3.delete.BulkDeleteTask.ObjectPathStrategy.*;
5+
import static org.geowebcache.s3.delete.BulkDeleteTask.ObjectPathStrategy.NoDeletionsRequired;
6+
import static org.geowebcache.s3.delete.BulkDeleteTask.ObjectPathStrategy.RetryPendingTask;
7+
import static org.geowebcache.s3.delete.BulkDeleteTask.ObjectPathStrategy.SingleTile;
68

79
import java.time.Instant;
810
import java.time.temporal.ChronoUnit;

‎geowebcache/s3storage/src/main/java/org/geowebcache/s3/callback/NotificationDecorator.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@
44
import static java.lang.String.format;
55

66
import java.util.logging.Logger;
7-
import org.geowebcache.s3.delete.*;
7+
import org.geowebcache.s3.delete.DeleteTileGridSet;
8+
import org.geowebcache.s3.delete.DeleteTileLayer;
9+
import org.geowebcache.s3.delete.DeleteTileObject;
10+
import org.geowebcache.s3.delete.DeleteTileParametersId;
11+
import org.geowebcache.s3.delete.DeleteTileRange;
12+
import org.geowebcache.s3.delete.DeleteTileZoom;
13+
import org.geowebcache.s3.delete.DeleteTileZoomInBoundedBox;
814
import org.geowebcache.s3.statistics.BatchStats;
915
import org.geowebcache.s3.statistics.ResultStat;
1016
import org.geowebcache.s3.statistics.Statistics;

‎geowebcache/s3storage/src/main/java/org/geowebcache/s3/delete/BulkDeleteTask.java‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,14 @@
22

33
import static com.google.common.base.Preconditions.checkNotNull;
44
import static java.lang.String.format;
5-
import static org.geowebcache.s3.delete.BulkDeleteTask.ObjectPathStrategy.*;
5+
import static org.geowebcache.s3.delete.BulkDeleteTask.ObjectPathStrategy.DefaultStrategy;
6+
import static org.geowebcache.s3.delete.BulkDeleteTask.ObjectPathStrategy.NoDeletionsRequired;
7+
import static org.geowebcache.s3.delete.BulkDeleteTask.ObjectPathStrategy.RetryPendingTask;
8+
import static org.geowebcache.s3.delete.BulkDeleteTask.ObjectPathStrategy.S3ObjectPathsForPrefix;
9+
import static org.geowebcache.s3.delete.BulkDeleteTask.ObjectPathStrategy.S3ObjectPathsForPrefixFilterByBoundedBox;
10+
import static org.geowebcache.s3.delete.BulkDeleteTask.ObjectPathStrategy.SingleTile;
11+
import static org.geowebcache.s3.delete.BulkDeleteTask.ObjectPathStrategy.TileRangeWithBoundedBox;
12+
import static org.geowebcache.s3.delete.BulkDeleteTask.ObjectPathStrategy.TileRangeWithBoundedBoxIfTileExist;
613

714
import java.util.List;
815
import java.util.Objects;
@@ -14,7 +21,13 @@
1421
import org.geowebcache.s3.callback.Callback;
1522
import org.geowebcache.s3.statistics.Statistics;
1623
import org.geowebcache.s3.statistics.SubStats;
17-
import org.geowebcache.s3.streams.*;
24+
import org.geowebcache.s3.streams.BatchingIterator;
25+
import org.geowebcache.s3.streams.MapKeyObjectsToDeleteObjectRequest;
26+
import org.geowebcache.s3.streams.MapS3ObjectSummaryToKeyObject;
27+
import org.geowebcache.s3.streams.PerformDeleteObjects;
28+
import org.geowebcache.s3.streams.S3ObjectPathsForPrefixSupplier;
29+
import org.geowebcache.s3.streams.TileIterator;
30+
import org.geowebcache.s3.streams.TileIteratorSupplier;
1831

1932
public class BulkDeleteTask implements Callable<Long> {
2033
private final AmazonS3Wrapper amazonS3Wrapper;

‎geowebcache/s3storage/src/main/java/org/geowebcache/s3/delete/CompositeDeleteTileParameterId.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public CompositeDeleteTileParameterId(
5151
this.prefix, this.bucket, this.layerId, gridSetId, format, this.parametersId, this.layerName))));
5252
}
5353

54+
@Override
5455
public String path() {
5556
return path;
5657
}

‎geowebcache/s3storage/src/main/java/org/geowebcache/s3/delete/CompositeDeleteTileRange.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ public interface CompositeDeleteTileRange extends DeleteTileRange {
88

99
void add(DeleteTileRange child);
1010

11+
@Override
1112
default Stream<DeleteTileRange> stream() {
1213
return children().stream();
1314
}

‎geowebcache/s3storage/src/main/java/org/geowebcache/s3/delete/DeleteTileGridSet.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public DeleteTileGridSet(String prefix, String bucket, String layerId, String gr
1919
this.path = DeleteTileInfo.toGridSet(prefix, layerId, gridSetId);
2020
}
2121

22+
@Override
2223
public String path() {
2324
return path;
2425
}

‎geowebcache/s3storage/src/main/java/org/geowebcache/s3/delete/DeleteTileParametersId.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public DeleteTileParametersId(
4949
this.path = DeleteTileInfo.toParametersId(prefix, layerId, gridSetId, format, parametersId);
5050
}
5151

52+
@Override
5253
public String path() {
5354
return path;
5455
}

0 commit comments

Comments
 (0)