Make a standalone class for ENV replacement so it is reusable for

property loading

Server/src/main/java/org/openas2/lib/util/StringEnvVarReplacer.java

@@ -0,0 +1,58 @@
+package org.openas2.lib.util;
+
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.openas2.OpenAS2Exception;
+
+
+/**
+ * Supports replacing strings containing environment variable references wiht he value of the env var.
+ */
+public class StringEnvVarReplacer {
+    private static final Pattern ENV_VAR_PATTERN = Pattern.compile("\\$ENV\\{([^\\}]++)\\}");
+    private Map<String, String> envVars;
+    private final String HOME_DIR_PLACEHOLDER = "%home%";
+    private String appHomeDir = null;
+
+    public StringEnvVarReplacer() {
+        super();
+        this.envVars = System.getenv();
+    }
+
+    public StringEnvVarReplacer(Map<String, String> env_vars) {
+        super();
+        this.envVars = env_vars;
+    }
+
+    public void setEnvVarMap(Map<String, String> envVarMap) {
+        this.envVars = envVarMap;
+    }
+
+    public void setAppHomeDir(String appHomeDir) {
+        this.appHomeDir = appHomeDir;
+    }
+
+    public String replace(String input) throws OpenAS2Exception {
+        if (this.appHomeDir != null) {
+            input = input.replace(this.HOME_DIR_PLACEHOLDER, this.appHomeDir);
+        }
+        StringBuffer strBuf = new StringBuffer();
+        Matcher matcher = ENV_VAR_PATTERN.matcher(input);
+        while (matcher.find()) {
+            String key = matcher.group(1);
+            String value = envVars.get(key);
+
+            if (value == null) {
+                throw new OpenAS2Exception("Missing environment variable for replacement: " + matcher.group() + " Using key: " + key);
+            } else {
+                matcher.appendReplacement(strBuf, Matcher.quoteReplacement(value));
+            }
+        }
+        matcher.appendTail(strBuf);
+
+        return strBuf.toString();
+    }
+
+}

Server/src/main/java/org/openas2/lib/xml/PropertyReplacementFilter.java

@@ -1,18 +1,17 @@
 package org.openas2.lib.xml;
 
+import org.openas2.OpenAS2Exception;
+import org.openas2.lib.util.StringEnvVarReplacer;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.AttributesImpl;
 import org.xml.sax.helpers.XMLFilterImpl;
 
 import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 
 /**
- * Supports replacing XML element properties with system environment variables.
+ * An XML handler to support replacing XML element properties with system environment variables.
  * Support for system properties is provided in the AS2Util.attributeEnhancer method
  *
  */
@@ -23,32 +22,32 @@ public void endElement(String uri, String localName, String qName) throws SAXExc
         super.endElement(uri, localName, qName);
     }
 
-    private static final Pattern ENV_VAR_PATTERN = Pattern.compile("\\$ENV\\{([^\\}]++)\\}");
-    private final Map<String, String> env_vars;
-    private final String HOME_DIR_PLACEHOLDER = "%home%";
+    @SuppressWarnings("unused")
     private String appHomeDir = null;
+    private final StringEnvVarReplacer envVarReplacer = new StringEnvVarReplacer();
 
     public PropertyReplacementFilter() {
         super();
-        this.env_vars = System.getenv();
+        envVarReplacer.setEnvVarMap(System.getenv());
     }
 
-    public PropertyReplacementFilter(Map<String, String> env_vars) {
+    public PropertyReplacementFilter(Map<String, String> envVars) {
         super();
-        this.env_vars = env_vars;
+        envVarReplacer.setEnvVarMap(envVars);
     }
 
     public PropertyReplacementFilter(XMLReader parent) {
         this(parent, System.getenv());
     }
 
-    public PropertyReplacementFilter(XMLReader parent, Map<String, String> env_vars) {
+    public PropertyReplacementFilter(XMLReader parent, Map<String, String> envVars) {
         super(parent);
-        this.env_vars = env_vars;
+        envVarReplacer.setEnvVarMap(envVars);
     }
 
     public void setAppHomeDir(String appHomeDir) {
         this.appHomeDir = appHomeDir;
+        envVarReplacer.setAppHomeDir(appHomeDir);
     }
 
     /**
@@ -58,7 +57,12 @@ public void setAppHomeDir(String appHomeDir) {
      */
     @Override
     public void characters(char[] data, int start, int length) throws SAXException {
-        char[] value = this.replace(String.copyValueOf(data, start, length)).toCharArray();
+        char[] value;
+        try {
+            value = envVarReplacer.replace(String.copyValueOf(data, start, length)).toCharArray();
+        } catch (OpenAS2Exception e) {
+            throw new SAXException(e);
+        }
         super.characters(value, 0, value.length);
     }
 
@@ -74,31 +78,13 @@ public void startElement(String uri, String localName, String qName, Attributes
 
         int length = attributes.getLength();
         for (int i = 0; i < length; ++i) {
-            attributes.setValue(i, this.replace(attributes.getValue(i)));
-        }
-
-        super.startElement(uri, localName, qName, attributes);
-    }
-
-    private String replace(String input) throws SAXException {
-        if (this.appHomeDir != null) {
-            input = input.replace(this.HOME_DIR_PLACEHOLDER, this.appHomeDir);
-        }
-        StringBuffer strBuf = new StringBuffer();
-        Matcher matcher = ENV_VAR_PATTERN.matcher(input);
-        while (matcher.find()) {
-            String key = matcher.group(1);
-            String value = env_vars.get(key);
-
-            if (value == null) {
-                throw new SAXException("Missing environment variable for replacement: " + matcher.group() + " Using key: " + key);
-            } else {
-                matcher.appendReplacement(strBuf, Matcher.quoteReplacement(value));
+            try {
+                attributes.setValue(i, envVarReplacer.replace(attributes.getValue(i)));
+            } catch (OpenAS2Exception e) {
+                throw new SAXException(e);
             }
         }
-        matcher.appendTail(strBuf);
 
-        return strBuf.toString();
+        super.startElement(uri, localName, qName, attributes);
     }
-
 }