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 ed63fd5f91c5aed0b558829333b10cbd8175df9e Author: Bertil Chapuis <[email protected]> AuthorDate: Tue Nov 22 15:25:58 2022 +0100 Move enums in package --- .../repository/PostgresRelationRepository.java | 2 +- .../function/CreateGeometryConsumer.java | 2 +- .../baremaps/openstreetmap/model/Change.java | 5 ---- .../model/{Change.java => ChangeType.java} | 19 +------------ .../baremaps/openstreetmap/model/Element.java | 1 + .../baremaps/openstreetmap/model/Member.java | 18 ------------ .../model/{Change.java => MemberType.java} | 32 ++++++++++------------ .../openstreetmap/pbf/DataBlockReader.java | 19 ++++--------- .../openstreetmap/xml/XmlChangeSpliterator.java | 15 +++------- .../openstreetmap/xml/XmlEntitySpliterator.java | 13 ++------- .../baremaps/database/database/Constants.java | 2 +- .../geometry/GeometryHandlerTest.java | 2 +- 12 files changed, 33 insertions(+), 97 deletions(-) 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 e9d25c8c..8719466b 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 @@ -32,7 +32,7 @@ import org.apache.baremaps.database.copy.CopyWriter; import org.apache.baremaps.openstreetmap.geometry.GeometryUtils; import org.apache.baremaps.openstreetmap.model.Info; import org.apache.baremaps.openstreetmap.model.Member; -import org.apache.baremaps.openstreetmap.model.Member.MemberType; +import org.apache.baremaps.openstreetmap.model.MemberType; import org.apache.baremaps.openstreetmap.model.Relation; import org.locationtech.jts.geom.Geometry; import org.postgresql.PGConnection; 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 389d4fc4..10ad00e1 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 @@ -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 -> Member.MemberType.WAY.equals(m.type())) + relation.getMembers().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/model/Change.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Change.java index 4006e1a8..9839835c 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 @@ -20,11 +20,6 @@ import java.util.StringJoiner; /** Represents a change in an OpenStreetMap dataset. */ public record Change(ChangeType type,List<Entity>entities){ -public enum ChangeType { - DELETE, CREATE, MODIFY - - } - /** {@inheritDoc} */ @Override public String 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/ChangeType.java similarity index 60% copy from baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Change.java copy to baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/ChangeType.java index 4006e1a8..267f45e6 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/ChangeType.java @@ -12,23 +12,6 @@ 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 enum ChangeType { - DELETE, CREATE, MODIFY - - } - - /** {@inheritDoc} */ - @Override - public String toString() { - return new StringJoiner(", ", Change.class.getSimpleName() + "[", "]").add("type=" + type) - .add("elements=" + entities).toString(); - } + DELETE, CREATE, MODIFY; } 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 d8b3b5e4..52200f87 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 @@ -24,6 +24,7 @@ import org.locationtech.jts.geom.Geometry; * world. */ public sealed + abstract class Element implements Entity permits Node, Way, Relation { 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 e4ad3606..ff746dd7 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 @@ -20,24 +20,6 @@ import java.util.StringJoiner; /** Represents a member of a relation in an OpenStreetMap dataset. */ public record Member(long ref,MemberType type,String role){ -public enum MemberType { - NODE, WAY, RELATION; - - public static MemberType forNumber(int value) { - switch (value) { - case 0: - return NODE; - case 1: - return WAY; - case 2: - return RELATION; - default: - throw new IllegalArgumentException(); - } - } - - } - /** {@inheritDoc} */ @Override public boolean equals(Object o) { 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/MemberType.java similarity index 58% copy from baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Change.java copy to baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/MemberType.java index 4006e1a8..1dc44192 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/MemberType.java @@ -12,23 +12,19 @@ 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 enum ChangeType { - DELETE, CREATE, MODIFY - - } - - /** {@inheritDoc} */ - @Override - public String toString() { - return new StringJoiner(", ", Change.class.getSimpleName() + "[", "]").add("type=" + type) - .add("elements=" + entities).toString(); +public enum MemberType { + NODE, WAY, RELATION; + + public static MemberType forNumber(int value) { + switch (value) { + case 0: + return NODE; + case 1: + return WAY; + case 2: + return RELATION; + default: + throw new IllegalArgumentException(); + } } } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/pbf/DataBlockReader.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/pbf/DataBlockReader.java index 62f5902b..0adb3e2d 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/pbf/DataBlockReader.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/pbf/DataBlockReader.java @@ -24,14 +24,7 @@ import java.util.Map; import java.util.TimeZone; import java.util.function.Consumer; import java.util.zip.DataFormatException; -import org.apache.baremaps.openstreetmap.model.Blob; -import org.apache.baremaps.openstreetmap.model.DataBlock; -import org.apache.baremaps.openstreetmap.model.Entity; -import org.apache.baremaps.openstreetmap.model.Info; -import org.apache.baremaps.openstreetmap.model.Member; -import org.apache.baremaps.openstreetmap.model.Node; -import org.apache.baremaps.openstreetmap.model.Relation; -import org.apache.baremaps.openstreetmap.model.Way; +import org.apache.baremaps.openstreetmap.model.*; import org.apache.baremaps.osm.binary.Osmformat; import org.apache.baremaps.osm.binary.Osmformat.DenseNodes; import org.apache.baremaps.osm.binary.Osmformat.PrimitiveGroup; @@ -219,7 +212,7 @@ class DataBlockReader { for (int j = 0; j < relation.getMemidsCount(); j++) { mid = mid + relation.getMemids(j); String role = getString(relation.getRolesSid(j)); - Member.MemberType type = type(relation.getTypes(j)); + MemberType type = type(relation.getTypes(j)); members.add(new Member(mid, type, role)); } @@ -229,14 +222,14 @@ class DataBlockReader { } } - private Member.MemberType type(Osmformat.Relation.MemberType type) { + private MemberType type(Osmformat.Relation.MemberType type) { switch (type) { case NODE: - return Member.MemberType.NODE; + return MemberType.NODE; case WAY: - return Member.MemberType.WAY; + return MemberType.WAY; case RELATION: - return Member.MemberType.RELATION; + return MemberType.RELATION; default: throw new UnsupportedOperationException(); } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/xml/XmlChangeSpliterator.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/xml/XmlChangeSpliterator.java index 83080d64..2c12e7fe 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/xml/XmlChangeSpliterator.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/xml/XmlChangeSpliterator.java @@ -33,14 +33,7 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -import org.apache.baremaps.openstreetmap.model.Change; -import org.apache.baremaps.openstreetmap.model.Element; -import org.apache.baremaps.openstreetmap.model.Entity; -import org.apache.baremaps.openstreetmap.model.Info; -import org.apache.baremaps.openstreetmap.model.Member; -import org.apache.baremaps.openstreetmap.model.Node; -import org.apache.baremaps.openstreetmap.model.Relation; -import org.apache.baremaps.openstreetmap.model.Way; +import org.apache.baremaps.openstreetmap.model.*; import org.apache.baremaps.stream.StreamException; /** @@ -121,7 +114,7 @@ public class XmlChangeSpliterator implements Spliterator<Change> { case ELEMENT_NAME_CREATE: case ELEMENT_NAME_DELETE: case ELEMENT_NAME_MODIFY: - Change.ChangeType type = Change.ChangeType.valueOf(reader.getLocalName().toUpperCase()); + ChangeType type = ChangeType.valueOf(reader.getLocalName().toUpperCase()); List<Entity> elements = new ArrayList<>(); reader.nextTag(); while (reader.getEventType() == XMLStreamConstants.START_ELEMENT) { @@ -229,8 +222,8 @@ public class XmlChangeSpliterator implements Spliterator<Change> { private void readRelationMember(List<Member> members) throws XMLStreamException { long id = Long.parseLong(reader.getAttributeValue(null, ATTRIBUTE_NAME_REF)); - Member.MemberType type = Member.MemberType - .valueOf(reader.getAttributeValue(null, ATTRIBUTE_NAME_TYPE).toUpperCase()); + MemberType type = + MemberType.valueOf(reader.getAttributeValue(null, ATTRIBUTE_NAME_TYPE).toUpperCase()); String role = reader.getAttributeValue(null, ATTRIBUTE_NAME_ROLE); members.add(new Member(id, type, role)); reader.nextTag(); diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/xml/XmlEntitySpliterator.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/xml/XmlEntitySpliterator.java index 754c3907..8daffb42 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/xml/XmlEntitySpliterator.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/xml/XmlEntitySpliterator.java @@ -35,14 +35,7 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -import org.apache.baremaps.openstreetmap.model.Bound; -import org.apache.baremaps.openstreetmap.model.Entity; -import org.apache.baremaps.openstreetmap.model.Header; -import org.apache.baremaps.openstreetmap.model.Info; -import org.apache.baremaps.openstreetmap.model.Member; -import org.apache.baremaps.openstreetmap.model.Node; -import org.apache.baremaps.openstreetmap.model.Relation; -import org.apache.baremaps.openstreetmap.model.Way; +import org.apache.baremaps.openstreetmap.model.*; import org.apache.baremaps.stream.StreamException; /** @@ -258,8 +251,8 @@ public class XmlEntitySpliterator implements Spliterator<Entity> { private void readRelationMember(List<Member> members) throws XMLStreamException { long id = Long.parseLong(reader.getAttributeValue(null, ATTRIBUTE_NAME_REF)); - Member.MemberType type = Member.MemberType - .valueOf(reader.getAttributeValue(null, ATTRIBUTE_NAME_TYPE).toUpperCase()); + MemberType type = + MemberType.valueOf(reader.getAttributeValue(null, ATTRIBUTE_NAME_TYPE).toUpperCase()); String role = reader.getAttributeValue(null, ATTRIBUTE_NAME_ROLE); members.add(new Member(id, type, role)); reader.nextTag(); diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/database/Constants.java b/baremaps-core/src/test/java/org/apache/baremaps/database/database/Constants.java index fdb47a74..7c14bdf0 100644 --- a/baremaps-core/src/test/java/org/apache/baremaps/database/database/Constants.java +++ b/baremaps-core/src/test/java/org/apache/baremaps/database/database/Constants.java @@ -20,7 +20,7 @@ import java.time.LocalDateTime; import org.apache.baremaps.openstreetmap.model.Header; import org.apache.baremaps.openstreetmap.model.Info; import org.apache.baremaps.openstreetmap.model.Member; -import org.apache.baremaps.openstreetmap.model.Member.MemberType; +import org.apache.baremaps.openstreetmap.model.MemberType; import org.apache.baremaps.openstreetmap.model.Node; import org.apache.baremaps.openstreetmap.model.Relation; import org.apache.baremaps.openstreetmap.model.Way; 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 5247c883..487b9a02 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 @@ -27,7 +27,7 @@ import org.apache.baremaps.collection.LongDataMap; import org.apache.baremaps.openstreetmap.function.CreateGeometryConsumer; import org.apache.baremaps.openstreetmap.model.Info; import org.apache.baremaps.openstreetmap.model.Member; -import org.apache.baremaps.openstreetmap.model.Member.MemberType; +import org.apache.baremaps.openstreetmap.model.MemberType; import org.apache.baremaps.openstreetmap.model.Node; import org.apache.baremaps.openstreetmap.model.Relation; import org.apache.baremaps.openstreetmap.model.Way;
