This is an automated email from the ASF dual-hosted git repository. bchapuis pushed a commit to branch instanceof in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
commit 87f60d51cc58179d49c4a14292c5624a99886f77 Author: Bertil Chapuis <[email protected]> AuthorDate: Tue Nov 22 16:22:35 2022 +0100 Use java 17 conventions --- .../org/apache/baremaps/database/DiffService.java | 16 ++--- .../baremaps/database/SaveBlockConsumer.java | 10 +-- .../baremaps/database/SaveChangeConsumer.java | 6 +- .../apache/baremaps/database/UpdateService.java | 8 +-- .../repository/PostgresHeaderRepository.java | 22 +++--- .../repository/PostgresNodeRepository.java | 38 +++++------ .../repository/PostgresRelationRepository.java | 43 ++++++------ .../database/repository/PostgresWayRepository.java | 34 +++++----- .../function/BlockEntitiesConsumer.java | 12 ++-- .../function/CreateGeometryConsumer.java | 22 +++--- .../function/ExtractGeometryFunction.java | 6 +- .../function/ReprojectEntityConsumer.java | 6 +- .../apache/baremaps/openstreetmap/model/Blob.java | 11 +-- .../apache/baremaps/openstreetmap/model/Block.java | 1 - .../apache/baremaps/openstreetmap/model/Bound.java | 31 --------- .../baremaps/openstreetmap/model/Change.java | 11 +-- .../baremaps/openstreetmap/model/DataBlock.java | 36 ---------- .../baremaps/openstreetmap/model/Element.java | 10 +-- .../baremaps/openstreetmap/model/Header.java | 79 ---------------------- .../baremaps/openstreetmap/model/HeaderBlock.java | 18 ----- .../apache/baremaps/openstreetmap/model/Info.java | 26 ------- .../baremaps/openstreetmap/model/Member.java | 32 +-------- .../apache/baremaps/openstreetmap/model/Node.java | 35 +--------- .../baremaps/openstreetmap/model/Relation.java | 33 +-------- .../apache/baremaps/openstreetmap/model/State.java | 34 +--------- .../apache/baremaps/openstreetmap/model/User.java | 24 +------ .../apache/baremaps/openstreetmap/model/Way.java | 33 +-------- .../openstreetmap/pbf/PbfEntityReader.java | 12 ++-- .../openstreetmap/store/DataStoreConsumer.java | 10 +-- .../database/database/ImportUpdateDataTest.java | 4 +- .../database/ImportUpdateLiechtensteinTest.java | 8 +-- .../database/database/ImportUpdateMonacoTest.java | 6 +- .../database/PostgresHeaderRepositoryTest.java | 14 ++-- .../database/PostgresNodeRepositoryTest.java | 14 ++-- .../database/PostgresRelationRepositoryTest.java | 20 +++--- .../database/PostgresWayRepositoryTest.java | 14 ++-- .../database/database/WayRepositoryTest.java | 14 ++-- .../baremaps/openstreetmap/OpenStreetMapTest.java | 6 +- .../geometry/GeometryHandlerTest.java | 31 ++++----- .../geometry/RelationGeometryTest.java | 10 +-- 40 files changed, 206 insertions(+), 594 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 824d46ca..5577fa70 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 @@ -74,8 +74,8 @@ public class DiffService implements Callable<List<Tile>> { logger.info("Importing changes"); Header header = headerRepository.selectLatest(); - String replicationUrl = header.getReplicationUrl(); - Long sequenceNumber = header.getReplicationSequenceNumber() + 1; + String replicationUrl = header.replicationUrl(); + Long sequenceNumber = header.replicationSequenceNumber() + 1; URL changeUrl = resolve(replicationUrl, sequenceNumber, "osc.gz"); ProjectionTransformer projectionTransformer = new ProjectionTransformer(srid, 4326); @@ -116,14 +116,14 @@ public class DiffService implements Callable<List<Tile>> { private Optional<Geometry> geometriesForPreviousVersion(Entity entity) { try { if (entity instanceof Node node) { - Node previousNode = nodeRepository.get(node.getId()); - return Optional.ofNullable(previousNode).map(Node::getGeometry); + Node previousNode = nodeRepository.get(node.id()); + return Optional.ofNullable(previousNode).map(Node::geometry); } else if (entity instanceof Way way) { - Way previousWay = wayRepository.get(way.getId()); - return Optional.ofNullable(previousWay).map(Way::getGeometry); + Way previousWay = wayRepository.get(way.id()); + return Optional.ofNullable(previousWay).map(Way::geometry); } else if (entity instanceof Relation relation) { - Relation previousRelation = relationRepository.get(relation.getId()); - return Optional.ofNullable(previousRelation).map(Relation::getGeometry); + Relation previousRelation = relationRepository.get(relation.id()); + return Optional.ofNullable(previousRelation).map(Relation::geometry); } else { return Optional.empty(); } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/SaveBlockConsumer.java b/baremaps-core/src/main/java/org/apache/baremaps/database/SaveBlockConsumer.java index eb40a00a..c3b4cf6e 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/database/SaveBlockConsumer.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/database/SaveBlockConsumer.java @@ -48,12 +48,12 @@ public class SaveBlockConsumer implements Consumer<Block> { public void accept(Block block) { try { if (block instanceof HeaderBlock headerBlock) { - headerRepository.put(headerBlock.getHeader()); + headerRepository.put(headerBlock.header()); } else if (block instanceof DataBlock dataBlock) { - nodeRepository.copy(dataBlock.getDenseNodes()); - nodeRepository.copy(dataBlock.getNodes()); - wayRepository.copy(dataBlock.getWays()); - relationRepository.copy(dataBlock.getRelations()); + nodeRepository.copy(dataBlock.denseNodes()); + nodeRepository.copy(dataBlock.nodes()); + wayRepository.copy(dataBlock.ways()); + relationRepository.copy(dataBlock.relations()); } } catch (Exception e) { throw new StreamException(e); diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/SaveChangeConsumer.java b/baremaps-core/src/main/java/org/apache/baremaps/database/SaveChangeConsumer.java index fcd5c98a..7f8f6282 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/database/SaveChangeConsumer.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/database/SaveChangeConsumer.java @@ -63,11 +63,11 @@ public class SaveChangeConsumer implements Consumer<Change> { break; case DELETE: if (entity instanceof Node node) { - nodeRepository.delete(node.getId()); + nodeRepository.delete(node.id()); } else if (entity instanceof Way way) { - wayRepository.delete(way.getId()); + wayRepository.delete(way.id()); } else if (entity instanceof Relation relation) { - relationRepository.delete(relation.getId()); + relationRepository.delete(relation.id()); } break; } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/UpdateService.java b/baremaps-core/src/main/java/org/apache/baremaps/database/UpdateService.java index 5d2060e0..673576a1 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/database/UpdateService.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/database/UpdateService.java @@ -67,8 +67,8 @@ public class UpdateService implements Callable<Void> { @Override public Void call() throws Exception { Header header = headerRepository.selectLatest(); - String replicationUrl = header.getReplicationUrl(); - Long sequenceNumber = header.getReplicationSequenceNumber() + 1; + String replicationUrl = header.replicationUrl(); + Long sequenceNumber = header.replicationSequenceNumber() + 1; Consumer<Entity> createGeometry = new CreateGeometryConsumer(coordinates, references); Consumer<Entity> reprojectGeometry = new ReprojectEntityConsumer(4326, srid); @@ -87,8 +87,8 @@ public class UpdateService implements Callable<Void> { URL stateUrl = resolve(replicationUrl, sequenceNumber, "state.txt"); try (InputStream stateInputStream = new BufferedInputStream(stateUrl.openStream())) { State state = new StateReader().state(stateInputStream); - headerRepository.put(new Header(state.getSequenceNumber(), state.getTimestamp(), - header.getReplicationUrl(), header.getSource(), header.getWritingProgram())); + headerRepository.put(new Header(state.sequenceNumber(), state.timestamp(), + header.replicationUrl(), header.source(), header.writingProgram())); } return null; diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresHeaderRepository.java b/baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresHeaderRepository.java index f0aa390b..8600f4cf 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresHeaderRepository.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresHeaderRepository.java @@ -204,7 +204,7 @@ public class PostgresHeaderRepository implements HeaderRepository { Map<Long, Header> values = new HashMap<>(); while (result.next()) { Header value = getValue(result); - values.put(value.getReplicationSequenceNumber(), value); + values.put(value.replicationSequenceNumber(), value); } return keys.stream().map(values::get).toList(); } @@ -287,11 +287,11 @@ public class PostgresHeaderRepository implements HeaderRepository { writer.writeHeader(); for (Header value : values) { writer.startRow(5); - writer.writeLong(value.getReplicationSequenceNumber()); - writer.writeLocalDateTime(value.getReplicationTimestamp()); - writer.write(value.getReplicationUrl()); - writer.write(value.getSource()); - writer.write(value.getWritingProgram()); + writer.writeLong(value.replicationSequenceNumber()); + writer.writeLocalDateTime(value.replicationTimestamp()); + writer.write(value.replicationUrl()); + writer.write(value.source()); + writer.write(value.writingProgram()); } } } catch (IOException | SQLException e) { @@ -310,10 +310,10 @@ public class PostgresHeaderRepository implements HeaderRepository { } private void setValue(PreparedStatement statement, Header value) throws SQLException { - statement.setObject(1, value.getReplicationSequenceNumber()); - statement.setObject(2, value.getReplicationTimestamp()); - statement.setObject(3, value.getReplicationUrl()); - statement.setObject(4, value.getSource()); - statement.setObject(5, value.getWritingProgram()); + statement.setObject(1, value.replicationSequenceNumber()); + statement.setObject(2, value.replicationTimestamp()); + statement.setObject(3, value.replicationUrl()); + statement.setObject(4, value.source()); + statement.setObject(5, value.writingProgram()); } } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresNodeRepository.java b/baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresNodeRepository.java index 5730ea0c..12f67033 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresNodeRepository.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresNodeRepository.java @@ -187,7 +187,7 @@ public class PostgresNodeRepository implements Repository<Long, Node> { Map<Long, Node> values = new HashMap<>(); while (result.next()) { Node value = getValue(result); - values.put(value.getId(), value); + values.put(value.id(), value); } return keys.stream().map(values::get).toList(); } @@ -270,15 +270,15 @@ public class PostgresNodeRepository implements Repository<Long, Node> { writer.writeHeader(); for (Node value : values) { writer.startRow(9); - writer.writeLong(value.getId()); - writer.writeInteger(value.getInfo().version()); - writer.writeInteger(value.getInfo().uid()); - writer.writeLocalDateTime(value.getInfo().timestamp()); - writer.writeLong(value.getInfo().changeset()); - writer.writeJsonb(PostgresJsonbMapper.toJson(value.getTags())); - writer.writeDouble(value.getLon()); - writer.writeDouble(value.getLat()); - writer.writePostgisGeometry(value.getGeometry()); + writer.writeLong(value.id()); + writer.writeInteger(value.info().version()); + writer.writeInteger(value.info().uid()); + writer.writeLocalDateTime(value.info().timestamp()); + writer.writeLong(value.info().changeset()); + writer.writeJsonb(PostgresJsonbMapper.toJson(value.tags())); + writer.writeDouble(value.lon()); + writer.writeDouble(value.lat()); + writer.writePostgisGeometry(value.geometry()); } } } catch (IOException | SQLException e) { @@ -302,14 +302,14 @@ public class PostgresNodeRepository implements Repository<Long, Node> { private void setValue(PreparedStatement statement, Node value) throws SQLException, JsonProcessingException { - statement.setObject(1, value.getId()); - statement.setObject(2, value.getInfo().version()); - statement.setObject(3, value.getInfo().uid()); - statement.setObject(4, value.getInfo().timestamp()); - statement.setObject(5, value.getInfo().changeset()); - statement.setObject(6, PostgresJsonbMapper.toJson(value.getTags())); - statement.setObject(7, value.getLon()); - statement.setObject(8, value.getLat()); - statement.setBytes(9, GeometryUtils.serialize(value.getGeometry())); + statement.setObject(1, value.id()); + statement.setObject(2, value.info().version()); + statement.setObject(3, value.info().uid()); + statement.setObject(4, value.info().timestamp()); + statement.setObject(5, value.info().changeset()); + statement.setObject(6, PostgresJsonbMapper.toJson(value.tags())); + statement.setObject(7, value.lon()); + statement.setObject(8, value.lat()); + statement.setBytes(9, GeometryUtils.serialize(value.geometry())); } } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresRelationRepository.java b/baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresRelationRepository.java index 8719466b..651436c7 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresRelationRepository.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresRelationRepository.java @@ -199,7 +199,7 @@ public class PostgresRelationRepository implements Repository<Long, Relation> { Map<Long, Relation> values = new HashMap<>(); while (result.next()) { Relation value = getValue(result); - values.put(value.getId(), value); + values.put(value.id(), value); } return keys.stream().map(values::get).toList(); } @@ -282,18 +282,18 @@ public class PostgresRelationRepository implements Repository<Long, Relation> { writer.writeHeader(); for (Relation value : values) { writer.startRow(10); - writer.writeLong(value.getId()); - writer.writeInteger(value.getInfo().version()); - writer.writeInteger(value.getInfo().uid()); - writer.writeLocalDateTime(value.getInfo().timestamp()); - writer.writeLong(value.getInfo().changeset()); - writer.writeJsonb(toJson(value.getTags())); + writer.writeLong(value.id()); + writer.writeInteger(value.info().version()); + writer.writeInteger(value.info().uid()); + writer.writeLocalDateTime(value.info().timestamp()); + writer.writeLong(value.info().changeset()); + writer.writeJsonb(toJson(value.tags())); writer.writeLongList( - value.getMembers().stream().map(Member::ref).collect(Collectors.toList())); - writer.writeIntegerList(value.getMembers().stream().map(Member::type) + value.members().stream().map(Member::ref).collect(Collectors.toList())); + writer.writeIntegerList(value.members().stream().map(Member::type) .map(MemberType::ordinal).collect(Collectors.toList())); - writer.write(value.getMembers().stream().map(Member::role).collect(Collectors.toList())); - writer.writePostgisGeometry(value.getGeometry()); + writer.write(value.members().stream().map(Member::role).collect(Collectors.toList())); + writer.writePostgisGeometry(value.geometry()); } } } catch (IOException | SQLException ex) { @@ -322,19 +322,18 @@ public class PostgresRelationRepository implements Repository<Long, Relation> { private void setValue(PreparedStatement statement, Relation value) throws SQLException, JsonProcessingException { - statement.setObject(1, value.getId()); - statement.setObject(2, value.getInfo().version()); - statement.setObject(3, value.getInfo().uid()); - statement.setObject(4, value.getInfo().timestamp()); - statement.setObject(5, value.getInfo().changeset()); - statement.setObject(6, toJson(value.getTags())); - Object[] refs = value.getMembers().stream().map(Member::ref).toArray(); + statement.setObject(1, value.id()); + statement.setObject(2, value.info().version()); + statement.setObject(3, value.info().uid()); + statement.setObject(4, value.info().timestamp()); + statement.setObject(5, value.info().changeset()); + statement.setObject(6, toJson(value.tags())); + Object[] refs = value.members().stream().map(Member::ref).toArray(); statement.setObject(7, statement.getConnection().createArrayOf("bigint", refs)); - Object[] types = - value.getMembers().stream().map(Member::type).map(MemberType::ordinal).toArray(); + Object[] types = value.members().stream().map(Member::type).map(MemberType::ordinal).toArray(); statement.setObject(8, statement.getConnection().createArrayOf("int", types)); - Object[] roles = value.getMembers().stream().map(Member::role).toArray(); + Object[] roles = value.members().stream().map(Member::role).toArray(); statement.setObject(9, statement.getConnection().createArrayOf("varchar", roles)); - statement.setBytes(10, GeometryUtils.serialize(value.getGeometry())); + statement.setBytes(10, GeometryUtils.serialize(value.geometry())); } } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresWayRepository.java b/baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresWayRepository.java index ff8120f6..7a0f4a66 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresWayRepository.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresWayRepository.java @@ -190,7 +190,7 @@ public class PostgresWayRepository implements Repository<Long, Way> { Map<Long, Way> values = new HashMap<>(); while (result.next()) { Way value = getValue(result); - values.put(value.getId(), value); + values.put(value.id(), value); } return keys.stream().map(values::get).toList(); } @@ -272,14 +272,14 @@ public class PostgresWayRepository implements Repository<Long, Way> { writer.writeHeader(); for (Way value : values) { writer.startRow(8); - writer.writeLong(value.getId()); - writer.writeInteger(value.getInfo().version()); - writer.writeInteger(value.getInfo().uid()); - writer.writeLocalDateTime(value.getInfo().timestamp()); - writer.writeLong(value.getInfo().changeset()); - writer.writeJsonb(PostgresJsonbMapper.toJson(value.getTags())); - writer.writeLongList(value.getNodes()); - writer.writePostgisGeometry(value.getGeometry()); + writer.writeLong(value.id()); + writer.writeInteger(value.info().version()); + writer.writeInteger(value.info().uid()); + writer.writeLocalDateTime(value.info().timestamp()); + writer.writeLong(value.info().changeset()); + writer.writeJsonb(PostgresJsonbMapper.toJson(value.tags())); + writer.writeLongList(value.nodes()); + writer.writePostgisGeometry(value.geometry()); } } } catch (IOException | SQLException e) { @@ -306,13 +306,13 @@ public class PostgresWayRepository implements Repository<Long, Way> { private void setValue(PreparedStatement statement, Way value) throws SQLException, JsonProcessingException { - statement.setObject(1, value.getId()); - statement.setObject(2, value.getInfo().version()); - statement.setObject(3, value.getInfo().uid()); - statement.setObject(4, value.getInfo().timestamp()); - statement.setObject(5, value.getInfo().changeset()); - statement.setObject(6, PostgresJsonbMapper.toJson(value.getTags())); - statement.setObject(7, value.getNodes().stream().mapToLong(Long::longValue).toArray()); - statement.setBytes(8, GeometryUtils.serialize(value.getGeometry())); + statement.setObject(1, value.id()); + statement.setObject(2, value.info().version()); + statement.setObject(3, value.info().uid()); + statement.setObject(4, value.info().timestamp()); + statement.setObject(5, value.info().changeset()); + statement.setObject(6, PostgresJsonbMapper.toJson(value.tags())); + statement.setObject(7, value.nodes().stream().mapToLong(Long::longValue).toArray()); + statement.setBytes(8, GeometryUtils.serialize(value.geometry())); } } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/BlockEntitiesConsumer.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/BlockEntitiesConsumer.java index 1863f7b9..7f44a3f5 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/BlockEntitiesConsumer.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/BlockEntitiesConsumer.java @@ -38,13 +38,13 @@ public class BlockEntitiesConsumer implements Consumer<Block> { @Override public void accept(Block block) { if (block instanceof HeaderBlock headerBlock) { - consumer.accept(headerBlock.getHeader()); - consumer.accept(headerBlock.getBound()); + consumer.accept(headerBlock.header()); + consumer.accept(headerBlock.bound()); } else if (block instanceof DataBlock dataBlock) { - dataBlock.getDenseNodes().forEach(consumer); - dataBlock.getNodes().forEach(consumer); - dataBlock.getWays().forEach(consumer); - dataBlock.getRelations().forEach(consumer); + dataBlock.denseNodes().forEach(consumer); + dataBlock.nodes().forEach(consumer); + dataBlock.ways().forEach(consumer); + dataBlock.relations().forEach(consumer); } else { throw new StreamException("Unknown block type."); } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/CreateGeometryConsumer.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/CreateGeometryConsumer.java index 10ad00e1..1adae2ee 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/CreateGeometryConsumer.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/CreateGeometryConsumer.java @@ -78,33 +78,33 @@ public class CreateGeometryConsumer implements Consumer<Entity> { /** {@inheritDoc} */ public void match(Node node) { - Point point = geometryFactory.createPoint(new Coordinate(node.getLon(), node.getLat())); - node.setGeometry(point); + Point point = geometryFactory.createPoint(new Coordinate(node.lon(), node.lat())); + node.withGeometry(point); } /** {@inheritDoc} */ public void match(Way way) { try { - List<Coordinate> list = way.getNodes().stream().map(coordinates::get).toList(); + List<Coordinate> list = way.nodes().stream().map(coordinates::get).toList(); Coordinate[] array = list.toArray(new Coordinate[list.size()]); LineString line = geometryFactory.createLineString(array); if (!line.isEmpty()) { if (!line.isClosed()) { - way.setGeometry(line); + way.withGeometry(line); } else { Polygon polygon = geometryFactory.createPolygon(line.getCoordinates()); - way.setGeometry(polygon); + way.withGeometry(polygon); } } } catch (Exception e) { - logger.warn("Unable to build the geometry for way #" + way.getId(), e); + logger.warn("Unable to build the geometry for way #" + way.id(), e); } } /** {@inheritDoc} */ public void match(Relation relation) { try { - Map<String, String> tags = relation.getTags(); + Map<String, String> tags = relation.tags(); // Filter multipolygon geometries if (!"multipolygon".equals(tags.get("type"))) { @@ -129,14 +129,14 @@ public class CreateGeometryConsumer implements Consumer<Entity> { // Set the geometry of the relation if (polygons.size() == 1) { Polygon polygon = polygons.get(0); - relation.setGeometry(polygon); + relation.withGeometry(polygon); } else if (polygons.size() > 1) { MultiPolygon multiPolygon = geometryFactory.createMultiPolygon(polygons.toArray(new Polygon[0])); - relation.setGeometry(multiPolygon); + relation.withGeometry(multiPolygon); } } catch (Exception e) { - logger.warn("Unable to build the geometry for relation #" + relation.getId(), e); + logger.warn("Unable to build the geometry for relation #" + relation.id(), e); } } @@ -186,7 +186,7 @@ public class CreateGeometryConsumer implements Consumer<Entity> { private Set<Polygon> createPolygons(Relation relation, String role) { Set<Polygon> polygons = new HashSet<>(); LineMerger lineMerger = new LineMerger(); - relation.getMembers().stream().filter(m -> MemberType.WAY.equals(m.type())) + relation.members().stream().filter(m -> MemberType.WAY.equals(m.type())) .filter(m -> role.equals(m.role())).forEach(member -> { LineString line = createLine(member); if (line.isClosed()) { diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/ExtractGeometryFunction.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/ExtractGeometryFunction.java index f874135b..d8b6975b 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/ExtractGeometryFunction.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/ExtractGeometryFunction.java @@ -27,11 +27,11 @@ public class ExtractGeometryFunction implements Function<Entity, Optional<Geomet public Optional<Geometry> apply(Entity entity) { try { if (entity instanceof Node node) { - return Optional.ofNullable(node.getGeometry()); + return Optional.ofNullable(node.geometry()); } else if (entity instanceof Way way) { - return Optional.ofNullable(way.getGeometry()); + return Optional.ofNullable(way.geometry()); } else if (entity instanceof Relation relation) { - return Optional.ofNullable(relation.getGeometry()); + return Optional.ofNullable(relation.geometry()); } else if (entity instanceof Header header) { return Optional.empty(); } else if (entity instanceof Bound bound) { diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/ReprojectEntityConsumer.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/ReprojectEntityConsumer.java index 41e9fd46..de7994e8 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/ReprojectEntityConsumer.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/ReprojectEntityConsumer.java @@ -37,9 +37,9 @@ public class ReprojectEntityConsumer implements Consumer<Entity> { /** {@inheritDoc} */ @Override public void accept(Entity entity) { - if (entity instanceof Element element && element.getGeometry() != null) { - Geometry geometry = projectionTransformer.transform(element.getGeometry()); - element.setGeometry(geometry); + if (entity instanceof Element element && element.geometry() != null) { + Geometry geometry = projectionTransformer.transform(element.geometry()); + element.withGeometry(geometry); } } } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Blob.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Blob.java index bac41042..a2aec973 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Blob.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Blob.java @@ -12,8 +12,6 @@ package org.apache.baremaps.openstreetmap.model; - - import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; import java.util.StringJoiner; @@ -23,7 +21,7 @@ import org.apache.baremaps.osm.binary.Fileformat; import org.apache.baremaps.osm.binary.Fileformat.BlobHeader; /** Represents a raw blob of data in an OpenStreetMap dataset. */ -public record Blob (BlobHeader header, byte[] rawData, int size) { +public record Blob(BlobHeader header, byte[] rawData, int size) { /** * Returns the data. @@ -47,11 +45,4 @@ public record Blob (BlobHeader header, byte[] rawData, int size) { throw new DataFormatException("Unsupported toPrimitiveBlock format"); } } - - /** {@inheritDoc} */ - @Override - public String toString() { - return new StringJoiner(", ", Blob.class.getSimpleName() + "[", "]").add("header=" + header) - .add("size=" + size).toString(); - } } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Block.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Block.java index 6c32b173..57f472f7 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Block.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Block.java @@ -12,7 +12,6 @@ package org.apache.baremaps.openstreetmap.model; - /** Represents a block of data in an OpenStreetMap dataset. */ public sealed interface Block diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Bound.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Bound.java index 37c5f9b8..2a18cfef 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Bound.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Bound.java @@ -12,38 +12,7 @@ package org.apache.baremaps.openstreetmap.model; - - -import java.util.Objects; -import java.util.StringJoiner; - /** Represents the bounds of an OpenStreetMap dataset. */ public record Bound(double maxLat, double maxLon, double minLat, double minLon) implements Entity { - /** {@inheritDoc} */ - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o instanceof Bound)) { - return false; - } - Bound bound = (Bound) o; - return Double.compare(bound.maxLat, maxLat) == 0 && Double.compare(bound.maxLon, maxLon) == 0 - && Double.compare(bound.minLat, minLat) == 0 && Double.compare(bound.minLon, minLon) == 0; - } - - /** {@inheritDoc} */ - @Override - public int hashCode() { - return Objects.hash(maxLat, maxLon, minLat, minLon); - } - - /** {@inheritDoc} */ - @Override - public String toString() { - return new StringJoiner(", ", Bound.class.getSimpleName() + "[", "]").add("maxLat=" + maxLat) - .add("maxLon=" + maxLon).add("minLat=" + minLat).add("minLon=" + minLon).toString(); - } } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Change.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Change.java index 9839835c..3bb86a98 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Change.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Change.java @@ -12,18 +12,9 @@ package org.apache.baremaps.openstreetmap.model; - - import java.util.List; -import java.util.StringJoiner; /** Represents a change in an OpenStreetMap dataset. */ -public record Change(ChangeType type,List<Entity>entities){ +public record Change(ChangeType type, List<Entity>entities) { - /** {@inheritDoc} */ - @Override - public String toString() { - return new StringJoiner(", ", Change.class.getSimpleName() + "[", "]").add("type=" + type) - .add("elements=" + entities).toString(); - } } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/DataBlock.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/DataBlock.java index 4940436f..a53666da 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/DataBlock.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/DataBlock.java @@ -19,40 +19,4 @@ import java.util.List; /** Represents a data block in an OpenStreetMap dataset. */ public record DataBlock(List<Node> denseNodes, List<Node> nodes, List<Way> ways, List<Relation> relations) implements Block { - /** - * Returns the dense nodes. - * - * @return the dense nodes - */ - public List<Node> getDenseNodes() { - return denseNodes; - } - - /** - * Returns the nodes. - * - * @return the nodes - */ - public List<Node> getNodes() { - return nodes; - } - - /** - * Returns the ways. - * - * @return the ways - */ - public List<Way> getWays() { - return ways; - } - - /** - * Returns the relations. - * - * @return the relations - */ - public List<Relation> getRelations() { - return relations; - } - } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Element.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Element.java index 52200f87..842d15c8 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Element.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Element.java @@ -61,7 +61,7 @@ permits Node, Way, Relation * * @return the id */ - public long getId() { + public long id() { return id; } @@ -70,7 +70,7 @@ permits Node, Way, Relation * * @return the info */ - public Info getInfo() { + public Info info() { return info; } @@ -79,7 +79,7 @@ permits Node, Way, Relation * * @return the tags */ - public Map<String, String> getTags() { + public Map<String, String> tags() { return tags; } @@ -88,7 +88,7 @@ permits Node, Way, Relation * * @return the geometry */ - public Geometry getGeometry() { + public Geometry geometry() { return this.geometry; } @@ -97,7 +97,7 @@ permits Node, Way, Relation * * @param geometry the geometry */ - public void setGeometry(Geometry geometry) { + public void withGeometry(Geometry geometry) { this.geometry = geometry; } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Header.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Header.java index 85ff2b78..2243dd2b 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Header.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Header.java @@ -15,87 +15,8 @@ package org.apache.baremaps.openstreetmap.model; import java.time.LocalDateTime; -import java.util.Objects; -import java.util.StringJoiner; /** Represents a header entity in an OpenStreetMap dataset. */ public record Header(Long replicationSequenceNumber, LocalDateTime replicationTimestamp,String replicationUrl,String source,String writingProgram) implements Entity { - /** - * Returns the replication timestamp. - * - * @return the replication timestamp - */ - public LocalDateTime getReplicationTimestamp() { - return replicationTimestamp; - } - - /** - * Returns the replication sequence number. - * - * @return the replication sequence number - */ - public Long getReplicationSequenceNumber() { - return replicationSequenceNumber; - } - - /** - * Returns the replication url. - * - * @return the replication url - */ - public String getReplicationUrl() { - return replicationUrl; - } - - /** - * Returns the source. - * - * @return the source - */ - public String getSource() { - return source; - } - - /** - * Returns the writing program. - * - * @return the writing program - */ - public String getWritingProgram() { - return writingProgram; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o instanceof Header)) { - return false; - } - Header header = (Header) o; - return Objects.equals(replicationTimestamp, header.replicationTimestamp) - && Objects.equals(replicationSequenceNumber, header.replicationSequenceNumber) - && Objects.equals(replicationUrl, header.replicationUrl) - && Objects.equals(source, header.source) - && Objects.equals(writingProgram, header.writingProgram); - } - - /** {@inheritDoc} */ - @Override - public int hashCode() { - return Objects.hash(replicationTimestamp, replicationSequenceNumber, replicationUrl, source, - writingProgram); - } - - /** {@inheritDoc} */ - @Override - public String toString() { - return new StringJoiner(", ", Header.class.getSimpleName() + "[", "]") - .add("replicationTimestamp=" + replicationTimestamp) - .add("replicationSequenceNumber=" + replicationSequenceNumber) - .add("replicationUrl='" + replicationUrl + "'").add("source='" + source + "'") - .add("writingProgram='" + writingProgram + "'").toString(); - } } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/HeaderBlock.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/HeaderBlock.java index 4d98efad..11c20a10 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/HeaderBlock.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/HeaderBlock.java @@ -17,22 +17,4 @@ package org.apache.baremaps.openstreetmap.model; /** Represents a header block in an OpenStreetMap dataset. */ public record HeaderBlock(Header header, Bound bound) implements Block { - /** - * Returns the header. - * - * @return the header - */ - public Header getHeader() { - return header; - } - - /** - * Returns the bounds. - * - * @return the bounds - */ - public Bound getBound() { - return bound; - } - } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Info.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Info.java index ab62f98f..7a5e4322 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Info.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Info.java @@ -21,30 +21,4 @@ import java.util.StringJoiner; /** Represents all the metadata associated to an element in an OpenStreetMap dataset. */ public record Info(int version, LocalDateTime timestamp, long changeset, int uid) { - /** {@inheritDoc} */ - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o instanceof Info)) { - return false; - } - Info info = (Info) o; - return version == info.version && changeset == info.changeset && uid == info.uid - && Objects.equals(timestamp, info.timestamp); - } - - /** {@inheritDoc} */ - @Override - public int hashCode() { - return Objects.hash(version, timestamp, changeset, uid); - } - - /** {@inheritDoc} */ - @Override - public String toString() { - return new StringJoiner(", ", Info.class.getSimpleName() + "[", "]").add("version=" + version) - .add("timestamp=" + timestamp).add("changeset=" + changeset).add("uid=" + uid).toString(); - } } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Member.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Member.java index ff746dd7..6bebe0a6 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Member.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Member.java @@ -13,37 +13,7 @@ package org.apache.baremaps.openstreetmap.model; - -import com.google.common.base.Objects; -import java.util.StringJoiner; - /** Represents a member of a relation in an OpenStreetMap dataset. */ -public record Member(long ref,MemberType type,String role){ - - /** {@inheritDoc} */ - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Member member = (Member) o; - return ref == member.ref && Objects.equal(type, member.type) - && Objects.equal(role, member.role); - } - - /** {@inheritDoc} */ - @Override - public int hashCode() { - return Objects.hashCode(ref, type, role); - } +public record Member(long ref, MemberType type, String role) { - /** {@inheritDoc} */ - @Override - public String toString() { - return new StringJoiner(", ", Member.class.getSimpleName() + "[", "]").add("ref=" + ref) - .add("type='" + type.name() + "'").add("role='" + role + "'").toString(); - } } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Node.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Node.java index 7444bac4..75dac528 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Node.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Node.java @@ -15,8 +15,6 @@ package org.apache.baremaps.openstreetmap.model; import java.util.Map; -import java.util.Objects; -import java.util.StringJoiner; import org.locationtech.jts.geom.Geometry; /** Represents a node element in an OpenStreetMap dataset. */ @@ -63,7 +61,7 @@ public final class Node extends Element { * * @return the longitude */ - public double getLon() { + public double lon() { return lon; } @@ -72,36 +70,7 @@ public final class Node extends Element { * * @return the latitude */ - public double getLat() { + public double lat() { return lat; } - - /** {@inheritDoc} */ - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o instanceof Node)) { - return false; - } - if (!super.equals(o)) { - return false; - } - Node node = (Node) o; - return Double.compare(node.lon, lon) == 0 && Double.compare(node.lat, lat) == 0; - } - - /** {@inheritDoc} */ - @Override - public int hashCode() { - return Objects.hash(super.hashCode(), lon, lat); - } - - /** {@inheritDoc} */ - @Override - public String toString() { - return new StringJoiner(", ", Node.class.getSimpleName() + "[", "]").add("lon=" + lon) - .add("lat=" + lat).add("id=" + id).toString(); - } } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Relation.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Relation.java index 653f2a1d..76a3fa6b 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Relation.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Relation.java @@ -16,8 +16,6 @@ package org.apache.baremaps.openstreetmap.model; import java.util.List; import java.util.Map; -import java.util.Objects; -import java.util.StringJoiner; import org.locationtech.jts.geom.Geometry; /** Represents a relation element in an OpenStreetMap dataset. */ @@ -58,36 +56,7 @@ public final class Relation extends Element { * * @return the members */ - public List<Member> getMembers() { + public List<Member> members() { return members; } - - /** {@inheritDoc} */ - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o instanceof Relation)) { - return false; - } - if (!super.equals(o)) { - return false; - } - Relation relation = (Relation) o; - return Objects.equals(members, relation.members); - } - - /** {@inheritDoc} */ - @Override - public int hashCode() { - return Objects.hash(super.hashCode(), members); - } - - /** {@inheritDoc} */ - @Override - public String toString() { - return new StringJoiner(", ", Relation.class.getSimpleName() + "[", "]") - .add("members=" + members).add("id=" + id).toString(); - } } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/State.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/State.java index 2ecebdee..aca6648b 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/State.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/State.java @@ -17,38 +17,6 @@ package org.apache.baremaps.openstreetmap.model; import java.time.LocalDateTime; /** Represents the state of an OpenStreetMap dataset, enabling its replication. */ -public class State { +public record State(long sequenceNumber, LocalDateTime timestamp) { - private final long sequenceNumber; - - private final LocalDateTime timestamp; - - /** - * Constructs an OpenStreetMap {@code State} with the specified parameters. - * - * @param sequenceNumber the sequence number - * @param timestamp the timestamp - */ - public State(long sequenceNumber, LocalDateTime timestamp) { - this.sequenceNumber = sequenceNumber; - this.timestamp = timestamp; - } - - /** - * Returns the sequence number. - * - * @return the sequence number - */ - public long getSequenceNumber() { - return sequenceNumber; - } - - /** - * Returns the timestamp. - * - * @return the timestamp - */ - public LocalDateTime getTimestamp() { - return timestamp; - } } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/User.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/User.java index 2a291347..c5d02b8f 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/User.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/User.java @@ -12,31 +12,9 @@ package org.apache.baremaps.openstreetmap.model; - - -import com.google.common.base.Objects; - /** Represents the author of an objet in an OpenStreetMap dataset. */ -public record User (int id, String name) { +public record User(int id, String name) { public static final User NO_USER = new User(-1, ""); - /** {@inheritDoc} */ - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - User user = (User) o; - return id == user.id && Objects.equal(name, user.name); - } - - /** {@inheritDoc} */ - @Override - public int hashCode() { - return Objects.hashCode(id, name); - } } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Way.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Way.java index 5513b1d5..614a2cb3 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Way.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Way.java @@ -16,8 +16,6 @@ package org.apache.baremaps.openstreetmap.model; import java.util.List; import java.util.Map; -import java.util.Objects; -import java.util.StringJoiner; import org.locationtech.jts.geom.Geometry; /** Represents a way element in an OpenStreetMap dataset. */ @@ -57,36 +55,7 @@ public final class Way extends Element { * * @return the nodes */ - public List<Long> getNodes() { + public List<Long> nodes() { return nodes; } - - /** {@inheritDoc} */ - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o instanceof Way)) { - return false; - } - if (!super.equals(o)) { - return false; - } - Way way = (Way) o; - return Objects.equals(nodes, way.nodes); - } - - /** {@inheritDoc} */ - @Override - public int hashCode() { - return Objects.hash(super.hashCode(), nodes); - } - - /** {@inheritDoc} */ - @Override - public String toString() { - return new StringJoiner(", ", Way.class.getSimpleName() + "[", "]").add("nodes=" + nodes) - .add("id=" + id).toString(); - } } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/pbf/PbfEntityReader.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/pbf/PbfEntityReader.java index fb173fea..f2d6afd8 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/pbf/PbfEntityReader.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/pbf/PbfEntityReader.java @@ -47,13 +47,13 @@ public class PbfEntityReader implements OsmReader<Entity> { try { Stream.Builder<Entity> entities = Stream.builder(); if (block instanceof HeaderBlock headerBlock) { - entities.add(headerBlock.getHeader()); - entities.add(headerBlock.getBound()); + entities.add(headerBlock.header()); + entities.add(headerBlock.bound()); } else if (block instanceof DataBlock dataBlock) { - dataBlock.getDenseNodes().forEach(entities::add); - dataBlock.getNodes().forEach(entities::add); - dataBlock.getWays().forEach(entities::add); - dataBlock.getRelations().forEach(entities::add); + dataBlock.denseNodes().forEach(entities::add); + dataBlock.nodes().forEach(entities::add); + dataBlock.ways().forEach(entities::add); + dataBlock.relations().forEach(entities::add); } else { throw new StreamException("Unknown block type."); } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/store/DataStoreConsumer.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/store/DataStoreConsumer.java index 11e5f52f..cd56861c 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/store/DataStoreConsumer.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/store/DataStoreConsumer.java @@ -45,11 +45,11 @@ public class DataStoreConsumer implements Consumer<Block> { public void accept(Block block) { try { if (block instanceof DataBlock dataBlock) { - dataBlock.getDenseNodes().stream().forEach( - node -> coordinates.put(node.getId(), new Coordinate(node.getLon(), node.getLat()))); - dataBlock.getNodes().stream().forEach( - node -> coordinates.put(node.getId(), new Coordinate(node.getLon(), node.getLat()))); - dataBlock.getWays().stream().forEach(way -> references.put(way.getId(), way.getNodes())); + dataBlock.denseNodes().stream() + .forEach(node -> coordinates.put(node.id(), new Coordinate(node.lon(), node.lat()))); + dataBlock.nodes().stream() + .forEach(node -> coordinates.put(node.id(), new Coordinate(node.lon(), node.lat()))); + dataBlock.ways().stream().forEach(way -> references.put(way.id(), way.nodes())); } } catch (Exception e) { throw new StreamException(e); diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/database/ImportUpdateDataTest.java b/baremaps-core/src/test/java/org/apache/baremaps/database/database/ImportUpdateDataTest.java index ec0f6ba9..aa6d0d1b 100644 --- a/baremaps-core/src/test/java/org/apache/baremaps/database/database/ImportUpdateDataTest.java +++ b/baremaps-core/src/test/java/org/apache/baremaps/database/database/ImportUpdateDataTest.java @@ -82,8 +82,8 @@ class ImportUpdateDataTest extends DatabaseContainerTest { // Check node properties Node node = nodeRepository.get(1l); - Assertions.assertEquals(1, node.getLon()); - Assertions.assertEquals(1, node.getLat()); + Assertions.assertEquals(1, node.lon()); + Assertions.assertEquals(1, node.lat()); // Check way properties Way way = wayRepository.get(1l); diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/database/ImportUpdateLiechtensteinTest.java b/baremaps-core/src/test/java/org/apache/baremaps/database/database/ImportUpdateLiechtensteinTest.java index 33df9dd5..f7c8b5c7 100644 --- a/baremaps-core/src/test/java/org/apache/baremaps/database/database/ImportUpdateLiechtensteinTest.java +++ b/baremaps-core/src/test/java/org/apache/baremaps/database/database/ImportUpdateLiechtensteinTest.java @@ -56,7 +56,7 @@ class ImportUpdateLiechtensteinTest extends DatabaseContainerTest { // Import data new ImportService(LIECHTENSTEIN_OSM_PBF, coordinates, references, headerRepository, nodeRepository, wayRepository, relationRepository, 3857).call(); - assertEquals(2434l, headerRepository.selectLatest().getReplicationSequenceNumber()); + assertEquals(2434l, headerRepository.selectLatest().replicationSequenceNumber()); // Fix the replicationUrl so that we can update the database with local files headerRepository.put(new Header(2434l, LocalDateTime.of(2019, 11, 18, 21, 19, 5, 0), @@ -71,20 +71,20 @@ class ImportUpdateLiechtensteinTest extends DatabaseContainerTest { // Update the database new UpdateService(coordinates, references, headerRepository, nodeRepository, wayRepository, relationRepository, 3857).call(); - assertEquals(2435l, headerRepository.selectLatest().getReplicationSequenceNumber()); + assertEquals(2435l, headerRepository.selectLatest().replicationSequenceNumber()); assertEquals(2, new DiffService(coordinates, references, headerRepository, nodeRepository, wayRepository, relationRepository, 3857, 14).call().size()); new UpdateService(coordinates, references, headerRepository, nodeRepository, wayRepository, relationRepository, 3857).call(); - assertEquals(2436l, headerRepository.selectLatest().getReplicationSequenceNumber()); + assertEquals(2436l, headerRepository.selectLatest().replicationSequenceNumber()); assertEquals(0, new DiffService(coordinates, references, headerRepository, nodeRepository, wayRepository, relationRepository, 3857, 14).call().size()); new UpdateService(coordinates, references, headerRepository, nodeRepository, wayRepository, relationRepository, 3857).call(); - assertEquals(2437l, headerRepository.selectLatest().getReplicationSequenceNumber()); + assertEquals(2437l, headerRepository.selectLatest().replicationSequenceNumber()); } } diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/database/ImportUpdateMonacoTest.java b/baremaps-core/src/test/java/org/apache/baremaps/database/database/ImportUpdateMonacoTest.java index ce8edebf..5252dc74 100644 --- a/baremaps-core/src/test/java/org/apache/baremaps/database/database/ImportUpdateMonacoTest.java +++ b/baremaps-core/src/test/java/org/apache/baremaps/database/database/ImportUpdateMonacoTest.java @@ -56,7 +56,7 @@ class ImportUpdateMonacoTest extends DatabaseContainerTest { new ImportService(TestFiles.resolve("monaco/monaco-210801.osm.pbf"), coordinates, references, headerRepository, nodeRepository, wayRepository, relationRepository, 3857).call(); - assertEquals(3047l, headerRepository.selectLatest().getReplicationSequenceNumber()); + assertEquals(3047l, headerRepository.selectLatest().replicationSequenceNumber()); // Fix the replicationUrl so that we can update the database with local files headerRepository.delete(3047l); @@ -67,14 +67,14 @@ class ImportUpdateMonacoTest extends DatabaseContainerTest { references = new PostgresReferenceMap(dataSource()); // Generate the diff and update the database - long replicationSequenceNumber = headerRepository.selectLatest().getReplicationSequenceNumber(); + long replicationSequenceNumber = headerRepository.selectLatest().replicationSequenceNumber(); while (replicationSequenceNumber < 3075) { new DiffService(coordinates, references, headerRepository, nodeRepository, wayRepository, relationRepository, 3857, 14).call(); new UpdateService(coordinates, references, headerRepository, nodeRepository, wayRepository, relationRepository, 3857).call(); long nextReplicationSequenceNumber = - headerRepository.selectLatest().getReplicationSequenceNumber(); + headerRepository.selectLatest().replicationSequenceNumber(); assertEquals(replicationSequenceNumber + 1, nextReplicationSequenceNumber); replicationSequenceNumber = nextReplicationSequenceNumber; } diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresHeaderRepositoryTest.java b/baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresHeaderRepositoryTest.java index 12392757..029144f4 100644 --- a/baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresHeaderRepositoryTest.java +++ b/baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresHeaderRepositoryTest.java @@ -60,7 +60,7 @@ class PostgresHeaderRepositoryTest extends DatabaseContainerTest { @Tag("integration") void insert() throws RepositoryException { headerRepository.put(HEADER_0); - assertEquals(HEADER_0, headerRepository.get(HEADER_0.getReplicationSequenceNumber())); + assertEquals(HEADER_0, headerRepository.get(HEADER_0.replicationSequenceNumber())); } @Test @@ -69,15 +69,15 @@ class PostgresHeaderRepositoryTest extends DatabaseContainerTest { List<Header> headers = Arrays.asList(HEADER_0, HEADER_1, HEADER_2); headerRepository.put(headers); assertIterableEquals(headers, headerRepository.get( - headers.stream().map(e -> e.getReplicationSequenceNumber()).collect(Collectors.toList()))); + headers.stream().map(e -> e.replicationSequenceNumber()).collect(Collectors.toList()))); } @Test @Tag("integration") void delete() throws RepositoryException { headerRepository.put(HEADER_0); - headerRepository.delete(HEADER_0.getReplicationSequenceNumber()); - assertNull(headerRepository.get(HEADER_0.getReplicationSequenceNumber())); + headerRepository.delete(HEADER_0.replicationSequenceNumber()); + assertNull(headerRepository.get(HEADER_0.replicationSequenceNumber())); } @Test @@ -86,9 +86,9 @@ class PostgresHeaderRepositoryTest extends DatabaseContainerTest { List<Header> headers = Arrays.asList(HEADER_0, HEADER_1, HEADER_2); headerRepository.put(headers); headerRepository.delete( - headers.stream().map(e -> e.getReplicationSequenceNumber()).collect(Collectors.toList())); + headers.stream().map(e -> e.replicationSequenceNumber()).collect(Collectors.toList())); assertIterableEquals(Arrays.asList(null, null, null), headerRepository.get( - headers.stream().map(e -> e.getReplicationSequenceNumber()).collect(Collectors.toList()))); + headers.stream().map(e -> e.replicationSequenceNumber()).collect(Collectors.toList()))); } @Test @@ -97,6 +97,6 @@ class PostgresHeaderRepositoryTest extends DatabaseContainerTest { List<Header> headers = Arrays.asList(HEADER_0, HEADER_1, HEADER_2); headerRepository.copy(headers); assertIterableEquals(headers, headerRepository.get( - headers.stream().map(e -> e.getReplicationSequenceNumber()).collect(Collectors.toList()))); + headers.stream().map(e -> e.replicationSequenceNumber()).collect(Collectors.toList()))); } } diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresNodeRepositoryTest.java b/baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresNodeRepositoryTest.java index 5b37822d..92397235 100644 --- a/baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresNodeRepositoryTest.java +++ b/baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresNodeRepositoryTest.java @@ -41,7 +41,7 @@ class PostgresNodeRepositoryTest extends DatabaseContainerTest { @Tag("integration") void insert() throws RepositoryException { nodeRepository.put(Constants.NODE_0); - assertEquals(Constants.NODE_0, nodeRepository.get(Constants.NODE_0.getId())); + assertEquals(Constants.NODE_0, nodeRepository.get(Constants.NODE_0.id())); } @Test @@ -50,15 +50,15 @@ class PostgresNodeRepositoryTest extends DatabaseContainerTest { List<Node> nodes = Arrays.asList(Constants.NODE_0, Constants.NODE_1, Constants.NODE_2); nodeRepository.put(nodes); assertIterableEquals(nodes, - nodeRepository.get(nodes.stream().map(e -> e.getId()).collect(Collectors.toList()))); + nodeRepository.get(nodes.stream().map(e -> e.id()).collect(Collectors.toList()))); } @Test @Tag("integration") void delete() throws RepositoryException { nodeRepository.put(Constants.NODE_0); - nodeRepository.delete(Constants.NODE_0.getId()); - assertNull(nodeRepository.get(Constants.NODE_0.getId())); + nodeRepository.delete(Constants.NODE_0.id()); + assertNull(nodeRepository.get(Constants.NODE_0.id())); } @Test @@ -66,9 +66,9 @@ class PostgresNodeRepositoryTest extends DatabaseContainerTest { void deleteAll() throws RepositoryException { List<Node> nodes = Arrays.asList(Constants.NODE_0, Constants.NODE_1, Constants.NODE_2); nodeRepository.put(nodes); - nodeRepository.delete(nodes.stream().map(e -> e.getId()).collect(Collectors.toList())); + nodeRepository.delete(nodes.stream().map(e -> e.id()).collect(Collectors.toList())); assertIterableEquals(Arrays.asList(null, null, null), - nodeRepository.get(nodes.stream().map(e -> e.getId()).collect(Collectors.toList()))); + nodeRepository.get(nodes.stream().map(e -> e.id()).collect(Collectors.toList()))); } @Test @@ -77,6 +77,6 @@ class PostgresNodeRepositoryTest extends DatabaseContainerTest { List<Node> nodes = Arrays.asList(Constants.NODE_0, Constants.NODE_1, Constants.NODE_2); nodeRepository.copy(nodes); assertIterableEquals(nodes, - nodeRepository.get(nodes.stream().map(e -> e.getId()).collect(Collectors.toList()))); + nodeRepository.get(nodes.stream().map(e -> e.id()).collect(Collectors.toList()))); } } diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresRelationRepositoryTest.java b/baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresRelationRepositoryTest.java index 83fa259d..f382526a 100644 --- a/baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresRelationRepositoryTest.java +++ b/baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresRelationRepositoryTest.java @@ -41,7 +41,7 @@ class PostgresRelationRepositoryTest extends DatabaseContainerTest { @Tag("integration") void insert() throws RepositoryException { relationRepository.put(Constants.RELATION_2); - assertEquals(Constants.RELATION_2, relationRepository.get(Constants.RELATION_2.getId())); + assertEquals(Constants.RELATION_2, relationRepository.get(Constants.RELATION_2.id())); } @Test @@ -50,16 +50,16 @@ class PostgresRelationRepositoryTest extends DatabaseContainerTest { List<Relation> relations = Arrays.asList(Constants.RELATION_2, Constants.RELATION_3, Constants.RELATION_4); relationRepository.put(relations); - assertIterableEquals(relations, relationRepository - .get(relations.stream().map(e -> e.getId()).collect(Collectors.toList()))); + assertIterableEquals(relations, + relationRepository.get(relations.stream().map(e -> e.id()).collect(Collectors.toList()))); } @Test @Tag("integration") void delete() throws RepositoryException { relationRepository.put(Constants.RELATION_2); - relationRepository.delete(Constants.RELATION_2.getId()); - assertNull(relationRepository.get(Constants.RELATION_2.getId())); + relationRepository.delete(Constants.RELATION_2.id()); + assertNull(relationRepository.get(Constants.RELATION_2.id())); } @Test @@ -68,9 +68,9 @@ class PostgresRelationRepositoryTest extends DatabaseContainerTest { List<Relation> relations = Arrays.asList(Constants.RELATION_2, Constants.RELATION_3, Constants.RELATION_4); relationRepository.put(relations); - relationRepository.delete(relations.stream().map(e -> e.getId()).collect(Collectors.toList())); - assertIterableEquals(Arrays.asList(null, null, null), relationRepository - .get(relations.stream().map(e -> e.getId()).collect(Collectors.toList()))); + relationRepository.delete(relations.stream().map(e -> e.id()).collect(Collectors.toList())); + assertIterableEquals(Arrays.asList(null, null, null), + relationRepository.get(relations.stream().map(e -> e.id()).collect(Collectors.toList()))); } @Test @@ -79,7 +79,7 @@ class PostgresRelationRepositoryTest extends DatabaseContainerTest { List<Relation> relations = Arrays.asList(Constants.RELATION_2, Constants.RELATION_3, Constants.RELATION_4); relationRepository.copy(relations); - assertIterableEquals(relations, relationRepository - .get(relations.stream().map(e -> e.getId()).collect(Collectors.toList()))); + assertIterableEquals(relations, + relationRepository.get(relations.stream().map(e -> e.id()).collect(Collectors.toList()))); } } diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresWayRepositoryTest.java b/baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresWayRepositoryTest.java index 78940d9a..cdbc012f 100644 --- a/baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresWayRepositoryTest.java +++ b/baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresWayRepositoryTest.java @@ -41,7 +41,7 @@ class PostgresWayRepositoryTest extends DatabaseContainerTest { @Tag("integration") void insert() throws RepositoryException { wayRepository.put(Constants.WAY_0); - assertEquals(Constants.WAY_0, wayRepository.get(Constants.WAY_0.getId())); + assertEquals(Constants.WAY_0, wayRepository.get(Constants.WAY_0.id())); } @Test @@ -50,15 +50,15 @@ class PostgresWayRepositoryTest extends DatabaseContainerTest { List<Way> ways = Arrays.asList(Constants.WAY_0, Constants.WAY_1, Constants.WAY_2); wayRepository.put(ways); assertIterableEquals(ways, - wayRepository.get(ways.stream().map(e -> e.getId()).collect(Collectors.toList()))); + wayRepository.get(ways.stream().map(e -> e.id()).collect(Collectors.toList()))); } @Test @Tag("integration") void delete() throws RepositoryException { wayRepository.put(Constants.WAY_0); - wayRepository.delete(Constants.WAY_0.getId()); - assertNull(wayRepository.get(Constants.WAY_0.getId())); + wayRepository.delete(Constants.WAY_0.id()); + assertNull(wayRepository.get(Constants.WAY_0.id())); } @Test @@ -66,9 +66,9 @@ class PostgresWayRepositoryTest extends DatabaseContainerTest { void deleteAll() throws RepositoryException { List<Way> ways = Arrays.asList(Constants.WAY_0, Constants.WAY_1, Constants.WAY_2); wayRepository.put(ways); - wayRepository.delete(ways.stream().map(e -> e.getId()).collect(Collectors.toList())); + wayRepository.delete(ways.stream().map(e -> e.id()).collect(Collectors.toList())); assertIterableEquals(Arrays.asList(null, null, null), - wayRepository.get(ways.stream().map(e -> e.getId()).collect(Collectors.toList()))); + wayRepository.get(ways.stream().map(e -> e.id()).collect(Collectors.toList()))); } @Test @@ -77,6 +77,6 @@ class PostgresWayRepositoryTest extends DatabaseContainerTest { List<Way> ways = Arrays.asList(Constants.WAY_0, Constants.WAY_1, Constants.WAY_2); wayRepository.copy(ways); assertIterableEquals(ways, - wayRepository.get(ways.stream().map(e -> e.getId()).collect(Collectors.toList()))); + wayRepository.get(ways.stream().map(e -> e.id()).collect(Collectors.toList()))); } } diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/database/WayRepositoryTest.java b/baremaps-core/src/test/java/org/apache/baremaps/database/database/WayRepositoryTest.java index 032f8903..ffa32987 100644 --- a/baremaps-core/src/test/java/org/apache/baremaps/database/database/WayRepositoryTest.java +++ b/baremaps-core/src/test/java/org/apache/baremaps/database/database/WayRepositoryTest.java @@ -41,7 +41,7 @@ class WayRepositoryTest extends DatabaseContainerTest { @Tag("integration") void insert() throws RepositoryException { wayRepository.put(Constants.WAY_1); - assertEquals(Constants.WAY_1, wayRepository.get(Constants.WAY_1.getId())); + assertEquals(Constants.WAY_1, wayRepository.get(Constants.WAY_1.id())); } @Test @@ -50,15 +50,15 @@ class WayRepositoryTest extends DatabaseContainerTest { List<Way> ways = Arrays.asList(Constants.WAY_1, Constants.WAY_2, Constants.WAY_3); wayRepository.put(ways); assertIterableEquals(ways, - wayRepository.get(ways.stream().map(e -> e.getId()).collect(Collectors.toList()))); + wayRepository.get(ways.stream().map(e -> e.id()).collect(Collectors.toList()))); } @Test @Tag("integration") void delete() throws RepositoryException { wayRepository.put(Constants.WAY_1); - wayRepository.delete(Constants.WAY_1.getId()); - assertNull(wayRepository.get(Constants.WAY_1.getId())); + wayRepository.delete(Constants.WAY_1.id()); + assertNull(wayRepository.get(Constants.WAY_1.id())); } @Test @@ -66,9 +66,9 @@ class WayRepositoryTest extends DatabaseContainerTest { void deleteAll() throws RepositoryException { List<Way> ways = Arrays.asList(Constants.WAY_1, Constants.WAY_2, Constants.WAY_3); wayRepository.put(ways); - wayRepository.delete(ways.stream().map(e -> e.getId()).collect(Collectors.toList())); + wayRepository.delete(ways.stream().map(e -> e.id()).collect(Collectors.toList())); assertIterableEquals(Arrays.asList(null, null, null), - wayRepository.get(ways.stream().map(e -> e.getId()).collect(Collectors.toList()))); + wayRepository.get(ways.stream().map(e -> e.id()).collect(Collectors.toList()))); } @Test @@ -77,6 +77,6 @@ class WayRepositoryTest extends DatabaseContainerTest { List<Way> ways = Arrays.asList(Constants.WAY_1, Constants.WAY_2, Constants.WAY_3); wayRepository.copy(ways); assertIterableEquals(ways, - wayRepository.get(ways.stream().map(e -> e.getId()).collect(Collectors.toList()))); + wayRepository.get(ways.stream().map(e -> e.id()).collect(Collectors.toList()))); } } diff --git a/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/OpenStreetMapTest.java b/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/OpenStreetMapTest.java index 61b754d1..0b6a64c3 100644 --- a/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/OpenStreetMapTest.java +++ b/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/OpenStreetMapTest.java @@ -120,8 +120,8 @@ class OpenStreetMapTest { void monacoStateTxt() throws URISyntaxException, IOException { try (InputStream inputStream = Files.newInputStream(MONACO_STATE_TXT)) { State state = new StateReader().state(inputStream); - assertEquals(2788, state.getSequenceNumber()); - assertEquals(LocalDateTime.parse("2020-11-10T21:42:03"), state.getTimestamp()); + assertEquals(2788, state.sequenceNumber()); + assertEquals(LocalDateTime.parse("2020-11-10T21:42:03"), state.timestamp()); } } @@ -152,7 +152,7 @@ class OpenStreetMapTest { stream.forEach(entity -> { if (entity instanceof Header header) { assertNotNull(header); - assertEquals("osmium/1.8.0", header.getWritingProgram()); + assertEquals("osmium/1.8.0", header.writingProgram()); headers.incrementAndGet(); } else if (entity instanceof Bound bound) { assertNotNull(bound); diff --git a/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/geometry/GeometryHandlerTest.java b/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/geometry/GeometryHandlerTest.java index 487b9a02..2580bee3 100644 --- a/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/geometry/GeometryHandlerTest.java +++ b/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/geometry/GeometryHandlerTest.java @@ -110,8 +110,7 @@ class GeometryHandlerTest { static final LongDataMap<Coordinate> COORDINATE_CACHE = new MockLongDataMap(Arrays .asList(NODE_0, NODE_1, NODE_2, NODE_3, NODE_4, NODE_5, NODE_6, NODE_7, NODE_8, NODE_9, NODE_10, NODE_11, NODE_12, NODE_13, NODE_14, NODE_15) - .stream() - .collect(Collectors.toMap(n -> n.getId(), n -> new Coordinate(n.getLon(), n.getLat())))); + .stream().collect(Collectors.toMap(n -> n.id(), n -> new Coordinate(n.lon(), n.lat())))); static final Way WAY_0 = new Way(0, INFO, ImmutableMap.of(), ImmutableList.of()); @@ -131,7 +130,7 @@ class GeometryHandlerTest { static final LongDataMap<List<Long>> REFERENCE_CACHE = new MockLongDataMap(Arrays.asList(WAY_0, WAY_1, WAY_2, WAY_3, WAY_4, WAY_5).stream() - .collect(Collectors.toMap(w -> w.getId(), w -> w.getNodes()))); + .collect(Collectors.toMap(w -> w.id(), w -> w.nodes()))); static final Relation RELATION_0 = new Relation(0, INFO, ImmutableMap.of(), Arrays.asList()); @@ -159,11 +158,11 @@ class GeometryHandlerTest { @Test void handleNode() { GEOMETRY_BUILDER.match(NODE_0); - Point p0 = (Point) NODE_0.getGeometry(); + Point p0 = (Point) NODE_0.geometry(); assertEquals(0, p0.getX()); assertEquals(0, p0.getY()); GEOMETRY_BUILDER.match(NODE_2); - Point p1 = (Point) NODE_2.getGeometry(); + Point p1 = (Point) NODE_2.geometry(); assertEquals(4, p1.getX()); assertEquals(4, p1.getY()); } @@ -171,32 +170,32 @@ class GeometryHandlerTest { @Test void handleWay() { GEOMETRY_BUILDER.match(WAY_0); - assertNull(WAY_0.getGeometry()); + assertNull(WAY_0.geometry()); GEOMETRY_BUILDER.match(WAY_1); - assertTrue(WAY_1.getGeometry() instanceof LineString); + assertTrue(WAY_1.geometry() instanceof LineString); GEOMETRY_BUILDER.match(WAY_2); - assertTrue(WAY_2.getGeometry() instanceof Polygon); + assertTrue(WAY_2.geometry() instanceof Polygon); } @Test void handleRelation() { GEOMETRY_BUILDER.match(RELATION_0); - assertNull(RELATION_0.getGeometry()); + assertNull(RELATION_0.geometry()); GEOMETRY_BUILDER.match(RELATION_1); - assertNull(RELATION_1.getGeometry()); + assertNull(RELATION_1.geometry()); GEOMETRY_BUILDER.match(RELATION_2); - assertTrue(RELATION_2.getGeometry() instanceof Polygon); + assertTrue(RELATION_2.geometry() instanceof Polygon); GEOMETRY_BUILDER.match(RELATION_3); - assertTrue(RELATION_3.getGeometry() instanceof Polygon); + assertTrue(RELATION_3.geometry() instanceof Polygon); GEOMETRY_BUILDER.match(RELATION_4); - assertTrue(RELATION_4.getGeometry() instanceof MultiPolygon); + assertTrue(RELATION_4.geometry() instanceof MultiPolygon); } @Test void handleRelationWithHole() { GEOMETRY_BUILDER.match(RELATION_5); - assertTrue(RELATION_5.getGeometry() instanceof Polygon); - assertNotNull(((Polygon) RELATION_5.getGeometry()).getExteriorRing()); - assertEquals(1, ((Polygon) RELATION_5.getGeometry()).getNumInteriorRing()); + assertTrue(RELATION_5.geometry() instanceof Polygon); + assertNotNull(((Polygon) RELATION_5.geometry()).getExteriorRing()); + assertEquals(1, ((Polygon) RELATION_5.geometry()).getNumInteriorRing()); } } diff --git a/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/geometry/RelationGeometryTest.java b/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/geometry/RelationGeometryTest.java index 44903584..b95cd513 100644 --- a/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/geometry/RelationGeometryTest.java +++ b/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/geometry/RelationGeometryTest.java @@ -37,16 +37,16 @@ class RelationGeometryTest { Geometry handleRelation(String file) throws IOException { InputStream input = new GZIPInputStream(this.getClass().getResourceAsStream(file)); List<Entity> entities = new XmlEntityReader().stream(input).toList(); - LongDataMap<Coordinate> coordinates = new MockLongDataMap<>( - entities.stream().filter(e -> e instanceof Node).map(e -> (Node) e).collect( - Collectors.toMap(n -> n.getId(), n -> new Coordinate(n.getLon(), n.getLat())))); + LongDataMap<Coordinate> coordinates = + new MockLongDataMap<>(entities.stream().filter(e -> e instanceof Node).map(e -> (Node) e) + .collect(Collectors.toMap(n -> n.id(), n -> new Coordinate(n.lon(), n.lat())))); LongDataMap<List<Long>> references = new MockLongDataMap<>(entities.stream().filter(e -> e instanceof Way).map(e -> (Way) e) - .collect(Collectors.toMap(w -> w.getId(), w -> w.getNodes()))); + .collect(Collectors.toMap(w -> w.id(), w -> w.nodes()))); Relation relation = entities.stream().filter(e -> e instanceof Relation).map(e -> (Relation) e) .findFirst().get(); new CreateGeometryConsumer(coordinates, references).match(relation); - return relation.getGeometry(); + return relation.geometry(); } @Test
