comments

indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexerFilter.java

 
 package org.opengroup.osdu.indexer.util;
 
-import java.io.IOException;
-import java.util.Map;
+import lombok.extern.java.Log;
+import org.opengroup.osdu.core.common.http.ResponseHeadersFactory;
+import org.opengroup.osdu.core.common.model.http.DpsHeaders;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
@@ -10,27 +15,23 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletResponse;
-import lombok.extern.java.Log;
-import org.opengroup.osdu.core.common.http.ResponseHeadersFactory;
-import org.opengroup.osdu.core.common.model.http.DpsHeaders;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
+import java.io.IOException;
+import java.util.Map;
 
 @Log
 @Component
 public class IndexerFilter implements Filter {
 
+    // defaults to * for any front-end, string must be comma-delimited if more than one domain
+    private final String accessControlAllowOriginDomains;
+
     private final DpsHeaders dpsHeaders;
     private ResponseHeadersFactory responseHeadersFactory = new ResponseHeadersFactory();
 
-    // defaults to * for any front-end, string must be comma-delimited if more than one domain
-    @Value("${ACCESS_CONTROL_ALLOW_ORIGIN_DOMAINS:*}")
-    String ACCESS_CONTROL_ALLOW_ORIGIN_DOMAINS;
-
     @Autowired
-    public IndexerFilter(DpsHeaders dpsHeaders) {
+    public IndexerFilter(DpsHeaders dpsHeaders, @Value("${ACCESS_CONTROL_ALLOW_ORIGIN_DOMAINS:*}") final String accessControlAllowOriginDomains) {
         this.dpsHeaders = dpsHeaders;
+        this.accessControlAllowOriginDomains = accessControlAllowOriginDomains;
     }
 
     @Override
@@ -52,7 +53,7 @@ public class IndexerFilter implements Filter {
     }
 
     private void setResponseHeaders(HttpServletResponse httpServletResponse) {
-        Map<String, String> responseHeaders = responseHeadersFactory.getResponseHeaders(ACCESS_CONTROL_ALLOW_ORIGIN_DOMAINS);
+        Map<String, String> responseHeaders = responseHeadersFactory.getResponseHeaders(accessControlAllowOriginDomains);
         for (Map.Entry<String, String> header : responseHeaders.entrySet()) {
             httpServletResponse.addHeader(header.getKey(), header.getValue());
         }
@@ -62,5 +63,4 @@ public class IndexerFilter implements Filter {
     @Override
     public void destroy() {
     }
-
 }