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

Use new query structure.

Browse Source
This commit is contained in:
Fabian Märki
2015-07-14 15:11:43 +02:00
parent 7518010d9b
commit 11e931c8e3
4 changed files with 70 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/ch/psi/daq/queryrest/config/QueryRestConfig.java
View File

@ -1,7 +1,6 @@
package ch.psi.daq.queryrest.config;
import java.util.Arrays;
import java.util.List;
import java.util.LinkedHashSet;
import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired;
@ -15,7 +14,6 @@ import org.springframework.util.StringUtils;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Sets;
import ch.psi.daq.common.statistic.StorelessStatistics;
import ch.psi.daq.domain.cassandra.ChannelEvent;
@ -64,12 +62,14 @@ public class QueryRestConfig {
}
@Bean
private Set<String> defaultResponseFields() {
List<String> defaultFields = Arrays.asList(
StringUtils.commaDelimitedListToStringArray(
env.getProperty("queryrest.default.response.fields")
));
Set<String> defaultResponseFields = Sets.newHashSet(defaultFields.iterator());
public Set<String> defaultResponseFields() {
String[] responseFields = StringUtils.commaDelimitedListToStringArray(env.getProperty("queryrest.default.response.fields"));
// preserve order
LinkedHashSet<String> defaultResponseFields = new LinkedHashSet<>(responseFields.length);
for (String field : defaultResponseFields) {
defaultResponseFields.add(field);
}
return defaultResponseFields;
}
}

21
src/main/java/ch/psi/daq/queryrest/response/ResponseStreamWriter.java
View File

@ -1,11 +1,8 @@
/**
*
*/
package ch.psi.daq.queryrest.response;
import java.io.IOException;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.servlet.ServletResponse;
@ -24,6 +21,7 @@ import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
import ch.psi.daq.domain.cassandra.DataEvent;
import ch.psi.daq.query.model.AbstractQuery;
import ch.psi.daq.query.model.AggregationEnum;
/**
* Takes a Java 8 stream and writes it to the output stream provided by the {@link ServletResponse}
@ -41,6 +39,7 @@ public class ResponseStreamWriter {
@Autowired
private Set<String> defaultResponseFields;
/**
* Responding with the the contents of the stream by writing into the output stream of the
* {@link ServletResponse}.
@ -52,17 +51,13 @@ public class ResponseStreamWriter {
*/
public void respond(Stream<DataEvent> stream, AbstractQuery query, ServletResponse response) throws IOException {
Set<String> includedFields = query.getFields();
if (includedFields == null) {
includedFields = defaultResponseFields;
}
Set<String> includedFields = query.getFieldsOrDefault(defaultResponseFields);
if (query.getAggregations() != null) {
includedFields.addAll(query.getAggregations()
.stream()
.map(a -> {
return a.getType().toString();
}).collect(Collectors.toSet()));
includedFields = new LinkedHashSet<String>(includedFields);
for (AggregationEnum aggregation : query.getAggregations()) {
includedFields.add(aggregation.name());
}
}
ObjectWriter writer = configureWriter(includedFields);
respondInternal(stream, response, writer);

8
src/test/java/ch/psi/daq/test/queryrest/DaqWebMvcConfig.java
View File

@ -1,12 +1,15 @@
package ch.psi.daq.test.queryrest;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
import ch.psi.daq.query.processor.QueryProcessor;
import ch.psi.daq.queryrest.config.QueryRestConfig;
import ch.psi.daq.test.cassandra.config.LocalCassandraTestConfig;
import ch.psi.daq.test.queryrest.query.DummyQueryProcessor;
@Configuration
@Import(value = {LocalCassandraTestConfig.class, QueryRestConfig.class})
@ -14,4 +17,9 @@ import ch.psi.daq.test.cassandra.config.LocalCassandraTestConfig;
public class DaqWebMvcConfig extends WebMvcConfigurationSupport {
// add test-specific beans and configurations here
@Bean
public QueryProcessor queryProcessor() {
return new DummyQueryProcessor();
}
}

61
src/test/java/ch/psi/daq/test/queryrest/controller/DaqRestControllerTest.java
View File

@ -16,11 +16,8 @@ import com.google.common.collect.Sets;
import ch.psi.daq.cassandra.reader.Ordering;
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.queryrest.AbstractDaqRestTest;
/**
@ -32,17 +29,15 @@ public class DaqRestControllerTest extends AbstractDaqRestTest {
@Test
public void testPulseRangeQuery() throws Exception {
QueryRange range = new QueryRangeImpl(100l, 101l);
PulseRangeQuery request = new PulseRangeQuery(
Ordering.desc, //ordering
Lists.newArrayList(), // channels, DummyQueryProcessor simply returns a fixed list
Sets.newLinkedHashSet(DEFAULT_PROPERTIES), // fields
BinningStrategyEnum.count,
100,
false,
AggregationType.index,
null,
range);
101
);
request.setOrdering(Ordering.desc);
request.setFields(Sets.newLinkedHashSet(DEFAULT_PROPERTIES));
request.setNrOfBins(100);
request.setAggregateChannels(false);
request.setAggregationType(AggregationType.index);
String content = mapper.writeValueAsString(request);
@ -61,22 +56,18 @@ public class DaqRestControllerTest extends AbstractDaqRestTest {
@Test
public void testTimeRangeQuery() throws Exception {
long startTime = new Date().getTime();
long endTime = startTime + TimeUnit.SECONDS.toMillis(1);
QueryRange range = new QueryRangeImpl(startTime, 0, endTime, 0);
TimeRangeQuery request = new TimeRangeQuery(
Ordering.asc,
Lists.newArrayList("test"),
Sets.newLinkedHashSet(DEFAULT_PROPERTIES),
BinningStrategyEnum.count,
100,
false,
AggregationType.index,
null, // aggregations
range,
null, // startMillis
null);
startTime,
endTime,
"test");
request.setOrdering(Ordering.asc);
request.setFields(Sets.newLinkedHashSet(DEFAULT_PROPERTIES));
request.setNrOfBins(100);
request.setAggregateChannels(false);
request.setAggregationType(AggregationType.index);
String content = mapper.writeValueAsString(request);
System.out.println(content);
@ -97,19 +88,15 @@ public class DaqRestControllerTest extends AbstractDaqRestTest {
public void testMapper() throws JsonProcessingException {
long startTime = new Date().getTime();
long endTime = startTime + TimeUnit.SECONDS.toMillis(1);
QueryRange range = new QueryRangeImpl(startTime, 0, endTime, 0);
TimeRangeQuery request = new TimeRangeQuery(
Ordering.asc,
Lists.newArrayList("test"),
Sets.newLinkedHashSet(DEFAULT_PROPERTIES),
BinningStrategyEnum.count,
100,
false,
AggregationType.index,
null, // aggregations
range,
null, // startMillis
null);
startTime,
endTime,
"test");
request.setOrdering(Ordering.asc);
request.setFields(Sets.newLinkedHashSet(DEFAULT_PROPERTIES));
request.setNrOfBins(100);
request.setAggregateChannels(false);
request.setAggregationType(AggregationType.index);
String content = mapper.writeValueAsString(request);
System.out.println(content);