This is an automated email from the ASF dual-hosted git repository. bchapuis pushed a commit to branch sonar in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
commit 7714c2370702d3a79c668c377ad0d7533e73d879 Author: Bertil Chapuis <[email protected]> AuthorDate: Thu Jun 13 01:07:32 2024 +0200 Use record instead of class --- .../org/apache/baremaps/database/DiffService.java | 6 ++-- .../database/function/ChangeElementsImporter.java | 6 ++-- .../database/function/CopyChangeImporter.java | 8 ++--- .../database/function/PutChangeImporter.java | 8 ++--- .../function/ChangeEntitiesHandler.java | 2 +- .../baremaps/openstreetmap/model/Change.java | 41 +--------------------- .../xml/XmlChangeSpliteratorTest.java | 2 +- 7 files changed, 17 insertions(+), 56 deletions(-) diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/DiffService.java b/baremaps-core/src/main/java/org/apache/baremaps/database/DiffService.java index 6bb0f453..cf84d3e8 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/database/DiffService.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/database/DiffService.java @@ -101,7 +101,7 @@ public class DiffService implements Callable<List<TileCoord>> { } private Stream<Geometry> geometriesForChange(Change change) { - switch (change.getType()) { + switch (change.type()) { case CREATE: return geometriesForNextVersion(change); case DELETE: @@ -115,7 +115,7 @@ public class DiffService implements Callable<List<TileCoord>> { } private Stream<Geometry> geometriesForPreviousVersion(Change change) { - return change.getEntities().stream().map(this::geometriesForPreviousVersion) + return change.entities().stream().map(this::geometriesForPreviousVersion) .flatMap(Optional::stream); } @@ -139,7 +139,7 @@ public class DiffService implements Callable<List<TileCoord>> { } private Stream<Geometry> geometriesForNextVersion(Change change) { - return change.getEntities().stream() + return change.entities().stream() .map(consumeThenReturn(new EntityGeometryBuilder(coordinateMap, referenceMap))) .flatMap(new EntityToGeometryMapper().andThen(Optional::stream)); } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/function/ChangeElementsImporter.java b/baremaps-core/src/main/java/org/apache/baremaps/database/function/ChangeElementsImporter.java index 200a8bfe..01cc8af1 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/database/function/ChangeElementsImporter.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/database/function/ChangeElementsImporter.java @@ -49,14 +49,14 @@ public class ChangeElementsImporter<T extends Element> implements Consumer<Chang /** {@inheritDoc} */ @Override public void accept(Change change) { - switch (change.getType()) { + switch (change.type()) { case CREATE, MODIFY -> put(change); case DELETE -> delete(change); } } private void put(Change change) { - var nodes = change.getEntities().stream() + var nodes = change.entities().stream() .filter(type::isInstance) .map(type::cast) .toList(); @@ -70,7 +70,7 @@ public class ChangeElementsImporter<T extends Element> implements Consumer<Chang } private void delete(Change change) { - var nodes = change.getEntities().stream() + var nodes = change.entities().stream() .filter(type::isInstance) .map(type::cast) .map(Element::getId) diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/function/CopyChangeImporter.java b/baremaps-core/src/main/java/org/apache/baremaps/database/function/CopyChangeImporter.java index 9e8676ec..451000e6 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/database/function/CopyChangeImporter.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/database/function/CopyChangeImporter.java @@ -56,23 +56,23 @@ public class CopyChangeImporter implements Consumer<Change> { /** {@inheritDoc} */ @Override public void accept(Change change) { - var nodes = change.getEntities().stream() + var nodes = change.entities().stream() .filter(entity -> entity instanceof Node) .map(entity -> (Node) entity) .toList(); var nodeIds = nodes.stream().map(Node::getId).toList(); - var ways = change.getEntities().stream() + var ways = change.entities().stream() .filter(entity -> entity instanceof Way) .map(entity -> (Way) entity) .toList(); var wayIds = ways.stream().map(Way::getId).toList(); - var relations = change.getEntities().stream() + var relations = change.entities().stream() .filter(entity -> entity instanceof Relation) .map(entity -> (Relation) entity) .toList(); var relationIds = relations.stream().map(Relation::getId).toList(); try { - switch (change.getType()) { + switch (change.type()) { case CREATE, MODIFY -> { if (!nodes.isEmpty()) { logger.trace("Creating {} nodes", nodes.size()); diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/function/PutChangeImporter.java b/baremaps-core/src/main/java/org/apache/baremaps/database/function/PutChangeImporter.java index 1bb76e8b..4e382e68 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/database/function/PutChangeImporter.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/database/function/PutChangeImporter.java @@ -57,23 +57,23 @@ public class PutChangeImporter implements Consumer<Change> { /** {@inheritDoc} */ @Override public void accept(Change change) { - var nodes = change.getEntities().stream() + var nodes = change.entities().stream() .filter(entity -> entity instanceof Node) .map(entity -> (Node) entity) .toList(); var nodeIds = nodes.stream().map(Node::getId).toList(); - var ways = change.getEntities().stream() + var ways = change.entities().stream() .filter(entity -> entity instanceof Way) .map(entity -> (Way) entity) .toList(); var wayIds = ways.stream().map(Way::getId).toList(); - var relations = change.getEntities().stream() + var relations = change.entities().stream() .filter(entity -> entity instanceof Relation) .map(entity -> (Relation) entity) .toList(); var relationIds = relations.stream().map(Relation::getId).toList(); try { - switch (change.getType()) { + switch (change.type()) { case CREATE, MODIFY -> { if (!nodes.isEmpty()) { logger.trace("Creating {} nodes", nodes.size()); diff --git a/baremaps-openstreetmap/src/main/java/org/apache/baremaps/openstreetmap/function/ChangeEntitiesHandler.java b/baremaps-openstreetmap/src/main/java/org/apache/baremaps/openstreetmap/function/ChangeEntitiesHandler.java index d500cd85..8b92a113 100644 --- a/baremaps-openstreetmap/src/main/java/org/apache/baremaps/openstreetmap/function/ChangeEntitiesHandler.java +++ b/baremaps-openstreetmap/src/main/java/org/apache/baremaps/openstreetmap/function/ChangeEntitiesHandler.java @@ -41,6 +41,6 @@ public class ChangeEntitiesHandler implements Consumer<Change> { /** {@inheritDoc} */ @Override public void accept(Change change) { - change.getEntities().forEach(consumer); + change.entities().forEach(consumer); } } diff --git a/baremaps-openstreetmap/src/main/java/org/apache/baremaps/openstreetmap/model/Change.java b/baremaps-openstreetmap/src/main/java/org/apache/baremaps/openstreetmap/model/Change.java index 43d1bce1..1b7285ab 100644 --- a/baremaps-openstreetmap/src/main/java/org/apache/baremaps/openstreetmap/model/Change.java +++ b/baremaps-openstreetmap/src/main/java/org/apache/baremaps/openstreetmap/model/Change.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.StringJoiner; /** Represents a change in an OpenStreetMap dataset. */ -public final class Change { +public record Change(ChangeType type, List<Entity> entities) { public enum ChangeType { DELETE, @@ -31,43 +31,4 @@ public final class Change { MODIFY } - private final ChangeType type; - - private final List<Entity> entities; - - /** - * Constructs an OpenStreetMap change. - * - * @param type the type of the change - * @param entities the entities affected by the change - */ - public Change(ChangeType type, List<Entity> entities) { - this.type = type; - this.entities = entities; - } - - /** - * Returns the type of the change. - * - * @return the type of the change - */ - public ChangeType getType() { - return type; - } - - /** - * Returns the entities affected by the change. - * - * @return the entities affected by the change - */ - public List<Entity> getEntities() { - return entities; - } - - /** {@inheritDoc} */ - @Override - public String toString() { - return new StringJoiner(", ", Change.class.getSimpleName() + "[", "]").add("type=" + type) - .add("elements=" + entities).toString(); - } } diff --git a/baremaps-openstreetmap/src/test/java/org/apache/baremaps/openstreetmap/xml/XmlChangeSpliteratorTest.java b/baremaps-openstreetmap/src/test/java/org/apache/baremaps/openstreetmap/xml/XmlChangeSpliteratorTest.java index e048be87..4da9f767 100644 --- a/baremaps-openstreetmap/src/test/java/org/apache/baremaps/openstreetmap/xml/XmlChangeSpliteratorTest.java +++ b/baremaps-openstreetmap/src/test/java/org/apache/baremaps/openstreetmap/xml/XmlChangeSpliteratorTest.java @@ -53,7 +53,7 @@ class XmlChangeSpliteratorTest { spliterator.forEachRemaining(accumulator); assertEquals(accumulator.values().size(), 5); assertEquals(accumulator.values().stream() - .flatMap(change -> change.getEntities().stream()) + .flatMap(change -> change.entities().stream()) .toList().size(), 36); } }
