Merge branch 'master' of git@git.psi.ch:sf_daq/ch.psi.daq.queryrest.git

This commit is contained in:
Fabian Märki
2016-04-11 14:55:09 +02:00

View File

@ -352,6 +352,16 @@ public class QueryRestController {
return Lists.newArrayList(Ordering.values());
}
/**
* Returns the current list of {@link ResponseFormat}s available.
*
* @return list of {@link Ordering}s as String array
*/
@RequestMapping(value = "responseformat", method = {RequestMethod.GET}, produces = {MediaType.APPLICATION_JSON_VALUE})
public @ResponseBody List<ResponseFormat> getResponseFormatValues() {
return Lists.newArrayList(ResponseFormat.values());
}
/**
* Returns the current list of {@link QueryField}s available.
*