ATEST-109:

- renaming rest to queryrest

.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ch.psi.daq.rest</name>
+	<name>ch.psi.daq.queryrest</name>
 	<comment></comment>
 	<projects>
 	</projects>

build.gradle

@@ -34,7 +34,7 @@ dependencies {
 
 uploadArchives {
    repositories {
-      mavenDeployer { pom.artifactId = 'rest' }
+      mavenDeployer { pom.artifactId = 'queryrest' }
    }
 }
 

settings.gradle

@@ -1 +1 @@
-rootProject.name = 'rest'
+rootProject.name = 'queryrest'

src/main/java/ch/psi/daq/queryrest/QueryRestApplication.java

@@ -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);
    }
 
 }

src/main/java/ch/psi/daq/queryrest/config/QueryRestConfig.java

@@ -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;

src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java

@@ -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;

src/main/java/ch/psi/daq/queryrest/model/PropertyFilterMixin.java

@@ -1,4 +1,4 @@
-package ch.psi.daq.rest.model;
+package ch.psi.daq.queryrest.model;
 
 import com.fasterxml.jackson.annotation.JsonFilter;
 

src/main/java/ch/psi/daq/queryrest/response/ResponseStreamWriter.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package ch.psi.daq.rest.response;
+package ch.psi.daq.queryrest.response;
 
 import java.io.IOException;
 import java.util.Set;

src/test/java/ch/psi/daq/test/rest/AbstractDaqRestTest.java

@@ -17,14 +17,14 @@ import org.springframework.web.context.WebApplicationContext;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import ch.psi.daq.rest.RestApplication;
+import ch.psi.daq.queryrest.QueryRestApplication;
 import ch.psi.daq.test.cassandra.CassandraDaqUnitDependencyInjectionTestExecutionListener;
 
 
 @TestExecutionListeners({
    CassandraDaqUnitDependencyInjectionTestExecutionListener.class,
    DependencyInjectionTestExecutionListener.class})
-@SpringApplicationConfiguration(classes = {RestApplication.class, DaqWebMvcConfig.class})
+@SpringApplicationConfiguration(classes = {QueryRestApplication.class, DaqWebMvcConfig.class})
 //@EmbeddedCassandra
 @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD)
 @WebAppConfiguration

src/test/java/ch/psi/daq/test/rest/DaqWebMvcConfig.java

@@ -5,11 +5,11 @@ 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.rest.config.RestConfig;
+import ch.psi.daq.queryrest.config.QueryRestConfig;
 import ch.psi.daq.test.cassandra.config.LocalCassandraTestConfig;
 
 @Configuration
-@Import(value = {LocalCassandraTestConfig.class, RestConfig.class})
+@Import(value = {LocalCassandraTestConfig.class, QueryRestConfig.class})
 @EnableWebMvc
 public class DaqWebMvcConfig extends WebMvcConfigurationSupport {
 

src/test/java/ch/psi/daq/test/rest/queries/AbstractQueryTestTest.java

@@ -57,7 +57,7 @@ public class AbstractQueryTestTest extends AbstractQueryTest {
       new TimeRangeQuery(
             Ordering.asc,
             Lists.newArrayList(),
-            null,
+            null,            // fields
             BinningStrategyEnum.count,
             100,             // binDurationOrBincount : long
             false,           // isAggregateChannels