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

ATEST-81:

Browse Source 
- renaming package in hazelcast project
This commit is contained in:
Zellweger Christof Ralf
2015-06-22 12:52:30 +02:00
parent 4f6ceccd68
commit c51db19001
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ import org.springframework.context.annotation.Configuration;
import ch.psi.daq.common.statistic.StorelessStatistics;
import ch.psi.daq.domain.cassandra.ChannelEvent;
import ch.psi.daq.hazelcast.common.query.processor.QueryProcessor;
import ch.psi.daq.hazelcast.query.processor.QueryProcessor;
import ch.psi.daq.rest.model.PropertyFilterMixin;
import ch.psi.daq.test.rest.query.DummyQueryProcessor;

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

@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import ch.psi.daq.domain.cassandra.DataEvent;
import ch.psi.daq.hazelcast.common.query.processor.QueryProcessor;
import ch.psi.daq.hazelcast.query.processor.QueryProcessor;
import ch.psi.daq.rest.queries.AbstractQuery;
import ch.psi.daq.rest.queries.PulseRangeQuery;
import ch.psi.daq.rest.queries.TimeRangeQuery;

8
src/main/java/ch/psi/daq/rest/queries/AbstractQuery.java
View File

@ -8,10 +8,10 @@ import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
import org.springframework.util.Assert;
import ch.psi.daq.cassandra.reader.Ordering;
import ch.psi.daq.hazelcast.common.query.Aggregation;
import ch.psi.daq.hazelcast.common.query.AggregationType;
import ch.psi.daq.hazelcast.common.query.Query;
import ch.psi.daq.hazelcast.common.query.bin.BinIntervalCalculator;
import ch.psi.daq.hazelcast.query.Aggregation;
import ch.psi.daq.hazelcast.query.AggregationType;
import ch.psi.daq.hazelcast.query.Query;
import ch.psi.daq.hazelcast.query.bin.BinIntervalCalculator;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;

6
src/main/java/ch/psi/daq/rest/queries/PulseRangeQuery.java
View File

@ -6,9 +6,9 @@ import java.util.List;
import org.apache.commons.lang.builder.ToStringBuilder;
import ch.psi.daq.cassandra.reader.Ordering;
import ch.psi.daq.hazelcast.common.query.Aggregation;
import ch.psi.daq.hazelcast.common.query.AggregationType;
import ch.psi.daq.hazelcast.common.query.range.QueryRange;
import ch.psi.daq.hazelcast.query.Aggregation;
import ch.psi.daq.hazelcast.query.AggregationType;
import ch.psi.daq.hazelcast.query.range.QueryRange;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;

6
src/main/java/ch/psi/daq/rest/queries/TimeRangeQuery.java
View File

@ -13,9 +13,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ch.psi.daq.cassandra.reader.Ordering;
import ch.psi.daq.hazelcast.common.query.Aggregation;
import ch.psi.daq.hazelcast.common.query.AggregationType;
import ch.psi.daq.hazelcast.common.query.range.QueryRange;
import ch.psi.daq.hazelcast.query.Aggregation;
import ch.psi.daq.hazelcast.query.AggregationType;
import ch.psi.daq.hazelcast.query.range.QueryRange;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;

2
src/test/java/ch/psi/daq/test/rest/controller/DaqControllerTest.java
View File

@ -11,7 +11,7 @@ import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
import ch.psi.daq.cassandra.reader.Ordering;
import ch.psi.daq.hazelcast.common.query.AggregationType;
import ch.psi.daq.hazelcast.query.AggregationType;
import ch.psi.daq.rest.queries.PulseRangeQuery;
import ch.psi.daq.rest.queries.TimeRangeQuery;
import ch.psi.daq.test.rest.AbstractDaqRestTest;

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

@ -12,8 +12,8 @@ import java.util.stream.Stream;
import ch.psi.daq.domain.cassandra.ChannelEvent;
import ch.psi.daq.domain.cassandra.DataEvent;
import ch.psi.daq.hazelcast.common.query.Query;
import ch.psi.daq.hazelcast.common.query.processor.QueryProcessor;
import ch.psi.daq.hazelcast.query.Query;
import ch.psi.daq.hazelcast.query.processor.QueryProcessor;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;