More compilation error fixes.

Geomatys · Jun 13, 2021 · 527f10c · 527f10c
1 parent a260ef8
commit 527f10c
Show file tree

Hide file tree

Showing 148 changed files with 661 additions and 1,268 deletions.
diff --git a/...-samples/src/main/java/org/geotoolkit/pending/demo/datamodel/FeatureStoreReadingDemo.java b/...-samples/src/main/java/org/geotoolkit/pending/demo/datamodel/FeatureStoreReadingDemo.java
@@ -7,12 +7,12 @@
 import java.util.Map;
 import java.util.stream.Stream;
 import org.apache.sis.internal.storage.query.SimpleQuery;
-import org.apache.sis.internal.system.DefaultFactories;
 import org.apache.sis.storage.DataStore;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.storage.FeatureSet;
 import org.geotoolkit.data.shapefile.ShapefileProvider;
 import org.geotoolkit.db.postgres.PostgresProvider;
+import org.geotoolkit.filter.FilterUtilities;
 import org.geotoolkit.pending.demo.Demos;
 import org.geotoolkit.storage.DataStores;
 import org.opengis.feature.Feature;
@@ -23,7 +23,7 @@
 
 public class FeatureStoreReadingDemo {
 
-    private static final FilterFactory FF = DefaultFactories.forBuildin(FilterFactory.class);
+    private static final FilterFactory FF = FilterUtilities.FF;
 
     public static void main(String[] args) throws DataStoreException, NoSuchAuthorityCodeException, FactoryException, URISyntaxException {
         Demos.init();

diff --git a/...-samples/src/main/java/org/geotoolkit/pending/demo/datamodel/FeatureStoreWritingDemo.java b/...-samples/src/main/java/org/geotoolkit/pending/demo/datamodel/FeatureStoreWritingDemo.java
@@ -8,10 +8,10 @@
 import java.util.Set;
 import org.apache.sis.feature.builder.AttributeRole;
 import org.apache.sis.feature.builder.FeatureTypeBuilder;
-import org.apache.sis.internal.system.DefaultFactories;
 import org.apache.sis.referencing.CommonCRS;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.storage.WritableFeatureSet;
+import org.geotoolkit.filter.FilterUtilities;
 import org.geotoolkit.storage.feature.DefiningFeatureSet;
 import org.geotoolkit.storage.memory.InMemoryStore;
 import org.geotoolkit.pending.demo.Demos;
@@ -26,7 +26,7 @@
 
 public class FeatureStoreWritingDemo {
 
-    private static final FilterFactory FF = DefaultFactories.forBuildin(FilterFactory.class);
+    private static final FilterFactory FF = FilterUtilities.FF;
 
     public static void main(String[] args) throws  DataStoreException {
         Demos.init();

diff --git a/demos/geotk-demo-samples/src/main/java/org/geotoolkit/pending/demo/filter/CQLDemo.java b/demos/geotk-demo-samples/src/main/java/org/geotoolkit/pending/demo/filter/CQLDemo.java
@@ -3,15 +3,15 @@
 package org.geotoolkit.pending.demo.filter;
 
 import org.apache.sis.cql.CQLException;
-import org.apache.sis.internal.system.DefaultFactories;
 import org.geotoolkit.cql.CQL;
+import org.geotoolkit.filter.FilterUtilities;
 import org.geotoolkit.pending.demo.Demos;
 import org.opengis.filter.Filter;
 import org.opengis.filter.FilterFactory;
 
 public class CQLDemo {
 
-    private static final FilterFactory FF = DefaultFactories.forBuildin(FilterFactory.class);
+    private static final FilterFactory FF = FilterUtilities.FF;
 
     public static void main(String[] args) throws CQLException {
         Demos.init();

diff --git a/...s/geotk-demo-samples/src/main/java/org/geotoolkit/pending/demo/filter/ExpressionDemo.java b/...s/geotk-demo-samples/src/main/java/org/geotoolkit/pending/demo/filter/ExpressionDemo.java
@@ -5,10 +5,10 @@
 import java.util.Collection;
 import java.util.Iterator;
 import org.apache.sis.internal.feature.FunctionRegister;
-import org.apache.sis.internal.system.DefaultFactories;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.storage.FeatureSet;
 import org.apache.sis.util.Classes;
+import org.geotoolkit.filter.FilterUtilities;
 import org.geotoolkit.filter.function.Functions;
 import org.geotoolkit.filter.function.math.MathFunctionFactory;
 import org.geotoolkit.pending.demo.Demos;
@@ -20,7 +20,7 @@
 
 public class ExpressionDemo {
 
-    private static final FilterFactory FF = DefaultFactories.forBuildin(FilterFactory.class);
+    private static final FilterFactory FF = FilterUtilities.FF;
 
     public static void main(String[] args) throws DataStoreException {
         Demos.init();

diff --git a/demos/geotk-demo-samples/src/main/java/org/geotoolkit/pending/demo/filter/FilterDemo.java b/demos/geotk-demo-samples/src/main/java/org/geotoolkit/pending/demo/filter/FilterDemo.java
@@ -6,10 +6,10 @@
 import java.util.Set;
 import org.apache.sis.feature.builder.AttributeRole;
 import org.apache.sis.feature.builder.FeatureTypeBuilder;
-import org.apache.sis.internal.system.DefaultFactories;
 import org.apache.sis.referencing.CommonCRS;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.storage.FeatureSet;
+import org.geotoolkit.filter.FilterUtilities;
 import org.geotoolkit.storage.feature.FeatureStoreUtilities;
 import org.geotoolkit.pending.demo.Demos;
 import org.locationtech.jts.geom.Coordinate;
@@ -20,13 +20,13 @@
 import org.opengis.filter.Filter;
 import org.opengis.filter.FilterFactory;
 import org.opengis.filter.Literal;
-import org.opengis.filter.PropertyName;
+import org.opengis.filter.ValueReference;
 import org.opengis.filter.identity.Identifier;
 
 
 public class FilterDemo {
 
-    private static final FilterFactory FF = DefaultFactories.forBuildin(FilterFactory.class);
+    private static final FilterFactory FF = FilterUtilities.FF;
 
     public static void main(String[] args) throws DataStoreException {
         Demos.init();
@@ -56,7 +56,7 @@ private static void testFilter(FeatureSet collection, Filter filter) throws Data
     }
 
     private static Filter attributeFilter(){
-        final PropertyName property = FF.property("name");
+        final ValueReference property = FF.property("name");
         final Literal value = FF.literal("robert");
         final Filter filter = FF.equals(property, value);
         return filter;

diff --git a/...demo-samples/src/main/java/org/geotoolkit/pending/demo/filter/JavascriptFunctionDemo.java b/...demo-samples/src/main/java/org/geotoolkit/pending/demo/filter/JavascriptFunctionDemo.java
@@ -3,7 +3,7 @@
 package org.geotoolkit.pending.demo.filter;
 
 import org.apache.sis.feature.builder.FeatureTypeBuilder;
-import org.apache.sis.internal.system.DefaultFactories;
+import org.geotoolkit.filter.FilterUtilities;
 import org.geotoolkit.filter.function.javascript.JavaScriptFunctionFactory;
 import org.geotoolkit.pending.demo.Demos;
 import org.opengis.feature.Feature;
@@ -15,7 +15,7 @@
 
 public class JavascriptFunctionDemo {
 
-    private static final FilterFactory FF = DefaultFactories.forBuildin(FilterFactory.class);
+    private static final FilterFactory FF = FilterUtilities.FF;
 
     public static void main(String[] args) {
         Demos.init();

diff --git a/...emo-samples/src/main/java/org/geotoolkit/pending/demo/filter/customaccessor/PojoDemo.java b/...emo-samples/src/main/java/org/geotoolkit/pending/demo/filter/customaccessor/PojoDemo.java
@@ -3,14 +3,14 @@
 package org.geotoolkit.pending.demo.filter.customaccessor;
 
 import java.util.Date;
-import org.apache.sis.internal.system.DefaultFactories;
+import org.geotoolkit.filter.FilterUtilities;
 import org.geotoolkit.pending.demo.Demos;
 import org.opengis.filter.FilterFactory;
 import org.opengis.filter.Expression;
 
 public class PojoDemo {
 
-    private static final FilterFactory FF = DefaultFactories.forBuildin(FilterFactory.class);
+    private static final FilterFactory FF = FilterUtilities.FF;
 
     public static void main(String[] args) {
         Demos.init();

diff --git a/...ples/src/main/java/org/geotoolkit/pending/demo/filter/customfunction/IMRFunctionDemo.java b/...ples/src/main/java/org/geotoolkit/pending/demo/filter/customfunction/IMRFunctionDemo.java
@@ -6,10 +6,10 @@
 import org.locationtech.jts.geom.Point;
 import java.util.Date;
 import org.apache.sis.feature.builder.FeatureTypeBuilder;
-import org.apache.sis.internal.system.DefaultFactories;
 import org.geotoolkit.pending.demo.Demos;
 import org.geotoolkit.pending.demo.filter.customaccessor.Pojo;
 import org.apache.sis.referencing.CommonCRS;
+import org.geotoolkit.filter.FilterUtilities;
 import org.opengis.feature.Feature;
 import org.opengis.feature.FeatureType;
 import org.opengis.filter.FilterFactory;
@@ -18,7 +18,7 @@
 
 public class IMRFunctionDemo {
 
-    private static final FilterFactory FF = DefaultFactories.forBuildin(FilterFactory.class);
+    private static final FilterFactory FF = FilterUtilities.FF;
 
     public static void main(String[] args) {
         Demos.init();

diff --git a/demos/geotk-demo-samples/src/main/java/org/geotoolkit/pending/demo/symbology/Styles.java b/demos/geotk-demo-samples/src/main/java/org/geotoolkit/pending/demo/symbology/Styles.java
@@ -21,6 +21,7 @@
 import org.apache.sis.storage.FeatureSet;
 import org.geotoolkit.data.shapefile.ShapefileFeatureStore;
 import org.geotoolkit.filter.DefaultLiteral;
+import org.geotoolkit.filter.FilterUtilities;
 import org.geotoolkit.font.FontAwesomeIcons;
 import org.geotoolkit.font.IconBuilder;
 import org.geotoolkit.map.MapBuilder;
@@ -76,7 +77,7 @@ public class Styles {
     /**
      * Factories used in all symbology exemples.
      */
-    protected static final FilterFactory FF = DefaultFactories.forBuildin(FilterFactory.class);
+    protected static final FilterFactory FF = FilterUtilities.FF;
     protected static final MutableSLDFactory SLDF = new DefaultSLDFactory();
     protected static final MutableStyleFactory SF = (MutableStyleFactory) DefaultFactories.forBuildin(StyleFactory.class);
 

diff --git a/...es/clients/geotk-client-wfs/src/main/java/org/geotoolkit/data/wfs/AbstractGetFeature.java b/...es/clients/geotk-client-wfs/src/main/java/org/geotoolkit/data/wfs/AbstractGetFeature.java
@@ -312,10 +312,10 @@ protected Optional<XMLFilter> prepareFilter() {
             visitor = new PrefixSwitchVisitor();
             ((PrefixSwitchVisitor)visitor).setPrefix(namespace, prefix);
         } else {
-            visitor = new SimplifyingFilterVisitor();
+            visitor = SimplifyingFilterVisitor.INSTANCE;
         }
 
-        final Object result = visitor.visit(filter, null);
+        final Object result = visitor.visit(filter);
         if (result == null || Filter.include().equals(result)) {
             return Optional.empty();
         } else if (result instanceof Filter) {

diff --git a/modules/clients/geotk-client-wfs/src/test/java/org/geotoolkit/wfs/GetFeatureTest.java b/modules/clients/geotk-client-wfs/src/test/java/org/geotoolkit/wfs/GetFeatureTest.java
@@ -19,8 +19,8 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import javax.xml.namespace.QName;
-import org.apache.sis.internal.system.DefaultFactories;
 import org.geotoolkit.data.wfs.v110.GetFeature110;
+import org.geotoolkit.filter.FilterUtilities;
 import org.junit.Test;
 import org.opengis.filter.FilterFactory;
 import static org.junit.Assert.*;
@@ -42,7 +42,7 @@ public GetFeatureTest() {}
     public void testGetFeature110() {
         final GetFeature110 getFeat110 = new GetFeature110("http://test.com",null);
         getFeat110.setTypeName(new QName("http://myqnametest.com", "value", "ut"));
-        final FilterFactory ff = DefaultFactories.forBuildin(FilterFactory.class);
+        final FilterFactory ff = FilterUtilities.FF;
         getFeat110.setFilter(ff.bbox("propGeom", -180.0, -90.0, 180.0, 90.0, "CRS:84"));
         final URL url;
         try {

diff --git a/modules/display/geotk-render2d/src/main/java/org/geotoolkit/display2d/GO2Utilities.java b/modules/display/geotk-render2d/src/main/java/org/geotoolkit/display2d/GO2Utilities.java
@@ -118,8 +118,8 @@
 import org.opengis.feature.FeatureType;
 import org.opengis.feature.PropertyNotFoundException;
 import org.opengis.feature.PropertyType;
-import org.opengis.filter.FilterFactory;
 import org.geotoolkit.filter.FilterFactory2;
+import org.geotoolkit.filter.FilterUtilities;
 import org.opengis.filter.Expression;
 import org.opengis.filter.ValueReference;
 import org.opengis.geometry.Envelope;
@@ -190,7 +190,7 @@ public final class GO2Utilities {
         }
 
         STYLE_FACTORY = (MutableStyleFactory) DefaultFactories.forBuildin(StyleFactory.class);
-        FILTER_FACTORY = (FilterFactory2) DefaultFactories.forBuildin(FilterFactory.class);
+        FILTER_FACTORY = FilterUtilities.FF;
 
         //LINE -----------------------------------------------------------------
         final float x2Points[] = {0,    0.4f,   0.6f,   1f};

diff --git a/...-render2d/src/main/java/org/geotoolkit/display2d/ext/graduation/GraduationSymbolizer.java b/...-render2d/src/main/java/org/geotoolkit/display2d/ext/graduation/GraduationSymbolizer.java
@@ -30,7 +30,6 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
-import org.apache.sis.internal.system.DefaultFactories;
 import org.geotoolkit.filter.DefaultLiteral;
 import org.geotoolkit.se.xml.v110.FontType;
 import org.geotoolkit.se.xml.v110.ParameterValueType;
@@ -46,7 +45,7 @@
 import org.opengis.style.Stroke;
 import org.opengis.style.StyleVisitor;
 import org.apache.sis.measure.Units;
-import org.opengis.filter.FilterFactory;
+import org.geotoolkit.filter.FilterUtilities;
 
 /**
  * Draw graduation along a LineStrings or polygon boundary.
@@ -129,7 +128,7 @@ public Map<String, Expression> getParameters() {
 
         int i=0;
         for(String str : properties){
-            config.put(String.valueOf(i++), DefaultFactories.forBuildin(FilterFactory.class).property(str));
+            config.put(String.valueOf(i++), FilterUtilities.FF.property(str));
         }
         return config;
     }

diff --git a/...er2d/src/main/java/org/geotoolkit/display2d/ext/isoline/symbolizer/IsolineSymbolizer.java b/...er2d/src/main/java/org/geotoolkit/display2d/ext/isoline/symbolizer/IsolineSymbolizer.java
@@ -37,7 +37,7 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import org.apache.sis.internal.system.DefaultFactories;
+import org.geotoolkit.filter.FilterUtilities;
 
 /**
  * @author Quentin Boileau (Geomatys)
@@ -48,7 +48,7 @@
 public class IsolineSymbolizer extends SymbolizerType implements ExtensionSymbolizer {
 
     @XmlTransient
-    private static final FilterFactory FF = DefaultFactories.forBuildin(FilterFactory.class);
+    private static final FilterFactory FF = FilterUtilities.FF;
 
     @XmlElement(name = "Raster", namespace = "http://geotoolkit.org")
     public RasterSymbolizerType rasterSymbolizerType;
@@ -134,7 +134,7 @@ public Map<String, Expression> getParameters() {
 
         int i = 0;
         for (String str : properties) {
-            config.put(String.valueOf(i++), DefaultFactories.forBuildin(FilterFactory.class).property(str));
+            config.put(String.valueOf(i++), FF.property(str));
         }
         return config;
     }

diff --git a/.../display/geotk-render2d/src/main/java/org/geotoolkit/display2d/ext/pie/PieSymbolizer.java b/.../display/geotk-render2d/src/main/java/org/geotoolkit/display2d/ext/pie/PieSymbolizer.java
@@ -39,8 +39,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.apache.sis.internal.system.DefaultFactories;
-import org.opengis.filter.FilterFactory;
+import org.geotoolkit.filter.FilterUtilities;
 
 /**
  * Pie symbolizer.
@@ -149,7 +148,7 @@ public Map<String, Expression> getParameters() {
 
         int i=0;
         for(String str : properties){
-            config.put(String.valueOf(i++), DefaultFactories.forBuildin(FilterFactory.class).property(str));
+            config.put(String.valueOf(i++), FilterUtilities.FF.property(str));
         }
         return config;
     }

diff --git a/...otk-render2d/src/main/java/org/geotoolkit/display2d/style/renderer/RenderingRoutines.java b/...otk-render2d/src/main/java/org/geotoolkit/display2d/style/renderer/RenderingRoutines.java
@@ -28,6 +28,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
+import org.apache.sis.feature.Features;
 import org.apache.sis.geometry.Envelope2D;
 import org.apache.sis.geometry.Envelopes;
 import org.apache.sis.geometry.GeneralEnvelope;
@@ -186,7 +187,7 @@ public static Query prepareQuery(final RenderingContext2D renderingContext, Feat
             allDefined = false;
         }
         if (geomDesc!=null && !allDefined) {
-            geomProperties.add(geomDesc.getName().toString());
+            geomProperties.add(Features.getLinkTarget(geomDesc).orElse(geomDesc.getName().toString()));
         }
 
         Filter<Object> filter;
@@ -274,10 +275,8 @@ public static Query prepareQuery(final RenderingContext2D renderingContext, Feat
                     }
                     sb.append(attName.substring(position));
                     atts[i] = sb.toString();
-
                 }
             }
-
             try {
                 expected = new ViewMapper(schema, atts).getMappedType();
             } catch (MismatchedFeatureException ex) {
@@ -535,7 +534,6 @@ public static BoundingBox optimizeBBox(RenderingContext2D renderingContext, Feat
                 }else{
                     env = new GeneralEnvelope(gbox);
                 }
-
             }catch(Exception ex){
                 //we should not catch this but we must not block the canvas
                 monitor.exceptionOccured(ex, Level.WARNING);
@@ -549,7 +547,6 @@ public static BoundingBox optimizeBBox(RenderingContext2D renderingContext, Feat
 
             bbox = new BoundingBox(env);
         }
-
         return bbox;
     }
 
@@ -608,6 +605,5 @@ public void remove() {
         public void close() throws IOException {
             ite.close();
         }
-
     }
 }
diff --git a/...play/geotk-render2d/src/main/java/org/geotoolkit/style/category/CategoryStyleBuilder.java b/...play/geotk-render2d/src/main/java/org/geotoolkit/style/category/CategoryStyleBuilder.java
@@ -33,6 +33,7 @@
 import org.apache.sis.storage.Resource;
 import org.apache.sis.util.logging.Logging;
 import org.geotoolkit.feature.FeatureExt;
+import org.geotoolkit.filter.FilterUtilities;
 import org.geotoolkit.storage.feature.FeatureStoreRuntimeException;
 import org.geotoolkit.storage.feature.query.Query;
 import org.geotoolkit.storage.feature.query.QueryBuilder;
@@ -106,15 +107,12 @@ public CategoryStyleBuilder(final MutableStyleFactory styleFactory, final Filter
         }else{
             sf = styleFactory;
         }
-
         if(filterFactory == null){
-             ff = DefaultFactories.forBuildin(FilterFactory.class);
+             ff = FilterUtilities.FF;
         }else{
             ff = filterFactory;
         }
-
         fts = sf.featureTypeStyle();
-
     }
 
     public void analyze(final MapLayer layer){