This is an automated email from the ASF dual-hosted git repository.
bchapuis pushed a commit to branch sonar
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
The following commit(s) were added to refs/heads/sonar by this push:
new 4df18881 Use record instead of class
4df18881 is described below
commit 4df1888103f0bbd47de7211f76693f5fed16e674
Author: Bertil Chapuis <[email protected]>
AuthorDate: Thu Jun 13 01:13:43 2024 +0200
Use record instead of class
---
.../baremaps/workflow/tasks/UpdateOsmDatabase.java | 4 +--
.../workflow/tasks/ImportUpdateSampleTest.java | 2 +-
.../baremaps/openstreetmap/model/Member.java | 3 --
.../apache/baremaps/openstreetmap/model/State.java | 34 +---------------------
.../baremaps/openstreetmap/state/StateReader.java | 34 +++++++++++-----------
.../baremaps/openstreetmap/OsmSampleTest.java | 4 +--
6 files changed, 23 insertions(+), 58 deletions(-)
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/UpdateOsmDatabase.java
b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/UpdateOsmDatabase.java
index 8dbd64a4..f4170dab 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/UpdateOsmDatabase.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/UpdateOsmDatabase.java
@@ -130,7 +130,7 @@ public class UpdateOsmDatabase implements Task {
var replicationTimestamp = header.replicationTimestamp();
var state = stateReader.getStateFromTimestamp(replicationTimestamp);
if (state.isPresent()) {
- sequenceNumber = state.get().getSequenceNumber();
+ sequenceNumber = state.get().sequenceNumber();
}
}
@@ -174,7 +174,7 @@ public class UpdateOsmDatabase implements Task {
var stateUrl = stateReader.getUrl(replicationUrl, nextSequenceNumber,
"state.txt");
try (var stateInputStream = new
BufferedInputStream(stateUrl.openStream())) {
var state = new StateReader().read(stateInputStream);
- headerRepository.put(new Header(state.getSequenceNumber(),
state.getTimestamp(),
+ headerRepository.put(new Header(state.sequenceNumber(),
state.timestamp(),
header.replicationUrl(), header.source(), header.writingProgram()));
}
}
diff --git
a/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportUpdateSampleTest.java
b/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportUpdateSampleTest.java
index b545d990..d91627d3 100644
---
a/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportUpdateSampleTest.java
+++
b/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportUpdateSampleTest.java
@@ -72,7 +72,7 @@ class ImportUpdateSampleTest extends PostgresRepositoryTest {
// Import the state file
try (var stateInput = Files.newInputStream(TestFiles.SAMPLE_STATE_TXT)) {
var state = new StateReader().read(stateInput);
- headerRepository.put(new Header(state.getSequenceNumber(),
state.getTimestamp(),
+ headerRepository.put(new Header(state.sequenceNumber(),
state.timestamp(),
"file:///" + TestFiles.SAMPLE_DIR, "", ""));
assertEquals(1,
headerRepository.selectLatest().replicationSequenceNumber());
}
diff --git
a/baremaps-openstreetmap/src/main/java/org/apache/baremaps/openstreetmap/model/Member.java
b/baremaps-openstreetmap/src/main/java/org/apache/baremaps/openstreetmap/model/Member.java
index 4e8e8a79..1f73d4d2 100644
---
a/baremaps-openstreetmap/src/main/java/org/apache/baremaps/openstreetmap/model/Member.java
+++
b/baremaps-openstreetmap/src/main/java/org/apache/baremaps/openstreetmap/model/Member.java
@@ -17,10 +17,7 @@
package org.apache.baremaps.openstreetmap.model;
-import static com.google.common.base.Preconditions.checkNotNull;
-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) {
diff --git
a/baremaps-openstreetmap/src/main/java/org/apache/baremaps/openstreetmap/model/State.java
b/baremaps-openstreetmap/src/main/java/org/apache/baremaps/openstreetmap/model/State.java
index 79f4c406..3795825f 100644
---
a/baremaps-openstreetmap/src/main/java/org/apache/baremaps/openstreetmap/model/State.java
+++
b/baremaps-openstreetmap/src/main/java/org/apache/baremaps/openstreetmap/model/State.java
@@ -22,38 +22,6 @@ package org.apache.baremaps.openstreetmap.model;
import java.time.LocalDateTime;
/** Represents the state of an OpenStreetMap dataset, enabling its
replication. */
-public final 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-openstreetmap/src/main/java/org/apache/baremaps/openstreetmap/state/StateReader.java
b/baremaps-openstreetmap/src/main/java/org/apache/baremaps/openstreetmap/state/StateReader.java
index d9e84dd5..d62fb2c8 100644
---
a/baremaps-openstreetmap/src/main/java/org/apache/baremaps/openstreetmap/state/StateReader.java
+++
b/baremaps-openstreetmap/src/main/java/org/apache/baremaps/openstreetmap/state/StateReader.java
@@ -115,16 +115,16 @@ public class StateReader implements Reader<State> {
if (upper.isEmpty()) {
return Optional.empty();
}
- if (timestamp.isAfter(upper.get().getTimestamp()) ||
upper.get().getSequenceNumber() <= 0) {
+ if (timestamp.isAfter(upper.get().timestamp()) ||
upper.get().sequenceNumber() <= 0) {
return upper;
}
var lower = Optional.<State>empty();
var lowerId = Optional.of(0L);
while (lower.isEmpty()) {
lower = getState(lowerId);
- if (lower.isPresent() && lower.get().getTimestamp().isAfter(timestamp)) {
- if (lower.get().getSequenceNumber() == 0
- || lower.get().getSequenceNumber() + 1 >=
upper.get().getSequenceNumber()) {
+ if (lower.isPresent() && lower.get().timestamp().isAfter(timestamp)) {
+ if (lower.get().sequenceNumber() == 0
+ || lower.get().sequenceNumber() + 1 >=
upper.get().sequenceNumber()) {
return lower;
}
upper = lower;
@@ -132,7 +132,7 @@ public class StateReader implements Reader<State> {
lowerId = Optional.of(0L);
}
if (lower.isEmpty()) {
- var newId = (lowerId.get() + upper.get().getSequenceNumber()) / 2;
+ var newId = (lowerId.get() + upper.get().sequenceNumber()) / 2;
if (newId <= lowerId.get()) {
return upper;
}
@@ -142,29 +142,29 @@ public class StateReader implements Reader<State> {
long baseSplitId;
while (true) {
if (balancedSearch) {
- baseSplitId = ((lower.get().getSequenceNumber() +
upper.get().getSequenceNumber()) / 2);
+ baseSplitId = ((lower.get().sequenceNumber() +
upper.get().sequenceNumber()) / 2);
} else {
- var tsInt = upper.get().getTimestamp().toEpochSecond(ZoneOffset.UTC)
- - lower.get().getTimestamp().toEpochSecond(ZoneOffset.UTC);
- var seqInt = upper.get().getSequenceNumber() -
lower.get().getSequenceNumber();
- var goal = timestamp.getSecond() -
lower.get().getTimestamp().getSecond();
+ var tsInt = upper.get().timestamp().toEpochSecond(ZoneOffset.UTC)
+ - lower.get().timestamp().toEpochSecond(ZoneOffset.UTC);
+ var seqInt = upper.get().sequenceNumber() -
lower.get().sequenceNumber();
+ var goal = timestamp.getSecond() - lower.get().timestamp().getSecond();
baseSplitId =
- lower.get().getSequenceNumber() + (long) Math.ceil((double) (goal
* seqInt) / tsInt);
- if (baseSplitId >= upper.get().getSequenceNumber()) {
- baseSplitId = upper.get().getSequenceNumber() - 1;
+ lower.get().sequenceNumber() + (long) Math.ceil((double) (goal *
seqInt) / tsInt);
+ if (baseSplitId >= upper.get().sequenceNumber()) {
+ baseSplitId = upper.get().sequenceNumber() - 1;
}
}
var split = getState(Optional.of(baseSplitId));
if (split.isEmpty()) {
var splitId = baseSplitId - 1;
- while (split.isEmpty() && splitId > lower.get().getSequenceNumber()) {
+ while (split.isEmpty() && splitId > lower.get().sequenceNumber()) {
split = getState(Optional.of(splitId));
splitId--;
}
}
if (split.isEmpty()) {
var splitId = baseSplitId + 1;
- while (split.isEmpty() && splitId < upper.get().getSequenceNumber()) {
+ while (split.isEmpty() && splitId < upper.get().sequenceNumber()) {
split = getState(Optional.of(splitId));
splitId++;
}
@@ -172,12 +172,12 @@ public class StateReader implements Reader<State> {
if (split.isEmpty()) {
return lower;
}
- if (split.get().getTimestamp().isBefore(timestamp)) {
+ if (split.get().timestamp().isBefore(timestamp)) {
lower = split;
} else {
upper = split;
}
- if (lower.get().getSequenceNumber() + 1 >=
upper.get().getSequenceNumber()) {
+ if (lower.get().sequenceNumber() + 1 >= upper.get().sequenceNumber()) {
return lower;
}
}
diff --git
a/baremaps-openstreetmap/src/test/java/org/apache/baremaps/openstreetmap/OsmSampleTest.java
b/baremaps-openstreetmap/src/test/java/org/apache/baremaps/openstreetmap/OsmSampleTest.java
index fdb51ca0..4236377c 100644
---
a/baremaps-openstreetmap/src/test/java/org/apache/baremaps/openstreetmap/OsmSampleTest.java
+++
b/baremaps-openstreetmap/src/test/java/org/apache/baremaps/openstreetmap/OsmSampleTest.java
@@ -44,8 +44,8 @@ class OsmSampleTest {
void sampleStateTxt() throws IOException {
try (InputStream inputStream =
Files.newInputStream(TestFiles.SAMPLE_STATE_TXT)) {
State state = new StateReader().read(inputStream);
- Assertions.assertEquals(1, state.getSequenceNumber());
- Assertions.assertEquals(LocalDateTime.parse("2000-01-01T00:00:00"),
state.getTimestamp());
+ Assertions.assertEquals(1, state.sequenceNumber());
+ Assertions.assertEquals(LocalDateTime.parse("2000-01-01T00:00:00"),
state.timestamp());
}
}
