Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Project] Using default values for PrivilegeUsers.xml and PrivilegeRoles.xml

This commit is contained in:
Robert von Burg 2023-09-18 13:57:39 +02:00
parent 17d9ffb245
commit 2f86493671
Signed by: eitch
GPG Key ID: 75DB9C85C74331F7
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
privilege/src/main/java/li/strolch/privilege/handler/XmlPersistenceHandler.java
View File

@ -169,10 +169,10 @@ public class XmlPersistenceHandler implements PersistenceHandler {
}
// get users file path
File usersPath = getFile(basePath, XML_PARAM_USERS_FILE);
File usersPath = getFile(basePath, XML_PARAM_USERS_FILE, XML_PARAM_USERS_FILE_DEF);
// get roles file path
File rolesPath = getFile(basePath, XML_PARAM_ROLES_FILE);
File rolesPath = getFile(basePath, XML_PARAM_ROLES_FILE, XML_PARAM_ROLES_FILE_DEF);
// save path to model
this.usersPath = usersPath;
@ -185,12 +185,13 @@ public class XmlPersistenceHandler implements PersistenceHandler {
logger.info("Privilege Data loaded.");
}
private File getFile(String basePath, String param) {
private File getFile(String basePath, String param, String defaultValue) {
String fileName = this.parameterMap.get(param);
if (isEmpty(fileName)) {
String msg = "[{0}] Defined parameter {1} is not valid as it is empty!";
msg = format(msg, PersistenceHandler.class.getName(), param);
throw new PrivilegeException(msg);
fileName = defaultValue;
String msg = "[{0}] Parameter {1} is not defined, using default {2}!";
msg = format(msg, PersistenceHandler.class.getName(), param, defaultValue);
logger.warn(msg);
}
String path = basePath + "/" + fileName;

10
privilege/src/main/java/li/strolch/privilege/helper/XmlConstants.java
View File

@ -308,11 +308,21 @@ public class XmlConstants {
*/
public static final String XML_PARAM_USERS_FILE = "usersXmlFile";
/**
* XML_PARAM_USERS_FILE_DEF = "PrivilegeUsers.xml" :
*/
public static final String XML_PARAM_USERS_FILE_DEF = "PrivilegeUsers.xml";
/**
* XML_PARAM_ROLES_FILE = "rolesXmlFile" :
*/
public static final String XML_PARAM_ROLES_FILE = "rolesXmlFile";
/**
* XML_PARAM_ROLES_FILE_DEF = "PrivilegeRoles.xml" :
*/
public static final String XML_PARAM_ROLES_FILE_DEF = "PrivilegeRoles.xml";
/**
* XML_PARAM_BASE_PATH = "basePath" :
*/