From 504a3c5c89f8a8690d5e0daee12f6f98477baae0 Mon Sep 17 00:00:00 2001
From: Possommi <Possommi@users.noreply.github.com>
Date: Tue, 9 Jan 2024 11:29:41 +0100
Subject: [PATCH] UBO-292 Made
 org.mycore.ubo.matcher.MCRUserMatcherLDAP#getUserNameFromLDAPUser protected
 (#343)

* UBO-292 Made org.mycore.ubo.matcher.MCRUserMatcherLDAP#getUserNameFromLDAPUser protected

* UBO-292 Made org.mycore.ubo.matcher.MCRUserMatcherLDAP#CONFIG_LDAP_LOGIN_ATTRIBUTENAME protected
---
 .../ubo/matcher/MCRUserMatcherLDAP.java       | 39 +++++++++----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/ubo-common/src/main/java/org/mycore/ubo/matcher/MCRUserMatcherLDAP.java b/ubo-common/src/main/java/org/mycore/ubo/matcher/MCRUserMatcherLDAP.java
index f3d4b2a7a..dff84c480 100644
--- a/ubo-common/src/main/java/org/mycore/ubo/matcher/MCRUserMatcherLDAP.java
+++ b/ubo-common/src/main/java/org/mycore/ubo/matcher/MCRUserMatcherLDAP.java
@@ -1,23 +1,5 @@
 package org.mycore.ubo.matcher;
 
-import java.net.URLDecoder;
-import java.nio.charset.StandardCharsets;
-import java.text.Normalizer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import javax.naming.NamingException;
-import javax.naming.ldap.LdapContext;
-
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
@@ -35,6 +17,23 @@
 import org.mycore.user2.MCRUser;
 import org.mycore.user2.MCRUserAttribute;
 
+import javax.naming.NamingException;
+import javax.naming.ldap.LdapContext;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.text.Normalizer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
 /**
  * Given a MCRUser match against the users of a LDAP-Server, enriching the attributes of the MCRUser by any matched
  * LDAP-Users attributes.
@@ -70,7 +69,7 @@ public class MCRUserMatcherLDAP implements MCRUserMatcher {
 
     private final static Logger LOGGER = LogManager.getLogger(MCRUserMatcherLDAP.class);
 
-    private final static String CONFIG_LDAP_LOGIN_ATTRIBUTENAME = "MCR.user2.LDAP.Login.AttributeName";
+    protected final static String CONFIG_LDAP_LOGIN_ATTRIBUTENAME = "MCR.user2.LDAP.Login.AttributeName";
 
     // all members regarding configuration of explicit mods/mycore nameIdentifier mapping
     private final static String CONFIG_EXPLICIT_NAMEIDENTIFIER_MAPPING = "MCR.user2.LDAP.Mapping.explicit";
@@ -230,7 +229,7 @@ Since currently (October 24th 2019), the LDAP and MyCoRe/UBO login is paired via
         return matcherDTO;
     }
 
-    private String getUserNameFromLDAPUser(LDAPObject ldapUser) {
+    protected String getUserNameFromLDAPUser(LDAPObject ldapUser) {
         String userName = "";
         String ldapLoginAttributeName = MCRConfiguration2.getString(CONFIG_LDAP_LOGIN_ATTRIBUTENAME).orElse("");
         if (StringUtils.isEmpty(ldapLoginAttributeName)) {