From 2813d5a4d4f140327a928344ef4ff5e5990491e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=A4rki?= Date: Fri, 20 Jan 2017 16:29:58 +0100 Subject: [PATCH] DropIt uses https. --- build.gradle | 2 +- .../daq/test/queryrest/query/AbstractStreamEventReader.java | 3 ++- .../test/queryrest/query/DummyArchiverApplianceReader.java | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index b164126..34e544e 100644 --- a/build.gradle +++ b/build.gradle @@ -52,5 +52,5 @@ uploadArchives { } 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"; } } \ No newline at end of file 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 57b6ec0..8964b3a 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 @@ -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.range.PulseIdRangeQuery; 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.StreamEventReader; import ch.psi.daq.domain.test.backend.TestBackendAccess; @@ -126,7 +127,7 @@ public abstract class AbstractStreamEventReader implements StreamEventReader getEventStream(EventQuery eventQuery, Stream queryProviders) { diff --git a/src/test/java/ch/psi/daq/test/queryrest/query/DummyArchiverApplianceReader.java b/src/test/java/ch/psi/daq/test/queryrest/query/DummyArchiverApplianceReader.java index c5bc357..2534613 100644 --- a/src/test/java/ch/psi/daq/test/queryrest/query/DummyArchiverApplianceReader.java +++ b/src/test/java/ch/psi/daq/test/queryrest/query/DummyArchiverApplianceReader.java @@ -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.range.PulseIdRangeQuery; import ch.psi.daq.domain.query.range.TimeRangeQuery; +import ch.psi.daq.domain.query.transform.ValueTransformation; import ch.psi.daq.domain.reader.DataReader; public class DummyArchiverApplianceReader implements DataReader { @@ -56,8 +57,8 @@ public class DummyArchiverApplianceReader implements DataReader { return DummyCassandraReader.getDummyEventStream(query.getChannel(), getBackend(), query.getStartMillis() / 10, query.getEndMillis() / 10) .filter(query.getFilterOrDefault(EventQuery.NO_OP_FILTER)) - // misuse value modification - .peek(query.getValueTransformation()); + // misuse value modification + .peek(query.getValueTransformationOrDefault(ValueTransformation.NO_OP)); } @Override