ATEST-259:

- clean up, improving naming

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

@@ -13,6 +13,7 @@ import javax.servlet.Filter;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -181,12 +182,8 @@ public class QueryRestConfig extends WebMvcConfigurerAdapter {
       return new QueryValidator();
    }
 
-//   @Bean
-//   public Filter regexCORSFilter() {
-//      return new RegexCORSFilter();
-//   }
-   
    @Bean
+   @ConditionalOnProperty("queryrest.cors.enable")
    public Filter corsFilter() {
       return new CorsFilter();
    }