You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2019/05/08 11:51:23 UTC
[jena] 02/08: - applied Apache contributors license. - cleaned up
unused imports.
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch geosparql
in repository https://gitbox.apache.org/repos/asf/jena.git
commit 6f4719b4789d2c1a6b406e699a96960c8af25bce
Author: Greg Albiston <46...@users.noreply.github.com>
AuthorDate: Mon May 6 17:23:47 2019 +0100
- applied Apache contributors license.
- cleaned up unused imports.
---
.../geosparql/configuration/GeoSPARQLConfig.java | 2 +-
.../configuration/GeoSPARQLOperations.java | 16 ++++++-------
.../jena/geosparql/configuration/ModeSRS.java | 16 ++++++-------
.../jena/geosparql/configuration/SrsException.java | 16 ++++++-------
.../GenericGeometryPropertyFunction.java | 16 +++++++------
.../geo/topological/GenericPropertyFunction.java | 6 ++---
.../topological/SpatialObjectGeometryLiteral.java | 2 +-
.../filter_functions/BoundaryFF.java | 2 +-
.../nontopological/filter_functions/BufferFF.java | 2 +-
.../filter_functions/ConvexHullFF.java | 2 +-
.../filter_functions/DifferenceFF.java | 2 +-
.../filter_functions/DistanceFF.java | 2 +-
.../nontopological/filter_functions/EnvelopFF.java | 2 +-
.../nontopological/filter_functions/GetSRIDFF.java | 2 +-
.../filter_functions/IntersectionFF.java | 2 +-
.../filter_functions/SymmetricDifferenceFF.java | 2 +-
.../nontopological/filter_functions/UnionFF.java | 2 +-
.../geof/topological/GenericFilterFunction.java | 2 +-
.../jena/geosparql/geof/topological/RelateFF.java | 2 +-
.../geometry_property/CoordinateDimensionFF.java | 2 +-
.../geometry_property/DimensionFF.java | 2 +-
.../geometry_property/IsEmptyFF.java | 2 +-
.../geometry_property/IsSimpleFF.java | 2 +-
.../geometry_property/IsValidFF.java | 2 +-
.../geometry_property/SpatialDimensionFF.java | 2 +-
.../geosparql/implementation/DimensionInfo.java | 4 ++--
.../geosparql/implementation/GeometryWrapper.java | 6 ++---
.../implementation/GeometryWrapperFactory.java | 16 ++++++-------
.../jena/geosparql/implementation/SRSInfo.java | 18 +++++++-------
.../geosparql/implementation/SRSInfoException.java | 16 ++++++-------
.../implementation/UnitsConversionException.java | 16 ++++++-------
.../implementation/datatype/GMLDatatype.java | 4 ++--
.../implementation/datatype/GeometryDatatype.java | 6 ++---
.../implementation/datatype/WKTDatatype.java | 2 +-
.../function_registration/Spatial.java | 14 ++++++-----
.../implementation/great_circle/Angle.java | 16 ++++++-------
.../implementation/great_circle/Azimuth.java | 16 ++++++-------
.../great_circle/CoordinatePair.java | 16 ++++++-------
.../great_circle/GreatCircleDistance.java | 16 ++++++-------
.../great_circle/GreatCirclePointDistance.java | 16 ++++++-------
.../implementation/great_circle/LatLonPoint.java | 16 ++++++-------
.../implementation/index/GeometryLiteralIndex.java | 2 +-
.../implementation/index/IndexConfiguration.java | 2 +-
.../jts/CoordinateSequenceDimensions.java | 16 ++++++-------
.../jts/CustomCoordinateSequence.java | 2 +-
.../implementation/parsers/gml/GMLReader.java | 16 ++++++-------
.../implementation/parsers/gml/GMLWriter.java | 2 +-
.../implementation/parsers/wkt/WKTReader.java | 6 ++---
.../implementation/registry/SRSRegistry.java | 10 ++++----
.../implementation/registry/UnitsRegistry.java | 4 ++--
.../implementation/registry/UnitsURIException.java | 16 ++++++-------
.../vocabulary/SpatialExtension.java | 14 ++++++-----
.../jena/geosparql/spatial/CardinalDirection.java | 14 ++++++-----
.../jena/geosparql/spatial/ConvertLatLon.java | 16 ++++++-------
.../jena/geosparql/spatial/ConvertLatLonBox.java | 16 ++++++-------
.../jena/geosparql/spatial/SearchEnvelope.java | 20 +++++++++-------
.../jena/geosparql/spatial/SpatialIndex.java | 28 ++++++++++++----------
.../geosparql/spatial/SpatialIndexException.java | 16 ++++++-------
.../jena/geosparql/spatial/SpatialIndexItem.java | 14 ++++++-----
.../geosparql/spatial/SpatialIndexStorage.java | 16 ++++++-------
.../spatial/filter_functions/AngleDegreesFF.java | 16 +++++++------
.../spatial/filter_functions/AngleFF.java | 16 +++++++------
.../spatial/filter_functions/AzimuthDegreesFF.java | 16 +++++++------
.../spatial/filter_functions/AzimuthFF.java | 16 +++++++------
.../filter_functions/ConvertLatLonBoxFF.java | 16 +++++++------
.../spatial/filter_functions/ConvertLatLonFF.java | 16 +++++++------
.../spatial/filter_functions/DistanceFF.java | 16 +++++++------
.../spatial/filter_functions/GreatCircleFF.java | 14 ++++++-----
.../filter_functions/GreatCircleGeomFF.java | 16 +++++++------
.../spatial/filter_functions/NearbyFF.java | 16 +++++++------
.../filter_functions/TransformDatatypeFF.java | 16 ++++++-------
.../spatial/filter_functions/TransformFF.java | 16 ++++++-------
.../spatial/filter_functions/TransformSRSFF.java | 16 ++++++-------
.../GenericSpatialGeomPropertyFunction.java | 18 +++++++-------
.../GenericSpatialPropertyFunction.java | 24 ++++++++++---------
.../property_functions/SpatialArguments.java | 16 ++++++-------
.../box/GenericSpatialBoxPropertyFunction.java | 18 +++++++-------
.../box/GenericSpatialGeomBoxPropertyFunction.java | 14 ++++++-----
.../property_functions/box/IntersectBoxGeomPF.java | 14 ++++++-----
.../property_functions/box/IntersectBoxPF.java | 14 ++++++-----
.../property_functions/box/WithinBoxGeomPF.java | 14 ++++++-----
.../property_functions/box/WithinBoxPF.java | 14 ++++++-----
.../property_functions/cardinal/EastGeomPF.java | 14 ++++++-----
.../property_functions/cardinal/EastPF.java | 14 ++++++-----
.../GenericCardinalGeomPropertyFunction.java | 14 ++++++-----
.../cardinal/GenericCardinalPropertyFunction.java | 18 +++++++-------
.../property_functions/cardinal/NorthGeomPF.java | 14 ++++++-----
.../property_functions/cardinal/NorthPF.java | 14 ++++++-----
.../property_functions/cardinal/SouthGeomPF.java | 14 ++++++-----
.../property_functions/cardinal/SouthPF.java | 14 ++++++-----
.../property_functions/cardinal/WestGeomPF.java | 14 ++++++-----
.../property_functions/cardinal/WestPF.java | 14 ++++++-----
.../property_functions/nearby/NearbyGeomPF.java | 18 +++++++-------
.../property_functions/nearby/NearbyPF.java | 18 +++++++-------
.../GenericGeometryPropertyFunctionTest.java | 17 ++++++-------
.../topological/GenericPropertyFunctionTest.java | 21 ++++++++--------
.../egenhofer/EhContainsPFTest.java | 17 +++++++------
.../egenhofer/EhCoveredByPFTest.java | 18 +++++++-------
.../egenhofer/EhCoversPFTest.java | 17 +++++++------
.../egenhofer/EhDisjointPFTest.java | 17 +++++++------
.../egenhofer/EhEqualsPFTest.java | 17 +++++++------
.../egenhofer/EhInsidePFTest.java | 17 +++++++------
.../property_functions/egenhofer/EhMeetPFTest.java | 17 +++++++------
.../egenhofer/EhOverlapPFTest.java | 17 +++++++------
.../CoordinateDimensionPFTest.java | 17 +++++++------
.../geometry_property/DimensionPFTest.java | 17 +++++++------
.../geometry_property/IsEmptyPFTest.java | 17 +++++++------
.../geometry_property/IsSimplePFTest.java | 17 +++++++------
.../geometry_property/IsValidPFTest.java | 17 +++++++------
.../geometry_property/SpatialDimensionPFTest.java | 17 +++++++------
.../rcc8/RccDisconnectedPFTest.java | 17 +++++++------
.../property_functions/rcc8/RccEqualsPFTest.java | 17 +++++++------
.../rcc8/RccExternallyConnectedPFTest.java | 17 +++++++------
.../RccNonTangentialProperPartInversePFTest.java | 17 +++++++------
.../rcc8/RccNonTangentialProperPartPFTest.java | 17 +++++++------
.../rcc8/RccPartiallyOverlappingPFTest.java | 17 +++++++------
.../rcc8/RccTangentialProperPartInversePFTest.java | 17 +++++++------
.../rcc8/RccTangentialProperPartPFTest.java | 17 +++++++------
.../simple_features/SfContainsPFTest.java | 17 +++++++------
.../simple_features/SfCrossesPFTest.java | 17 +++++++------
.../simple_features/SfDisjointPFTest.java | 17 +++++++------
.../simple_features/SfEqualsPFTest.java | 17 +++++++------
.../simple_features/SfIntersectsPFTest.java | 17 +++++++------
.../simple_features/SfOverlapsPFTest.java | 17 +++++++------
.../simple_features/SfTouchesPFTest.java | 17 +++++++------
.../simple_features/SfWithinPFTest.java | 17 +++++++------
.../filter_functions/BoundaryFFTest.java | 1 -
.../filter_functions/BufferFFTest.java | 17 +++++++------
.../filter_functions/ConvexHullFFTest.java | 17 +++++++------
.../filter_functions/DifferenceFFTest.java | 17 +++++++------
.../filter_functions/DistanceFFTest.java | 17 +++++++------
.../filter_functions/EnvelopFFTest.java | 17 +++++++------
.../filter_functions/GetSRIDFFTest.java | 17 +++++++------
.../filter_functions/IntersectionFFTest.java | 17 +++++++------
.../SymmetricDifferenceFFTest.java | 17 +++++++------
.../filter_functions/UnionFFTest.java | 17 +++++++------
.../egenhofer/EhContainsFFTest.java | 17 +++++++------
.../egenhofer/EhCoveredByFFTest.java | 18 +++++++-------
.../filter_functions/egenhofer/EhCoversFFTest.java | 17 +++++++------
.../egenhofer/EhDisjointFFTest.java | 17 +++++++------
.../filter_functions/egenhofer/EhEqualsFFTest.java | 17 +++++++------
.../filter_functions/egenhofer/EhInsideFFTest.java | 17 +++++++------
.../filter_functions/egenhofer/EhMeetFFTest.java | 17 +++++++------
.../egenhofer/EhOverlapFFTest.java | 17 +++++++------
.../CoordinateDimensionFFTest.java | 17 +++++++------
.../geometry_property/DimensionFFTest.java | 17 +++++++------
.../geometry_property/IsEmptyFFTest.java | 17 +++++++------
.../geometry_property/IsSimpleFFTest.java | 17 +++++++------
.../geometry_property/IsValidFFTest.java | 17 +++++++------
.../geometry_property/SpatialDimensionFFTest.java | 17 +++++++------
.../rcc8/RccDisconnectedFFTest.java | 17 +++++++------
.../filter_functions/rcc8/RccEqualsFFTest.java | 17 +++++++------
.../rcc8/RccExternallyConnectedFFTest.java | 17 +++++++------
.../rcc8/RccNonTangentialProperPartFFTest.java | 17 +++++++------
.../RccNonTangentialProperPartInverseFFTest.java | 17 +++++++------
.../rcc8/RccPartiallyOverlappingFFTest.java | 17 +++++++------
.../rcc8/RccTangentialProperPartFFTest.java | 17 +++++++------
.../rcc8/RccTangentialProperPartInverseFFTest.java | 17 +++++++------
.../simple_features/SfContainsFFTest.java | 16 ++++++-------
.../simple_features/SfCrossesFFTest.java | 16 ++++++-------
.../simple_features/SfDisjointFFTest.java | 16 ++++++-------
.../simple_features/SfEqualsFFTest.java | 17 +++++++------
.../simple_features/SfIntersectsFFTest.java | 17 +++++++------
.../simple_features/SfOverlapsFFTest.java | 17 +++++++------
.../simple_features/SfTouchesFFTest.java | 17 +++++++------
.../simple_features/SfWithinFFTest.java | 17 +++++++------
.../implementation/GeometryReverseTest.java | 1 -
.../implementation/GeometryWrapperFactoryTest.java | 6 ++---
.../implementation/GeometryWrapperTest.java | 2 --
.../implementation/UnitsOfMeasureTest.java | 2 --
.../implementation/datatype/GMLDatatypeTest.java | 3 +--
.../datatype/GeometryDatatypeTest.java | 2 --
.../implementation/datatype/WKTDatatypeTest.java | 1 -
.../jts/CoordinateSequenceDimensionsTest.java | 1 -
.../implementation/jts/GeometryTransformTest.java | 1 -
.../implementation/parsers/gml/GMLReaderTest.java | 7 +++---
.../implementation/parsers/gml/GMLWriterTest.java | 1 -
.../implementation/parsers/wkt/WKTReaderTest.java | 1 -
.../implementation/parsers/wkt/WKTWriterTest.java | 1 -
.../implementation/registry/SRSRegistryTest.java | 1 -
.../geosparql/spatial/ConvertLatLonBoxTest.java | 1 -
.../jena/geosparql/spatial/ConvertLatLonTest.java | 3 +--
.../jena/geosparql/spatial/SearchEnvelopeTest.java | 21 ++++++++--------
.../geosparql/spatial/SpatialIndexTestData.java | 2 --
.../filter_functions/AngleDegreesFFTest.java | 5 ++--
.../spatial/filter_functions/AngleFFTest.java | 5 ++--
.../filter_functions/AzimuthDegreesFFTest.java | 5 ++--
.../spatial/filter_functions/AzimuthFFTest.java | 5 ++--
.../filter_functions/ConvertLatLonBoxFFTest.java | 7 +++---
.../filter_functions/ConvertLatLonFFTest.java | 21 ++++++++--------
.../spatial/filter_functions/DistanceFFTest.java | 9 ++++---
.../spatial/filter_functions/EqualsFFTest.java | 17 +++++++------
.../filter_functions/GreatCircleFFTest.java | 7 +++---
.../filter_functions/GreatCircleGeomFFTest.java | 9 ++++---
.../filter_functions/TransformDatatypeFFTest.java | 7 +++---
.../spatial/filter_functions/TransformFFTest.java | 7 +++---
.../filter_functions/TransformSRSFFTest.java | 7 +++---
.../spatial/property_functions/EqualsPFTest.java | 17 +++++++------
.../GenericSpatialGeomPropertyFunctionTest.java | 6 ++---
.../GenericSpatialPropertyFunctionTest.java | 8 +++----
.../box/GenericSpatialBoxPropertyFunctionTest.java | 6 ++---
.../GenericCardinalGeomPropertyFunctionTest.java | 5 ++--
.../GenericCardinalPropertyFunctionTest.java | 5 ++--
203 files changed, 1232 insertions(+), 1264 deletions(-)
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/GeoSPARQLConfig.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/GeoSPARQLConfig.java
index 77ab58e..e60742f 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/GeoSPARQLConfig.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/GeoSPARQLConfig.java
@@ -17,6 +17,7 @@
*/
package org.apache.jena.geosparql.configuration;
+import java.io.File;
import org.apache.jena.geosparql.geof.topological.RelateFF;
import org.apache.jena.geosparql.implementation.datatype.GeometryDatatype;
import org.apache.jena.geosparql.implementation.function_registration.Egenhofer;
@@ -33,7 +34,6 @@ import org.apache.jena.geosparql.implementation.registry.SRSRegistry;
import org.apache.jena.geosparql.implementation.vocabulary.Geo;
import org.apache.jena.geosparql.spatial.SpatialIndex;
import org.apache.jena.geosparql.spatial.SpatialIndexException;
-import java.io.File;
import org.apache.jena.query.Dataset;
import org.apache.jena.sparql.function.FunctionRegistry;
import org.apache.jena.sparql.pfunction.PropertyFunctionRegistry;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/GeoSPARQLOperations.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/GeoSPARQLOperations.java
index bd02fa6..7150a89 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/GeoSPARQLOperations.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/GeoSPARQLOperations.java
@@ -17,14 +17,6 @@
*/
package org.apache.jena.geosparql.configuration;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.datatype.GeometryDatatype;
-import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
-import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex;
-import org.apache.jena.geosparql.implementation.vocabulary.Geo;
-import org.apache.jena.geosparql.implementation.vocabulary.GeoSPARQL_URI;
-import org.apache.jena.geosparql.implementation.vocabulary.SpatialExtension;
-import org.apache.jena.geosparql.spatial.ConvertLatLon;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -40,6 +32,14 @@ import java.util.TreeSet;
import java.util.UUID;
import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.datatypes.RDFDatatype;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.apache.jena.geosparql.implementation.datatype.GeometryDatatype;
+import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
+import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex;
+import org.apache.jena.geosparql.implementation.vocabulary.Geo;
+import org.apache.jena.geosparql.implementation.vocabulary.GeoSPARQL_URI;
+import org.apache.jena.geosparql.implementation.vocabulary.SpatialExtension;
+import org.apache.jena.geosparql.spatial.ConvertLatLon;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.DatasetFactory;
import org.apache.jena.query.ReadWrite;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/ModeSRS.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/ModeSRS.java
index 5a48f6e..46c41e4 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/ModeSRS.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/ModeSRS.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/SrsException.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/SrsException.java
index 947620b..ebc7d5f 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/SrsException.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/SrsException.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunction.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunction.java
index a5d7025..5050dde 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunction.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunction.java
@@ -1,12 +1,14 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunction.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunction.java
index b2b376c..37184ea 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunction.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunction.java
@@ -17,6 +17,9 @@
*/
package org.apache.jena.geosparql.geo.topological;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.index.QueryRewriteIndex;
@@ -24,9 +27,6 @@ import org.apache.jena.geosparql.implementation.vocabulary.Geo;
import org.apache.jena.geosparql.implementation.vocabulary.SpatialExtension;
import org.apache.jena.geosparql.spatial.SpatialIndex;
import org.apache.jena.geosparql.spatial.SpatialIndexException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
import org.apache.jena.graph.Graph;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.Triple;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/SpatialObjectGeometryLiteral.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/SpatialObjectGeometryLiteral.java
index 913db93..77167ac 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/SpatialObjectGeometryLiteral.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/SpatialObjectGeometryLiteral.java
@@ -17,10 +17,10 @@
*/
package org.apache.jena.geosparql.geo.topological;
+import java.util.Objects;
import org.apache.jena.geosparql.implementation.vocabulary.Geo;
import org.apache.jena.geosparql.implementation.vocabulary.SpatialExtension;
import org.apache.jena.geosparql.spatial.ConvertLatLon;
-import java.util.Objects;
import org.apache.jena.graph.Graph;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.Triple;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFF.java
index 603dfec..f269952 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFF.java
@@ -17,8 +17,8 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase1;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFF.java
index 67c2bb7..f9e73d4 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFF.java
@@ -17,8 +17,8 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.graph.Node;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFF.java
index a8c6fc9..f6850cd 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFF.java
@@ -17,8 +17,8 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase1;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFF.java
index 91f855c..ca27288 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFF.java
@@ -17,9 +17,9 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex.GeometryIndex;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase2;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFF.java
index 793ddbc..6e5ffd9 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFF.java
@@ -17,9 +17,9 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex.GeometryIndex;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase3;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFF.java
index 336a944..2127d69 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFF.java
@@ -17,8 +17,8 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase1;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFF.java
index c4e495a..f139105 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFF.java
@@ -17,8 +17,8 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase1;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFF.java
index 170e74a..2651661 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFF.java
@@ -17,9 +17,9 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex.GeometryIndex;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase2;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFF.java
index c86719a..a87b62f 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFF.java
@@ -17,9 +17,9 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex.GeometryIndex;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase2;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFF.java
index 9d5fbf0..f725388 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFF.java
@@ -17,9 +17,9 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex.GeometryIndex;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase2;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/GenericFilterFunction.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/GenericFilterFunction.java
index 039313d..80037dd 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/GenericFilterFunction.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/GenericFilterFunction.java
@@ -17,10 +17,10 @@
*/
package org.apache.jena.geosparql.geof.topological;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex.GeometryIndex;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.graph.Node;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/RelateFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/RelateFF.java
index 93c51c9..740d015 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/RelateFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/RelateFF.java
@@ -17,9 +17,9 @@
*/
package org.apache.jena.geosparql.geof.topological;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex.GeometryIndex;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase3;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFF.java
index b08ed8d..2df36e2 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFF.java
@@ -17,8 +17,8 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase1;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFF.java
index 1cb1afc..555ca20 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFF.java
@@ -17,8 +17,8 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase1;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFF.java
index b7fe00d..6b0ac14 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFF.java
@@ -17,8 +17,8 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase1;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFF.java
index 832ee06..f5bb543 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFF.java
@@ -17,8 +17,8 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase1;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFF.java
index ebca622..83122c4 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFF.java
@@ -17,8 +17,8 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase1;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFF.java
index 46f1409..d928e09 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFF.java
@@ -17,8 +17,8 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase1;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/DimensionInfo.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/DimensionInfo.java
index a6af415..cd9f1bd 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/DimensionInfo.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/DimensionInfo.java
@@ -17,11 +17,11 @@
*/
package org.apache.jena.geosparql.implementation;
-import org.apache.jena.geosparql.implementation.jts.CoordinateSequenceDimensions;
-import static org.apache.jena.geosparql.implementation.jts.CustomCoordinateSequence.findCoordinateSequenceDimensions;
import java.io.Serializable;
import java.util.List;
import java.util.Objects;
+import org.apache.jena.geosparql.implementation.jts.CoordinateSequenceDimensions;
+import static org.apache.jena.geosparql.implementation.jts.CustomCoordinateSequence.findCoordinateSequenceDimensions;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.CoordinateXY;
import org.locationtech.jts.geom.Geometry;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/GeometryWrapper.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/GeometryWrapper.java
index 5cd208b..8e97818 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/GeometryWrapper.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/GeometryWrapper.java
@@ -17,6 +17,9 @@
*/
package org.apache.jena.geosparql.implementation;
+import java.io.Serializable;
+import java.util.Objects;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.datatype.GMLDatatype;
import org.apache.jena.geosparql.implementation.datatype.GeometryDatatype;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
@@ -32,9 +35,6 @@ import org.apache.jena.geosparql.implementation.registry.SRSRegistry;
import org.apache.jena.geosparql.implementation.registry.UnitsRegistry;
import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
-import java.io.Serializable;
-import java.util.Objects;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.graph.Node;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactory.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactory.java
index 591c718..e0ff097 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactory.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactory.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/SRSInfo.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/SRSInfo.java
index 5256ca6..5723bc6 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/SRSInfo.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/SRSInfo.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,12 +17,12 @@
*/
package org.apache.jena.geosparql.implementation;
-import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
-import static org.apache.jena.geosparql.implementation.vocabulary.SRS_URI.EPSG_BASE_SRS_URI;
import java.math.BigInteger;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
+import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
+import static org.apache.jena.geosparql.implementation.vocabulary.SRS_URI.EPSG_BASE_SRS_URI;
import org.apache.sis.referencing.CRS;
import org.locationtech.jts.geom.Envelope;
import org.opengis.geometry.DirectPosition;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/SRSInfoException.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/SRSInfoException.java
index cb78a1b..59fe658 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/SRSInfoException.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/SRSInfoException.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/UnitsConversionException.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/UnitsConversionException.java
index 6c74209..90310bf 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/UnitsConversionException.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/UnitsConversionException.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatype.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatype.java
index f5ad60b..456eb2b 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatype.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatype.java
@@ -17,13 +17,13 @@
*/
package org.apache.jena.geosparql.implementation.datatype;
+import java.io.IOException;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.parsers.gml.GMLReader;
import org.apache.jena.geosparql.implementation.parsers.gml.GMLWriter;
import org.apache.jena.geosparql.implementation.vocabulary.Geo;
-import java.io.IOException;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.jdom2.JDOMException;
import org.locationtech.jts.geom.Geometry;
import org.slf4j.Logger;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatype.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatype.java
index 84e18f3..6eee42b 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatype.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatype.java
@@ -17,13 +17,13 @@
*/
package org.apache.jena.geosparql.implementation.datatype;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex;
-import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex.GeometryIndex;
import org.apache.jena.datatypes.BaseDatatype;
import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.datatypes.RDFDatatype;
import org.apache.jena.datatypes.TypeMapper;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex;
+import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex.GeometryIndex;
/**
*
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/datatype/WKTDatatype.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/datatype/WKTDatatype.java
index 190daf3..485ae00 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/datatype/WKTDatatype.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/datatype/WKTDatatype.java
@@ -17,12 +17,12 @@
*/
package org.apache.jena.geosparql.implementation.datatype;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.parsers.wkt.WKTReader;
import org.apache.jena.geosparql.implementation.parsers.wkt.WKTWriter;
import org.apache.jena.geosparql.implementation.vocabulary.Geo;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.locationtech.jts.geom.Geometry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/function_registration/Spatial.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/function_registration/Spatial.java
index 80641fa..72704b3 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/function_registration/Spatial.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/function_registration/Spatial.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/Angle.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/Angle.java
index 3dc064d..8dc369d 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/Angle.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/Angle.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/Azimuth.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/Azimuth.java
index 7cef0eb..3b07547 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/Azimuth.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/Azimuth.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/CoordinatePair.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/CoordinatePair.java
index 9c1708a..781ef41 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/CoordinatePair.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/CoordinatePair.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/GreatCircleDistance.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/GreatCircleDistance.java
index d17277b..3bedd79 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/GreatCircleDistance.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/GreatCircleDistance.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/GreatCirclePointDistance.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/GreatCirclePointDistance.java
index f2bd5f1..05eaaea 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/GreatCirclePointDistance.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/GreatCirclePointDistance.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/LatLonPoint.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/LatLonPoint.java
index 9a4154f..abf97a5 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/LatLonPoint.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/LatLonPoint.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/GeometryLiteralIndex.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/GeometryLiteralIndex.java
index 5a34e0e..762a33a 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/GeometryLiteralIndex.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/GeometryLiteralIndex.java
@@ -20,9 +20,9 @@ package org.apache.jena.geosparql.implementation.index;
import io.github.galbiston.expiring_map.ExpiringMap;
import static io.github.galbiston.expiring_map.MapDefaultValues.MAP_EXPIRY_INTERVAL;
import static io.github.galbiston.expiring_map.MapDefaultValues.UNLIMITED_MAP;
+import java.util.Map;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.GeometryDatatype;
-import java.util.Map;
/**
*
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/IndexConfiguration.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/IndexConfiguration.java
index bc3344a..2c9ef14 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/IndexConfiguration.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/IndexConfiguration.java
@@ -19,9 +19,9 @@ package org.apache.jena.geosparql.implementation.index;
import static io.github.galbiston.expiring_map.MapDefaultValues.NO_MAP;
import static io.github.galbiston.expiring_map.MapDefaultValues.UNLIMITED_MAP;
+import java.util.UUID;
import org.apache.jena.geosparql.implementation.registry.MathTransformRegistry;
import org.apache.jena.geosparql.implementation.registry.SRSRegistry;
-import java.util.UUID;
/**
*
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensions.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensions.java
index 9bf90b0..a0a85ac 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensions.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensions.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/jts/CustomCoordinateSequence.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/jts/CustomCoordinateSequence.java
index 0953645..f3451dd 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/jts/CustomCoordinateSequence.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/jts/CustomCoordinateSequence.java
@@ -17,10 +17,10 @@
*/
package org.apache.jena.geosparql.implementation.jts;
-import static org.apache.jena.geosparql.implementation.WKTLiteralFactory.reducePrecision;
import java.io.Serializable;
import java.util.Arrays;
import java.util.List;
+import static org.apache.jena.geosparql.implementation.WKTLiteralFactory.reducePrecision;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.CoordinateSequence;
import org.locationtech.jts.geom.Envelope;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLReader.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLReader.java
index dcd0f46..b163a26 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLReader.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLReader.java
@@ -17,6 +17,14 @@
*/
package org.apache.jena.geosparql.implementation.parsers.gml;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.SRSInfo;
import org.apache.jena.geosparql.implementation.SRSInfoException;
@@ -26,14 +34,6 @@ import org.apache.jena.geosparql.implementation.jts.CustomCoordinateSequence;
import org.apache.jena.geosparql.implementation.jts.CustomGeometryFactory;
import org.apache.jena.geosparql.implementation.parsers.ParserReader;
import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.invoke.MethodHandles;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.jdom2.Document;
import org.jdom2.Element;
import org.jdom2.JDOMException;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLWriter.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLWriter.java
index 62b9131..8ddec7e 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLWriter.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLWriter.java
@@ -17,10 +17,10 @@
*/
package org.apache.jena.geosparql.implementation.parsers.gml;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.jts.CoordinateSequenceDimensions;
import org.apache.jena.geosparql.implementation.jts.CustomCoordinateSequence;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.jdom2.Element;
import org.jdom2.Namespace;
import org.jdom2.output.XMLOutputter;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTReader.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTReader.java
index 8447315..b9acb58 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTReader.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTReader.java
@@ -17,15 +17,15 @@
*/
package org.apache.jena.geosparql.implementation.parsers.wkt;
+import java.util.Arrays;
+import java.util.Objects;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.jts.CoordinateSequenceDimensions;
import org.apache.jena.geosparql.implementation.jts.CustomCoordinateSequence;
import org.apache.jena.geosparql.implementation.jts.CustomGeometryFactory;
import org.apache.jena.geosparql.implementation.parsers.ParserReader;
import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
-import java.util.Arrays;
-import java.util.Objects;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.geom.GeometryFactory;
import org.locationtech.jts.geom.LineString;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/registry/SRSRegistry.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/registry/SRSRegistry.java
index 239ad18..a7da281 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/registry/SRSRegistry.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/registry/SRSRegistry.java
@@ -17,17 +17,17 @@
*/
package org.apache.jena.geosparql.implementation.registry;
-import org.apache.jena.geosparql.implementation.SRSInfo;
-import org.apache.jena.geosparql.implementation.SRSInfoException;
-import org.apache.jena.geosparql.implementation.UnitsOfMeasure;
-import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
-import static org.apache.jena.geosparql.implementation.vocabulary.SRS_URI.EPSG_BASE_SRS_URI;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
import java.text.DecimalFormat;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.apache.jena.geosparql.implementation.SRSInfo;
+import org.apache.jena.geosparql.implementation.SRSInfoException;
+import org.apache.jena.geosparql.implementation.UnitsOfMeasure;
+import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
+import static org.apache.jena.geosparql.implementation.vocabulary.SRS_URI.EPSG_BASE_SRS_URI;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/registry/UnitsRegistry.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/registry/UnitsRegistry.java
index 561d132..c86e934 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/registry/UnitsRegistry.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/registry/UnitsRegistry.java
@@ -17,13 +17,13 @@
*/
package org.apache.jena.geosparql.implementation.registry;
-import org.apache.jena.geosparql.implementation.UnitsOfMeasure;
-import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import javax.measure.Unit;
import javax.measure.quantity.Length;
+import org.apache.jena.geosparql.implementation.UnitsOfMeasure;
+import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
import org.apache.sis.measure.Units;
/**
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/registry/UnitsURIException.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/registry/UnitsURIException.java
index 2431469..8bd057e 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/registry/UnitsURIException.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/registry/UnitsURIException.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/vocabulary/SpatialExtension.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/vocabulary/SpatialExtension.java
index b36b2aa..903e1de 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/vocabulary/SpatialExtension.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/vocabulary/SpatialExtension.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/CardinalDirection.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/CardinalDirection.java
index bf4e52d..f32b5a6 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/CardinalDirection.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/CardinalDirection.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/ConvertLatLon.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/ConvertLatLon.java
index 4e77f5f..1d50ef9 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/ConvertLatLon.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/ConvertLatLon.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/ConvertLatLonBox.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/ConvertLatLonBox.java
index 5dfc114..426d50c 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/ConvertLatLonBox.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/ConvertLatLonBox.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SearchEnvelope.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SearchEnvelope.java
index eb3c57b..7ab0ea9 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SearchEnvelope.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SearchEnvelope.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,14 +17,14 @@
*/
package org.apache.jena.geosparql.spatial;
+import java.lang.invoke.MethodHandles;
+import java.util.HashSet;
+import java.util.Objects;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.SRSInfo;
import org.apache.jena.geosparql.implementation.UnitsOfMeasure;
import org.apache.jena.geosparql.implementation.great_circle.GreatCirclePointDistance;
import org.apache.jena.geosparql.implementation.great_circle.LatLonPoint;
-import java.lang.invoke.MethodHandles;
-import java.util.HashSet;
-import java.util.Objects;
import org.apache.jena.rdf.model.Resource;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.locationtech.jts.geom.Envelope;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndex.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndex.java
index ba1dd55..56008ea 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndex.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndex.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,13 +17,6 @@
*/
package org.apache.jena.geosparql.spatial;
-import org.apache.jena.geosparql.configuration.GeoSPARQLOperations;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.SRSInfo;
-import org.apache.jena.geosparql.implementation.registry.SRSRegistry;
-import org.apache.jena.geosparql.implementation.vocabulary.Geo;
-import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
-import org.apache.jena.geosparql.implementation.vocabulary.SpatialExtension;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -34,6 +29,13 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import org.apache.jena.geosparql.configuration.GeoSPARQLOperations;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.apache.jena.geosparql.implementation.SRSInfo;
+import org.apache.jena.geosparql.implementation.registry.SRSRegistry;
+import org.apache.jena.geosparql.implementation.vocabulary.Geo;
+import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
+import org.apache.jena.geosparql.implementation.vocabulary.SpatialExtension;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.DatasetFactory;
import org.apache.jena.query.ReadWrite;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexException.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexException.java
index 5062fda..a50bd94 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexException.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexException.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexItem.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexItem.java
index e3b5a97..8e6e7a0 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexItem.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexItem.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexStorage.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexStorage.java
index 0ac0f5a..410e8b4 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexStorage.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexStorage.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFF.java
index 6849e6f..0c5c406 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +17,8 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.implementation.great_circle.Angle;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.great_circle.Angle;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase4;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFF.java
index 2d18283..960ec20 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +17,8 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.implementation.great_circle.Angle;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.great_circle.Angle;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase4;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFF.java
index 8e66733..2e3e588 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +17,8 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.implementation.great_circle.Azimuth;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.great_circle.Azimuth;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase4;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthFF.java
index f3b94ce..9c75ae4 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthFF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +17,8 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.implementation.great_circle.Azimuth;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.great_circle.Azimuth;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase4;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonBoxFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonBoxFF.java
index 5748cba..8dc8cf9 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonBoxFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonBoxFF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +17,8 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.ConvertLatLonBox;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.spatial.ConvertLatLonBox;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase4;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonFF.java
index 1b6e314..034b659 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonFF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +17,8 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.ConvertLatLon;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.spatial.ConvertLatLon;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase2;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/DistanceFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/DistanceFF.java
index 9f27539..0147d15 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/DistanceFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/DistanceFF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,9 +17,9 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase3;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleFF.java
index 2100692..de163e6 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleFF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleGeomFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleGeomFF.java
index 4ec4e0e..e80f0cc 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleGeomFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleGeomFF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,9 +17,9 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase3;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/NearbyFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/NearbyFF.java
index bbd98d7..4c031e8 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/NearbyFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/NearbyFF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,9 +17,9 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase4;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/TransformDatatypeFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/TransformDatatypeFF.java
index 9bb2946..7e7410c 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/TransformDatatypeFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/TransformDatatypeFF.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/TransformFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/TransformFF.java
index 0321a01..1139774 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/TransformFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/TransformFF.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/TransformSRSFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/TransformSRSFF.java
index 9a489be..26da44b 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/TransformSRSFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/TransformSRSFF.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialGeomPropertyFunction.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialGeomPropertyFunction.java
index fa58800..86f4316 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialGeomPropertyFunction.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialGeomPropertyFunction.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,11 +17,11 @@
*/
package org.apache.jena.geosparql.spatial.property_functions;
+import java.util.List;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.SRSInfo;
import org.apache.jena.geosparql.spatial.SearchEnvelope;
-import java.util.List;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.graph.Node;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialPropertyFunction.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialPropertyFunction.java
index 9cd23a7..01102f0 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialPropertyFunction.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialPropertyFunction.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +17,11 @@
*/
package org.apache.jena.geosparql.spatial.property_functions;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import org.apache.commons.collections4.iterators.IteratorChain;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.SRSInfo;
import org.apache.jena.geosparql.implementation.vocabulary.Geo;
@@ -23,11 +30,6 @@ import org.apache.jena.geosparql.spatial.ConvertLatLon;
import org.apache.jena.geosparql.spatial.SearchEnvelope;
import org.apache.jena.geosparql.spatial.SpatialIndex;
import org.apache.jena.geosparql.spatial.SpatialIndexException;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import org.apache.commons.collections4.iterators.IteratorChain;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.graph.Graph;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.Triple;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/SpatialArguments.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/SpatialArguments.java
index abc6149..e5fde91 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/SpatialArguments.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/SpatialArguments.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialBoxPropertyFunction.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialBoxPropertyFunction.java
index 72dda0d..cf21b58 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialBoxPropertyFunction.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialBoxPropertyFunction.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,14 +17,14 @@
*/
package org.apache.jena.geosparql.spatial.property_functions.box;
+import java.util.List;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.SRSInfo;
import org.apache.jena.geosparql.spatial.ConvertLatLonBox;
import org.apache.jena.geosparql.spatial.SearchEnvelope;
import org.apache.jena.geosparql.spatial.property_functions.GenericSpatialGeomPropertyFunction;
import org.apache.jena.geosparql.spatial.property_functions.SpatialArguments;
-import java.util.List;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.graph.Node;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialGeomBoxPropertyFunction.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialGeomBoxPropertyFunction.java
index ada6af7..d7d532e 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialGeomBoxPropertyFunction.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialGeomBoxPropertyFunction.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxGeomPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxGeomPF.java
index 87e5756..9ff1d61 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxGeomPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxGeomPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxPF.java
index 6f8fe71..94f7934 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxGeomPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxGeomPF.java
index 7ba220c..49382fa 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxGeomPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxGeomPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxPF.java
index b034769..4ec40ee 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastGeomPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastGeomPF.java
index c9302dc..3334c99 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastGeomPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastGeomPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastPF.java
index 7a363e3..025429e 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalGeomPropertyFunction.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalGeomPropertyFunction.java
index d738f7e..c08b07c 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalGeomPropertyFunction.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalGeomPropertyFunction.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalPropertyFunction.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalPropertyFunction.java
index 960b913..1bbf97a 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalPropertyFunction.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalPropertyFunction.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,13 +17,13 @@
*/
package org.apache.jena.geosparql.spatial.property_functions.cardinal;
+import java.util.List;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.SRSInfo;
import org.apache.jena.geosparql.spatial.ConvertLatLon;
import org.apache.jena.geosparql.spatial.SearchEnvelope;
import org.apache.jena.geosparql.spatial.property_functions.SpatialArguments;
-import java.util.List;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.graph.Node;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthGeomPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthGeomPF.java
index 898c0d6..501c816 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthGeomPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthGeomPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthPF.java
index 16619cc..e43b89f 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthGeomPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthGeomPF.java
index c19a656..71f8a4c 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthGeomPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthGeomPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthPF.java
index 05850bc..50026d9 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestGeomPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestGeomPF.java
index c321985..3a2e67b 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestGeomPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestGeomPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestPF.java
index 85787b3..d1125ca 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyGeomPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyGeomPF.java
index 03bf1aa..3407097 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyGeomPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyGeomPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,14 +17,14 @@
*/
package org.apache.jena.geosparql.spatial.property_functions.nearby;
+import java.util.List;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.SRSInfo;
import org.apache.jena.geosparql.spatial.SearchEnvelope;
import org.apache.jena.geosparql.spatial.filter_functions.NearbyFF;
import org.apache.jena.geosparql.spatial.property_functions.GenericSpatialPropertyFunction;
import org.apache.jena.geosparql.spatial.property_functions.SpatialArguments;
-import java.util.List;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.graph.Node;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyPF.java
index 76b76f5..7328e6e 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,14 +17,14 @@
*/
package org.apache.jena.geosparql.spatial.property_functions.nearby;
+import java.util.List;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.SRSInfo;
import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
import org.apache.jena.geosparql.spatial.ConvertLatLon;
import org.apache.jena.geosparql.spatial.SearchEnvelope;
import org.apache.jena.geosparql.spatial.property_functions.SpatialArguments;
-import java.util.List;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.graph.Node;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunctionTest.java
index beb3cdd..531462b 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunctionTest.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,11 +17,10 @@
*/
package org.apache.jena.geosparql.geo.topological;
-import org.apache.jena.geosparql.geo.topological.GenericGeometryPropertyFunction;
+import org.apache.jena.datatypes.xsd.XSDDatatype;
import org.apache.jena.geosparql.geo.topological.property_functions.geometry_property.CoordinateDimensionPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.geosparql.implementation.vocabulary.Geo;
-import org.apache.jena.datatypes.xsd.XSDDatatype;
import org.apache.jena.graph.Graph;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunctionTest.java
index daed2d0..950f22b 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunctionTest.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,7 +17,9 @@
*/
package org.apache.jena.geosparql.geo.topological;
-import org.apache.jena.geosparql.geo.topological.GenericPropertyFunction;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
import static org.apache.jena.geosparql.geo.topological.QueryRewriteTestData.FEATURE_A;
import static org.apache.jena.geosparql.geo.topological.QueryRewriteTestData.FEATURE_B;
@@ -35,9 +39,6 @@ import org.apache.jena.geosparql.implementation.index.QueryRewriteIndex;
import org.apache.jena.geosparql.implementation.vocabulary.Geo;
import org.apache.jena.geosparql.spatial.SpatialIndex;
import org.apache.jena.geosparql.spatial.SpatialIndexException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
import org.apache.jena.graph.BlankNodeId;
import org.apache.jena.graph.Graph;
import org.apache.jena.graph.Node;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhContainsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhContainsPFTest.java
index b508b80..b9896b2 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhContainsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhContainsPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.egenhofer;
-import org.apache.jena.geosparql.geo.topological.property_functions.egenhofer.EhContainsPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoveredByPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoveredByPFTest.java
index 164156c..d51a2c2 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoveredByPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoveredByPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,8 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.egenhofer;
-import org.apache.jena.geosparql.geo.topological.property_functions.egenhofer.EhCoveredByPF;
-import org.apache.jena.geosparql.geo.topological.property_functions.egenhofer.EhInsidePF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoversPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoversPFTest.java
index 13eaf01..92b44a3 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoversPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoversPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.egenhofer;
-import org.apache.jena.geosparql.geo.topological.property_functions.egenhofer.EhCoversPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhDisjointPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhDisjointPFTest.java
index de78001..51265b5 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhDisjointPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhDisjointPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.egenhofer;
-import org.apache.jena.geosparql.geo.topological.property_functions.egenhofer.EhDisjointPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhEqualsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhEqualsPFTest.java
index f22fc2c..0c3fba2 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhEqualsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhEqualsPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.egenhofer;
-import org.apache.jena.geosparql.geo.topological.property_functions.egenhofer.EhEqualsPF;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhInsidePFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhInsidePFTest.java
index 95638b8..e9ec8b8 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhInsidePFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhInsidePFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.egenhofer;
-import org.apache.jena.geosparql.geo.topological.property_functions.egenhofer.EhInsidePF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhMeetPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhMeetPFTest.java
index e3d70f7..22a6edb 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhMeetPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhMeetPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.egenhofer;
-import org.apache.jena.geosparql.geo.topological.property_functions.egenhofer.EhMeetPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhOverlapPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhOverlapPFTest.java
index 25301aa..f521ea1 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhOverlapPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhOverlapPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.egenhofer;
-import org.apache.jena.geosparql.geo.topological.property_functions.egenhofer.EhOverlapPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/CoordinateDimensionPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/CoordinateDimensionPFTest.java
index 5899458..860df27 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/CoordinateDimensionPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/CoordinateDimensionPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.geometry_property;
-import org.apache.jena.geosparql.geo.topological.property_functions.geometry_property.CoordinateDimensionPF;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/DimensionPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/DimensionPFTest.java
index f72a08b..24fbbba 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/DimensionPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/DimensionPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.geometry_property;
-import org.apache.jena.geosparql.geo.topological.property_functions.geometry_property.DimensionPF;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsEmptyPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsEmptyPFTest.java
index a84b42c..d5f24e8 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsEmptyPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsEmptyPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.geometry_property;
-import org.apache.jena.geosparql.geo.topological.property_functions.geometry_property.IsEmptyPF;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsSimplePFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsSimplePFTest.java
index 700765e..74f2dd7 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsSimplePFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsSimplePFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.geometry_property;
-import org.apache.jena.geosparql.geo.topological.property_functions.geometry_property.IsSimplePF;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsValidPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsValidPFTest.java
index acdd065..a4395d4 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsValidPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsValidPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.geometry_property;
-import org.apache.jena.geosparql.geo.topological.property_functions.geometry_property.IsValidPF;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/SpatialDimensionPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/SpatialDimensionPFTest.java
index 81d58ae..f4e3a19 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/SpatialDimensionPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/SpatialDimensionPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.geometry_property;
-import org.apache.jena.geosparql.geo.topological.property_functions.geometry_property.SpatialDimensionPF;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccDisconnectedPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccDisconnectedPFTest.java
index 674a189..4d1d390 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccDisconnectedPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccDisconnectedPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.rcc8;
-import org.apache.jena.geosparql.geo.topological.property_functions.rcc8.RccDisconnectedPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccEqualsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccEqualsPFTest.java
index bf7ef1a..72318d0 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccEqualsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccEqualsPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.rcc8;
-import org.apache.jena.geosparql.geo.topological.property_functions.rcc8.RccEqualsPF;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccExternallyConnectedPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccExternallyConnectedPFTest.java
index 80356ca..9759c26 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccExternallyConnectedPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccExternallyConnectedPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.rcc8;
-import org.apache.jena.geosparql.geo.topological.property_functions.rcc8.RccExternallyConnectedPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartInversePFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartInversePFTest.java
index ddbb380..e7dda11 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartInversePFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartInversePFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.rcc8;
-import org.apache.jena.geosparql.geo.topological.property_functions.rcc8.RccNonTangentialProperPartInversePF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartPFTest.java
index d6499b4..1be6f78 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.rcc8;
-import org.apache.jena.geosparql.geo.topological.property_functions.rcc8.RccNonTangentialProperPartPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccPartiallyOverlappingPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccPartiallyOverlappingPFTest.java
index b4e7c15..07cc3b9 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccPartiallyOverlappingPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccPartiallyOverlappingPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.rcc8;
-import org.apache.jena.geosparql.geo.topological.property_functions.rcc8.RccPartiallyOverlappingPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartInversePFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartInversePFTest.java
index b4be26c..1f7a359 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartInversePFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartInversePFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.rcc8;
-import org.apache.jena.geosparql.geo.topological.property_functions.rcc8.RccTangentialProperPartInversePF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartPFTest.java
index 3961d36..a8c1742 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.rcc8;
-import org.apache.jena.geosparql.geo.topological.property_functions.rcc8.RccTangentialProperPartPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfContainsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfContainsPFTest.java
index a8924a9..913a6bd 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfContainsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfContainsPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.simple_features;
-import org.apache.jena.geosparql.geo.topological.property_functions.simple_features.SfContainsPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfCrossesPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfCrossesPFTest.java
index 2ddb0aa..475483f 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfCrossesPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfCrossesPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.simple_features;
-import org.apache.jena.geosparql.geo.topological.property_functions.simple_features.SfCrossesPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfDisjointPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfDisjointPFTest.java
index 3bfebd5..c774f01 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfDisjointPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfDisjointPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.simple_features;
-import org.apache.jena.geosparql.geo.topological.property_functions.simple_features.SfDisjointPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfEqualsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfEqualsPFTest.java
index f977e97..ba4b73e 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfEqualsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfEqualsPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.simple_features;
-import org.apache.jena.geosparql.geo.topological.property_functions.simple_features.SfEqualsPF;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfIntersectsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfIntersectsPFTest.java
index 8a2ee1c..1f42ca7 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfIntersectsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfIntersectsPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.simple_features;
-import org.apache.jena.geosparql.geo.topological.property_functions.simple_features.SfIntersectsPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfOverlapsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfOverlapsPFTest.java
index 0045c1f..3a997b5 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfOverlapsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfOverlapsPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.simple_features;
-import org.apache.jena.geosparql.geo.topological.property_functions.simple_features.SfOverlapsPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfTouchesPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfTouchesPFTest.java
index 952a4a8..c24e33d 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfTouchesPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfTouchesPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.simple_features;
-import org.apache.jena.geosparql.geo.topological.property_functions.simple_features.SfTouchesPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfWithinPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfWithinPFTest.java
index 3e10794..ac6fa77 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfWithinPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfWithinPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.simple_features;
-import org.apache.jena.geosparql.geo.topological.property_functions.simple_features.SfWithinPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFFTest.java
index 59f8523..0cbbe54 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFFTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.geof.nontopological.filter_functions.BoundaryFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFFTest.java
index 6d0fe73..05d569a 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.geof.nontopological.filter_functions.BufferFF;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFFTest.java
index d7099ac..03c6253 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.geof.nontopological.filter_functions.ConvexHullFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFFTest.java
index c621c23..7bbf340 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.geof.nontopological.filter_functions.DifferenceFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFFTest.java
index 22892a6..d929668 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.geof.nontopological.filter_functions.DistanceFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
import org.apache.jena.graph.NodeFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFFTest.java
index 7b70adc..e47bc51 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.geof.nontopological.filter_functions.EnvelopFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFFTest.java
index cba912a..5c811c0 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.geof.nontopological.filter_functions.GetSRIDFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFFTest.java
index 776ba0f..0d13327 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.geof.nontopological.filter_functions.IntersectionFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFFTest.java
index 8092068..4ffd552 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.geof.nontopological.filter_functions.SymmetricDifferenceFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFFTest.java
index d341ebf..07bfd89 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.geof.nontopological.filter_functions.UnionFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhContainsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhContainsFFTest.java
index 2f22686..9788609 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhContainsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhContainsFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
-import org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer.EhContainsFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoveredByFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoveredByFFTest.java
index 5caf8dc..f00dfbd 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoveredByFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoveredByFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,8 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
-import org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer.EhCoveredByFF;
-import org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer.EhInsideFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoversFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoversFFTest.java
index 98303bb..7b9d603 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoversFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoversFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
-import org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer.EhCoversFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhDisjointFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhDisjointFFTest.java
index 0c7a814..3da2b6c 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhDisjointFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhDisjointFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
-import org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer.EhDisjointFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhEqualsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhEqualsFFTest.java
index 8df8e74..c8b9dc8 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhEqualsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhEqualsFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
-import org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer.EhEqualsFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhInsideFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhInsideFFTest.java
index 8c3ec46..c7d99ce 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhInsideFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhInsideFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
-import org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer.EhInsideFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhMeetFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhMeetFFTest.java
index 27faa55..fbac108 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhMeetFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhMeetFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
-import org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer.EhMeetFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhOverlapFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhOverlapFFTest.java
index 7b2f110..ba66971 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhOverlapFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhOverlapFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
-import org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer.EhOverlapFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFFTest.java
index 7c85af5..f9c9a09 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property;
-import org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property.CoordinateDimensionFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFFTest.java
index c05da94..4dd6f94 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property;
-import org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property.DimensionFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFFTest.java
index 1a8d01a..e57a366 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property;
-import org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property.IsEmptyFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFFTest.java
index 8e1927a..d45768b 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property;
-import org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property.IsSimpleFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFFTest.java
index 324c35f..8be38a8 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property;
-import org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property.IsValidFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFFTest.java
index aa51a27..32105bd 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property;
-import org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property.SpatialDimensionFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccDisconnectedFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccDisconnectedFFTest.java
index 01d9c2c..b3d3a3d 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccDisconnectedFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccDisconnectedFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
-import org.apache.jena.geosparql.geof.topological.filter_functions.rcc8.RccDisconnectedFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccEqualsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccEqualsFFTest.java
index 24f3c4d..bd1772f 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccEqualsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccEqualsFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
-import org.apache.jena.geosparql.geof.topological.filter_functions.rcc8.RccEqualsFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccExternallyConnectedFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccExternallyConnectedFFTest.java
index 2116db9..b7bdcc1 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccExternallyConnectedFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccExternallyConnectedFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
-import org.apache.jena.geosparql.geof.topological.filter_functions.rcc8.RccExternallyConnectedFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartFFTest.java
index 2853bf3..8b6101c 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
-import org.apache.jena.geosparql.geof.topological.filter_functions.rcc8.RccNonTangentialProperPartFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartInverseFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartInverseFFTest.java
index cbd5ef0..a93fc9b 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartInverseFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartInverseFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
-import org.apache.jena.geosparql.geof.topological.filter_functions.rcc8.RccNonTangentialProperPartInverseFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccPartiallyOverlappingFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccPartiallyOverlappingFFTest.java
index 84466c2..5e724f3 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccPartiallyOverlappingFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccPartiallyOverlappingFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
-import org.apache.jena.geosparql.geof.topological.filter_functions.rcc8.RccPartiallyOverlappingFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartFFTest.java
index 569a274..802afc9 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
-import org.apache.jena.geosparql.geof.topological.filter_functions.rcc8.RccTangentialProperPartFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartInverseFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartInverseFFTest.java
index ddaf14d..191c585 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartInverseFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartInverseFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
-import org.apache.jena.geosparql.geof.topological.filter_functions.rcc8.RccTangentialProperPartInverseFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfContainsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfContainsFFTest.java
index 67618ab..9f0860f 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfContainsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfContainsFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfCrossesFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfCrossesFFTest.java
index 3a7f97c..4099503 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfCrossesFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfCrossesFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfDisjointFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfDisjointFFTest.java
index 2b990da..9eb3e35 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfDisjointFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfDisjointFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfEqualsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfEqualsFFTest.java
index d2c5a9c..cdc34c2 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfEqualsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfEqualsFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.simple_features;
-import org.apache.jena.geosparql.geof.topological.filter_functions.simple_features.SfEqualsFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfIntersectsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfIntersectsFFTest.java
index b16e4c4..9c10ef3 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfIntersectsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfIntersectsFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.simple_features;
-import org.apache.jena.geosparql.geof.topological.filter_functions.simple_features.SfIntersectsFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfOverlapsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfOverlapsFFTest.java
index 2e48b87..d25ee9a 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfOverlapsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfOverlapsFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.simple_features;
-import org.apache.jena.geosparql.geof.topological.filter_functions.simple_features.SfOverlapsFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfTouchesFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfTouchesFFTest.java
index e30e2fb..5947918 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfTouchesFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfTouchesFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.simple_features;
-import org.apache.jena.geosparql.geof.topological.filter_functions.simple_features.SfTouchesFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfWithinFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfWithinFFTest.java
index 7f37686..1e11014 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfWithinFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfWithinFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.simple_features;
-import org.apache.jena.geosparql.geof.topological.filter_functions.simple_features.SfWithinFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryReverseTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryReverseTest.java
index 8f77211..04f802b 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryReverseTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryReverseTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.implementation;
-import org.apache.jena.geosparql.implementation.GeometryReverse;
import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
import org.junit.After;
import org.junit.AfterClass;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactoryTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactoryTest.java
index 5233551..eec9c07 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactoryTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactoryTest.java
@@ -17,12 +17,10 @@
*/
package org.apache.jena.geosparql.implementation;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.GeometryWrapperFactory;
-import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
-import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
import java.util.Arrays;
import java.util.List;
+import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
+import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
import org.junit.After;
import org.junit.AfterClass;
import static org.junit.Assert.assertEquals;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperTest.java
index 6f6a899..92d2655 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperTest.java
@@ -17,8 +17,6 @@
*/
package org.apache.jena.geosparql.implementation;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.datatype.GMLDatatype;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.geosparql.implementation.jts.CustomGeometryFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/UnitsOfMeasureTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/UnitsOfMeasureTest.java
index 814b13c..f2909bc 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/UnitsOfMeasureTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/UnitsOfMeasureTest.java
@@ -17,8 +17,6 @@
*/
package org.apache.jena.geosparql.implementation;
-import org.apache.jena.geosparql.implementation.UnitsConversionException;
-import org.apache.jena.geosparql.implementation.UnitsOfMeasure;
import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
import org.apache.sis.referencing.CRS;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatypeTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatypeTest.java
index 14876f8..adcb40f 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatypeTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatypeTest.java
@@ -17,7 +17,7 @@
*/
package org.apache.jena.geosparql.implementation.datatype;
-import org.apache.jena.geosparql.implementation.datatype.GMLDatatype;
+import java.io.IOException;
import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
@@ -25,7 +25,6 @@ import org.apache.jena.geosparql.implementation.jts.CoordinateSequenceDimensions
import org.apache.jena.geosparql.implementation.jts.CustomCoordinateSequence;
import org.apache.jena.geosparql.implementation.jts.CustomGeometryFactory;
import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
-import java.io.IOException;
import static org.hamcrest.CoreMatchers.not;
import org.jdom2.JDOMException;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatypeTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatypeTest.java
index a878e04..564eeeb 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatypeTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatypeTest.java
@@ -17,8 +17,6 @@
*/
package org.apache.jena.geosparql.implementation.datatype;
-import org.apache.jena.geosparql.implementation.datatype.GeometryDatatype;
-import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.datatypes.RDFDatatype;
import org.apache.jena.datatypes.xsd.XSDDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/WKTDatatypeTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/WKTDatatypeTest.java
index 61d63ef..ffb0514 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/WKTDatatypeTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/WKTDatatypeTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.implementation.datatype;
-import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensionsTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensionsTest.java
index fd2b4b2..174d459 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensionsTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensionsTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.implementation.jts;
-import org.apache.jena.geosparql.implementation.jts.CoordinateSequenceDimensions;
import org.junit.After;
import org.junit.AfterClass;
import static org.junit.Assert.*;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/GeometryTransformTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/GeometryTransformTest.java
index ae55ac0..0ab14f6 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/GeometryTransformTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/GeometryTransformTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.implementation.jts;
-import org.apache.jena.geosparql.implementation.jts.GeometryTransformation;
import org.apache.jena.geosparql.implementation.SRSInfo;
import org.apache.jena.geosparql.implementation.parsers.wkt.WKTReader;
import org.apache.jena.geosparql.implementation.registry.MathTransformRegistry;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLReaderTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLReaderTest.java
index d0e4d1d..14405d9 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLReaderTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLReaderTest.java
@@ -17,15 +17,14 @@
*/
package org.apache.jena.geosparql.implementation.parsers.gml;
-import org.apache.jena.geosparql.implementation.parsers.gml.GMLReader;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.jts.CoordinateSequenceDimensions;
import org.apache.jena.geosparql.implementation.jts.CustomCoordinateSequence;
import org.apache.jena.geosparql.implementation.jts.CustomGeometryFactory;
import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
import org.jdom2.JDOMException;
import org.junit.After;
import org.junit.AfterClass;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLWriterTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLWriterTest.java
index 3357d47..9db1b5f 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLWriterTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLWriterTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.implementation.parsers.gml;
-import org.apache.jena.geosparql.implementation.parsers.gml.GMLWriter;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.GMLDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTReaderTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTReaderTest.java
index ef7ee6a..17a5e27 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTReaderTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTReaderTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.implementation.parsers.wkt;
-import org.apache.jena.geosparql.implementation.parsers.wkt.WKTReader;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.jts.CoordinateSequenceDimensions;
import org.apache.jena.geosparql.implementation.jts.CustomCoordinateSequence;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTWriterTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTWriterTest.java
index e50a5ab..624f9cf 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTWriterTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTWriterTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.implementation.parsers.wkt;
-import org.apache.jena.geosparql.implementation.parsers.wkt.WKTWriter;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/registry/SRSRegistryTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/registry/SRSRegistryTest.java
index 374fb9b..9cc9555 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/registry/SRSRegistryTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/registry/SRSRegistryTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.implementation.registry;
-import org.apache.jena.geosparql.implementation.registry.SRSRegistry;
import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
import org.apache.sis.referencing.CRS;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonBoxTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonBoxTest.java
index 35465e1..f453601 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonBoxTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonBoxTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.spatial;
-import org.apache.jena.geosparql.spatial.ConvertLatLonBox;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonTest.java
index 18d6764..908528c 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonTest.java
@@ -17,9 +17,8 @@
*/
package org.apache.jena.geosparql.spatial;
-import org.apache.jena.geosparql.spatial.ConvertLatLon;
-import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.rdf.model.Literal;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java
index 8c2e9bb..5253a6c 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,14 +17,11 @@
*/
package org.apache.jena.geosparql.spatial;
-import org.apache.jena.geosparql.spatial.CardinalDirection;
-import org.apache.jena.geosparql.spatial.SearchEnvelope;
-import org.apache.jena.geosparql.spatial.SpatialIndex;
+import java.util.Arrays;
+import java.util.HashSet;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
-import java.util.Arrays;
-import java.util.HashSet;
import org.apache.jena.rdf.model.Resource;
import org.junit.After;
import org.junit.AfterClass;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SpatialIndexTestData.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SpatialIndexTestData.java
index 70ae752..606e007 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SpatialIndexTestData.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SpatialIndexTestData.java
@@ -17,8 +17,6 @@
*/
package org.apache.jena.geosparql.spatial;
-import org.apache.jena.geosparql.spatial.SpatialIndexException;
-import org.apache.jena.geosparql.spatial.SpatialIndex;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.SRSInfo;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFFTest.java
index e465afa..805237b 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFFTest.java
@@ -17,13 +17,12 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.filter_functions.AngleDegreesFF;
-import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
-import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.jena.datatypes.xsd.XSDDatatype;
+import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
+import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.QueryExecution;
import org.apache.jena.query.QueryExecutionFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFFTest.java
index 583e9e5..076588b 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFFTest.java
@@ -17,13 +17,12 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.filter_functions.AngleFF;
-import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
-import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.jena.datatypes.xsd.XSDDatatype;
+import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
+import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.QueryExecution;
import org.apache.jena.query.QueryExecutionFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFFTest.java
index 3dcedd6..5aef81f 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFFTest.java
@@ -17,13 +17,12 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.filter_functions.AzimuthDegreesFF;
-import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
-import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.jena.datatypes.xsd.XSDDatatype;
+import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
+import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.QueryExecution;
import org.apache.jena.query.QueryExecutionFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthFFTest.java
index a8659e1..08a7712 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthFFTest.java
@@ -17,13 +17,12 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.filter_functions.AzimuthFF;
-import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
-import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.jena.datatypes.xsd.XSDDatatype;
+import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
+import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.QueryExecution;
import org.apache.jena.query.QueryExecutionFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonBoxFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonBoxFFTest.java
index a7f0a34..6f1cc68 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonBoxFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonBoxFFTest.java
@@ -17,13 +17,12 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.filter_functions.ConvertLatLonBoxFF;
-import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
-import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
-import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
+import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
+import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.QueryExecution;
import org.apache.jena.query.QueryExecutionFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonFFTest.java
index 35ee668..0b8dba0 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonFFTest.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,13 +17,12 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.filter_functions.ConvertLatLonFF;
-import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
-import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
-import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
+import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
+import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.QueryExecution;
import org.apache.jena.query.QueryExecutionFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/DistanceFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/DistanceFFTest.java
index 1b0639a..22c3f07 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/DistanceFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/DistanceFFTest.java
@@ -17,15 +17,14 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.filter_functions.DistanceFF;
-import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
-import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
-import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
-import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.jena.datatypes.xsd.XSDDatatype;
+import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
+import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
+import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
+import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.QueryExecution;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/EqualsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/EqualsFFTest.java
index 290deee..669b27a 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/EqualsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/EqualsFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.filter_functions.EqualsFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleFFTest.java
index 80d9cc9..1e39f22 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleFFTest.java
@@ -17,14 +17,13 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.filter_functions.GreatCircleFF;
-import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
-import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
-import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.jena.datatypes.xsd.XSDDatatype;
+import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
+import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
+import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.QueryExecution;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleGeomFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleGeomFFTest.java
index 28fde46..441ba94 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleGeomFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleGeomFFTest.java
@@ -17,15 +17,14 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.filter_functions.GreatCircleGeomFF;
-import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
-import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
-import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
-import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.jena.datatypes.xsd.XSDDatatype;
+import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
+import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
+import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
+import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.QueryExecution;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/TransformDatatypeFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/TransformDatatypeFFTest.java
index fc1c093..79e8216 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/TransformDatatypeFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/TransformDatatypeFFTest.java
@@ -17,14 +17,13 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.filter_functions.TransformDatatypeFF;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
import org.apache.jena.geosparql.implementation.datatype.GMLDatatype;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.QueryExecution;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/TransformFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/TransformFFTest.java
index ee11f6a..5d50922 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/TransformFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/TransformFFTest.java
@@ -17,15 +17,14 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.filter_functions.TransformFF;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
import org.apache.jena.geosparql.implementation.datatype.GMLDatatype;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.QueryExecution;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/TransformSRSFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/TransformSRSFFTest.java
index 104fd96..24452a4 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/TransformSRSFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/TransformSRSFFTest.java
@@ -17,14 +17,13 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.filter_functions.TransformSRSFF;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.QueryExecution;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/EqualsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/EqualsPFTest.java
index 86e3bdb..70b6105 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/EqualsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/EqualsPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.spatial.property_functions;
-import org.apache.jena.geosparql.spatial.property_functions.EqualsPF;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialGeomPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialGeomPropertyFunctionTest.java
index d883aa3..cc3ede2 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialGeomPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialGeomPropertyFunctionTest.java
@@ -17,16 +17,14 @@
*/
package org.apache.jena.geosparql.spatial.property_functions;
-import org.apache.jena.geosparql.spatial.property_functions.SpatialArguments;
-import org.apache.jena.geosparql.spatial.property_functions.GenericSpatialGeomPropertyFunction;
+import java.util.Arrays;
+import java.util.List;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.vocabulary.SpatialExtension;
import org.apache.jena.geosparql.spatial.ConvertLatLon;
import org.apache.jena.geosparql.spatial.SearchEnvelope;
import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import org.apache.jena.geosparql.spatial.property_functions.box.IntersectBoxGeomPF;
-import java.util.Arrays;
-import java.util.List;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.rdf.model.Literal;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialPropertyFunctionTest.java
index 69ba97d..a1280a5 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialPropertyFunctionTest.java
@@ -17,15 +17,15 @@
*/
package org.apache.jena.geosparql.spatial.property_functions;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.apache.jena.datatypes.xsd.XSDDatatype;
import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
import org.apache.jena.geosparql.implementation.vocabulary.SpatialExtension;
import org.apache.jena.geosparql.spatial.SpatialIndex;
import org.apache.jena.geosparql.spatial.SpatialIndexException;
import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import org.apache.jena.datatypes.xsd.XSDDatatype;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.QueryExecution;
import org.apache.jena.query.QueryExecutionFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialBoxPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialBoxPropertyFunctionTest.java
index 5baee81..04dd41f 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialBoxPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialBoxPropertyFunctionTest.java
@@ -17,16 +17,14 @@
*/
package org.apache.jena.geosparql.spatial.property_functions.box;
-import org.apache.jena.geosparql.spatial.property_functions.box.WithinBoxPF;
-import org.apache.jena.geosparql.spatial.property_functions.box.GenericSpatialBoxPropertyFunction;
+import java.util.Arrays;
+import java.util.List;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.vocabulary.SpatialExtension;
import org.apache.jena.geosparql.spatial.ConvertLatLonBox;
import org.apache.jena.geosparql.spatial.SearchEnvelope;
import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import org.apache.jena.geosparql.spatial.property_functions.SpatialArguments;
-import java.util.Arrays;
-import java.util.List;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.rdf.model.Literal;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalGeomPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalGeomPropertyFunctionTest.java
index 355e904..9dd4caf 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalGeomPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalGeomPropertyFunctionTest.java
@@ -17,14 +17,13 @@
*/
package org.apache.jena.geosparql.spatial.property_functions.cardinal;
-import org.apache.jena.geosparql.spatial.property_functions.cardinal.NorthPF;
+import java.util.Arrays;
+import java.util.List;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.vocabulary.SpatialExtension;
import org.apache.jena.geosparql.spatial.ConvertLatLon;
import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import org.apache.jena.geosparql.spatial.property_functions.SpatialArguments;
-import java.util.Arrays;
-import java.util.List;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.rdf.model.Literal;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalPropertyFunctionTest.java
index ec36d63..862e466 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalPropertyFunctionTest.java
@@ -17,15 +17,14 @@
*/
package org.apache.jena.geosparql.spatial.property_functions.cardinal;
-import org.apache.jena.geosparql.spatial.property_functions.cardinal.NorthPF;
+import java.util.Arrays;
+import java.util.List;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.vocabulary.SpatialExtension;
import org.apache.jena.geosparql.spatial.ConvertLatLon;
import org.apache.jena.geosparql.spatial.SearchEnvelope;
import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import org.apache.jena.geosparql.spatial.property_functions.SpatialArguments;
-import java.util.Arrays;
-import java.util.List;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.rdf.model.Literal;