Github user asqasq commented on a diff in the pull request:
https://github.com/apache/incubator-crail/pull/7#discussion_r170948451
--- Diff:
client/src/main/java/org/apache/crail/conf/CrailConfiguration.java ---
@@ -19,36 +19,80 @@
package org.apache.crail.conf;
+import org.apache.crail.utils.CrailUtils;
+import org.slf4j.Logger;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.crail.utils.CrailUtils;
-import org.slf4j.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
public class CrailConfiguration {
private static final Logger LOG = CrailUtils.getLogger();
private ConcurrentHashMap<String, String> conf;
-
-
- public CrailConfiguration() throws IOException{
+
+ public CrailConfiguration() throws IOException {
conf = new ConcurrentHashMap<>();
Properties properties = loadProperties("crail-site.conf");
mergeProperties(properties);
}
+ private static String expandEnvVars(String input) {
+ if (null == input) {
+ return null;
+ }
+ // match ${ENV_VAR_NAME} or $ENV_VAR_NAME
+ Pattern p = Pattern.compile("\\$\\{(\\w+)\\}|\\$(\\w+)");
+ Matcher m = p.matcher(input);
+ StringBuffer output = new StringBuffer();
+ while (m.find()) {
+ String envVar;
+ if (m.group(1) != null)
+ envVar = m.group(1);
--- End diff --
Can you add braces to the if-else like every where else in the file?
---
