move Entry and Entries to data-store

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<Entry> {
     /**
      * 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);
 

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;

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;

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 {

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;

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;

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.datastore.Entries;
-import org.lucares.pdb.api.Entry;
+import org.lucares.pdb.datastore.Entry;
 import org.lucares.performance.db.PdbExport;
 
 import com.fasterxml.jackson.core.JsonParseException;

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;

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<Entry> toEntry(String line) throws IOException;

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;

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;
 

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.datastore.Entries;
-import org.lucares.pdb.api.Entry;
+import org.lucares.pdb.datastore.Entry;
 
 public class EntryToEntriesIterator implements Iterator<Entries> {
 

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;

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<Entry> {
     public static final Comparator<Entry> INSTANCE = new EntryByDateComparator();

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;