From 5d8df6888d6a3a26335f44ca309fe60f674df1b7 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Fri, 13 Dec 2019 18:15:10 +0100 Subject: [PATCH] move Entry and Entries to data-store --- .../src/main/java/org/lucares/pdb/datastore}/Entries.java | 4 ++-- .../src/main/java/org/lucares/pdb/datastore}/Entry.java | 4 +++- .../java/org/lucares/pdb/datastore/internal/PdbWriter.java | 2 +- .../main/java/org/lucares/pdbui/CsvToEntryTransformer.java | 4 ++-- pdb-ui/src/main/java/org/lucares/pdbui/CsvUploadHandler.java | 2 +- .../lucares/pdbui/CustomExportFormatToEntryTransformer.java | 4 ++-- pdb-ui/src/main/java/org/lucares/pdbui/IngestionHandler.java | 4 ++-- .../main/java/org/lucares/pdbui/JsonToEntryTransformer.java | 2 +- .../main/java/org/lucares/pdbui/LineToEntryTransformer.java | 2 +- pdb-ui/src/main/java/org/lucares/pdbui/TcpIngestor.java | 2 +- .../java/org/lucares/pdbui/CsvToEntryTransformerTest.java | 2 +- .../org/lucares/performance/db/EntryToEntriesIterator.java | 4 ++-- .../main/java/org/lucares/performance/db/PerformanceDb.java | 4 ++-- .../org/lucares/performance/db/EntryByDateComparator.java | 2 +- .../java/org/lucares/performance/db/PerformanceDbTest.java | 2 +- 15 files changed, 23 insertions(+), 21 deletions(-) rename {pdb-api/src/main/java/org/lucares/pdb/api => data-store/src/main/java/org/lucares/pdb/datastore}/Entries.java (97%) rename {pdb-api/src/main/java/org/lucares/pdb/api => data-store/src/main/java/org/lucares/pdb/datastore}/Entry.java (96%) diff --git a/pdb-api/src/main/java/org/lucares/pdb/api/Entries.java b/data-store/src/main/java/org/lucares/pdb/datastore/Entries.java similarity index 97% rename from pdb-api/src/main/java/org/lucares/pdb/api/Entries.java rename to data-store/src/main/java/org/lucares/pdb/datastore/Entries.java index 7cd354b..7b3d020 100644 --- a/pdb-api/src/main/java/org/lucares/pdb/api/Entries.java +++ b/data-store/src/main/java/org/lucares/pdb/datastore/Entries.java @@ -1,4 +1,4 @@ -package org.lucares.pdb.api; +package org.lucares.pdb.datastore; import java.util.ArrayList; import java.util.Arrays; @@ -26,7 +26,7 @@ import java.util.concurrent.TimeoutException; public class Entries implements Iterable { /** * A special {@link Entries} instance that can be used as poison object for - * {@link BlockingQueueIterator}. + * blocking queues. */ public static final Entries POISON = new Entries(0); diff --git a/pdb-api/src/main/java/org/lucares/pdb/api/Entry.java b/data-store/src/main/java/org/lucares/pdb/datastore/Entry.java similarity index 96% rename from pdb-api/src/main/java/org/lucares/pdb/api/Entry.java rename to data-store/src/main/java/org/lucares/pdb/datastore/Entry.java index 62e2045..0a23f2a 100644 --- a/pdb-api/src/main/java/org/lucares/pdb/api/Entry.java +++ b/data-store/src/main/java/org/lucares/pdb/datastore/Entry.java @@ -1,10 +1,12 @@ -package org.lucares.pdb.api; +package org.lucares.pdb.datastore; import java.time.Instant; import java.time.OffsetDateTime; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; +import org.lucares.pdb.api.Tags; + public class Entry { private final long value; diff --git a/data-store/src/main/java/org/lucares/pdb/datastore/internal/PdbWriter.java b/data-store/src/main/java/org/lucares/pdb/datastore/internal/PdbWriter.java index 59263ee..78dc397 100644 --- a/data-store/src/main/java/org/lucares/pdb/datastore/internal/PdbWriter.java +++ b/data-store/src/main/java/org/lucares/pdb/datastore/internal/PdbWriter.java @@ -3,8 +3,8 @@ package org.lucares.pdb.datastore.internal; import java.io.Flushable; import java.util.Optional; -import org.lucares.pdb.api.Entry; import org.lucares.pdb.blockstorage.TimeSeriesFile; +import org.lucares.pdb.datastore.Entry; import org.lucares.pdb.datastore.InvalidValueException; import org.lucares.pdb.datastore.PdbFile; import org.lucares.pdb.datastore.WriteException; diff --git a/pdb-ui/src/main/java/org/lucares/pdbui/CsvToEntryTransformer.java b/pdb-ui/src/main/java/org/lucares/pdbui/CsvToEntryTransformer.java index 3ee8450..125a2b4 100644 --- a/pdb-ui/src/main/java/org/lucares/pdbui/CsvToEntryTransformer.java +++ b/pdb-ui/src/main/java/org/lucares/pdbui/CsvToEntryTransformer.java @@ -8,10 +8,10 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import org.lucares.collections.IntList; -import org.lucares.pdb.api.Entries; -import org.lucares.pdb.api.Entry; import org.lucares.pdb.api.Tags; import org.lucares.pdb.api.TagsBuilder; +import org.lucares.pdb.datastore.Entries; +import org.lucares.pdb.datastore.Entry; import org.lucares.pdbui.date.FastISODateParser; class CsvToEntryTransformer { diff --git a/pdb-ui/src/main/java/org/lucares/pdbui/CsvUploadHandler.java b/pdb-ui/src/main/java/org/lucares/pdbui/CsvUploadHandler.java index c70fa80..b5bfb6a 100644 --- a/pdb-ui/src/main/java/org/lucares/pdbui/CsvUploadHandler.java +++ b/pdb-ui/src/main/java/org/lucares/pdbui/CsvUploadHandler.java @@ -16,7 +16,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.lucares.pdb.api.Entries; +import org.lucares.pdb.datastore.Entries; import org.lucares.performance.db.PerformanceDb; import org.lucares.utils.file.FileUtils; import org.slf4j.Logger; diff --git a/pdb-ui/src/main/java/org/lucares/pdbui/CustomExportFormatToEntryTransformer.java b/pdb-ui/src/main/java/org/lucares/pdbui/CustomExportFormatToEntryTransformer.java index a517f58..300c44c 100644 --- a/pdb-ui/src/main/java/org/lucares/pdbui/CustomExportFormatToEntryTransformer.java +++ b/pdb-ui/src/main/java/org/lucares/pdbui/CustomExportFormatToEntryTransformer.java @@ -7,10 +7,10 @@ import java.util.Map; import java.util.concurrent.ArrayBlockingQueue; import java.util.regex.Pattern; -import org.lucares.pdb.api.Entries; -import org.lucares.pdb.api.Entry; import org.lucares.pdb.api.Tags; import org.lucares.pdb.api.TagsBuilder; +import org.lucares.pdb.datastore.Entries; +import org.lucares.pdb.datastore.Entry; import org.lucares.performance.db.PdbExport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pdb-ui/src/main/java/org/lucares/pdbui/IngestionHandler.java b/pdb-ui/src/main/java/org/lucares/pdbui/IngestionHandler.java index 72f3ae7..0fd3323 100644 --- a/pdb-ui/src/main/java/org/lucares/pdbui/IngestionHandler.java +++ b/pdb-ui/src/main/java/org/lucares/pdbui/IngestionHandler.java @@ -15,8 +15,8 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeoutException; import java.util.zip.GZIPInputStream; -import org.lucares.pdb.api.Entries; -import org.lucares.pdb.api.Entry; +import org.lucares.pdb.datastore.Entries; +import org.lucares.pdb.datastore.Entry; import org.lucares.performance.db.PdbExport; import com.fasterxml.jackson.core.JsonParseException; diff --git a/pdb-ui/src/main/java/org/lucares/pdbui/JsonToEntryTransformer.java b/pdb-ui/src/main/java/org/lucares/pdbui/JsonToEntryTransformer.java index 010798f..81f5282 100644 --- a/pdb-ui/src/main/java/org/lucares/pdbui/JsonToEntryTransformer.java +++ b/pdb-ui/src/main/java/org/lucares/pdbui/JsonToEntryTransformer.java @@ -4,9 +4,9 @@ import java.io.IOException; import java.util.Map; import java.util.Optional; -import org.lucares.pdb.api.Entry; import org.lucares.pdb.api.Tags; import org.lucares.pdb.api.TagsBuilder; +import org.lucares.pdb.datastore.Entry; import org.lucares.pdbui.date.FastISODateParser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pdb-ui/src/main/java/org/lucares/pdbui/LineToEntryTransformer.java b/pdb-ui/src/main/java/org/lucares/pdbui/LineToEntryTransformer.java index ea7789a..95d5278 100644 --- a/pdb-ui/src/main/java/org/lucares/pdbui/LineToEntryTransformer.java +++ b/pdb-ui/src/main/java/org/lucares/pdbui/LineToEntryTransformer.java @@ -3,7 +3,7 @@ package org.lucares.pdbui; import java.io.IOException; import java.util.Optional; -import org.lucares.pdb.api.Entry; +import org.lucares.pdb.datastore.Entry; public interface LineToEntryTransformer { public Optional toEntry(String line) throws IOException; diff --git a/pdb-ui/src/main/java/org/lucares/pdbui/TcpIngestor.java b/pdb-ui/src/main/java/org/lucares/pdbui/TcpIngestor.java index 5cbe3aa..e8f56e7 100644 --- a/pdb-ui/src/main/java/org/lucares/pdbui/TcpIngestor.java +++ b/pdb-ui/src/main/java/org/lucares/pdbui/TcpIngestor.java @@ -13,7 +13,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import javax.annotation.PreDestroy; -import org.lucares.pdb.api.Entries; +import org.lucares.pdb.datastore.Entries; import org.lucares.performance.db.PerformanceDb; import org.lucares.recommind.logs.Config; import org.slf4j.Logger; diff --git a/pdb-ui/src/test/java/org/lucares/pdbui/CsvToEntryTransformerTest.java b/pdb-ui/src/test/java/org/lucares/pdbui/CsvToEntryTransformerTest.java index 489645e..0d06da9 100644 --- a/pdb-ui/src/test/java/org/lucares/pdbui/CsvToEntryTransformerTest.java +++ b/pdb-ui/src/test/java/org/lucares/pdbui/CsvToEntryTransformerTest.java @@ -18,8 +18,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.lucares.collections.LongList; import org.lucares.pdb.api.DateTimeRange; -import org.lucares.pdb.api.Entries; import org.lucares.pdb.api.Query; +import org.lucares.pdb.datastore.Entries; import org.lucares.performance.db.PerformanceDb; import org.lucares.utils.file.FileUtils; diff --git a/performanceDb/src/main/java/org/lucares/performance/db/EntryToEntriesIterator.java b/performanceDb/src/main/java/org/lucares/performance/db/EntryToEntriesIterator.java index f77023a..88b94d7 100644 --- a/performanceDb/src/main/java/org/lucares/performance/db/EntryToEntriesIterator.java +++ b/performanceDb/src/main/java/org/lucares/performance/db/EntryToEntriesIterator.java @@ -2,8 +2,8 @@ package org.lucares.performance.db; import java.util.Iterator; -import org.lucares.pdb.api.Entries; -import org.lucares.pdb.api.Entry; +import org.lucares.pdb.datastore.Entries; +import org.lucares.pdb.datastore.Entry; public class EntryToEntriesIterator implements Iterator { diff --git a/performanceDb/src/main/java/org/lucares/performance/db/PerformanceDb.java b/performanceDb/src/main/java/org/lucares/performance/db/PerformanceDb.java index 20a7b2b..785f742 100644 --- a/performanceDb/src/main/java/org/lucares/performance/db/PerformanceDb.java +++ b/performanceDb/src/main/java/org/lucares/performance/db/PerformanceDb.java @@ -16,13 +16,13 @@ import java.util.stream.Stream; import org.lucares.collections.LongList; import org.lucares.pdb.api.DateTimeRange; -import org.lucares.pdb.api.Entries; -import org.lucares.pdb.api.Entry; import org.lucares.pdb.api.GroupResult; import org.lucares.pdb.api.Query; import org.lucares.pdb.api.QueryWithCaretMarker; import org.lucares.pdb.api.Result; import org.lucares.pdb.api.Tags; +import org.lucares.pdb.datastore.Entries; +import org.lucares.pdb.datastore.Entry; import org.lucares.pdb.datastore.InvalidValueException; import org.lucares.pdb.datastore.PdbFile; import org.lucares.pdb.datastore.Proposal; diff --git a/performanceDb/src/test/java/org/lucares/performance/db/EntryByDateComparator.java b/performanceDb/src/test/java/org/lucares/performance/db/EntryByDateComparator.java index 9a76cd3..a1fa1d7 100644 --- a/performanceDb/src/test/java/org/lucares/performance/db/EntryByDateComparator.java +++ b/performanceDb/src/test/java/org/lucares/performance/db/EntryByDateComparator.java @@ -2,7 +2,7 @@ package org.lucares.performance.db; import java.util.Comparator; -import org.lucares.pdb.api.Entry; +import org.lucares.pdb.datastore.Entry; public class EntryByDateComparator implements Comparator { public static final Comparator INSTANCE = new EntryByDateComparator(); diff --git a/performanceDb/src/test/java/org/lucares/performance/db/PerformanceDbTest.java b/performanceDb/src/test/java/org/lucares/performance/db/PerformanceDbTest.java index f9b8a75..8bfe62b 100644 --- a/performanceDb/src/test/java/org/lucares/performance/db/PerformanceDbTest.java +++ b/performanceDb/src/test/java/org/lucares/performance/db/PerformanceDbTest.java @@ -19,11 +19,11 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.lucares.collections.LongList; import org.lucares.pdb.api.DateTimeRange; -import org.lucares.pdb.api.Entry; import org.lucares.pdb.api.GroupResult; import org.lucares.pdb.api.Query; import org.lucares.pdb.api.Result; import org.lucares.pdb.api.Tags; +import org.lucares.pdb.datastore.Entry; import org.junit.jupiter.api.Assertions; import org.lucares.utils.DateUtils;