OO-2891: Proper object initialisation with Spring

src/main/java/org/olat/shibboleth/ShibbolethDispatcher.java

@@ -41,6 +41,7 @@ import org.olat.admin.user.delete.service.UserDeletionManager;
 import org.olat.basesecurity.AuthHelper;
 import org.olat.basesecurity.Authentication;
 import org.olat.basesecurity.BaseSecurity;
+import org.olat.core.CoreSpringFactory;
 import org.olat.core.dispatcher.Dispatcher;
 import org.olat.core.dispatcher.DispatcherModule;
 import org.olat.core.gui.UserRequest;
@@ -207,7 +208,8 @@ public class ShibbolethDispatcher implements Dispatcher{
 		// Successful login
 		Identity authenticationedIdentity = ureq.getIdentity();
 		userDeletionManager.setIdentityAsActiv(authenticationedIdentity);
-		ShibbolethAttributes shibbolethAttriutes = new ShibbolethAttributes(attributesMap);
+		ShibbolethAttributes shibbolethAttriutes = CoreSpringFactory.getImpl(ShibbolethAttributes.class);
+		shibbolethAttriutes.setAttributesMap(attributesMap);
 		shibbolethManager.syncUser(authenticationedIdentity, shibbolethAttriutes);
 		ureq.getUserSession().getIdentityEnvironment().addAttributes(
 				shibbolethModule.getAttributeTranslator().translateAttributesMap(attributesMap));

src/main/java/org/olat/shibboleth/ShibbolethRegistrationController.java

@@ -330,7 +330,8 @@ public class ShibbolethRegistrationController extends DefaultController implemen
 					if(!hasEmailInShibAttr){
 						shibbolethAttributesMap.put(shibbolethModule.getShibbolethAttributeName(UserConstants.EMAIL), regWithEmailForm.getEmail());
 					}
-					ShibbolethAttributes shibbolethAttributes = new ShibbolethAttributes(shibbolethAttributesMap);
+					ShibbolethAttributes shibbolethAttributes = CoreSpringFactory.getImpl(ShibbolethAttributes.class);
+					shibbolethAttributes.setAttributesMap(shibbolethAttributesMap);
 					String email = shibbolethAttributes.getValueForUserPropertyName(UserConstants.EMAIL);
 
 					User user = null;
@@ -362,7 +363,8 @@ public class ShibbolethRegistrationController extends DefaultController implemen
 					secMgr.createAndPersistAuthentication(authenticationedIdentity, ShibbolethDispatcher.PROVIDER_SHIB, shibbolethUniqueID, null, null);
 
 					// update user profile
-					ShibbolethAttributes shibbolethAttributes = new ShibbolethAttributes(shibbolethAttributesMap);
+					ShibbolethAttributes shibbolethAttributes = CoreSpringFactory.getImpl(ShibbolethAttributes.class);
+					shibbolethAttributes.setAttributesMap(shibbolethAttributesMap);
 					shibbolethManager.syncUser(authenticationedIdentity, shibbolethAttributes);
 
 					doLogin(authenticationedIdentity, ureq);

src/main/java/org/olat/shibboleth/handler/SpringShibbolethAttributeHandlerFactory.java

@@ -22,6 +22,7 @@ package org.olat.shibboleth.handler;
 import org.olat.core.CoreSpringFactory;
 import org.olat.core.logging.OLog;
 import org.olat.core.logging.Tracing;
+import org.olat.core.util.StringHelper;
 import org.springframework.stereotype.Component;
 
 /**
@@ -43,7 +44,7 @@ public class SpringShibbolethAttributeHandlerFactory implements ShibbolethAttrib
 		try {
 			shibbolethAttributeHandler = getHandlerByName(handlerName);
 		} catch (Exception e) {
-			if (handlerName != null) {
+			if (StringHelper.containsNonWhitespace(handlerName)) {
 				log.warn("ShibbolethAttributeHandler '" + handlerName
 						+ "' does not exist. Using the Default ShibbolethAttributeHandler '" + DEFAULT_HANDLER_NAME
 						+ "'.");

src/main/java/org/olat/shibboleth/manager/ShibbolethAttributes.java

@@ -28,6 +28,8 @@ import org.olat.shibboleth.ShibbolethModule;
 import org.olat.shibboleth.handler.ShibbolethAttributeHandler;
 import org.olat.shibboleth.handler.ShibbolethAttributeHandlerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
 
 /**
  *
@@ -35,6 +37,8 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @author uhensler, urs.hensler@frentix.com, http://www.frentix.com
  *
  */
+@Component
+@Scope("prototype")
 public class ShibbolethAttributes {
 
 	private Map<String, String> shibbolethMap;
@@ -44,8 +48,8 @@ public class ShibbolethAttributes {
 	@Autowired
 	private ShibbolethAttributeHandlerFactory shibbolethAttributeHandlerFactory;
 
-	public ShibbolethAttributes(Map<String, String> shibbolethMap) {
-		this.shibbolethMap = shibbolethMap;
+	public void setAttributesMap(Map<String, String> attributesMap) {
+		this.shibbolethMap = attributesMap;
 	}
 
 	public String getValueForAttributeName(String attributeName) {
@@ -105,4 +109,5 @@ public class ShibbolethAttributes {
 	private Set<Entry<String, String>> getUserMappingEntrySet() {
 		return shibbolethModule.getUserMapping().entrySet();
 	}
+
 }

src/test/java/org/olat/shibboleth/manager/ShibbolethAttributesTest.java

@@ -81,7 +81,8 @@ public class ShibbolethAttributesTest {
 		when(shibbolethModuleMock.getUserMapping()).thenReturn(shibbolethUserMapping);
 
 		Map<String, String> shibbolethKeysValues = initShibbolethMap();
-		sut = new ShibbolethAttributes(shibbolethKeysValues);
+		sut = new ShibbolethAttributes();
+		sut.setAttributesMap(shibbolethKeysValues);
 
 		ReflectionTestUtils.setField(sut, "shibbolethModule", shibbolethModuleMock);