DropIt uses https.
This commit is contained in:
@ -52,5 +52,5 @@ uploadArchives {
|
|||||||
}
|
}
|
||||||
|
|
||||||
task dropIt(dependsOn: build) << {
|
task dropIt(dependsOn: build) << {
|
||||||
exec{ executable "curl"; args "-X", "POST", "-F", "file=@build/libs/ch.psi.daq.queryrest-" + version + ".jar", "http://dropit.psi.ch/upload"; }
|
exec{ executable "curl"; args "-X", "POST", "-F", "file=@build/libs/ch.psi.daq.queryrest-" + version + ".jar", "https://dropit.psi.ch/upload"; }
|
||||||
}
|
}
|
@ -39,6 +39,7 @@ import ch.psi.daq.domain.query.event.EventQuery;
|
|||||||
import ch.psi.daq.domain.query.event.StreamEventQuery;
|
import ch.psi.daq.domain.query.event.StreamEventQuery;
|
||||||
import ch.psi.daq.domain.query.range.PulseIdRangeQuery;
|
import ch.psi.daq.domain.query.range.PulseIdRangeQuery;
|
||||||
import ch.psi.daq.domain.query.range.TimeRangeQuery;
|
import ch.psi.daq.domain.query.range.TimeRangeQuery;
|
||||||
|
import ch.psi.daq.domain.query.transform.ValueTransformation;
|
||||||
import ch.psi.daq.domain.reader.MetaStreamEventQuery;
|
import ch.psi.daq.domain.reader.MetaStreamEventQuery;
|
||||||
import ch.psi.daq.domain.reader.StreamEventReader;
|
import ch.psi.daq.domain.reader.StreamEventReader;
|
||||||
import ch.psi.daq.domain.test.backend.TestBackendAccess;
|
import ch.psi.daq.domain.test.backend.TestBackendAccess;
|
||||||
@ -126,7 +127,7 @@ public abstract class AbstractStreamEventReader implements StreamEventReader<Cha
|
|||||||
query.getEndMillis() / 10)
|
query.getEndMillis() / 10)
|
||||||
.filter(query.getFilterOrDefault(EventQuery.NO_OP_FILTER))
|
.filter(query.getFilterOrDefault(EventQuery.NO_OP_FILTER))
|
||||||
// misuse value modification
|
// misuse value modification
|
||||||
.peek(query.getValueTransformation());
|
.peek(query.getValueTransformationOrDefault(ValueTransformation.NO_OP));
|
||||||
}
|
}
|
||||||
|
|
||||||
public Stream<ChannelEvent> getEventStream(EventQuery eventQuery, Stream<? extends StreamEventQuery> queryProviders) {
|
public Stream<ChannelEvent> getEventStream(EventQuery eventQuery, Stream<? extends StreamEventQuery> queryProviders) {
|
||||||
|
@ -13,6 +13,7 @@ import ch.psi.daq.domain.backend.Backend;
|
|||||||
import ch.psi.daq.domain.query.event.EventQuery;
|
import ch.psi.daq.domain.query.event.EventQuery;
|
||||||
import ch.psi.daq.domain.query.range.PulseIdRangeQuery;
|
import ch.psi.daq.domain.query.range.PulseIdRangeQuery;
|
||||||
import ch.psi.daq.domain.query.range.TimeRangeQuery;
|
import ch.psi.daq.domain.query.range.TimeRangeQuery;
|
||||||
|
import ch.psi.daq.domain.query.transform.ValueTransformation;
|
||||||
import ch.psi.daq.domain.reader.DataReader;
|
import ch.psi.daq.domain.reader.DataReader;
|
||||||
|
|
||||||
public class DummyArchiverApplianceReader implements DataReader {
|
public class DummyArchiverApplianceReader implements DataReader {
|
||||||
@ -56,8 +57,8 @@ public class DummyArchiverApplianceReader implements DataReader {
|
|||||||
return DummyCassandraReader.getDummyEventStream(query.getChannel(), getBackend(), query.getStartMillis() / 10,
|
return DummyCassandraReader.getDummyEventStream(query.getChannel(), getBackend(), query.getStartMillis() / 10,
|
||||||
query.getEndMillis() / 10)
|
query.getEndMillis() / 10)
|
||||||
.filter(query.getFilterOrDefault(EventQuery.NO_OP_FILTER))
|
.filter(query.getFilterOrDefault(EventQuery.NO_OP_FILTER))
|
||||||
// misuse value modification
|
// misuse value modification
|
||||||
.peek(query.getValueTransformation());
|
.peek(query.getValueTransformationOrDefault(ValueTransformation.NO_OP));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Reference in New Issue
Block a user