Have OGC API features build fully and pass QA

src/community/ogcapi/dggs/dggs-clickhouse/src/main/java/org/geotools/dggs/clickhouse/ClickHouseDGGSDataStore.java

@@ -196,7 +196,7 @@ public FeatureReader<SimpleFeatureType, SimpleFeature> getFeatureReader(
         DGGSFeatureSource source = getFeatureSource(query.getTypeName());
         @SuppressWarnings("PMD.CloseResource") // wrapped and returned
         SimpleFeatureIterator features = source.getFeatures(query).features();
-        return new FeatureReader<SimpleFeatureType, SimpleFeature>() {
+        return new FeatureReader<>() {
             @Override
             public SimpleFeatureType getFeatureType() {
                 return source.getSchema();

src/community/ogcapi/dggs/dggs-clickhouse/src/main/java/org/geotools/dggs/clickhouse/ClickhouseAggregatorCollection.java

@@ -58,9 +58,8 @@ public void accepts(FeatureVisitor visitor, ProgressListener progress) throws IO
             if (visit((MatrixAggregate) visitor)) return;
         } else if (visitor instanceof GroupedMatrixAggregate) {
             if (visit((GroupedMatrixAggregate) visitor)) return;
-        } else {
-            delegate.accepts(visitor, progress);
         }
+        delegate.accepts(visitor, progress);
     }
 
     private boolean visit(MatrixAggregate visitor) throws IOException {

src/community/ogcapi/dggs/dggs-core/src/main/java/org/geotools/dggs/ZoneWrapper.java

@@ -41,7 +41,7 @@ public enum DatelineLocation {
         West,
         /** Crossing the dateline, majority of points in the east empisphere */
         East
-    };
+    }
 
     /**
      * Wraps a dateline crossing polygon so that its longitudes are all packed on one side. Will not

src/community/ogcapi/dggs/dggs-core/src/main/java/org/geotools/dggs/h3/H3DGGSInstance.java

@@ -101,6 +101,7 @@ public H3Zone getZone(double lat, double lon, int resolution) {
     }
 
     @Override
+    @SuppressWarnings("PMD.UnnecessaryCast")
     public Iterator<Zone> zonesFromEnvelope(
             Envelope envelope, int targetResolution, boolean compact) {
         Envelope intersection = envelope.intersection(WORLD);
@@ -287,6 +288,7 @@ public List<AttributeDescriptor> getExtraProperties() {
     }
 
     @Override
+    @SuppressWarnings("PMD.UnnecessaryCast")
     public Iterator<Zone> neighbors(String id, int radius) {
         // Using H3 facilities. Upside fast and accurate (considering dateline and pole neighbors
         // too), downside, will quickly go OOM, radius should be limited
@@ -324,6 +326,7 @@ public Zone point(Point point, int resolution) {
     }
 
     @Override
+    @SuppressWarnings("PMD.UnnecessaryCast")
     public Iterator<Zone> polygon(Polygon polygon, int resolution, boolean compact) {
         List<GeoCoord> shell = getGeoCoords(polygon.getExteriorRing());
         List<List<GeoCoord>> holes =

src/community/ogcapi/dggs/dggs-core/src/main/java/org/geotools/dggs/rhealpix/RHealPixDGGSInstance.java

@@ -140,6 +140,7 @@ private String toZoneId(List<Object> idList) {
     }
 
     @Override
+    @SuppressWarnings("PMD.UnnecessaryCast")
     public Iterator<Zone> zonesFromEnvelope(
             Envelope envelope, int targetResolution, boolean compact) {
         // WAY USING DIRECT LIBRARY CALLS. Faster, but memory bound.
@@ -374,6 +375,7 @@ public List<AttributeDescriptor> getExtraProperties() {
     }
 
     @Override
+    @SuppressWarnings("PMD.UnnecessaryCast")
     public Iterator<Zone> neighbors(String id, int radius) {
         Set<String> result = new HashSet<>();
         // temporary add to work as an exclusion mask too
@@ -417,6 +419,7 @@ public Iterator<Zone> neighbors(String id, int radius) {
     }
 
     @Override
+    @SuppressWarnings("PMD.UnnecessaryCast")
     public Iterator<Zone> children(String zoneId, int resolution) {
         Zone parent = getZone(zoneId);
         if (parent.getResolution() >= resolution) return new EmptyIterator<>();
@@ -480,7 +483,7 @@ public Iterator<Zone> polygon(Polygon polygon, int resolution, boolean compact)
                                             && testContains(prepared, zone.getCenter()))
                                     || testContains(prepared, zone.getBoundary());
                         },
-                        zone -> (Zone) zone);
+                        zone -> zone);
         // if compact iteration, we are done
         if (compact) return compactIterator;
         // otherwise expand the cells that are at a lower resolution using the fast children

src/community/ogcapi/dggs/ogcapi-dggs/src/main/java/org/geoserver/ogcapi/v1/dggs/CollectionsDocument.java

@@ -40,11 +40,11 @@ public List<Link> getLinks() {
     }
 
     @JacksonXmlProperty(localName = "Collection")
-    @SuppressWarnings({"PMD.CloseResource", "PMD.EmptyWhileStmt"})
+    @SuppressWarnings({"PMD.CloseResource", "PMD.EmptyControlStatement"})
     public Iterator<CollectionDocument> getCollections() {
         CloseableIterator<FeatureTypeInfo> featureTypes =
                 geoServer.getCatalog().list(FeatureTypeInfo.class, Filter.INCLUDE);
-        return new Iterator<CollectionDocument>() {
+        return new Iterator<>() {
 
             CollectionDocument next;
 

src/community/ogcapi/dggs/ogcapi-dggs/src/main/java/org/geoserver/ogcapi/v1/dggs/DGGSDAPAExtension.java

@@ -196,9 +196,7 @@ public SimpleFeatureCollection areaSpaceAggregation(
         q.getHints().put(VIRTUAL_TABLE_PARAMETERS, singletonMap(VP_RESOLUTION, resolution));
         SimpleFeatureSource fs = (SimpleFeatureSource) ft.getFeatureSource(null, null);
         List<Expression> expressions =
-                Arrays.stream(variables)
-                        .map(v -> (Expression) FF.property(v))
-                        .collect(Collectors.toList());
+                Arrays.stream(variables).map(v -> FF.property(v)).collect(Collectors.toList());
         // run a full aggregate and build the feature
         List<Expression> timeGroupExpressions = getTimeGroup(ft);
         GroupedMatrixAggregate aggregate =
@@ -283,9 +281,7 @@ public SimpleFeatureCollection areaTimeAggregation(
         q.getHints().put(VIRTUAL_TABLE_PARAMETERS, singletonMap(VP_RESOLUTION, resolution));
         SimpleFeatureSource fs = (SimpleFeatureSource) ft.getFeatureSource(null, null);
         List<Expression> expressions =
-                Arrays.stream(variables)
-                        .map(v -> (Expression) FF.property(v))
-                        .collect(Collectors.toList());
+                Arrays.stream(variables).map(v -> FF.property(v)).collect(Collectors.toList());
         // run a full aggregate and build the feature
         GroupedMatrixAggregate aggregate =
                 new GroupedMatrixAggregate(
@@ -360,9 +356,7 @@ public SimpleFeatureCollection areaSpaceTimeAggregation(
         q.getHints().put(VIRTUAL_TABLE_PARAMETERS, singletonMap(VP_RESOLUTION, resolution));
         SimpleFeatureSource fs = (SimpleFeatureSource) ft.getFeatureSource(null, null);
         List<Expression> expressions =
-                Arrays.stream(variables)
-                        .map(v -> (Expression) FF.property(v))
-                        .collect(Collectors.toList());
+                Arrays.stream(variables).map(v -> FF.property(v)).collect(Collectors.toList());
         // run a full aggregate and build the feature
         MatrixAggregate aggregate = new MatrixAggregate(expressions, Arrays.asList(functions));
         fs.getFeatures(q).accepts(aggregate, null);
@@ -476,9 +470,7 @@ public SimpleFeatureCollection positionTimeAggregate(
         q.getHints().put(VIRTUAL_TABLE_PARAMETERS, singletonMap(VP_RESOLUTION, resolution));
         SimpleFeatureSource fs = (SimpleFeatureSource) ft.getFeatureSource(null, null);
         List<Expression> expressions =
-                Arrays.stream(variables)
-                        .map(v -> (Expression) FF.property(v))
-                        .collect(Collectors.toList());
+                Arrays.stream(variables).map(v -> FF.property(v)).collect(Collectors.toList());
         // run a full aggregate and build the feature
         GroupedMatrixAggregate aggregate =
                 new GroupedMatrixAggregate(

src/community/ogcapi/dggs/ogcapi-dggs/src/main/java/org/geoserver/ogcapi/v1/dggs/GroupMatrixFeatureCollection.java

@@ -116,7 +116,7 @@ public boolean containsAll(Collection<?> o) {
     @Override
     public boolean isEmpty() {
         try (CloseableIterator<GroupByResult> it = result.getIterator()) {
-            return features().hasNext();
+            return it.hasNext();
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

src/community/ogcapi/ogcapi-changeset/src/main/java/org/geoserver/ogcapi/v1/changeset/ChangeSet.java

@@ -20,7 +20,7 @@ enum Priority {
         high,
         medium,
         low
-    };
+    }
 
     public static class ChangedItem {
         Priority priority;

src/community/ogcapi/ogcapi-core/src/main/java/org/geoserver/ogcapi/APIBBoxParser.java

@@ -105,7 +105,7 @@ private static Filter toFilter(ReferencedEnvelope[] bboxes) {
             return FF.bbox(FF.property(""), bboxes[0]);
         } else if (bboxes instanceof ReferencedEnvelope[]) {
             List<Filter> filters =
-                    Stream.of((ReferencedEnvelope[]) bboxes)
+                    Stream.of(bboxes)
                             .map(e -> FF.bbox(FF.property(""), e))
                             .collect(Collectors.toList());
             return FF.or(filters);

src/community/ogcapi/ogcapi-core/src/main/java/org/geoserver/ogcapi/APIDispatcher.java

@@ -352,7 +352,7 @@ private void dispatchService(Request dr, HandlerMethod handler) {
     public static APIService getApiServiceAnnotation(Class<?> clazz) {
         APIService annotation = null;
         while (annotation == null && clazz != null) {
-            annotation = (APIService) clazz.getAnnotation(APIService.class);
+            annotation = clazz.getAnnotation(APIService.class);
             if (annotation == null) {
                 clazz = clazz.getSuperclass();
             }

src/community/ogcapi/ogcapi-core/src/main/java/org/geoserver/ogcapi/QueryablesBuilder.java

@@ -90,7 +90,7 @@ public static Schema<?> getSchema(Class<?> binding) {
     }
 
     private static Schema<?> getGeometrySchema(Class<?> binding) {
-        Schema schema = new Schema();
+        Schema schema = new Schema<>();
         String ref;
         String description;
         if (Point.class.isAssignableFrom(binding)) {

src/community/ogcapi/ogcapi-core/src/test/java/org/geoserver/ogcapi/HelloController.java

@@ -30,7 +30,7 @@
 @RequestMapping(path = APIDispatcher.ROOT_PATH + "/hello/v1")
 public class HelloController {
 
-    static interface HelloServiceInfo extends ServiceInfo {};
+    static interface HelloServiceInfo extends ServiceInfo {}
 
     String defaultValue = "hello";
 
@@ -51,13 +51,13 @@ public Message hello(@RequestParam(name = "message", required = false) String me
     public ResponseEntity echo(@RequestBody Message message) {
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.TEXT_PLAIN);
-        return new ResponseEntity<String>(message.getMessage(), headers, HttpStatus.CREATED);
+        return new ResponseEntity<>(message.getMessage(), headers, HttpStatus.CREATED);
     }
 
     @DeleteMapping(path = "delete")
     @ResponseBody
     public ResponseEntity<String> delete() {
-        return new ResponseEntity<String>(HttpStatus.NO_CONTENT);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
     @PutMapping(path = "default")

src/community/ogcapi/ogcapi-coverages/src/main/java/org/geoserver/ogcapi/v1/coverages/CollectionsDocument.java

@@ -51,7 +51,7 @@ public List<Link> getLinks() {
     public Iterator<CollectionDocument> getCollections() {
         CloseableIterator<CoverageInfo> coverages =
                 geoServer.getCatalog().list(CoverageInfo.class, Filter.INCLUDE);
-        return new Iterator<CollectionDocument>() {
+        return new Iterator<>() {
 
             CollectionDocument next;
 

src/community/ogcapi/ogcapi-features/src/main/java/org/geoserver/ogcapi/v1/features/CollectionsDocument.java

@@ -53,7 +53,7 @@ public List<Link> getLinks() {
     public Iterator<CollectionDocument> getCollections() {
         CloseableIterator<FeatureTypeInfo> featureTypes =
                 geoServer.getCatalog().list(FeatureTypeInfo.class, Filter.INCLUDE);
-        return new Iterator<CollectionDocument>() {
+        return new Iterator<>() {
 
             CollectionDocument next;
 

src/community/ogcapi/ogcapi-features/src/main/java/org/geoserver/ogcapi/v1/features/FeaturesAPIBuilder.java

@@ -67,7 +67,7 @@ public OpenAPI build(WFSInfo wfs) throws IOException {
 
         // list of valid filter-lang values
         Parameter filterLang = parameters.get("filter-lang");
-        filterLang.getSchema().setEnum(new ArrayList(APIFilterParser.SUPPORTED_ENCODINGS));
+        filterLang.getSchema().setEnum(new ArrayList<>(APIFilterParser.SUPPORTED_ENCODINGS));
 
         // provide actual values for limit
         Parameter limit = parameters.get("limit");

src/community/ogcapi/ogcapi-features/src/main/java/org/geoserver/ogcapi/v1/features/RFCGeoJSONFeaturesResponse.java

@@ -212,10 +212,10 @@ protected void addLinks(
     protected FeatureTypeInfo getFeatureType(GetFeatureRequest request) {
         // OGC API Features always have a collection reference, so one query
         return Optional.ofNullable(request.getQueries())
-                .filter(qs -> qs.size() > 0)
+                .filter(qs -> !qs.isEmpty())
                 .map(qs -> qs.get(0))
                 .map(q -> q.getTypeNames())
-                .filter(tns -> tns.size() > 0)
+                .filter(tns -> !tns.isEmpty())
                 .map(tns -> tns.get(0))
                 .map(tn -> new NameImpl(tn.getNamespaceURI(), tn.getLocalPart()))
                 .map(tn -> gs.getCatalog().getFeatureTypeByName(tn))

src/community/ogcapi/ogcapi-images/src/main/java/org/geoserver/ogcapi/v1/images/ImagesCollectionsDocument.java

@@ -45,7 +45,7 @@ public Iterator<ImagesCollectionDocument> getCollections() {
         boolean skipInvalid =
                 gs.getGlobal().getResourceErrorHandling()
                         == ResourceErrorHandling.SKIP_MISCONFIGURED_LAYERS;
-        return new Iterator<ImagesCollectionDocument>() {
+        return new Iterator<>() {
 
             ImagesCollectionDocument next;
 

src/community/ogcapi/ogcapi-images/src/main/java/org/geoserver/ogcapi/v1/images/ImagesService.java

@@ -653,7 +653,7 @@ public ResponseEntity deleteImage(
 
         imageListeners.imageRemoved(info, feature);
 
-        return new ResponseEntity(HttpStatus.OK);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @Override

src/community/ogcapi/ogcapi-maps/src/main/java/org/geoserver/ogcapi/v1/maps/CollectionsDocument.java

@@ -47,7 +47,7 @@ public Iterator<CollectionDocument> getCollections() {
         @SuppressWarnings("PMD.CloseResource") // wrapped and returned
         CloseableIterator<PublishedInfo> publisheds =
                 geoServer.getCatalog().list(PublishedInfo.class, Filter.INCLUDE);
-        return new Iterator<CollectionDocument>() {
+        return new Iterator<>() {
 
             CollectionDocument next;
 

src/community/ogcapi/ogcapi-maps/src/test/java/org/geoserver/ogcapi/v1/maps/MapsTest.java

@@ -5,13 +5,10 @@
 package org.geoserver.ogcapi.v1.maps;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
 
 import com.jayway.jsonpath.DocumentContext;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.jsoup.nodes.DataNode;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
@@ -47,8 +44,7 @@ public void testDatetimeHTMLMapsFormat() throws Exception {
         Document document =
                 getAsJSoup(
                         "ogc/maps/v1/collections/sf:TimeWithStartEnd/styles/Default/map?f=html&datetime=2012-02-12T00:00:00Z");
-        boolean found = searchParameter(document, "\"datetime\": '2012-02-12T00:00:00Z'");
-        assertTrue(found);
+        assertEquals("2012-02-12T00:00:00Z", getParameterValue(document, "datetime"));
     }
 
     @Test
@@ -57,27 +53,15 @@ public void testHTMLNoDatetime() throws Exception {
         // failed here when no datetime provided, FTL processing error, null on js_string
         Document document =
                 getAsJSoup("ogc/maps/v1/collections/sf:TimeWithStartEnd/styles/Default/map?f=html");
-        boolean found = searchParameter(document, "\"datetime\": '2012-02-12T00:00:00Z'");
-        assertFalse(found);
+        assertNull(getParameterValue(document, "datetime"));
     }
 
-    private static boolean searchParameter(Document document, String keyValue) {
-        Elements scriptsOnPage = document.select("script");
-        Matcher matcher = null;
-        // check that the datetime is in the javascript parameters
-        String keyToFind = "datetime";
-        Pattern pattern = Pattern.compile("\"" + keyToFind + "\":\\s*'(.*?)'");
-        boolean found = false;
-        for (Element element : scriptsOnPage) {
-            for (DataNode node : element.dataNodes()) {
-                matcher = pattern.matcher(node.getWholeData());
-                while (matcher.find()) {
-                    if (matcher.group().equals(keyValue)) {
-                        found = true;
-                    }
-                }
-            }
-        }
-        return found;
+    private static String getParameterValue(Document document, String key) {
+        Elements parameters = document.select("input[type='hidden'][title='" + key + "']");
+        if (parameters.isEmpty()) return null;
+        if (parameters.size() > 1)
+            fail("Found more than one element with key " + key + ": " + parameters);
+        Element parameter = parameters.first();
+        return parameter.attr("value");
     }
 }

src/community/ogcapi/ogcapi-styles/src/main/java/org/geoserver/ogcapi/v1/styles/StyleAttributeExtractor.java

@@ -317,10 +317,7 @@ public void visit(TextSymbolizer text) {
             }
         }
 
-        if (text instanceof TextSymbolizer) {
-            if (((TextSymbolizer) text).getGraphic() != null)
-                ((TextSymbolizer) text).getGraphic().accept(this);
-        }
+        if (text.getGraphic() != null) text.getGraphic().accept(this);
 
         if (text.getFill() != null) {
             text.getFill().accept(this);

src/community/ogcapi/ogcapi-styles/src/main/java/org/geoserver/ogcapi/v1/styles/StyleLayer.java

@@ -59,7 +59,7 @@ enum LayerType {
         polygon,
         geometry,
         raster
-    };
+    }
 
     String id;
     LayerType type;

src/community/ogcapi/ogcapi-styles/src/main/java/org/geoserver/ogcapi/v1/styles/StylesDocument.java

@@ -29,7 +29,7 @@ public StylesDocument(Catalog catalog) {
     public Iterator<StyleDocument> getStyles() {
         // full scan (we might add paging/filtering later)
         CloseableIterator<StyleInfo> styles = catalog.list(StyleInfo.class, Filter.INCLUDE);
-        return new Iterator<StyleDocument>() {
+        return new Iterator<>() {
 
             StyleDocument next;
 

src/community/ogcapi/ogcapi-styles/src/main/java/org/geoserver/ogcapi/v1/styles/StylesService.java

@@ -335,7 +335,7 @@ public ResponseEntity postStyle(
         // validation
         if (validate == only || validate == yes) {
             validate(mimeType, content, handler);
-            return new ResponseEntity(HttpStatus.NO_CONTENT);
+            return new ResponseEntity<>(HttpStatus.NO_CONTENT);
         } else {
             String styleId = getStyleId(mimeType, handler, content);
             StyleInfo styleInfo = getStyleInfo(styleId, false);

src/community/ogcapi/ogcapi-styles/src/main/java/org/geoserver/ogcapi/v1/styles/ThumbnailBuilder.java

@@ -172,6 +172,6 @@ public boolean canGenerateThumbnail(StyleInfo styleInfo) {
             LOGGER.log(Level.FINER, "Could not setup thumbnail", e);
         }
         // if we have at least a layer, we can work it
-        return request.getLayers().size() > 0;
+        return !request.getLayers().isEmpty();
     }
 }

src/community/ogcapi/ogcapi-tiles/src/main/java/org/geoserver/ogcapi/v1/tiles/TiledCollectionsDocument.java

@@ -53,7 +53,7 @@ public Iterator<TiledCollectionDocument> getCollections() {
         boolean skipInvalid =
                 gs.getGlobal().getResourceErrorHandling()
                         == ResourceErrorHandling.SKIP_MISCONFIGURED_LAYERS;
-        return new Iterator<TiledCollectionDocument>() {
+        return new Iterator<>() {
 
             TiledCollectionDocument next;