ATEST-79:
- removing code that uses UUIDGen
This commit is contained in:
@ -5,7 +5,6 @@ import java.text.SimpleDateFormat;
|
|||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.LinkedHashSet;
|
import java.util.LinkedHashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
import javax.validation.constraints.NotNull;
|
import javax.validation.constraints.NotNull;
|
||||||
|
|
||||||
@ -14,12 +13,10 @@ import org.slf4j.Logger;
|
|||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import ch.psi.daq.cassandra.reader.Ordering;
|
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.Aggregation;
|
||||||
import ch.psi.daq.hazelcast.common.query.ValueAggregation;
|
import ch.psi.daq.hazelcast.common.query.ValueAggregation;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
public class TimeRangeQuery extends AbstractQuery {
|
public class TimeRangeQuery extends AbstractQuery {
|
||||||
@ -33,17 +30,12 @@ public class TimeRangeQuery extends AbstractQuery {
|
|||||||
private long start;
|
private long start;
|
||||||
@NotNull
|
@NotNull
|
||||||
private long startNanoOffset;
|
private long startNanoOffset;
|
||||||
@JsonIgnore
|
|
||||||
private UUID startTime;
|
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
private long end;
|
private long end;
|
||||||
@NotNull
|
@NotNull
|
||||||
private long endNanoOffset;
|
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() {
|
public long getStart() {
|
||||||
@ -132,14 +121,6 @@ public class TimeRangeQuery extends AbstractQuery {
|
|||||||
this.endNanoOffset = endNanoOffset;
|
this.endNanoOffset = endNanoOffset;
|
||||||
}
|
}
|
||||||
|
|
||||||
public UUID getStartTime() {
|
|
||||||
return startTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
public UUID getEndTime() {
|
|
||||||
return endTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@inheritDoc}
|
* {@inheritDoc}
|
||||||
*/
|
*/
|
||||||
|
Reference in New Issue
Block a user