|
|
|
@ -1,4 +1,4 @@
|
|
|
|
|
package space.caoshd.otone.tool;
|
|
|
|
|
package space.caoshd.otone.helper;
|
|
|
|
|
|
|
|
|
|
import space.caoshd.otone.util.ResUtils;
|
|
|
|
|
|
|
|
|
@ -12,18 +12,18 @@ import java.util.Objects;
|
|
|
|
|
import java.util.Optional;
|
|
|
|
|
import java.util.Properties;
|
|
|
|
|
|
|
|
|
|
public class PropTools {
|
|
|
|
|
public class PropHelper {
|
|
|
|
|
|
|
|
|
|
private Map<String, String> propertyMap;
|
|
|
|
|
|
|
|
|
|
private Properties properties;
|
|
|
|
|
|
|
|
|
|
public PropTools(InputStream stream) {
|
|
|
|
|
public PropHelper(InputStream stream) {
|
|
|
|
|
loadProperties(stream);
|
|
|
|
|
parseProperties();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public PropTools(String filename) {
|
|
|
|
|
public PropHelper(String filename) {
|
|
|
|
|
this(ResUtils.getClassPathFileStream(filename));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -51,34 +51,58 @@ public class PropTools {
|
|
|
|
|
return Optional.ofNullable(propertyMap.get(key)).orElse(defaultValue);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public Integer getInt(String key) {
|
|
|
|
|
public Integer getInt(String key, Integer defaultInt) {
|
|
|
|
|
String value = propertyMap.get(key);
|
|
|
|
|
if (value == null || value.trim().isEmpty()) {
|
|
|
|
|
return defaultInt;
|
|
|
|
|
}
|
|
|
|
|
return Integer.valueOf(propertyMap.get(key));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public Boolean getBoolean(String key) {
|
|
|
|
|
public Integer getInt(String key) {
|
|
|
|
|
return getInt(key, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public Boolean getBoolean(String key, Boolean defaultBoolean) {
|
|
|
|
|
String value = propertyMap.get(key);
|
|
|
|
|
if (value == null) {
|
|
|
|
|
return Boolean.FALSE;
|
|
|
|
|
if (value == null || value.trim().isEmpty()) {
|
|
|
|
|
return defaultBoolean;
|
|
|
|
|
}
|
|
|
|
|
return Boolean.valueOf(value);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public Long getLong(String key) {
|
|
|
|
|
public Boolean getBoolean(String key) {
|
|
|
|
|
return getBoolean(key, false);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public Long getLong(String key, Long defaultLong) {
|
|
|
|
|
String value = propertyMap.get(key);
|
|
|
|
|
if (value == null || value.trim().isEmpty()) {
|
|
|
|
|
return defaultLong;
|
|
|
|
|
}
|
|
|
|
|
return Long.valueOf(propertyMap.get(key));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public List<String> getStrings(String key) {
|
|
|
|
|
List<String> result = new ArrayList<>();
|
|
|
|
|
public Long getLong(String key) {
|
|
|
|
|
return getLong(key, 0L);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public List<String> getStringList(String key, List<String> defaultStringList) {
|
|
|
|
|
String values = propertyMap.get(key);
|
|
|
|
|
if (Objects.isNull(values)) {
|
|
|
|
|
return result;
|
|
|
|
|
return defaultStringList;
|
|
|
|
|
}
|
|
|
|
|
List<String> result = new ArrayList<>();
|
|
|
|
|
for (String value : values.split(",")) {
|
|
|
|
|
result.add(value.trim());
|
|
|
|
|
}
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public List<String> getStringList(String key) {
|
|
|
|
|
return getStringList(key, new ArrayList<>());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public Map<String, String> getPropertyMap() {
|
|
|
|
|
return propertyMap;
|
|
|
|
|
}
|