1 files changed, 190 insertions, 172 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAMOAIDPInterfederationConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAMOAIDPInterfederationConfig.java
index a4d71f0ed..ef5658ca4 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAMOAIDPInterfederationConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAMOAIDPInterfederationConfig.java
@@ -27,194 +27,212 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.log4j.Logger;
-
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.InterfederationIDPType;
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.OnlineApplication;
 import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
 import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
 import at.gv.egovernment.moa.util.MiscUtil;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * @author tlenz
  *
  */
+@Slf4j
 public class OAMOAIDPInterfederationConfig implements IOnlineApplicationData {
 
-	private static final Logger log = Logger.getLogger(OAMOAIDPInterfederationConfig.class);
-	
-	private String queryURL;
-	private Boolean inboundSSO = true;
-	private Boolean outboundSSO = true;
-	private Boolean storeSSOSession = true;
-	private Boolean passiveRequest = true;
-	private Boolean localAuthOnError = true;
-	
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#getName()
-	 */
-	@Override
-	public String getName() {
-		return "MOAIDPInterfederation";
-	}
-
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#parse(at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication, at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser, javax.servlet.http.HttpServletRequest)
-	 */
-	@Override
-	public List<String> parse(OnlineApplication dbOA,
-			AuthenticatedUser authUser, HttpServletRequest request) {
-		
-		InterfederationIDPType moaIDP = dbOA.getInterfederationIDP();
-		if (moaIDP != null) {
-			this.queryURL = moaIDP.getAttributeQueryURL();
-			this.inboundSSO = moaIDP.isInboundSSO();
-			this.outboundSSO = moaIDP.isOutboundSSO();
-			this.storeSSOSession = moaIDP.isStoreSSOSession();
-			this.localAuthOnError = moaIDP.isPerformLocalAuthenticationOnError();
-			this.passiveRequest = moaIDP.isPerformPassivRequest();
-		}
-		
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#store(at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication, at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser, javax.servlet.http.HttpServletRequest)
-	 */
-	@Override
-	public String store(OnlineApplication dbOA, AuthenticatedUser authUser,
-			HttpServletRequest request) {
-
-		if (authUser.isAdmin()) {			
-			dbOA.setIsInterfederationIDP(true);
-			
-			InterfederationIDPType moaIDP = dbOA.getInterfederationIDP();
-			if (moaIDP == null) {
-				moaIDP = new InterfederationIDPType();
-				dbOA.setInterfederationIDP(moaIDP);
-			}
-			
-			moaIDP.setAttributeQueryURL(queryURL);
-			moaIDP.setInboundSSO(inboundSSO);
-			moaIDP.setOutboundSSO(outboundSSO);
-			moaIDP.setStoreSSOSession(storeSSOSession);
-			moaIDP.setPerformLocalAuthenticationOnError(localAuthOnError);
-			moaIDP.setPerformPassivRequest(passiveRequest);
-			
-		}		
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#validate(at.gv.egovernment.moa.id.configuration.data.oa.OAGeneralConfig, at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser, javax.servlet.http.HttpServletRequest)
-	 */
-	@Override
-	public List<String> validate(OAGeneralConfig general,
-			AuthenticatedUser authUser, HttpServletRequest request) {
-		
-		List<String> errors  = new ArrayList<String>();
-		
-		if (MiscUtil.isNotEmpty(queryURL)) {
-			if (!ValidationHelper.validateURL(queryURL)) {
-				log.info("AttributeQuery URL is not valid");
-				errors.add(LanguageHelper.getErrorString("validation.interfederation.moaidp.queryurl.valid", request));
-				
-			}			
-		}
-		
+  private String queryURL;
+  private Boolean inboundSSO = true;
+  private Boolean outboundSSO = true;
+  private Boolean storeSSOSession = true;
+  private Boolean passiveRequest = true;
+  private Boolean localAuthOnError = true;
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see
+   * at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#getName
+   * ()
+   */
+  @Override
+  public String getName() {
+    return "MOAIDPInterfederation";
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see
+   * at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#parse(
+   * at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication,
+   * at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser,
+   * javax.servlet.http.HttpServletRequest)
+   */
+  @Override
+  public List<String> parse(OnlineApplication dbOA,
+      AuthenticatedUser authUser, HttpServletRequest request) {
+
+    final InterfederationIDPType moaIDP = dbOA.getInterfederationIDP();
+    if (moaIDP != null) {
+      this.queryURL = moaIDP.getAttributeQueryURL();
+      this.inboundSSO = moaIDP.isInboundSSO();
+      this.outboundSSO = moaIDP.isOutboundSSO();
+      this.storeSSOSession = moaIDP.isStoreSSOSession();
+      this.localAuthOnError = moaIDP.isPerformLocalAuthenticationOnError();
+      this.passiveRequest = moaIDP.isPerformPassivRequest();
+    }
+
+    return null;
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see
+   * at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#store(
+   * at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication,
+   * at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser,
+   * javax.servlet.http.HttpServletRequest)
+   */
+  @Override
+  public String store(OnlineApplication dbOA, AuthenticatedUser authUser,
+      HttpServletRequest request) {
+
+    if (authUser.isAdmin()) {
+      dbOA.setIsInterfederationIDP(true);
+
+      InterfederationIDPType moaIDP = dbOA.getInterfederationIDP();
+      if (moaIDP == null) {
+        moaIDP = new InterfederationIDPType();
+        dbOA.setInterfederationIDP(moaIDP);
+      }
+
+      moaIDP.setAttributeQueryURL(queryURL);
+      moaIDP.setInboundSSO(inboundSSO);
+      moaIDP.setOutboundSSO(outboundSSO);
+      moaIDP.setStoreSSOSession(storeSSOSession);
+      moaIDP.setPerformLocalAuthenticationOnError(localAuthOnError);
+      moaIDP.setPerformPassivRequest(passiveRequest);
+
+    }
+    return null;
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#
+   * validate(at.gv.egovernment.moa.id.configuration.data.oa.OAGeneralConfig,
+   * at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser,
+   * javax.servlet.http.HttpServletRequest)
+   */
+  @Override
+  public List<String> validate(OAGeneralConfig general,
+      AuthenticatedUser authUser, HttpServletRequest request) {
+
+    final List<String> errors = new ArrayList<>();
+
+    if (MiscUtil.isNotEmpty(queryURL)) {
+      if (!ValidationHelper.validateURL(queryURL)) {
+        log.info("AttributeQuery URL is not valid");
+        errors.add(LanguageHelper.getErrorString("validation.interfederation.moaidp.queryurl.valid",
+            request));
+
+      }
+    }
+
 //		if (inboundSSO && MiscUtil.isEmpty(queryURL)) {
 //			log.info("Inbound Single Sign-On requires AttributQueryURL configuration.");
 //			errors.add(LanguageHelper.getErrorString("validation.interfederation.moaidp.queryurl.empty", request));
 //		}
-		
-		return errors;
-	}
-
-	/**
-	 * @return the queryURL
-	 */
-	public String getQueryURL() {
-		return queryURL;
-	}
-
-	/**
-	 * @param queryURL the queryURL to set
-	 */
-	public void setQueryURL(String queryURL) {
-		this.queryURL = queryURL;
-	}
-
-	/**
-	 * @return the inboundSSO
-	 */
-	public boolean isInboundSSO() {
-		return inboundSSO.booleanValue();
-	}
-
-	/**
-	 * @param inboundSSO the inboundSSO to set
-	 */
-	public void setInboundSSO(boolean inboundSSO) {
-		this.inboundSSO = inboundSSO;
-	}
-
-	/**
-	 * @return the outboundSSO
-	 */
-	public boolean isOutboundSSO() {
-		return outboundSSO.booleanValue();
-	}
-
-	/**
-	 * @param outboundSSO the outboundSSO to set
-	 */
-	public void setOutboundSSO(boolean outboundSSO) {
-		this.outboundSSO = outboundSSO;
-	}
-
-	/**
-	 * @return the storeSSOSession
-	 */
-	public boolean isStoreSSOSession() {
-		return storeSSOSession.booleanValue();
-	}
-
-	/**
-	 * @param storeSSOSession the storeSSOSession to set
-	 */
-	public void setStoreSSOSession(boolean storeSSOSession) {
-		this.storeSSOSession = storeSSOSession;
-	}
-
-	/**
-	 * @return the passiveRequest
-	 */
-	public boolean isPassiveRequest() {
-		return passiveRequest.booleanValue();
-	}
-
-	/**
-	 * @param passiveRequest the passiveRequest to set
-	 */
-	public void setPassiveRequest(boolean passiveRequest) {
-		this.passiveRequest = passiveRequest;
-	}
-
-	/**
-	 * @return the localAuthOnError
-	 */
-	public boolean isLocalAuthOnError() {
-		return localAuthOnError.booleanValue();
-	}
-
-	/**
-	 * @param localAuthOnError the localAuthOnError to set
-	 */
-	public void setLocalAuthOnError(boolean localAuthOnError) {
-		this.localAuthOnError = localAuthOnError;
-	}
-	
-	
+
+    return errors;
+  }
+
+  /**
+   * @return the queryURL
+   */
+  public String getQueryURL() {
+    return queryURL;
+  }
+
+  /**
+   * @param queryURL the queryURL to set
+   */
+  public void setQueryURL(String queryURL) {
+    this.queryURL = queryURL;
+  }
+
+  /**
+   * @return the inboundSSO
+   */
+  public boolean isInboundSSO() {
+    return inboundSSO.booleanValue();
+  }
+
+  /**
+   * @param inboundSSO the inboundSSO to set
+   */
+  public void setInboundSSO(boolean inboundSSO) {
+    this.inboundSSO = inboundSSO;
+  }
+
+  /**
+   * @return the outboundSSO
+   */
+  public boolean isOutboundSSO() {
+    return outboundSSO.booleanValue();
+  }
+
+  /**
+   * @param outboundSSO the outboundSSO to set
+   */
+  public void setOutboundSSO(boolean outboundSSO) {
+    this.outboundSSO = outboundSSO;
+  }
+
+  /**
+   * @return the storeSSOSession
+   */
+  public boolean isStoreSSOSession() {
+    return storeSSOSession.booleanValue();
+  }
+
+  /**
+   * @param storeSSOSession the storeSSOSession to set
+   */
+  public void setStoreSSOSession(boolean storeSSOSession) {
+    this.storeSSOSession = storeSSOSession;
+  }
+
+  /**
+   * @return the passiveRequest
+   */
+  public boolean isPassiveRequest() {
+    return passiveRequest.booleanValue();
+  }
+
+  /**
+   * @param passiveRequest the passiveRequest to set
+   */
+  public void setPassiveRequest(boolean passiveRequest) {
+    this.passiveRequest = passiveRequest;
+  }
+
+  /**
+   * @return the localAuthOnError
+   */
+  public boolean isLocalAuthOnError() {
+    return localAuthOnError.booleanValue();
+  }
+
+  /**
+   * @param localAuthOnError the localAuthOnError to set
+   */
+  public void setLocalAuthOnError(boolean localAuthOnError) {
+    this.localAuthOnError = localAuthOnError;
+  }
 
 }