anph
/
hugegraph-sync
forked from hugegraph/hugegraph-sync
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HugeGraph-1097: fix missing check for duplicated options 

Change-Id: I542998a0024d83706b0d8c485b4ec8ef40fd310f
This commit is contained in:
Zhangmei Li 2018-02-01 17:07:17 +08:00 committed by liningrui
parent 8219a10e74
commit 2ae8e1571b
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -156,7 +156,7 @@
</manifest>
<manifestEntries>
<Implementation-Version>
1.3.12.0
1.3.12.1
</Implementation-Version>
</manifestEntries>
</archive>

31
src/main/java/com/baidu/hugegraph/config/HugeConfig.java
View File

@ -20,8 +20,6 @@
package com.baidu.hugegraph.config;
import java.io.File;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Iterator;
import java.util.List;
@ -61,26 +59,23 @@ public class HugeConfig extends PropertiesConfiguration {
}
public HugeConfig(String configFile) throws ConfigurationException {
super(loadConfigFile(configFile));
this.checkRequiredOptions();
this(loadConfigFile(configFile));
}
public HugeConfig(InputStream is) throws ConfigurationException {
E.checkNotNull(is, "config input stream");
this.load(new InputStreamReader(is));
this.checkRequiredOptions();
}
private static PropertiesConfiguration loadConfigFile(String path) {
E.checkNotNull(path, "config path");
E.checkArgument(!path.isEmpty(),
"The config path can't be empty");
private static File loadConfigFile(String fileName) {
E.checkNotNull(fileName, "config file");
E.checkArgument(!fileName.isEmpty(),
"The config file can't be empty");
File file = new File(fileName);
File file = new File(path);
E.checkArgument(file.exists() && file.isFile() && file.canRead(),
"Need to specify a readable config file, but got: %s",
"Need to specify a readable config, but got: %s",
file.toString());
return file;
try {
return new PropertiesConfiguration(file);
} catch (ConfigurationException e) {
throw new ConfigException("Unable to load config: %s", e, path);
}
}
@SuppressWarnings("unchecked")
@ -103,7 +98,7 @@ public class HugeConfig extends PropertiesConfiguration {
private Object validateOption(String key, Object value) {
E.checkArgument(value instanceof String,
"Invalid value for key '%s'", key);
"Invalid value for key '%s': %s", key, value);
ConfigOption<?> option = OptionSpace.get(key);
Class<?> dataType = option.dataType();