From 84c66ad73feeea4f5d12161d7c7032e0a1e56283 Mon Sep 17 00:00:00 2001
From: Zellweger Christof Ralf <christof.zellweger@psi.ch>
Date: Tue, 22 Dec 2015 13:20:47 +0100
Subject: [PATCH] sf_daq/ch.psi.daq.queryrest#1: - adjustments after moving
 classes

---
 .../ch/psi/daq/queryrest/controller/QueryRestController.java  | 2 +-
 .../daq/queryrest/response/AbstractResponseStreamWriter.java  | 2 +-
 .../test/queryrest/controller/QueryRestControllerCsvTest.java | 4 ++--
 .../queryrest/controller/QueryRestControllerJsonTest.java     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

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 ea02349..18ebfe5 100644
--- a/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java
+++ b/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java
@@ -31,7 +31,6 @@ import ch.psi.daq.common.concurrent.singleton.Deferred;
 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.ResponseFormat;
 import ch.psi.daq.query.analyzer.QueryAnalyzer;
 import ch.psi.daq.query.config.QueryConfig;
 import ch.psi.daq.query.model.Aggregation;
@@ -39,6 +38,7 @@ import ch.psi.daq.query.model.AggregationType;
 import ch.psi.daq.query.model.DBMode;
 import ch.psi.daq.query.model.Query;
 import ch.psi.daq.query.model.QueryField;
+import ch.psi.daq.query.model.ResponseFormat;
 import ch.psi.daq.query.model.impl.DAQQuery;
 import ch.psi.daq.query.processor.QueryProcessor;
 import ch.psi.daq.query.request.ChannelsRequest;
diff --git a/src/main/java/ch/psi/daq/queryrest/response/AbstractResponseStreamWriter.java b/src/main/java/ch/psi/daq/queryrest/response/AbstractResponseStreamWriter.java
index 45bea43..a1f42f6 100644
--- a/src/main/java/ch/psi/daq/queryrest/response/AbstractResponseStreamWriter.java
+++ b/src/main/java/ch/psi/daq/queryrest/response/AbstractResponseStreamWriter.java
@@ -9,7 +9,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.http.MediaType;
 
-import ch.psi.daq.domain.ResponseFormat;
+import ch.psi.daq.query.model.ResponseFormat;
 import ch.psi.daq.query.model.impl.DAQQuery;
 
 
diff --git a/src/test/java/ch/psi/daq/test/queryrest/controller/QueryRestControllerCsvTest.java b/src/test/java/ch/psi/daq/test/queryrest/controller/QueryRestControllerCsvTest.java
index d3f7ec2..9700f38 100644
--- a/src/test/java/ch/psi/daq/test/queryrest/controller/QueryRestControllerCsvTest.java
+++ b/src/test/java/ch/psi/daq/test/queryrest/controller/QueryRestControllerCsvTest.java
@@ -29,11 +29,11 @@ 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.Compression;
-import ch.psi.daq.domain.ResponseFormat;
 import ch.psi.daq.query.model.Aggregation;
 import ch.psi.daq.query.model.AggregationType;
+import ch.psi.daq.query.model.Compression;
 import ch.psi.daq.query.model.QueryField;
+import ch.psi.daq.query.model.ResponseFormat;
 import ch.psi.daq.query.model.impl.DAQQuery;
 import ch.psi.daq.queryrest.controller.QueryRestController;
 import ch.psi.daq.queryrest.filter.CorsFilter;
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 2d3ee83..051fb3f 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,8 +15,8 @@ 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.Compression;
 import ch.psi.daq.query.model.AggregationType;
+import ch.psi.daq.query.model.Compression;
 import ch.psi.daq.query.model.impl.DAQQuery;
 import ch.psi.daq.queryrest.controller.QueryRestController;
 import ch.psi.daq.queryrest.filter.CorsFilter;