ATEST-109:

- renaming rest to queryrest
This commit is contained in:
Zellweger Christof Ralf
2015-07-08 16:18:47 +02:00
parent 7fb05a65f3
commit 8c363bacd6
11 changed files with 22 additions and 22 deletions
@@ -1,4 +1,4 @@
package ch.psi.daq.rest;
package ch.psi.daq.queryrest;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -10,16 +10,16 @@ import org.springframework.boot.context.web.SpringBootServletInitializer;
* wires all the @RestController annotated classes.
*/
@SpringBootApplication
public class RestApplication extends SpringBootServletInitializer {
public class QueryRestApplication extends SpringBootServletInitializer {
public static void main(final String[] args) {
SpringApplication.run(RestApplication.class, args);
SpringApplication.run(QueryRestApplication.class, args);
}
@Override
protected final SpringApplicationBuilder configure(final SpringApplicationBuilder application) {
return application.sources(RestApplication.class);
return application.sources(QueryRestApplication.class);
}
}
@@ -1,4 +1,4 @@
package ch.psi.daq.rest.config;
package ch.psi.daq.queryrest.config;
import java.util.Arrays;
import java.util.List;
@@ -21,13 +21,13 @@ import ch.psi.daq.common.statistic.StorelessStatistics;
import ch.psi.daq.domain.cassandra.ChannelEvent;
import ch.psi.daq.query.config.QueryClientConfig;
import ch.psi.daq.query.config.QueryConfig;
import ch.psi.daq.rest.model.PropertyFilterMixin;
import ch.psi.daq.rest.response.ResponseStreamWriter;
import ch.psi.daq.queryrest.model.PropertyFilterMixin;
import ch.psi.daq.queryrest.response.ResponseStreamWriter;
@Configuration
@PropertySource(value = {"classpath:rest.properties"})
@PropertySource(value = {"file:${user.home}/.config/daq/rest.properties"}, ignoreResourceNotFound = true)
public class RestConfig {
public class QueryRestConfig {
@Autowired
private Environment env;
@@ -1,4 +1,4 @@
package ch.psi.daq.rest.controller;
package ch.psi.daq.queryrest.controller;
import java.io.IOException;
import java.util.Arrays;
@@ -30,12 +30,12 @@ import ch.psi.daq.query.model.AbstractQuery;
import ch.psi.daq.query.model.PulseRangeQuery;
import ch.psi.daq.query.model.TimeRangeQuery;
import ch.psi.daq.query.processor.QueryProcessor;
import ch.psi.daq.rest.response.ResponseStreamWriter;
import ch.psi.daq.queryrest.response.ResponseStreamWriter;
@RestController
public class DaqRestController {
public class QueryRestController {
private static final Logger logger = LoggerFactory.getLogger(DaqRestController.class);
private static final Logger logger = LoggerFactory.getLogger(QueryRestController.class);
@Autowired
private CassandraWriter cassandraWriter;
@@ -1,4 +1,4 @@
package ch.psi.daq.rest.model;
package ch.psi.daq.queryrest.model;
import com.fasterxml.jackson.annotation.JsonFilter;
@@ -1,7 +1,7 @@
/**
*
*/
package ch.psi.daq.rest.response;
package ch.psi.daq.queryrest.response;
import java.io.IOException;
import java.util.Set;