Merge remote-tracking branch 'refs/remotes/origin/master' into neo4j-…

…latest-java21 # Conflicts: # pom.xml # src/main/java/org/neo4j/gis/spatial/rtree/RTreeIndex.java
neo4j-contrib · May 30, 2024 · 65553b4 · 65553b4
2 parents ba6b5ea + 99b4198
commit 65553b4
Show file tree

Hide file tree

Showing 229 changed files with 1,032 additions and 685 deletions.
diff --git a/neo.sld.xml b/neo.sld.xml
@@ -1,25 +1,23 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-
-    Copyright (c) 2010-2020 "Neo4j,"
-    Neo4j Sweden AB [http://neo4j.com]
-
-    This file is part of Neo4j Spatial.
-
-    Neo4j is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program. If not, see <http://www.gnu.org/licenses/>.
-
--->
+  ~ Copyright (c) "Neo4j"
+  ~ Neo4j Sweden AB [http://neo4j.com]
+  ~
+  ~ This file is part of Neo4j Spatial.
+  ~
+  ~ Neo4j is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
+  -->
 <StyledLayerDescriptor version="1.0.0"
 		xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

diff --git a/pom.xml b/pom.xml
@@ -37,7 +37,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.12.1</version>
+				<version>3.13.0</version>
 				<configuration>
 					<source>${neo4j.java.version}</source>
 					<target>${neo4j.java.version}</target>
@@ -304,12 +304,6 @@
 		</dependency>
 
 		<!-- The JUnit-Hamcrest-Mockito combo -->
-		<dependency>
-			<groupId>org.junit.vintage</groupId>
-			<artifactId>junit-vintage-engine</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>

diff --git a/src/main/assembly/docs-assembly.xml b/src/main/assembly/docs-assembly.xml
@@ -1,24 +1,22 @@
 <!--
-
-    Copyright (c) 2010-2020 "Neo4j,"
-    Neo4j Sweden AB [http://neo4j.com]
-
-    This file is part of Neo4j Spatial.
-
-    Neo4j is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program. If not, see <http://www.gnu.org/licenses/>.
-
--->
+  ~ Copyright (c) "Neo4j"
+  ~ Neo4j Sweden AB [http://neo4j.com]
+  ~
+  ~ This file is part of Neo4j Spatial.
+  ~
+  ~ Neo4j is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
+  -->
 <assembly>
 	<id>docs</id>
 	<includeBaseDirectory>false</includeBaseDirectory>

diff --git a/src/main/assembly/geoserver-plugin.xml b/src/main/assembly/geoserver-plugin.xml
@@ -1,24 +1,22 @@
 <!--
-
-    Copyright (c) 2010-2020 "Neo4j,"
-    Neo4j Sweden AB [http://neo4j.com]
-
-    This file is part of Neo4j Spatial.
-
-    Neo4j is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program. If not, see <http://www.gnu.org/licenses/>.
-
--->
+  ~ Copyright (c) "Neo4j"
+  ~ Neo4j Sweden AB [http://neo4j.com]
+  ~
+  ~ This file is part of Neo4j Spatial.
+  ~
+  ~ Neo4j is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
+  -->
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">

diff --git a/src/main/assembly/server-plugin.xml b/src/main/assembly/server-plugin.xml
@@ -1,24 +1,22 @@
 <!--
-
-    Copyright (c) 2010-2020 "Neo4j,"
-    Neo4j Sweden AB [http://neo4j.com]
-
-    This file is part of Neo4j Spatial.
-
-    Neo4j is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program. If not, see <http://www.gnu.org/licenses/>.
-
--->
+  ~ Copyright (c) "Neo4j"
+  ~ Neo4j Sweden AB [http://neo4j.com]
+  ~
+  ~ This file is part of Neo4j Spatial.
+  ~
+  ~ Neo4j is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
+  -->
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">

diff --git a/src/main/java/org/geotools/data/neo4j/DefaultResourceInfo.java b/src/main/java/org/geotools/data/neo4j/DefaultResourceInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2020 "Neo4j,"
+ * Copyright (c) "Neo4j"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j Spatial.

diff --git a/src/main/java/org/geotools/data/neo4j/Neo4jFeatureBuilder.java b/src/main/java/org/geotools/data/neo4j/Neo4jFeatureBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2020 "Neo4j,"
+ * Copyright (c) "Neo4j"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j Spatial.

diff --git a/src/main/java/org/geotools/data/neo4j/Neo4jSpatialDataStore.java b/src/main/java/org/geotools/data/neo4j/Neo4jSpatialDataStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2020 "Neo4j,"
+ * Copyright (c) "Neo4j"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j Spatial.

diff --git a/src/main/java/org/geotools/data/neo4j/Neo4jSpatialDataStoreFactory.java b/src/main/java/org/geotools/data/neo4j/Neo4jSpatialDataStoreFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2020 "Neo4j,"
+ * Copyright (c) "Neo4j"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j Spatial.

diff --git a/src/main/java/org/geotools/data/neo4j/Neo4jSpatialFeatureSource.java b/src/main/java/org/geotools/data/neo4j/Neo4jSpatialFeatureSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2020 "Neo4j,"
+ * Copyright (c) "Neo4j"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j Spatial.

diff --git a/src/main/java/org/geotools/data/neo4j/Neo4jSpatialFeatureStore.java b/src/main/java/org/geotools/data/neo4j/Neo4jSpatialFeatureStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2020 "Neo4j,"
+ * Copyright (c) "Neo4j"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j Spatial.

diff --git a/src/main/java/org/geotools/data/neo4j/StyledImageExporter.java b/src/main/java/org/geotools/data/neo4j/StyledImageExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2020 "Neo4j,"
+ * Copyright (c) "Neo4j"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j Spatial.
@@ -136,7 +136,7 @@ private File checkFile(File file) {
 	}
 
 	@SuppressWarnings({"unused"})
-	private void debugStore(DataStore store, String[] layerNames) throws IOException {
+	private static void debugStore(DataStore store, String[] layerNames) throws IOException {
 		for (String layerName : layerNames) {
 			System.out.println(asList(store.getTypeNames()));
 			System.out.println(Collections.singletonList(store.getSchema(layerName).getAttributeDescriptors()));
@@ -244,7 +244,7 @@ public void saveLayerImage(String[] layerNames, String sldFile, File imagefile,
 		}
 	}
 
-	private Style getStyleFromSLDFile(String sldFile) {
+	private static Style getStyleFromSLDFile(String sldFile) {
 		Style style = null;
 		if (sldFile != null) {
 			style = createStyleFromSLD(sldFile);
@@ -283,7 +283,7 @@ private void saveMapContentToImageFile(MapContent mapContent, File imagefile, Re
 	/**
 	 * Create a Style object from a definition in a SLD document
 	 */
-	private Style createStyleFromSLD(String sldFile) {
+	private static Style createStyleFromSLD(String sldFile) {
 		try {
 			SLDParser stylereader = new SLDParser(styleFactory, new File(sldFile).toURI().toURL());
 			Style[] style = stylereader.readXML();

diff --git a/src/main/java/org/neo4j/gis/spatial/AbstractGeometryEncoder.java b/src/main/java/org/neo4j/gis/spatial/AbstractGeometryEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2020 "Neo4j,"
+ * Copyright (c) "Neo4j"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j Spatial.
@@ -71,7 +71,7 @@ public Envelope decodeEnvelope(Entity container) {
 
 	protected abstract void encodeGeometryShape(Transaction tx, Geometry geometry, Entity container);
 
-	protected Integer encodeGeometryType(String jtsGeometryType) {
+	protected static Integer encodeGeometryType(String jtsGeometryType) {
 		// TODO: Consider alternatives for specifying type, like relationship to type category objects (or similar indexing structure)
 		return switch (jtsGeometryType) {
 			case "Point" -> GTYPE_POINT;

diff --git a/src/main/java/org/neo4j/gis/spatial/ConsoleListener.java b/src/main/java/org/neo4j/gis/spatial/ConsoleListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2020 "Neo4j,"
+ * Copyright (c) "Neo4j"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j Spatial.

diff --git a/src/main/java/org/neo4j/gis/spatial/Constants.java b/src/main/java/org/neo4j/gis/spatial/Constants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2020 "Neo4j,"
+ * Copyright (c) "Neo4j"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j Spatial.

diff --git a/src/main/java/org/neo4j/gis/spatial/DefaultLayer.java b/src/main/java/org/neo4j/gis/spatial/DefaultLayer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2020 "Neo4j,"
+ * Copyright (c) "Neo4j"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j Spatial.
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 package org.neo4j.gis.spatial;
 

diff --git a/src/main/java/org/neo4j/gis/spatial/DynamicLayer.java b/src/main/java/org/neo4j/gis/spatial/DynamicLayer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2020 "Neo4j,"
+ * Copyright (c) "Neo4j"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j Spatial.

diff --git a/src/main/java/org/neo4j/gis/spatial/DynamicLayerConfig.java b/src/main/java/org/neo4j/gis/spatial/DynamicLayerConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2020 "Neo4j,"
+ * Copyright (c) "Neo4j"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j Spatial.

diff --git a/src/main/java/org/neo4j/gis/spatial/EditableLayer.java b/src/main/java/org/neo4j/gis/spatial/EditableLayer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2020 "Neo4j,"
+ * Copyright (c) "Neo4j"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j Spatial.

diff --git a/src/main/java/org/neo4j/gis/spatial/EditableLayerImpl.java b/src/main/java/org/neo4j/gis/spatial/EditableLayerImpl.java
@@ -1,18 +1,18 @@
 /*
- * Copyright (c) 2010-2020 "Neo4j,"
+ * Copyright (c) "Neo4j"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j Spatial.
  *
- * Neo4j is free software: you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option) any
- * later version.
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.

diff --git a/src/main/java/org/neo4j/gis/spatial/GeometryEncoder.java b/src/main/java/org/neo4j/gis/spatial/GeometryEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2020 "Neo4j,"
+ * Copyright (c) "Neo4j"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j Spatial.

diff --git a/src/main/java/org/neo4j/gis/spatial/Layer.java b/src/main/java/org/neo4j/gis/spatial/Layer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2020 "Neo4j,"
+ * Copyright (c) "Neo4j"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j Spatial.

diff --git a/src/main/java/org/neo4j/gis/spatial/LineStringNetworkGenerator.java b/src/main/java/org/neo4j/gis/spatial/LineStringNetworkGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2020 "Neo4j,"
+ * Copyright (c) "Neo4j"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j Spatial.

diff --git a/src/main/java/org/neo4j/gis/spatial/OrderedEditableLayer.java b/src/main/java/org/neo4j/gis/spatial/OrderedEditableLayer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2020 "Neo4j,"
+ * Copyright (c) "Neo4j"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j Spatial.