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 ea926e6bd5b894b4100c94c2b4da892a65d39f8a Author: Bertil Chapuis <[email protected]> AuthorDate: Tue Nov 22 16:22:35 2022 +0100 Use java 17 conventions --- .../org/apache/baremaps/database/DiffService.java | 4 +- .../baremaps/database/SaveBlockConsumer.java | 10 +-- .../apache/baremaps/database/UpdateService.java | 6 +- .../repository/PostgresHeaderRepository.java | 22 +++--- .../database/repository/PostgresWayRepository.java | 4 +- .../function/BlockEntitiesConsumer.java | 12 ++-- .../function/CreateGeometryConsumer.java | 2 +- .../apache/baremaps/openstreetmap/model/Blob.java | 7 -- .../apache/baremaps/openstreetmap/model/Bound.java | 16 +---- .../baremaps/openstreetmap/model/Change.java | 7 -- .../baremaps/openstreetmap/model/DataBlock.java | 8 +-- .../baremaps/openstreetmap/model/Header.java | 79 ---------------------- .../baremaps/openstreetmap/model/HeaderBlock.java | 18 ----- .../apache/baremaps/openstreetmap/model/Info.java | 26 ------- .../baremaps/openstreetmap/model/Member.java | 30 -------- .../apache/baremaps/openstreetmap/model/Node.java | 31 --------- .../baremaps/openstreetmap/model/Relation.java | 31 --------- .../apache/baremaps/openstreetmap/model/User.java | 22 ------ .../apache/baremaps/openstreetmap/model/Way.java | 33 +-------- .../openstreetmap/pbf/PbfEntityReader.java | 12 ++-- .../openstreetmap/store/DataStoreConsumer.java | 6 +- .../database/ImportUpdateLiechtensteinTest.java | 8 +-- .../database/database/ImportUpdateMonacoTest.java | 6 +- .../database/PostgresHeaderRepositoryTest.java | 14 ++-- .../baremaps/openstreetmap/OpenStreetMapTest.java | 2 +- .../geometry/GeometryHandlerTest.java | 2 +- .../geometry/RelationGeometryTest.java | 2 +- 27 files changed, 62 insertions(+), 358 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..13e3e958 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); 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/UpdateService.java b/baremaps-core/src/main/java/org/apache/baremaps/database/UpdateService.java index 5d2060e0..300dc1d0 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); @@ -88,7 +88,7 @@ public class UpdateService implements Callable<Void> { 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())); + 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/PostgresWayRepository.java b/baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresWayRepository.java index ff8120f6..1039bf94 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 @@ -278,7 +278,7 @@ public class PostgresWayRepository implements Repository<Long, Way> { writer.writeLocalDateTime(value.getInfo().timestamp()); writer.writeLong(value.getInfo().changeset()); writer.writeJsonb(PostgresJsonbMapper.toJson(value.getTags())); - writer.writeLongList(value.getNodes()); + writer.writeLongList(value.nodes()); writer.writePostgisGeometry(value.getGeometry()); } } @@ -312,7 +312,7 @@ public class PostgresWayRepository implements Repository<Long, Way> { 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.setObject(7, value.nodes().stream().mapToLong(Long::longValue).toArray()); statement.setBytes(8, GeometryUtils.serialize(value.getGeometry())); } } 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..8bbadd39 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 @@ -85,7 +85,7 @@ public class CreateGeometryConsumer implements Consumer<Entity> { /** {@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()) { 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..f603389e 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 @@ -47,11 +47,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/Bound.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Bound.java index 37c5f9b8..88144833 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 @@ -14,8 +14,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 { @@ -33,17 +32,4 @@ public record Bound(double maxLat, double maxLon, double minLat, double minLon) 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..ffdc8f3f 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 @@ -15,15 +15,8 @@ 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){ - /** {@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..1312c59e 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 @@ -24,7 +24,7 @@ public record DataBlock(List<Node> denseNodes, List<Node> nodes, List<Way> ways, * * @return the dense nodes */ - public List<Node> getDenseNodes() { + public List<Node> denseNodes() { return denseNodes; } @@ -33,7 +33,7 @@ public record DataBlock(List<Node> denseNodes, List<Node> nodes, List<Way> ways, * * @return the nodes */ - public List<Node> getNodes() { + public List<Node> nodes() { return nodes; } @@ -42,7 +42,7 @@ public record DataBlock(List<Node> denseNodes, List<Node> nodes, List<Way> ways, * * @return the ways */ - public List<Way> getWays() { + public List<Way> ways() { return ways; } @@ -51,7 +51,7 @@ public record DataBlock(List<Node> denseNodes, List<Node> nodes, List<Way> ways, * * @return the relations */ - public List<Relation> getRelations() { + public List<Relation> relations() { return relations; } 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..6aa75090 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); - } - - /** {@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..adf2f5ef 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. */ @@ -75,33 +73,4 @@ public final class Node extends Element { public double getLat() { 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..09eb5998 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. */ @@ -61,33 +59,4 @@ public final class Relation extends Element { public List<Member> getMembers() { 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/User.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/User.java index 2a291347..a82cf2f6 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 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..358d208f 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( + dataBlock.denseNodes().stream().forEach( node -> coordinates.put(node.getId(), new Coordinate(node.getLon(), node.getLat()))); - dataBlock.getNodes().stream().forEach( + dataBlock.nodes().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.ways().stream().forEach(way -> references.put(way.getId(), way.nodes())); } } catch (Exception e) { throw new StreamException(e); 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/openstreetmap/OpenStreetMapTest.java b/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/OpenStreetMapTest.java index 61b754d1..241edc56 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 @@ -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..c83c19ac 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 @@ -131,7 +131,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.getId(), w -> w.nodes()))); static final Relation RELATION_0 = new Relation(0, INFO, ImmutableMap.of(), Arrays.asList()); 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..8eb7fdac 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 @@ -42,7 +42,7 @@ class RelationGeometryTest { Collectors.toMap(n -> n.getId(), n -> new Coordinate(n.getLon(), n.getLat())))); 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.getId(), w -> w.nodes()))); Relation relation = entities.stream().filter(e -> e instanceof Relation).map(e -> (Relation) e) .findFirst().get(); new CreateGeometryConsumer(coordinates, references).match(relation);
