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

ATEST-109:

Browse Source 
- renaming hazelcast to query
This commit is contained in:
Zellweger Christof Ralf
2015-07-08 14:30:55 +02:00
parent 749904b747
commit fa78ce234c
10 changed files with 30 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.project
View File

@ -5,11 +5,6 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
@ -25,6 +20,5 @@
<nature>org.springframework.ide.eclipse.core.springnature</nature>
<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures>
</projectDescription>

2
.settings/org.eclipse.jdt.core.prefs
View File

@ -1,5 +1,5 @@
#
#Fri Jun 26 16:19:32 CEST 2015
#Wed Jul 08 14:23:53 CEST 2015
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

2
build.gradle
View File

@ -23,7 +23,7 @@ applicationDefaultJvmArgs = [
//}
dependencies {
compile (project(':ch.psi.daq.hazelcast'))
compile (project(':ch.psi.daq.query'))
compile libraries.spring_boot_starter_web
compile libraries.commons_lang

4
src/main/java/ch/psi/daq/rest/config/RestConfig.java
View File

@ -19,8 +19,8 @@ import com.google.common.collect.Sets;
import ch.psi.daq.common.statistic.StorelessStatistics;
import ch.psi.daq.domain.cassandra.ChannelEvent;
import ch.psi.daq.hazelcast.config.HazelcastClientConfig;
import ch.psi.daq.hazelcast.config.HazelcastConfig;
import ch.psi.daq.query.config.HazelcastClientConfig;
import ch.psi.daq.query.config.HazelcastConfig;
import ch.psi.daq.rest.model.PropertyFilterMixin;
import ch.psi.daq.rest.response.ResponseStreamWriter;

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.hazelcast.query.AbstractQuery;
import ch.psi.daq.hazelcast.query.PulseRangeQuery;
import ch.psi.daq.hazelcast.query.TimeRangeQuery;
import ch.psi.daq.hazelcast.query.processor.QueryProcessor;
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.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.hazelcast.query.AbstractQuery;
import ch.psi.daq.query.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.hazelcast.query.AggregationType;
import ch.psi.daq.hazelcast.query.BinningStrategyEnum;
import ch.psi.daq.hazelcast.query.PulseRangeQuery;
import ch.psi.daq.hazelcast.query.TimeRangeQuery;
import ch.psi.daq.hazelcast.query.range.QueryRange;
import ch.psi.daq.hazelcast.query.range.QueryRangeImpl;
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.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.hazelcast.query.AggregationType;
import ch.psi.daq.hazelcast.query.BinningStrategyEnum;
import ch.psi.daq.hazelcast.query.TimeRangeQuery;
import ch.psi.daq.hazelcast.query.bin.BinningStrategyBinCount;
import ch.psi.daq.hazelcast.query.bin.BinningStrategyLengthPulse;
import ch.psi.daq.hazelcast.query.bin.BinningStrategyLengthTime;
import ch.psi.daq.hazelcast.query.range.QueryRange;
import ch.psi.daq.hazelcast.query.range.QueryRangeImpl;
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;
@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.hazelcast.query.AggregationType;
import ch.psi.daq.hazelcast.query.BinningStrategyEnum;
import ch.psi.daq.hazelcast.query.TimeRangeQuery;
import ch.psi.daq.hazelcast.query.range.QueryRange;
import ch.psi.daq.hazelcast.query.range.QueryRangeImpl;
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;
@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.hazelcast.query.Query;
import ch.psi.daq.hazelcast.query.processor.QueryProcessor;
import ch.psi.daq.query.query.model.Query;
import ch.psi.daq.query.query.processor.QueryProcessor;
/**
* @author zellweger_c