ITQC/gls_docs
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ATEST-109:

Browse Source 
- renaming packages in query project
This commit is contained in:
Zellweger Christof Ralf
2015-07-08 15:27:08 +02:00
parent 6d9ca551ce
commit 7fb05a65f3
6 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/ch/psi/daq/rest/controller/DaqRestController.java
View File

@ -26,10 +26,10 @@ import ch.psi.daq.cassandra.writer.CassandraWriter;
import ch.psi.daq.domain.DataType;
import ch.psi.daq.domain.cassandra.ChannelEvent;
import ch.psi.daq.domain.cassandra.DataEvent;
import ch.psi.daq.query.query.model.AbstractQuery;
import ch.psi.daq.query.query.model.PulseRangeQuery;
import ch.psi.daq.query.query.model.TimeRangeQuery;
import ch.psi.daq.query.query.processor.QueryProcessor;
import ch.psi.daq.query.model.AbstractQuery;
import ch.psi.daq.query.model.PulseRangeQuery;
import ch.psi.daq.query.model.TimeRangeQuery;
import ch.psi.daq.query.processor.QueryProcessor;
import ch.psi.daq.rest.response.ResponseStreamWriter;
@RestController

2
src/main/java/ch/psi/daq/rest/response/ResponseStreamWriter.java
View File

@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
import ch.psi.daq.domain.cassandra.DataEvent;
import ch.psi.daq.query.query.model.AbstractQuery;
import ch.psi.daq.query.model.AbstractQuery;
/**
* Takes a Java 8 stream and writes it to the output stream provided by the {@link ServletResponse}

12
src/test/java/ch/psi/daq/test/rest/controller/DaqRestControllerTest.java
View File

@ -15,12 +15,12 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import ch.psi.daq.cassandra.reader.Ordering;
import ch.psi.daq.query.query.model.AggregationType;
import ch.psi.daq.query.query.model.BinningStrategyEnum;
import ch.psi.daq.query.query.model.PulseRangeQuery;
import ch.psi.daq.query.query.model.TimeRangeQuery;
import ch.psi.daq.query.query.range.QueryRange;
import ch.psi.daq.query.query.range.QueryRangeImpl;
import ch.psi.daq.query.model.AggregationType;
import ch.psi.daq.query.model.BinningStrategyEnum;
import ch.psi.daq.query.model.PulseRangeQuery;
import ch.psi.daq.query.model.TimeRangeQuery;
import ch.psi.daq.query.range.QueryRange;
import ch.psi.daq.query.range.QueryRangeImpl;
import ch.psi.daq.test.rest.AbstractDaqRestTest;
/**

16
src/test/java/ch/psi/daq/test/rest/queries/AbstractQueryTestTest.java
View File

@ -12,14 +12,14 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import ch.psi.daq.cassandra.reader.Ordering;
import ch.psi.daq.query.query.bin.BinningStrategyBinCount;
import ch.psi.daq.query.query.bin.BinningStrategyLengthPulse;
import ch.psi.daq.query.query.bin.BinningStrategyLengthTime;
import ch.psi.daq.query.query.model.AggregationType;
import ch.psi.daq.query.query.model.BinningStrategyEnum;
import ch.psi.daq.query.query.model.TimeRangeQuery;
import ch.psi.daq.query.query.range.QueryRange;
import ch.psi.daq.query.query.range.QueryRangeImpl;
import ch.psi.daq.query.bin.BinningStrategyBinCount;
import ch.psi.daq.query.bin.BinningStrategyLengthPulse;
import ch.psi.daq.query.bin.BinningStrategyLengthTime;
import ch.psi.daq.query.model.AggregationType;
import ch.psi.daq.query.model.BinningStrategyEnum;
import ch.psi.daq.query.model.TimeRangeQuery;
import ch.psi.daq.query.range.QueryRange;
import ch.psi.daq.query.range.QueryRangeImpl;
@RunWith(BlockJUnit4ClassRunner.class)
public class AbstractQueryTestTest extends AbstractQueryTest {

10
src/test/java/ch/psi/daq/test/rest/queries/TimeRangeQueryTest.java
View File

@ -12,11 +12,11 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import ch.psi.daq.cassandra.reader.Ordering;
import ch.psi.daq.query.query.model.AggregationType;
import ch.psi.daq.query.query.model.BinningStrategyEnum;
import ch.psi.daq.query.query.model.TimeRangeQuery;
import ch.psi.daq.query.query.range.QueryRange;
import ch.psi.daq.query.query.range.QueryRangeImpl;
import ch.psi.daq.query.model.AggregationType;
import ch.psi.daq.query.model.BinningStrategyEnum;
import ch.psi.daq.query.model.TimeRangeQuery;
import ch.psi.daq.query.range.QueryRange;
import ch.psi.daq.query.range.QueryRangeImpl;
@RunWith(BlockJUnit4ClassRunner.class)
public class TimeRangeQueryTest extends AbstractQueryTest {

4
src/test/java/ch/psi/daq/test/rest/query/DummyQueryProcessor.java
View File

@ -15,8 +15,8 @@ import com.google.common.collect.Maps;
import ch.psi.daq.domain.cassandra.ChannelEvent;
import ch.psi.daq.domain.cassandra.DataEvent;
import ch.psi.daq.query.query.model.Query;
import ch.psi.daq.query.query.processor.QueryProcessor;
import ch.psi.daq.query.model.Query;
import ch.psi.daq.query.processor.QueryProcessor;
/**
* @author zellweger_c