code-cleanup: static methods, @OverRide (#407)

* make methods static if possible
* add missing `@override`
* unwrap `else` after `return`

Author: Andy2003

src/main/java/org/geotools/data/neo4j/StyledImageExporter.java

@@ -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();

src/main/java/org/neo4j/gis/spatial/AbstractGeometryEncoder.java

@@ -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;

src/main/java/org/neo4j/gis/spatial/DynamicLayer.java

@@ -101,11 +101,11 @@ public DynamicLayerConfig addCQLDynamicLayerOnGeometryType(Transaction tx, int g
 	}
 
 	public DynamicLayerConfig addCQLDynamicLayerOnAttribute(Transaction tx, String key, String value, int gtype) {
-		// TODO: Better escaping here
-		//return addLayerConfig("CQL:" + key + "-" + value, gtype, key + " = '" + value + "' AND " + makeGeometryCQL(gtype));
 		if (value == null) {
 			return addLayerConfig(tx, "CQL:" + key, gtype, key + " IS NOT NULL AND " + makeGeometryCQL(gtype));
 		}
+		// TODO: Better escaping here
+		//return addLayerConfig("CQL:" + key + "-" + value, gtype, key + " = '" + value + "' AND " + makeGeometryCQL(gtype));
 		return addCQLDynamicLayerOnAttributes(tx, new String[]{key, value}, gtype);
 	}
 

src/main/java/org/neo4j/gis/spatial/DynamicLayerConfig.java

@@ -227,12 +227,12 @@ public Integer getGeometryType(Transaction tx) {
 	public LayerIndexReader getIndex() {
 		if (parent.indexReader instanceof LayerTreeIndexReader) {
 			String query = getQuery();
-			// Make a CQL based dynamic layer
-			// Make a standard JSON based dynamic layer
 			if (query.startsWith("{")) {
+				// Make a standard JSON based dynamic layer
 				return new DynamicIndexReader((LayerTreeIndexReader) parent.indexReader, query);
 			}
 			try {
+				// Make a CQL based dynamic layer
 				return new CQLIndexReader((LayerTreeIndexReader) parent.indexReader, this, query);
 			} catch (CQLException e) {
 				throw new SpatialDatabaseException("Error while creating CQL based DynamicLayer", e);

src/main/java/org/neo4j/gis/spatial/ShapefileImporter.java

@@ -226,7 +226,7 @@ record = shpReader.nextRecord();
 		return added;
 	}
 
-	private CoordinateReferenceSystem readCRS(ShpFiles shpFiles, ShapefileReader shpReader) {
+	private static CoordinateReferenceSystem readCRS(ShpFiles shpFiles, ShapefileReader shpReader) {
 		try (PrjFileReader prjReader = new PrjFileReader(shpFiles.getReadChannel(ShpFileType.PRJ, shpReader))) {
 			return prjReader.getCoordinateReferenceSystem();
 		} catch (IOException | FactoryException e) {
@@ -235,11 +235,11 @@ private CoordinateReferenceSystem readCRS(ShpFiles shpFiles, ShapefileReader shp
 		}
 	}
 
-	private void log(String message) {
+	private static void log(String message) {
 		System.out.println(message);
 	}
 
-	private void log(String message, Exception e) {
+	private static void log(String message, Exception e) {
 		System.out.println(message);
 		e.printStackTrace();
 	}

src/main/java/org/neo4j/gis/spatial/SimplePointLayer.java

@@ -46,7 +46,7 @@ public SpatialDatabaseRecord add(Transaction tx, double x, double y, String[] fi
 		return add(tx, new Coordinate(x, y), fieldsName, fields);
 	}
 
-	public Integer getGeometryType() {
+	public static Integer getGeometryType() {
 		return GTYPE_POINT;
 	}
 

src/main/java/org/neo4j/gis/spatial/SpatialDatabaseRecord.java

@@ -179,7 +179,7 @@ protected SpatialDatabaseRecord(Layer layer, Node geomNode, Geometry geometry) {
 
 	// Private methods
 
-	private void checkIsNotReservedProperty(String name) {
+	private static void checkIsNotReservedProperty(String name) {
 		for (String property : RESERVED_PROPS) {
 			if (property.equals(name)) {
 				throw new SpatialDatabaseException("Updating not allowed for Reserved Property: " + name);

src/main/java/org/neo4j/gis/spatial/SpatialDatabaseService.java

@@ -202,7 +202,7 @@ public EditableLayer getOrCreateEditableLayer(Transaction tx, String name, Strin
 	public static final String RTREE_INDEX_NAME = "rtree";
 	public static final String GEOHASH_INDEX_NAME = "geohash";
 
-	public Class<? extends LayerIndexReader> resolveIndexClass(String index) {
+	public static Class<? extends LayerIndexReader> resolveIndexClass(String index) {
 		if (index == null) {
 			return LayerRTreeIndex.class;
 		}
@@ -333,7 +333,7 @@ public SimplePointLayer createPointLayer(Transaction tx, String name, Class<? ex
 				makeEncoderConfig(encoderConfig), org.geotools.referencing.crs.DefaultGeographicCRS.WGS84);
 	}
 
-	public String makeEncoderConfig(String... args) {
+	public static String makeEncoderConfig(String... args) {
 		StringBuilder sb = new StringBuilder();
 		if (args != null) {
 			for (String arg : args) {
@@ -555,13 +555,13 @@ public Layer getOrCreateRegisteredTypeLayer(Transaction tx, String name, Registe
 				(config == null) ? registeredLayerType.defaultConfig : config);
 	}
 
-	public Map<String, String> getRegisteredLayerTypes() {
+	public static Map<String, String> getRegisteredLayerTypes() {
 		Map<String, String> results = new LinkedHashMap<>();
 		registeredLayerTypes.forEach((s, definition) -> results.put(s, definition.getSignature()));
 		return results;
 	}
 
-	public Class<? extends Layer> suggestLayerClassForEncoder(Class<? extends GeometryEncoder> encoderClass) {
+	public static Class<? extends Layer> suggestLayerClassForEncoder(Class<? extends GeometryEncoder> encoderClass) {
 		for (RegisteredLayerType type : registeredLayerTypes.values()) {
 			if (type.geometryEncoder == encoderClass) {
 				return type.layerClass;

src/main/java/org/neo4j/gis/spatial/SpatialTopologyUtils.java

@@ -84,6 +84,7 @@ public int compareTo(PointResult other) {
 			return Double.compare(this.distance, other.distance);
 		}
 
+		@Override
 		public String toString() {
 			return "Point[" + point + "] distance[" + distance + "] record[" + record + "]";
 		}

src/main/java/org/neo4j/gis/spatial/attributes/PropertyMapper.java

@@ -37,6 +37,7 @@ public PropertyMapper(String from, String to, String type, String params) {
 		this.params = params;
 	}
 
+	@Override
 	public boolean equals(Object obj) {
 		if (obj instanceof PropertyMapper other) {
 			return this.key().equals(other.key());