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

Log loaded values in config

Browse Source 
Add/remove / in REST interface.
This commit is contained in:
Fabian Märki
2015-08-10 17:28:15 +02:00
parent c751aab8de
commit 776c8135e5
4 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ch/psi/daq/queryrest/config/QueryRestConfig.java
+5
View File
@@ -1,5 +1,6 @@
package ch.psi.daq.queryrest.config;
import java.util.Arrays;
import java.util.EnumMap;
import java.util.LinkedHashSet;
import java.util.List;
@@ -131,6 +132,8 @@ public class QueryRestConfig extends WebMvcConfigurerAdapter {
public Set<QueryField> defaultResponseFields() {
String[] responseFields =
StringUtils.commaDelimitedListToStringArray(env.getProperty(QUERYREST_DEFAULT_RESPONSE_FIELDS));
LOGGER.debug("Load '{}={}'", BEAN_NAME_DEFAULT_RESPONSE_FIELDS, Arrays.toString(responseFields));
// preserve order
LinkedHashSet<QueryField> defaultResponseFields = new LinkedHashSet<>(responseFields.length);
for (String field : responseFields) {
@@ -148,6 +151,8 @@ public class QueryRestConfig extends WebMvcConfigurerAdapter {
public Set<Aggregation> defaultResponseAggregations() {
String[] responseAggregations =
StringUtils.commaDelimitedListToStringArray(env.getProperty(QUERYREST_DEFAULT_RESPONSE_AGGREGATIONS));
LOGGER.debug("Load '{}={}'", BEAN_NAME_DEFAULT_RESPONSE_AGGREGATIONS, Arrays.toString(responseAggregations));
// preserve order
LinkedHashSet<Aggregation> defaultResponseAggregations = new LinkedHashSet<>(responseAggregations.length);
for (String aggregation : responseAggregations) {
src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java
+9 -7
View File
@@ -70,11 +70,13 @@ public class QueryRestController {
@InitBinder
protected void initBinder(WebDataBinder binder) {
if (requestProviderValidator.supports(binder.getTarget().getClass())) {
binder.addValidators(requestProviderValidator);
}
if (queryValidator.supports(binder.getTarget().getClass())) {
binder.addValidators(queryValidator);
if (binder.getTarget() != null) {
if (requestProviderValidator.supports(binder.getTarget().getClass())) {
binder.addValidators(requestProviderValidator);
}
if (queryValidator.supports(binder.getTarget().getClass())) {
binder.addValidators(queryValidator);
}
}
}
@@ -159,7 +161,7 @@ public class QueryRestController {
i -> 0,
i -> new long[] {nrOfElements - i, nrOfElements - i, nrOfElements - i, nrOfElements - i},
"TRFCA-channel2");
cassandraDataGen.writeData(3, 0, 4,
i -> i,
i -> 0,
@@ -168,7 +170,7 @@ public class QueryRestController {
i -> 0,
i -> i,
"TRFCB-channel3");
cassandraDataGen.writeData(3, 0, 4,
i -> i,
i -> 0,