rename close to finalizeTransaction

Author: Andy2003

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

@@ -63,5 +63,5 @@ public interface EditableLayer extends Layer {
 	/**
 	 * Do any cleanup or final calculation required by the layer implementation.
 	 */
-	void close(Transaction tx);
+	void finalizeTransaction(Transaction tx);
 }

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

@@ -83,7 +83,7 @@ public String getSignature() {
 	}
 
 	@Override
-	public void close(Transaction tx) {
-		getIndex().close(tx);
+	public void finalizeTransaction(Transaction tx) {
+		getIndex().finalizeTransaction(tx);
 	}
 }

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

@@ -221,7 +221,7 @@ record = shpReader.nextRecord();
 			}
 		}
 		try (Transaction tx = database.beginTx()) {
-			layer.close(tx);
+			layer.finalizeTransaction(tx);
 			tx.commit();
 		}
 

src/main/java/org/neo4j/gis/spatial/index/SpatialIndexReader.java

@@ -48,6 +48,6 @@ public interface SpatialIndexReader {
 
 	void configure(Map<String, Object> config);
 
-	default void close(Transaction tx) {
+	default void finalizeTransaction(Transaction tx) {
 	}
 }

src/main/java/org/neo4j/gis/spatial/osm/OSMImporter.java

@@ -329,7 +329,7 @@ public long reIndex(GraphDatabaseService database, int commitInterval, boolean i
 					}
 				} // TODO ask charset to user?
 			}
-			layer.close(tx);
+			layer.finalizeTransaction(tx);
 			tx.commit();
 		} finally {
 			endProgressMonitor();

src/main/java/org/neo4j/gis/spatial/procedures/SpatialProcedures.java

@@ -555,7 +555,7 @@ public void removeLayer(@Name("name") String name) {
 	public Stream<NodeResult> addNodeToLayer(@Name("layerName") String name, @Name("node") Node node) {
 		EditableLayer layer = getEditableLayerOrThrow(tx, spatial(), name);
 		Node geomNode = layer.add(tx, node).getGeomNode();
-		layer.close(tx);
+		layer.finalizeTransaction(tx);
 		return streamNode(geomNode);
 	}
 
@@ -564,7 +564,7 @@ public Stream<NodeResult> addNodeToLayer(@Name("layerName") String name, @Name("
 	public Stream<CountResult> addNodesToLayer(@Name("layerName") String name, @Name("nodes") List<Node> nodes) {
 		EditableLayer layer = getEditableLayerOrThrow(tx, spatial(), name);
 		int count = layer.addAll(tx, nodes);
-		layer.close(tx);
+		layer.finalizeTransaction(tx);
 		return Stream.of(new CountResult(count));
 	}
 
@@ -573,7 +573,7 @@ public Stream<CountResult> addNodesToLayer(@Name("layerName") String name, @Name
 	public Stream<NodeResult> addNodeIdToLayer(@Name("layerName") String name, @Name("nodeId") String nodeId) {
 		EditableLayer layer = getEditableLayerOrThrow(tx, spatial(), name);
 		Node geomNode = layer.add(tx, tx.getNodeByElementId(nodeId)).getGeomNode();
-		layer.close(tx);
+		layer.finalizeTransaction(tx);
 		return streamNode(geomNode);
 	}
 
@@ -584,7 +584,7 @@ public Stream<CountResult> addNodeIdsToLayer(@Name("layerName") String name,
 		EditableLayer layer = getEditableLayerOrThrow(tx, spatial(), name);
 		List<Node> nodes = nodeIds.stream().map(id -> tx.getNodeByElementId(id)).collect(Collectors.toList());
 		int count = layer.addAll(tx, nodes);
-		layer.close(tx);
+		layer.finalizeTransaction(tx);
 		return Stream.of(new CountResult(count));
 	}
 
@@ -593,7 +593,7 @@ public Stream<CountResult> addNodeIdsToLayer(@Name("layerName") String name,
 	public Stream<NodeIdResult> removeNodeFromLayer(@Name("layerName") String name, @Name("node") Node node) {
 		EditableLayer layer = getEditableLayerOrThrow(tx, spatial(), name);
 		layer.removeFromIndex(tx, node.getElementId());
-		layer.close(tx);
+		layer.finalizeTransaction(tx);
 		return streamNode(node.getElementId());
 	}
 
@@ -607,7 +607,7 @@ public Stream<CountResult> removeNodesFromLayer(@Name("layerName") String name,
 			layer.removeFromIndex(tx, node.getElementId());
 		}
 		int after = layer.getIndex().count(tx);
-		layer.close(tx);
+		layer.finalizeTransaction(tx);
 		return Stream.of(new CountResult(before - after));
 	}
 
@@ -616,7 +616,7 @@ public Stream<CountResult> removeNodesFromLayer(@Name("layerName") String name,
 	public Stream<NodeIdResult> removeNodeFromLayer(@Name("layerName") String name, @Name("nodeId") String nodeId) {
 		EditableLayer layer = getEditableLayerOrThrow(tx, spatial(), name);
 		layer.removeFromIndex(tx, nodeId);
-		layer.close(tx);
+		layer.finalizeTransaction(tx);
 		return streamNode(nodeId);
 	}
 
@@ -631,7 +631,7 @@ public Stream<CountResult> removeNodeIdsFromLayer(@Name("layerName") String name
 			layer.removeFromIndex(tx, nodeId);
 		}
 		int after = layer.getIndex().count(tx);
-		layer.close(tx);
+		layer.finalizeTransaction(tx);
 		return Stream.of(new CountResult(before - after));
 	}
 
@@ -642,7 +642,7 @@ public Stream<NodeResult> addGeometryWKTToLayer(@Name("layerName") String name,
 		EditableLayer layer = getEditableLayerOrThrow(tx, spatial(), name);
 		WKTReader reader = new WKTReader(layer.getGeometryFactory());
 		Node node = addGeometryWkt(layer, reader, geometryWKT);
-		layer.close(tx);
+		layer.finalizeTransaction(tx);
 		return streamNode(node);
 	}
 
@@ -654,7 +654,7 @@ public Stream<NodeResult> addGeometryWKTsToLayer(@Name("layerName") String name,
 		WKTReader reader = new WKTReader(layer.getGeometryFactory());
 		return geometryWKTs.stream().map(geometryWKT -> addGeometryWkt(layer, reader, geometryWKT))
 				.map(NodeResult::new)
-				.onClose(() -> layer.close(tx));
+				.onClose(() -> layer.finalizeTransaction(tx));
 	}
 
 	private Node addGeometryWkt(EditableLayer layer, WKTReader reader, String geometryWKT) {
@@ -673,7 +673,7 @@ public Stream<CountResult> importShapefile(
 			@Name("uri") String uri) throws IOException {
 		EditableLayerImpl layer = getEditableLayerOrThrow(tx, spatial(), name);
 		List<Node> nodes = importShapefileToLayer(uri, layer, 1000);
-		layer.close(tx);
+		layer.finalizeTransaction(tx);
 		return Stream.of(new CountResult(nodes.size()));
 	}
 

src/main/java/org/neo4j/gis/spatial/rtree/RTreeIndex.java

@@ -1556,7 +1556,7 @@ public int compare(NodeWithEnvelope o1, NodeWithEnvelope o2) {
 	}
 
 	@Override
-	public void close(Transaction tx) {
+	public void finalizeTransaction(Transaction tx) {
 		saveCount(tx);
 	}
 }

src/test/java/org/neo4j/gis/spatial/LayersTest.java

@@ -365,7 +365,7 @@ public void testIndexAccessAfterBulkInsertion() {
 				coordinateNodes.add(node);
 			}
 			layer.addAll(tx, coordinateNodes);
-			layer.close(tx);
+			layer.finalizeTransaction(tx);
 			tx.commit();
 		}