Pmd features gml

xtraplatform-features-gml/src/main/java/de/ii/xtraplatform/features/gml/app/FeatureProviderWfs.java

@@ -42,7 +42,6 @@
 import de.ii.xtraplatform.features.domain.FeatureQuery;
 import de.ii.xtraplatform.features.domain.FeatureQueryEncoder;
 import de.ii.xtraplatform.features.domain.FeatureSchema;
-import de.ii.xtraplatform.features.domain.FeatureStorePathParser;
 import de.ii.xtraplatform.features.domain.FeatureStream;
 import de.ii.xtraplatform.features.domain.FeatureStreamImpl;
 import de.ii.xtraplatform.features.domain.FeatureTokenDecoder;
@@ -53,7 +52,6 @@
 import de.ii.xtraplatform.features.domain.SchemaMapping;
 import de.ii.xtraplatform.features.domain.transform.OnlyQueryables;
 import de.ii.xtraplatform.features.domain.transform.OnlySortables;
-import de.ii.xtraplatform.features.gml.domain.ConnectionInfoWfsHttp;
 import de.ii.xtraplatform.features.gml.domain.FeatureProviderWfsData;
 import de.ii.xtraplatform.features.gml.domain.WfsConnector;
 import de.ii.xtraplatform.features.gml.domain.XMLNamespaceNormalizer;
@@ -131,7 +129,6 @@ public class FeatureProviderWfs
 
   private FeatureQueryEncoderWfs queryTransformer;
   private AggregateStatsReader<FeatureSchema> aggregateStatsReader;
-  private FeatureStorePathParser pathParser;
 
   @AssistedInject
   public FeatureProviderWfs(
@@ -159,8 +156,6 @@ public FeatureProviderWfs(
 
   @Override
   protected boolean onStartup() throws InterruptedException {
-    this.pathParser = createPathParser(getData().getConnectionInfo());
-
     boolean success = super.onStartup();
 
     if (!success) {
@@ -190,11 +185,6 @@ protected Map<String, List<FeatureSchema>> getSourceSchemas() {
     return types;
   }
 
-  private static FeatureStorePathParser createPathParser(
-      ConnectionInfoWfsHttp connectionInfoWfsHttp) {
-    return new FeatureStorePathParserWfs(connectionInfoWfsHttp.getNamespaces());
-  }
-
   @Override
   public FeatureProviderWfsData getData() {
     return (FeatureProviderWfsData) super.getData();
@@ -328,7 +318,6 @@ public Optional<BoundingBox> getSpatialExtent(String typeName) {
           .join();
     } catch (Throwable e) {
       // continue
-      boolean br = true;
     }
 
     return Optional.empty();

xtraplatform-features-gml/src/main/java/de/ii/xtraplatform/features/gml/app/FeatureProviderWfsAuto.java

@@ -42,7 +42,7 @@ public FeatureProviderWfsAuto(WfsClientBasicFactory clientFactory) {
 
   @Override
   public <T extends AutoEntity> Map<String, String> check(T entityData) {
-    return null;
+    return Map.of();
   }
 
   @Override

xtraplatform-features-gml/src/main/java/de/ii/xtraplatform/features/gml/app/FeatureProviderWfsFactory.java

@@ -114,9 +114,11 @@ public EntityData hydrateData(EntityData entityData) {
 
     try {
       if (data.isAuto()) {
-        LOGGER.info(
-            "Feature provider with id '{}' is in auto mode, generating configuration ...",
-            data.getId());
+        if (LOGGER.isInfoEnabled()) {
+          LOGGER.info(
+              "Feature provider with id '{}' is in auto mode, generating configuration ...",
+              data.getId());
+        }
 
         Map<String, List<String>> types = featureProviderWfsAuto.analyze(data);
 

xtraplatform-features-gml/src/main/java/de/ii/xtraplatform/features/gml/app/FeatureQueryEncoderWfs.java

@@ -33,13 +33,9 @@
 import java.net.URI;
 import java.util.Map;
 import javax.xml.namespace.QName;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class FeatureQueryEncoderWfs implements FeatureQueryEncoder<String, QueryOptions> {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(FeatureQueryEncoderWfs.class);
-
   private final Map<String, FeatureSchema> featureSchemas;
   private final XMLNamespaceNormalizer namespaceNormalizer;
   private final WfsRequestEncoder wfsRequestEncoder;
@@ -71,8 +67,7 @@ public FeatureQueryEncoderWfs(
             connectionInfo.getNamespaces(),
             urls);
     this.nativeCrs = nativeCrs;
-    this.filterEncoder =
-        new FilterEncoderWfs(nativeCrs, crsTransformerFactory, cql, namespaceNormalizer);
+    this.filterEncoder = new FilterEncoderWfs(nativeCrs, crsTransformerFactory, cql);
   }
 
   // TODO: add cql2 classes
@@ -127,7 +122,7 @@ GetFeature encodeGetFeature(
       return encodeGetFeature(
           query, featureTypeName, featureSchemas.get(query.getType()), additionalQueryParameters);
     } catch (CqlParseException e) {
-      throw new IllegalArgumentException("Filter is invalid", e.getCause());
+      throw new IllegalArgumentException("Filter is invalid", e);
     }
   }
 
@@ -139,8 +134,7 @@ private GetFeature encodeGetFeature(
       FeatureQuery query,
       QName featureTypeName,
       FeatureSchema featureSchema,
-      Map<String, String> additionalQueryParameters)
-      throws CqlParseException {
+      Map<String, String> additionalQueryParameters) {
     final String featureTypeNameFull =
         namespaceNormalizer.getQualifiedName(
             featureTypeName.getNamespaceURI(), featureTypeName.getLocalPart());

xtraplatform-features-gml/src/main/java/de/ii/xtraplatform/features/gml/app/FeatureStorePathParserWfs.java

@@ -14,11 +14,14 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 public class FeatureStorePathParserWfs implements FeatureStorePathParser {
 
-  public FeatureStorePathParserWfs(Map<String, String> namespaces) {}
+  public FeatureStorePathParserWfs(Map<String, String> namespaces) {
+    Objects.requireNonNull(namespaces);
+  }
 
   @Override
   public List<FeatureStoreInstanceContainer> parse(FeatureSchema schema) {