From d23291b7cd6bdea2f5cec15bb4b765f66c2f9709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=A4rki?= Date: Tue, 23 Feb 2016 09:35:22 +0100 Subject: [PATCH] Some bug fixes. --- build.gradle | 2 +- .../ch/psi/daq/queryrest/controller/QueryRestController.java | 2 +- .../ch/psi/daq/queryrest/response/ResponseStreamWriter.java | 2 +- .../psi/daq/queryrest/response/csv/CSVResponseStreamWriter.java | 2 +- .../daq/queryrest/response/json/JSONResponseStreamWriter.java | 2 +- .../test/queryrest/controller/QueryRestControllerJsonTest.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index e5ed3ed..6aba98d 100644 --- a/build.gradle +++ b/build.gradle @@ -42,5 +42,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:8080/upload"; } + exec{ executable "curl"; args "-X", "POST", "-F", "file=@build/libs/ch.psi.daq.queryrest-" + version + ".jar", "http://dropit.psi.ch/upload"; } } \ No newline at end of file diff --git a/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java b/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java index dc4bbbb..08a0d9e 100644 --- a/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java +++ b/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java @@ -39,6 +39,7 @@ import ch.psi.daq.cassandra.request.validate.RequestProviderValidator; import ch.psi.daq.common.json.deserialize.AttributeBasedDeserializer; import ch.psi.daq.common.ordering.Ordering; import ch.psi.daq.domain.DataEvent; +import ch.psi.daq.domain.json.ChannelName; import ch.psi.daq.domain.reader.Backend; import ch.psi.daq.query.analyzer.QueryAnalyzer; import ch.psi.daq.query.config.QueryConfig; @@ -53,7 +54,6 @@ import ch.psi.daq.query.model.impl.DAQQuery; import ch.psi.daq.query.model.impl.DAQQueryElement; import ch.psi.daq.query.processor.ChannelNameCache; import ch.psi.daq.query.processor.QueryProcessor; -import ch.psi.daq.query.request.ChannelName; import ch.psi.daq.query.request.ChannelsRequest; import ch.psi.daq.query.request.ChannelsResponse; import ch.psi.daq.queryrest.response.csv.CSVResponseStreamWriter; diff --git a/src/main/java/ch/psi/daq/queryrest/response/ResponseStreamWriter.java b/src/main/java/ch/psi/daq/queryrest/response/ResponseStreamWriter.java index 387a6bc..da2aded 100644 --- a/src/main/java/ch/psi/daq/queryrest/response/ResponseStreamWriter.java +++ b/src/main/java/ch/psi/daq/queryrest/response/ResponseStreamWriter.java @@ -9,10 +9,10 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.tuple.Triple; +import ch.psi.daq.domain.json.ChannelName; import ch.psi.daq.query.model.ResponseOptions; import ch.psi.daq.query.model.impl.BackendQuery; import ch.psi.daq.query.model.impl.DAQQueryElement; -import ch.psi.daq.query.request.ChannelName; public interface ResponseStreamWriter { diff --git a/src/main/java/ch/psi/daq/queryrest/response/csv/CSVResponseStreamWriter.java b/src/main/java/ch/psi/daq/queryrest/response/csv/CSVResponseStreamWriter.java index aa764eb..89233f6 100644 --- a/src/main/java/ch/psi/daq/queryrest/response/csv/CSVResponseStreamWriter.java +++ b/src/main/java/ch/psi/daq/queryrest/response/csv/CSVResponseStreamWriter.java @@ -28,6 +28,7 @@ import org.supercsv.prefs.CsvPreference; import com.fasterxml.jackson.core.JsonEncoding; import ch.psi.daq.domain.DataEvent; +import ch.psi.daq.domain.json.ChannelName; import ch.psi.daq.query.analyzer.QueryAnalyzer; import ch.psi.daq.query.model.Aggregation; import ch.psi.daq.query.model.Query; @@ -35,7 +36,6 @@ import ch.psi.daq.query.model.QueryField; import ch.psi.daq.query.model.ResponseOptions; import ch.psi.daq.query.model.impl.BackendQuery; import ch.psi.daq.query.model.impl.DAQQueryElement; -import ch.psi.daq.query.request.ChannelName; import ch.psi.daq.queryrest.response.AbstractResponseStreamWriter; /** diff --git a/src/main/java/ch/psi/daq/queryrest/response/json/JSONResponseStreamWriter.java b/src/main/java/ch/psi/daq/queryrest/response/json/JSONResponseStreamWriter.java index 5ea08e9..70ab124 100644 --- a/src/main/java/ch/psi/daq/queryrest/response/json/JSONResponseStreamWriter.java +++ b/src/main/java/ch/psi/daq/queryrest/response/json/JSONResponseStreamWriter.java @@ -25,12 +25,12 @@ import com.fasterxml.jackson.databind.ObjectWriter; import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter; import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider; +import ch.psi.daq.domain.json.ChannelName; import ch.psi.daq.query.model.Aggregation; import ch.psi.daq.query.model.QueryField; import ch.psi.daq.query.model.ResponseOptions; import ch.psi.daq.query.model.impl.BackendQuery; import ch.psi.daq.query.model.impl.DAQQueryElement; -import ch.psi.daq.query.request.ChannelName; import ch.psi.daq.queryrest.response.AbstractResponseStreamWriter; /** diff --git a/src/test/java/ch/psi/daq/test/queryrest/controller/QueryRestControllerJsonTest.java b/src/test/java/ch/psi/daq/test/queryrest/controller/QueryRestControllerJsonTest.java index b7f1581..46b2011 100644 --- a/src/test/java/ch/psi/daq/test/queryrest/controller/QueryRestControllerJsonTest.java +++ b/src/test/java/ch/psi/daq/test/queryrest/controller/QueryRestControllerJsonTest.java @@ -15,13 +15,13 @@ import ch.psi.daq.cassandra.request.range.RequestRangePulseId; import ch.psi.daq.cassandra.request.range.RequestRangeTime; import ch.psi.daq.cassandra.util.test.CassandraDataGen; import ch.psi.daq.common.ordering.Ordering; +import ch.psi.daq.domain.json.ChannelName; import ch.psi.daq.domain.reader.Backend; import ch.psi.daq.query.model.AggregationType; import ch.psi.daq.query.model.Compression; import ch.psi.daq.query.model.impl.DAQQueries; import ch.psi.daq.query.model.impl.DAQQuery; import ch.psi.daq.query.model.impl.DAQQueryElement; -import ch.psi.daq.query.request.ChannelName; import ch.psi.daq.query.request.ChannelsRequest; import ch.psi.daq.queryrest.controller.QueryRestController; import ch.psi.daq.queryrest.filter.CorsFilter;