refectore OnlineApplication formData

1 files changed, 70 insertions, 3 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAPVP2Config.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAPVP2Config.java
index a61e1ea96..c2a92c9fc 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAPVP2Config.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAPVP2Config.java
@@ -27,6 +27,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.security.cert.CertificateException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
@@ -37,10 +38,12 @@ import iaik.x509.X509Certificate;
 import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentOA;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OAPVP2;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
+import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
+import at.gv.egovernment.moa.id.configuration.validation.oa.OAPVP2ConfigValidation;
 import at.gv.egovernment.moa.util.MiscUtil;
 
-public class OAPVP2Config {
+public class OAPVP2Config implements IOnlineApplicationData{
 	
 	private final Logger log = Logger.getLogger(OAPVP2Config.class);
 	
@@ -56,7 +59,72 @@ public class OAPVP2Config {
 	public OAPVP2Config() {
 	}
 	
-	public List<String> parse(OnlineApplication dbOAConfig, HttpServletRequest request) {
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#getName()
+	 */
+	@Override
+	public String getName() {
+		return "OAPVP2";
+	}
+
+	/* (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)
+	 */
+	@Override
+	public String store(OnlineApplication dboa, AuthenticatedUser authUser, HttpServletRequest request) {		
+        AuthComponentOA authoa = dboa.getAuthComponentOA();
+        if (authoa == null) {
+            authoa = new AuthComponentOA();
+            dboa.setAuthComponentOA(authoa);
+        }		
+        OAPVP2 pvp2 = authoa.getOAPVP2();
+        if (pvp2 == null) {
+            pvp2 = new OAPVP2();
+            authoa.setOAPVP2(pvp2);
+        }
+
+        try {
+
+            if (getFileUpload() != null) { 
+            	pvp2.setCertificate(getCertificate());
+            	setReLoad(true);
+            }
+
+        } catch (CertificateException e) {
+            log.info("Uploaded Certificate can not be found", e);
+            return LanguageHelper.getErrorString("validation.pvp2.certificate.notfound", request);
+        } catch (IOException e) {
+            log.info("Uploaded Certificate can not be parsed", e);
+            return LanguageHelper.getErrorString("validation.pvp2.certificate.format", request);
+        }
+
+        if (getMetaDataURL() != null && 
+        		!getMetaDataURL().equals(pvp2.getMetadataURL()))
+        	setReLoad(true);        
+        pvp2.setMetadataURL(getMetaDataURL());
+        
+        if (isReLoad())
+        	pvp2.setUpdateRequiredItem(new Date());
+        
+        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) {
+		return new OAPVP2ConfigValidation().validate(this, request);
+	}
+	
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#parse(at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication)
+	 */
+	@Override
+	public List<String> parse(OnlineApplication dbOAConfig, AuthenticatedUser authUser, HttpServletRequest request) {
 		List<String> errors = new ArrayList<String>();
 		
 		AuthComponentOA authdata = dbOAConfig.getAuthComponentOA();
@@ -158,7 +226,6 @@ public class OAPVP2Config {
 		this.reLoad = reLoad;
 	}
 	
-	
 }