Refactor layer type registration using LayerTypePresets to centralize and streamline configuration management.

api/src/main/java/org/neo4j/spatial/api/layer/LayerTypePresets.java

@@ -0,0 +1,70 @@
+/*
+ * 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/>.
+ */
+
+package org.neo4j.spatial.api.layer;
+
+import java.util.List;
+import org.geotools.referencing.crs.AbstractCRS;
+import org.neo4j.spatial.api.encoder.GeometryEncoder;
+import org.neo4j.spatial.api.index.LayerIndexReader;
+
+/**
+ * Interface that provides a mechanism for managing a collection of predefined
+ * layer configurations, referred to as layer-type presets. These presets define
+ * mappings between layer types and their corresponding properties, components
+ * and behaviors.
+ *
+ * <p>Implementations are discovered via {@link java.util.ServiceLoader} and must
+ * be registered in META-INF/services/org.neo4j.spatial.api.layer.LayerTypePresets.
+ * All registered presets from all implementations are combined into a single registry.
+ * If multiple implementations define presets with the same type name (case-insensitive),
+ * the last one loaded will override earlier registrations.</p>
+ */
+public interface LayerTypePresets {
+
+	List<RegisteredLayerType> getLayerTypePresets();
+
+	/**
+	 * Support mapping a String (ex: 'SimplePoint') to the respective GeometryEncoder and Layer classes
+	 * to allow for more streamlined method for creating Layers.
+	 */
+	record RegisteredLayerType(
+			String typeName,
+			Class<? extends GeometryEncoder> geometryEncoder,
+			Class<? extends Layer> layerClass,
+			AbstractCRS crs,
+			Class<? extends LayerIndexReader> layerIndexClass,
+			String defaultConfig
+	) {
+
+		/**
+		 * For external expression of the configuration of this geometry encoder
+		 *
+		 * @return descriptive signature of encoder, type and configuration
+		 */
+		public String getSignature() {
+			return "RegisteredLayerType(name='" + typeName + "', geometryEncoder=" +
+					geometryEncoder.getSimpleName() + ", layerClass=" + layerClass.getSimpleName() +
+					", index=" + layerIndexClass.getSimpleName() +
+					", crs='" + crs.getName(null) + "', defaultConfig='" + defaultConfig + "')";
+		}
+	}
+
+}

server-plugin/src/main/java/org/neo4j/gis/spatial/OsmSpatialLayerTypePresets.java

@@ -0,0 +1,39 @@
+/*
+ * 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/>.
+ */
+
+package org.neo4j.gis.spatial;
+
+import java.util.List;
+import org.geotools.referencing.crs.DefaultGeographicCRS;
+import org.neo4j.gis.spatial.index.LayerRTreeIndex;
+import org.neo4j.gis.spatial.osm.OSMGeometryEncoder;
+import org.neo4j.gis.spatial.osm.OSMLayer;
+import org.neo4j.spatial.api.layer.LayerTypePresets;
+
+public class OsmSpatialLayerTypePresets implements LayerTypePresets {
+
+	@Override
+	public List<RegisteredLayerType> getLayerTypePresets() {
+		return List.of(
+				new RegisteredLayerType("OSM", OSMGeometryEncoder.class, OSMLayer.class,
+						DefaultGeographicCRS.WGS84, LayerRTreeIndex.class, "geometry")
+		);
+	}
+}

server-plugin/src/main/java/org/neo4j/gis/spatial/SpatialDatabaseService.java

@@ -20,12 +20,12 @@
 package org.neo4j.gis.spatial;
 
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.ServiceLoader;
+import java.util.TreeMap;
 import java.util.logging.Logger;
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
-import org.geotools.referencing.crs.AbstractCRS;
 import org.geotools.referencing.crs.DefaultGeographicCRS;
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.geom.LineString;
@@ -36,14 +36,11 @@
 import org.locationtech.jts.geom.Polygon;
 import org.neo4j.gis.spatial.encoders.Configurable;
 import org.neo4j.gis.spatial.encoders.NativePointEncoder;
-import org.neo4j.gis.spatial.encoders.NativePointsEncoder;
 import org.neo4j.gis.spatial.encoders.SimplePointEncoder;
 import org.neo4j.gis.spatial.index.LayerGeohashPointIndex;
 import org.neo4j.gis.spatial.index.LayerHilbertPointIndex;
 import org.neo4j.gis.spatial.index.LayerRTreeIndex;
 import org.neo4j.gis.spatial.index.LayerZOrderPointIndex;
-import org.neo4j.gis.spatial.osm.OSMGeometryEncoder;
-import org.neo4j.gis.spatial.osm.OSMLayer;
 import org.neo4j.gis.spatial.utilities.LayerUtilities;
 import org.neo4j.gis.spatial.utilities.ReferenceNodes;
 import org.neo4j.graphdb.Direction;
@@ -56,6 +53,8 @@
 import org.neo4j.spatial.api.index.LayerIndexReader;
 import org.neo4j.spatial.api.layer.EditableLayer;
 import org.neo4j.spatial.api.layer.Layer;
+import org.neo4j.spatial.api.layer.LayerTypePresets;
+import org.neo4j.spatial.api.layer.LayerTypePresets.RegisteredLayerType;
 import org.neo4j.spatial.api.monitoring.ProgressListener;
 
 /**
@@ -67,35 +66,19 @@
 public class SpatialDatabaseService implements Constants {
 
 	private static final Logger LOGGER = Logger.getLogger(SpatialDatabaseService.class.getName());
-	private static final Map<String, RegisteredLayerType> registeredLayerTypes = new LinkedHashMap<>();
+	private static final Map<String, RegisteredLayerType> registeredLayerPresets = new TreeMap<>();
 
 	static {
-		addRegisteredLayerType(new RegisteredLayerType("SimplePoint", SimplePointEncoder.class,
-				SimplePointLayer.class, DefaultGeographicCRS.WGS84, LayerRTreeIndex.class, "longitude:latitude"));
-		addRegisteredLayerType(new RegisteredLayerType("Geohash", SimplePointEncoder.class,
-				SimplePointLayer.class, DefaultGeographicCRS.WGS84, LayerGeohashPointIndex.class,
-				"longitude:latitude"));
-		addRegisteredLayerType(new RegisteredLayerType("ZOrder", SimplePointEncoder.class,
-				SimplePointLayer.class, DefaultGeographicCRS.WGS84, LayerZOrderPointIndex.class, "longitude:latitude"));
-		addRegisteredLayerType(new RegisteredLayerType("Hilbert", SimplePointEncoder.class,
-				SimplePointLayer.class, DefaultGeographicCRS.WGS84, LayerHilbertPointIndex.class,
-				"longitude:latitude"));
-		addRegisteredLayerType(new RegisteredLayerType("NativePoint", NativePointEncoder.class,
-				SimplePointLayer.class, DefaultGeographicCRS.WGS84, LayerRTreeIndex.class, "location"));
-		addRegisteredLayerType(new RegisteredLayerType("NativePoints", NativePointsEncoder.class,
-				EditableLayerImpl.class, DefaultGeographicCRS.WGS84, LayerRTreeIndex.class, "geometry"));
-		addRegisteredLayerType(new RegisteredLayerType("NativeGeohash", NativePointEncoder.class,
-				SimplePointLayer.class, DefaultGeographicCRS.WGS84, LayerGeohashPointIndex.class, "location"));
-		addRegisteredLayerType(new RegisteredLayerType("NativeZOrder", NativePointEncoder.class,
-				SimplePointLayer.class, DefaultGeographicCRS.WGS84, LayerZOrderPointIndex.class, "location"));
-		addRegisteredLayerType(new RegisteredLayerType("NativeHilbert", NativePointEncoder.class,
-				SimplePointLayer.class, DefaultGeographicCRS.WGS84, LayerHilbertPointIndex.class, "location"));
-		addRegisteredLayerType(new RegisteredLayerType("WKT", WKTGeometryEncoder.class, EditableLayerImpl.class,
-				DefaultGeographicCRS.WGS84, LayerRTreeIndex.class, "geometry"));
-		addRegisteredLayerType(new RegisteredLayerType("WKB", WKBGeometryEncoder.class, EditableLayerImpl.class,
-				DefaultGeographicCRS.WGS84, LayerRTreeIndex.class, "geometry"));
-		addRegisteredLayerType(new RegisteredLayerType("OSM", OSMGeometryEncoder.class, OSMLayer.class,
-				DefaultGeographicCRS.WGS84, LayerRTreeIndex.class, "geometry"));
+		ServiceLoader.load(LayerTypePresets.class).forEach(layerPresets -> {
+			layerPresets.getLayerTypePresets().forEach(preset -> {
+				String key = preset.typeName().toLowerCase();
+				if (registeredLayerPresets.containsKey(key)) {
+					LOGGER.warning(
+							"Duplicate layer type preset detected: " + key + " - overwriting previous registration");
+				}
+				registeredLayerPresets.put(key, preset);
+			});
+		});
 	}
 
 	public final IndexManager indexManager;
@@ -181,20 +164,16 @@ public static int convertJtsClassToGeometryType(Class<? extends Geometry> jtsCla
 		return GTYPE_GEOMETRY;
 	}
 
-	private static void addRegisteredLayerType(RegisteredLayerType type) {
-		registeredLayerTypes.put(type.typeName.toLowerCase(), type);
-	}
-
 	public static Map<String, String> getRegisteredLayerTypes() {
-		Map<String, String> results = new LinkedHashMap<>();
-		registeredLayerTypes.forEach((s, definition) -> results.put(s, definition.getSignature()));
+		Map<String, String> results = new TreeMap<>();
+		registeredLayerPresets.forEach((s, definition) -> results.put(s, definition.getSignature()));
 		return results;
 	}
 
 	public static Class<? extends Layer> suggestLayerClassForEncoder(Class<? extends GeometryEncoder> encoderClass) {
-		for (RegisteredLayerType type : registeredLayerTypes.values()) {
-			if (type.geometryEncoder == encoderClass) {
-				return type.layerClass;
+		for (RegisteredLayerType type : registeredLayerPresets.values()) {
+			if (type.geometryEncoder() == encoderClass) {
+				return type.layerClass();
 			}
 		}
 		return EditableLayerImpl.class;
@@ -497,52 +476,15 @@ public Layer createResultsLayer(Transaction tx, String layerName, List<SpatialRe
 
 	public Layer getOrCreateRegisteredTypeLayer(Transaction tx, String name, String type, String encoderConfig,
 			String indexConfig, boolean readOnly) {
-		RegisteredLayerType registeredLayerType = registeredLayerTypes.get(type.toLowerCase());
+		RegisteredLayerType registeredLayerType = registeredLayerPresets.get(type.toLowerCase());
 		return getOrCreateRegisteredTypeLayer(tx, name, registeredLayerType, encoderConfig, indexConfig, readOnly);
 	}
 
 
 	public Layer getOrCreateRegisteredTypeLayer(Transaction tx, String name, RegisteredLayerType registeredLayerType,
 			String encoderConfig, String indexConfig, boolean readOnly) {
-		return getOrCreateLayer(tx, name, registeredLayerType.geometryEncoder, registeredLayerType.layerClass,
-				(encoderConfig == null) ? registeredLayerType.defaultConfig : encoderConfig, indexConfig, readOnly);
+		return getOrCreateLayer(tx, name, registeredLayerType.geometryEncoder(), registeredLayerType.layerClass(),
+				(encoderConfig == null) ? registeredLayerType.defaultConfig() : encoderConfig, indexConfig, readOnly);
 	}
 
-	/**
-	 * Support mapping a String (ex: 'SimplePoint') to the respective GeometryEncoder and Layer classes
-	 * to allow for more streamlined method for creating Layers
-	 * This was added to help support Spatial Cypher project.
-	 */
-	public static class RegisteredLayerType {
-
-		final String typeName;
-		final Class<? extends GeometryEncoder> geometryEncoder;
-		final Class<? extends Layer> layerClass;
-		final Class<? extends LayerIndexReader> layerIndexClass;
-		final String defaultConfig;
-		final org.geotools.referencing.crs.AbstractCRS crs;
-
-		RegisteredLayerType(String typeName, Class<? extends GeometryEncoder> geometryEncoder,
-				Class<? extends Layer> layerClass, AbstractCRS crs,
-				Class<? extends LayerIndexReader> layerIndexClass, String defaultConfig) {
-			this.typeName = typeName;
-			this.geometryEncoder = geometryEncoder;
-			this.layerClass = layerClass;
-			this.layerIndexClass = layerIndexClass;
-			this.crs = crs;
-			this.defaultConfig = defaultConfig;
-		}
-
-		/**
-		 * For external expression of the configuration of this geometry encoder
-		 *
-		 * @return descriptive signature of encoder, type and configuration
-		 */
-		String getSignature() {
-			return "RegisteredLayerType(name='" + typeName + "', geometryEncoder=" +
-					geometryEncoder.getSimpleName() + ", layerClass=" + layerClass.getSimpleName() +
-					", index=" + layerIndexClass.getSimpleName() +
-					", crs='" + crs.getName(null) + "', defaultConfig='" + defaultConfig + "')";
-		}
-	}
 }

server-plugin/src/main/java/org/neo4j/gis/spatial/SpatialLayerTypePresets.java

@@ -0,0 +1,67 @@
+/*
+ * 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/>.
+ */
+
+package org.neo4j.gis.spatial;
+
+import java.util.List;
+import org.geotools.referencing.crs.DefaultGeographicCRS;
+import org.neo4j.gis.spatial.encoders.NativePointEncoder;
+import org.neo4j.gis.spatial.encoders.NativePointsEncoder;
+import org.neo4j.gis.spatial.encoders.SimplePointEncoder;
+import org.neo4j.gis.spatial.index.LayerGeohashPointIndex;
+import org.neo4j.gis.spatial.index.LayerHilbertPointIndex;
+import org.neo4j.gis.spatial.index.LayerRTreeIndex;
+import org.neo4j.gis.spatial.index.LayerZOrderPointIndex;
+import org.neo4j.spatial.api.layer.LayerTypePresets;
+
+public class SpatialLayerTypePresets implements LayerTypePresets {
+
+	@Override
+	public List<RegisteredLayerType> getLayerTypePresets() {
+		return List.of(
+				new RegisteredLayerType("SimplePoint", SimplePointEncoder.class,
+						SimplePointLayer.class, DefaultGeographicCRS.WGS84, LayerRTreeIndex.class,
+						"longitude:latitude"),
+				new RegisteredLayerType("Geohash", SimplePointEncoder.class,
+						SimplePointLayer.class, DefaultGeographicCRS.WGS84, LayerGeohashPointIndex.class,
+						"longitude:latitude"),
+				new RegisteredLayerType("ZOrder", SimplePointEncoder.class,
+						SimplePointLayer.class, DefaultGeographicCRS.WGS84, LayerZOrderPointIndex.class,
+						"longitude:latitude"),
+				new RegisteredLayerType("Hilbert", SimplePointEncoder.class,
+						SimplePointLayer.class, DefaultGeographicCRS.WGS84, LayerHilbertPointIndex.class,
+						"longitude:latitude"),
+				new RegisteredLayerType("NativePoint", NativePointEncoder.class,
+						SimplePointLayer.class, DefaultGeographicCRS.WGS84, LayerRTreeIndex.class, "location"),
+				new RegisteredLayerType("NativePoints", NativePointsEncoder.class,
+						EditableLayerImpl.class, DefaultGeographicCRS.WGS84, LayerRTreeIndex.class, "geometry"),
+				new RegisteredLayerType("NativeGeohash", NativePointEncoder.class,
+						SimplePointLayer.class, DefaultGeographicCRS.WGS84, LayerGeohashPointIndex.class, "location"),
+				new RegisteredLayerType("NativeZOrder", NativePointEncoder.class,
+						SimplePointLayer.class, DefaultGeographicCRS.WGS84, LayerZOrderPointIndex.class, "location"),
+				new RegisteredLayerType("NativeHilbert", NativePointEncoder.class,
+						SimplePointLayer.class, DefaultGeographicCRS.WGS84, LayerHilbertPointIndex.class, "location"),
+				new RegisteredLayerType("WKT", WKTGeometryEncoder.class, EditableLayerImpl.class,
+						DefaultGeographicCRS.WGS84, LayerRTreeIndex.class, "geometry"),
+				new RegisteredLayerType("WKB", WKBGeometryEncoder.class, EditableLayerImpl.class,
+						DefaultGeographicCRS.WGS84, LayerRTreeIndex.class, "geometry")
+		);
+	}
+}

server-plugin/src/main/resources/META-INF/services/org.neo4j.spatial.api.layer.LayerTypePresets

@@ -0,0 +1,2 @@
+org.neo4j.gis.spatial.SpatialLayerTypePresets
+org.neo4j.gis.spatial.OsmSpatialLayerTypePresets