From b3f7cb51aecac2d601643def5e97e2575218b069 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=A4rki?= <fabian.maerki@psi.ch>
Date: Thu, 3 Dec 2015 11:22:59 +0100
Subject: [PATCH] Extract String to Set transformation.

---
 .../psi/daq/queryrest/filter/CorsFilter.java  | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/java/ch/psi/daq/queryrest/filter/CorsFilter.java b/src/main/java/ch/psi/daq/queryrest/filter/CorsFilter.java
index 003b7d3..964f242 100644
--- a/src/main/java/ch/psi/daq/queryrest/filter/CorsFilter.java
+++ b/src/main/java/ch/psi/daq/queryrest/filter/CorsFilter.java
@@ -2,10 +2,10 @@ package ch.psi.daq.queryrest.filter;
 
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import javax.annotation.PostConstruct;
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -24,17 +24,18 @@ public class CorsFilter extends OncePerRequestFilter {
    @Value("${queryrest.cors.forceallheaders}")
    private boolean forceAllHeaders;
    
+   private Set<String> allowedOrigins;
+   
+   @PostConstruct
+   public void afterPropertiesSet(){     
+      allowedOrigins = Arrays.stream(configuredOrigins.split(","))
+            .map(s -> s.trim())
+            .collect(Collectors.toSet());
+   }
 
    @Override
    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
-         throws ServletException, IOException {
-
-      Set<String> allowedOrigins = new HashSet<String>(Arrays.asList(configuredOrigins.split(","))
-            .stream()
-            .map(s -> {
-               return s.trim(); })
-            .collect(Collectors.toList()));
-      
+         throws ServletException, IOException {     
       String originHeader = request.getHeader("Origin");
       if (forceAllHeaders) {
          // include headers no matter what - good for development