From 8c363bacd6e521f27290934ed7d55de72459715b Mon Sep 17 00:00:00 2001 From: Zellweger Christof Ralf Date: Wed, 8 Jul 2015 16:18:47 +0200 Subject: [PATCH] ATEST-109: - renaming rest to queryrest --- .project | 2 +- build.gradle | 2 +- settings.gradle | 2 +- .../QueryRestApplication.java} | 8 ++++---- .../config/QueryRestConfig.java} | 8 ++++---- .../controller/QueryRestController.java} | 8 ++++---- .../{rest => queryrest}/model/PropertyFilterMixin.java | 2 +- .../response/ResponseStreamWriter.java | 2 +- .../java/ch/psi/daq/test/rest/AbstractDaqRestTest.java | 4 ++-- src/test/java/ch/psi/daq/test/rest/DaqWebMvcConfig.java | 4 ++-- .../psi/daq/test/rest/queries/AbstractQueryTestTest.java | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) rename src/main/java/ch/psi/daq/{rest/RestApplication.java => queryrest/QueryRestApplication.java} (73%) rename src/main/java/ch/psi/daq/{rest/config/RestConfig.java => queryrest/config/QueryRestConfig.java} (93%) rename src/main/java/ch/psi/daq/{rest/controller/DaqRestController.java => queryrest/controller/QueryRestController.java} (96%) rename src/main/java/ch/psi/daq/{rest => queryrest}/model/PropertyFilterMixin.java (79%) rename src/main/java/ch/psi/daq/{rest => queryrest}/response/ResponseStreamWriter.java (99%) diff --git a/.project b/.project index 3a3b8a1..08328ec 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - ch.psi.daq.rest + ch.psi.daq.queryrest diff --git a/build.gradle b/build.gradle index 33ebb31..892a06b 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ dependencies { uploadArchives { repositories { - mavenDeployer { pom.artifactId = 'rest' } + mavenDeployer { pom.artifactId = 'queryrest' } } } diff --git a/settings.gradle b/settings.gradle index 85ed6d8..510253e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -rootProject.name = 'rest' \ No newline at end of file +rootProject.name = 'queryrest' \ No newline at end of file diff --git a/src/main/java/ch/psi/daq/rest/RestApplication.java b/src/main/java/ch/psi/daq/queryrest/QueryRestApplication.java similarity index 73% rename from src/main/java/ch/psi/daq/rest/RestApplication.java rename to src/main/java/ch/psi/daq/queryrest/QueryRestApplication.java index f61fce4..142d6f1 100644 --- a/src/main/java/ch/psi/daq/rest/RestApplication.java +++ b/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); } } diff --git a/src/main/java/ch/psi/daq/rest/config/RestConfig.java b/src/main/java/ch/psi/daq/queryrest/config/QueryRestConfig.java similarity index 93% rename from src/main/java/ch/psi/daq/rest/config/RestConfig.java rename to src/main/java/ch/psi/daq/queryrest/config/QueryRestConfig.java index 643c997..6608ef8 100644 --- a/src/main/java/ch/psi/daq/rest/config/RestConfig.java +++ b/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; diff --git a/src/main/java/ch/psi/daq/rest/controller/DaqRestController.java b/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java similarity index 96% rename from src/main/java/ch/psi/daq/rest/controller/DaqRestController.java rename to src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java index f629eed..4bd8cc1 100644 --- a/src/main/java/ch/psi/daq/rest/controller/DaqRestController.java +++ b/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; diff --git a/src/main/java/ch/psi/daq/rest/model/PropertyFilterMixin.java b/src/main/java/ch/psi/daq/queryrest/model/PropertyFilterMixin.java similarity index 79% rename from src/main/java/ch/psi/daq/rest/model/PropertyFilterMixin.java rename to src/main/java/ch/psi/daq/queryrest/model/PropertyFilterMixin.java index e6faa41..62a1af0 100644 --- a/src/main/java/ch/psi/daq/rest/model/PropertyFilterMixin.java +++ b/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; diff --git a/src/main/java/ch/psi/daq/rest/response/ResponseStreamWriter.java b/src/main/java/ch/psi/daq/queryrest/response/ResponseStreamWriter.java similarity index 99% rename from src/main/java/ch/psi/daq/rest/response/ResponseStreamWriter.java rename to src/main/java/ch/psi/daq/queryrest/response/ResponseStreamWriter.java index 6979633..d0b4d47 100644 --- a/src/main/java/ch/psi/daq/rest/response/ResponseStreamWriter.java +++ b/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; diff --git a/src/test/java/ch/psi/daq/test/rest/AbstractDaqRestTest.java b/src/test/java/ch/psi/daq/test/rest/AbstractDaqRestTest.java index 82453ca..0ced6f8 100644 --- a/src/test/java/ch/psi/daq/test/rest/AbstractDaqRestTest.java +++ b/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 diff --git a/src/test/java/ch/psi/daq/test/rest/DaqWebMvcConfig.java b/src/test/java/ch/psi/daq/test/rest/DaqWebMvcConfig.java index b5254c4..9af2f6f 100644 --- a/src/test/java/ch/psi/daq/test/rest/DaqWebMvcConfig.java +++ b/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 { diff --git a/src/test/java/ch/psi/daq/test/rest/queries/AbstractQueryTestTest.java b/src/test/java/ch/psi/daq/test/rest/queries/AbstractQueryTestTest.java index f36d166..4c5b8ea 100644 --- a/src/test/java/ch/psi/daq/test/rest/queries/AbstractQueryTestTest.java +++ b/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