Truncate cache 4151

geowebcache/core/src/main/java/org/geowebcache/demo/Demo.java

@@ -55,6 +55,7 @@ public class Demo {
 
     private static Logger LOGGER = Logging.getLogger(Demo.class.getName());
 
+    @SuppressWarnings("DefaultCharset")
     public static void makeMap(
             TileLayerDispatcher tileLayerDispatcher,
             GridSetBroker gridSetBroker,
@@ -118,6 +119,7 @@ public static void makeMap(
         }
     }
 
+    @SuppressWarnings("JdkObsolete")
     private static String generateHTML(TileLayerDispatcher tileLayerDispatcher, GridSetBroker gridSetBroker)
             throws GeoWebCacheException {
         String reloadPath = "rest/reload";
@@ -216,6 +218,7 @@ private static void tableRows(
         }
     }
 
+    @SuppressWarnings("ReferenceEquality")
     private static void outputKMLSupport(StringBuffer buf, TileLayer layer) {
         buf.append("   KML: [");
         String prefix = "";
@@ -378,6 +381,7 @@ private static String generateHTML(TileLayer layer, String gridSetStr, String fo
         return buf.append("</body>\n</html>").toString();
     }
 
+    @SuppressWarnings("StringCaseLocaleUsage")
     private static String makeModifiableParameters(TileLayer tl) {
         List<ParameterFilter> parameterFilters = tl.getParameterFilters();
         if (parameterFilters == null || parameterFilters.isEmpty()) {

geowebcache/core/src/main/java/org/geowebcache/storage/TileObject.java

@@ -114,6 +114,18 @@ public long[] getXYZ() {
         return xyz;
     }
 
+    public long getX() {
+        return xyz[0];
+    }
+
+    public long getY() {
+        return xyz[1];
+    }
+
+    public long getZ() {
+        return xyz[2];
+    }
+
     // public int getSrs() {
     // return srs;
     // }

geowebcache/core/src/main/java/org/geowebcache/storage/TileRange.java

@@ -78,7 +78,7 @@ public TileRange(
                 if (bounds != null) {
                     // could be null in case calling code is only interested in a subset of zoom
                     // levels
-                    this.rangeBounds.put(Integer.valueOf((int) bounds[4]), bounds);
+                    this.rangeBounds.put((int) bounds[4], bounds);
                 }
             }
         }
@@ -102,9 +102,7 @@ public boolean contains(long x, long y, int z) {
 
             long[] rB = rangeBounds(z);
 
-            if (rB[0] <= x && rB[2] >= x && rB[1] <= y && rB[3] >= y) {
-                return true;
-            }
+            return rB[0] <= x && rB[2] >= x && rB[1] <= y && rB[3] >= y;
         }
         return false;
     }
@@ -118,6 +116,18 @@ public String getParametersId() {
         return parametersId;
     }
 
+    /** @return the parameters id, or {@code null} if unset */
+    public String getParametersIdOrDefault() {
+        if (parametersId == null) {
+            Map<String, String> parameters = this.getParameters();
+            parametersId = ParametersUtils.getId(parameters);
+            if (parametersId == null) {
+                parametersId = "default";
+            }
+        }
+        return parametersId;
+    }
+
     /** @return the zoomStart */
     public int getZoomStart() {
         return zoomStart;
@@ -161,7 +171,7 @@ public long[] rangeBounds(final int zoomLevel) {
         if (zoomLevel > zoomStop) {
             throw new IllegalArgumentException(zoomLevel + " > zoomStop (" + zoomStop + ")");
         }
-        long[] zlevelBounds = rangeBounds.get(Integer.valueOf(zoomLevel));
+        long[] zlevelBounds = rangeBounds.get(zoomLevel);
         if (zlevelBounds == null) {
             throw new IllegalStateException("Found no range bounds for z level " + zoomLevel + ": " + rangeBounds);
         }

geowebcache/core/src/main/java/org/geowebcache/util/TMSKeyBuilder.java

@@ -40,6 +40,10 @@ public final class TMSKeyBuilder {
     public static final String PARAMETERS_METADATA_OBJECT_SUFFIX = ".properties";
     public static final String PENDING_DELETES = "_pending_deletes.properties";
 
+    public String getPrefix() {
+        return prefix;
+    }
+
     private String prefix;
 
     private TileLayerDispatcher layers;

geowebcache/s3storage/src/main/java/org/geowebcache/s3/AmazonS3Wrapper.java

@@ -0,0 +1,18 @@
+package org.geowebcache.s3;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.model.DeleteObjectsRequest;
+import com.amazonaws.services.s3.model.DeleteObjectsResult;
+
+public class AmazonS3Wrapper {
+    private final AmazonS3 conn;
+
+    public AmazonS3Wrapper(AmazonS3 conn) {
+        this.conn = conn;
+    }
+
+    public DeleteObjectsResult deleteObjects(DeleteObjectsRequest deleteObjectsRequest) throws SdkClientException {
+        return conn.deleteObjects(deleteObjectsRequest);
+    }
+}