diff --git a/src/main/java/ch/psi/daq/rest/queries/TimeRangeQuery.java b/src/main/java/ch/psi/daq/rest/queries/TimeRangeQuery.java index fef0e01..cbac26d 100644 --- a/src/main/java/ch/psi/daq/rest/queries/TimeRangeQuery.java +++ b/src/main/java/ch/psi/daq/rest/queries/TimeRangeQuery.java @@ -5,7 +5,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.LinkedHashSet; import java.util.List; -import java.util.UUID; import javax.validation.constraints.NotNull; @@ -14,12 +13,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ch.psi.daq.cassandra.reader.Ordering; -import ch.psi.daq.domain.utils.UUIDGen; import ch.psi.daq.hazelcast.common.query.Aggregation; import ch.psi.daq.hazelcast.common.query.ValueAggregation; import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; public class TimeRangeQuery extends AbstractQuery { @@ -33,17 +30,12 @@ public class TimeRangeQuery extends AbstractQuery { private long start; @NotNull private long startNanoOffset; - @JsonIgnore - private UUID startTime; @NotNull private long end; @NotNull private long endNanoOffset; - @JsonIgnore - private UUID endTime; - /** * @@ -95,9 +87,6 @@ public class TimeRangeQuery extends AbstractQuery { } } - this.startTime = UUIDGen.getMinTime(this.start, this.startNanoOffset); - this.endTime = UUIDGen.getMaxTime(this.end, this.endNanoOffset); - } public long getStart() { @@ -132,14 +121,6 @@ public class TimeRangeQuery extends AbstractQuery { this.endNanoOffset = endNanoOffset; } - public UUID getStartTime() { - return startTime; - } - - public UUID getEndTime() { - return endTime; - } - /** * {@inheritDoc} */