[HippoCMS-scm] [Git][cms-community/hippo-cms-utilities][feature/webpack] CMS-10437 Make list of proxies static

[Mathijs den Burger]

Mathijs den Burger pushed to branch feature/webpack at cms-community / 
hippo-cms-utilities


Commits:
ac35e1cc by Mathijs den Burger at 2016-10-20T10:01:26+02:00
CMS-10437 Make list of proxies static

- - - - -


1 changed file:

- src/main/java/org/onehippo/cms7/utilities/servlet/ResourceServlet.java


Changes:

=====================================
src/main/java/org/onehippo/cms7/utilities/servlet/ResourceServlet.java
=====================================
--- a/src/main/java/org/onehippo/cms7/utilities/servlet/ResourceServlet.java
+++ b/src/main/java/org/onehippo/cms7/utilities/servlet/ResourceServlet.java
@@ -264,6 +264,8 @@ public class ResourceServlet extends HttpServlet {
         DEFAULT_COMPRESSED_MIME_TYPES.add(Pattern.compile("text/.*"));
     }
 
+    private static final Map<String, String> PROXIES = initProxies();
+
     private String jarPathPrefix;
     private boolean gzipEnabled;
     private boolean webResourceEnabled;
@@ -273,8 +275,6 @@ public class ResourceServlet extends HttpServlet {
     private Set<Pattern> compressedMimeTypes;
     private Map<String, String> mimeTypes;
 
-    private Map<String, String> proxies;
-
     @Override
     public void init() throws ServletException {
         if (getInitParameter("cacheTimeOut") != null) {
@@ -303,29 +303,6 @@ public class ResourceServlet extends HttpServlet {
                 }
             }
         }
-
-        final String proxiesAsString = 
System.getProperty(PROXIES_SYSTEM_PROPERTY);
-        proxies = new HashMap<>();
-        if (StringUtils.isNotBlank(proxiesAsString)) {
-            Arrays.stream(StringUtils.split(proxiesAsString, PROXY_SEPARATOR))
-                    .filter(StringUtils::isNotBlank)
-                    .map(proxyLine -> StringUtils.split(proxyLine, 
PROXY_FROM_TO_SEPARATOR))
-                    .forEach(fromTo -> {
-                        if (fromTo.length > 1) {
-                            final String from = "/" + 
StringUtils.trim(fromTo[0]) + "/";
-                            final String to = StringUtils.trim(fromTo[1]) + 
"/";
-                            proxies.put(from, to);
-                        }
-                    });
-        }
-
-        if (!proxies.isEmpty()) {
-            final List<String> messages = new ArrayList<>(proxies.size() + 1);
-            messages.add(PROXY_ENABLED_MESSAGE);
-            proxies.forEach((from, to) -> messages.add(String.format("from %s 
to %s", from, to)));
-
-            logBorderedMessage(messages);
-        }
     }
 
     @Override
@@ -352,7 +329,7 @@ public class ResourceServlet extends HttpServlet {
         long modifiedSince = 
request.getDateHeader(HTTP_IF_MODIFIED_SINCE_HEADER);
         final URLConnection conn = resource.openConnection();
 
-        if (!proxies.isEmpty() && conn instanceof HttpURLConnection) {
+        if (!PROXIES.isEmpty() && conn instanceof HttpURLConnection) {
 
             if (modifiedSince >= 0) {
                 conn.setIfModifiedSince(modifiedSince);
@@ -396,6 +373,33 @@ public class ResourceServlet extends HttpServlet {
         }
     }
 
+    private static Map<String, String> initProxies() {
+        final Map<String, String> proxies = new HashMap<>();
+        final String proxiesAsString = 
System.getProperty(PROXIES_SYSTEM_PROPERTY);
+
+        if (StringUtils.isNotBlank(proxiesAsString)) {
+            Arrays.stream(StringUtils.split(proxiesAsString, PROXY_SEPARATOR))
+                    .filter(StringUtils::isNotBlank)
+                    .map(proxyLine -> StringUtils.split(proxyLine, 
PROXY_FROM_TO_SEPARATOR))
+                    .forEach(fromTo -> {
+                        if (fromTo.length > 1) {
+                            final String from = "/" + 
StringUtils.trim(fromTo[0]) + "/";
+                            final String to = StringUtils.trim(fromTo[1]) + 
"/";
+                            proxies.put(from, to);
+                        }
+                    });
+        }
+
+        if (!proxies.isEmpty()) {
+            final List<String> messages = new ArrayList<>(proxies.size() + 1);
+            messages.add(PROXY_ENABLED_MESSAGE);
+            proxies.forEach((from, to) -> messages.add(String.format("from %s 
to %s", from, to)));
+
+            logBorderedMessage(messages);
+        }
+        return proxies;
+    }
+
     private Set<Pattern> initPatterns(final String paramName, Set<Pattern> 
defaultPatterns) {
         final String param = getInitParameter(paramName, null);
 
@@ -422,7 +426,7 @@ public class ResourceServlet extends HttpServlet {
             return null;
         }
 
-        for (Map.Entry<String, String> entry : proxies.entrySet()) {
+        for (Map.Entry<String, String> entry : PROXIES.entrySet()) {
             final String from = entry.getKey();
             final String to = entry.getValue();
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms-utilities/commit/ac35e1cce90cf2184e6d2e2a7c510402a6976c1f

_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn