From bcb85849975b67baeb5c1701deb1836bba8d8bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=A4rki?= Date: Tue, 25 Oct 2016 17:22:40 +0200 Subject: [PATCH] Implement new interface. --- .../query/AbstractStreamEventReader.java | 14 ++++++++++++++ .../queryrest/query/DummyCassandraReader.java | 16 ++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/src/test/java/ch/psi/daq/test/queryrest/query/AbstractStreamEventReader.java b/src/test/java/ch/psi/daq/test/queryrest/query/AbstractStreamEventReader.java index a78f7ec..db98e9a 100644 --- a/src/test/java/ch/psi/daq/test/queryrest/query/AbstractStreamEventReader.java +++ b/src/test/java/ch/psi/daq/test/queryrest/query/AbstractStreamEventReader.java @@ -28,8 +28,10 @@ import ch.psi.daq.domain.backend.Backend; import ch.psi.daq.domain.config.DomainConfig; import ch.psi.daq.domain.events.ChannelConfiguration; import ch.psi.daq.domain.events.ChannelEvent; +import ch.psi.daq.domain.events.MetaPulseId; import ch.psi.daq.domain.events.impl.ChannelConfigurationImpl; import ch.psi.daq.domain.events.impl.ChannelEventImpl; +import ch.psi.daq.domain.events.impl.MetaPulseIdImpl; import ch.psi.daq.domain.json.channels.info.ChannelInfo; import ch.psi.daq.domain.json.channels.info.ChannelInfoImpl; import ch.psi.daq.domain.query.event.EventQuery; @@ -388,4 +390,16 @@ public abstract class AbstractStreamEventReader implements StreamEventReader getStartMetaPulseIdAsync(PulseIdRangeQuery query) { + return CompletableFuture.completedFuture(new MetaPulseIdImpl(query.getChannel(), query.getStartPulseId(), + TimeUtils.getTimeFromMillis(query.getStartPulseId() * 10, 0))); + } + + @Override + public CompletableFuture getEndMetaPulseIdAsync(PulseIdRangeQuery query) { + return CompletableFuture.completedFuture(new MetaPulseIdImpl(query.getChannel(), query.getEndPulseId(), + TimeUtils.getTimeFromMillis(query.getEndPulseId() * 10, 0))); + } } diff --git a/src/test/java/ch/psi/daq/test/queryrest/query/DummyCassandraReader.java b/src/test/java/ch/psi/daq/test/queryrest/query/DummyCassandraReader.java index b740e57..3649476 100644 --- a/src/test/java/ch/psi/daq/test/queryrest/query/DummyCassandraReader.java +++ b/src/test/java/ch/psi/daq/test/queryrest/query/DummyCassandraReader.java @@ -9,8 +9,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ch.psi.daq.cassandra.reader.CassandraReader; +import ch.psi.daq.common.time.TimeUtils; import ch.psi.daq.domain.backend.Backend; import ch.psi.daq.domain.events.ChannelConfiguration; +import ch.psi.daq.domain.events.MetaPulseId; +import ch.psi.daq.domain.events.impl.MetaPulseIdImpl; +import ch.psi.daq.domain.query.range.PulseIdRangeQuery; import ch.psi.daq.domain.query.range.TimeRangeQuery; public class DummyCassandraReader extends AbstractStreamEventReader implements CassandraReader { @@ -57,4 +61,16 @@ public class DummyCassandraReader extends AbstractStreamEventReader implements C // implement when needed throw new UnsupportedOperationException(); } + + @Override + public CompletableFuture getStartMetaPulseIdAsync(PulseIdRangeQuery query) { + return CompletableFuture.completedFuture(new MetaPulseIdImpl(query.getChannel(), query.getStartPulseId(), + TimeUtils.getTimeFromMillis(query.getStartPulseId() * 10, 0))); + } + + @Override + public CompletableFuture getEndMetaPulseIdAsync(PulseIdRangeQuery query) { + return CompletableFuture.completedFuture(new MetaPulseIdImpl(query.getChannel(), query.getEndPulseId(), + TimeUtils.getTimeFromMillis(query.getEndPulseId() * 10, 0))); + } }