Skip to content

Fix for config entry rename bug. #260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: GROUPER_5_BRANCH
Choose a base branch
from
Open

Fix for config entry rename bug. #260

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions ...uth/src/main/java/edu/internet2/middleware/grouper/authentication/plugin/ConfigUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public static void setProperties(BaseClientConfiguration configuration, String a
.toList()) {
// map name to realname if needed (e.g., changing case)
String realName = ConfigUtils.propertyNameRename(name);
String fieldName = realName.substring(name.lastIndexOf('.') + 1);
String fieldName = realName.substring(realName.lastIndexOf('.') + 1);
try {
Method method = getSetter(clazz, getMethodNameFromFieldName(fieldName));
method.invoke(configuration, getProperty(grouperConfig, method.getParameterTypes()[0], name));
Expand Down Expand Up @@ -108,7 +108,12 @@ private static void checkConfig() {
* @return
*/
private static String propertyNameRename(String propertyName) {
return PROPERTY_RENAMES.getOrDefault(propertyName, propertyName);
for (Map.Entry<String, String> rename: PROPERTY_RENAMES.entrySet()) {
if(rename.getValue() != null && rename.getValue().equals(propertyName)) {
return rename.getKey();
}
}
return propertyName;
}

private static String getMethodNameFromFieldName(String fieldName) {
Expand Down