more refactoring staff

1 files changed, 75 insertions, 68 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/StatisticLogger.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/StatisticLogger.java
index b0c232ba2..e12b1372e 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/StatisticLogger.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/StatisticLogger.java
@@ -46,20 +46,21 @@ import at.gv.e_government.reference.namespace.persondata._20020228_.CorporateBod
 import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.api.idp.IAuthData;
 import at.gv.egiz.eaaf.core.api.logging.IStatisticLogger;
-import at.gv.egiz.eaaf.core.impl.idp.controller.protocols.RequestImpl;
-import at.gv.egovernment.moa.id.auth.exception.BKUException;
-import at.gv.egovernment.moa.id.auth.exception.MISSimpleClientException;
 import at.gv.egovernment.moa.id.auth.exception.ServiceException;
 import at.gv.egovernment.moa.id.client.SZRGWClientException;
 import at.gv.egovernment.moa.id.commons.api.AuthConfiguration;
 import at.gv.egovernment.moa.id.commons.api.IOAAuthParameters;
 import at.gv.egovernment.moa.id.commons.api.data.IAuthenticationSession;
 import at.gv.egovernment.moa.id.commons.api.data.IMISMandate;
+import at.gv.egovernment.moa.id.commons.api.exceptions.BKUException;
 import at.gv.egovernment.moa.id.commons.api.exceptions.ConfigurationException;
+import at.gv.egovernment.moa.id.commons.api.exceptions.MISSimpleClientException;
 import at.gv.egovernment.moa.id.commons.api.exceptions.MOAIDException;
 import at.gv.egovernment.moa.id.commons.db.dao.statistic.StatisticLog;
 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
 import at.gv.egovernment.moa.id.config.auth.OAAuthParameterDecorator;
+import at.gv.egovernment.moa.id.data.IMOAAuthData;
+import at.gv.egovernment.moa.id.moduls.AuthenticationManager;
 import at.gv.egovernment.moa.id.storage.IAuthenticationSessionStoreage;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.MiscUtil;
@@ -92,7 +93,9 @@ public class StatisticLogger implements IStatisticLogger{
 	private EntityManager entityManager;
 		
 	
-	public void testConnection() throws Exception {
+	@Override
+	//TODO: update tests!!!!
+	public void internalTesting() throws Exception {
 		Date expioredate = new Date(new Date().getTime() - 120);
 		Query query = entityManager.createNamedQuery("getAllEntriesNotBeforeTimeStamp");
 		query.setParameter("timeout", expioredate);			
@@ -129,88 +132,92 @@ public class StatisticLogger implements IStatisticLogger{
 				Logger.warn("Can not extract some information for StatisticLogger.", e);
 			}
 			
-			dblog.setOatarget(authData.getBPKType());
-
-
-			boolean isFederatedAuthentication = protocolRequest.getGenericData(RequestImpl.DATAID_INTERFEDERATIOIDP_RESPONSE) != null;
-			dblog.setInterfederatedSSOSession(isFederatedAuthentication);
-			
-			if (isFederatedAuthentication) {
-				dblog.setBkutype(IOAAuthParameters.INDERFEDERATEDIDP);
-				dblog.setBkuurl(protocolRequest.getGenericData(RequestImpl.DATAID_INTERFEDERATIOIDP_ENTITYID, String.class));
-				
-			} else {
-				dblog.setBkuurl(authData.getBkuURL());
-				dblog.setBkutype(findBKUType(authData.getBkuURL(), dbOA));
-				
-			}
-			
 			dblog.setProtocoltype(protocolRequest.requestedModule());
 			dblog.setProtocolsubtype(protocolRequest.requestedAction());
 			dblog.setSsosession(isSSOSession);
 			
 			
-			//log MandateInforamtion
-			if (authData.isUseMandate()) {
-				dblog.setMandatelogin(authData.isUseMandate());
+			if (authData instanceof IMOAAuthData) {
+				IMOAAuthData moaAuthData = (IMOAAuthData) authData;
+				dblog.setOatarget(moaAuthData.getBPKType());	
+
+				boolean isFederatedAuthentication = protocolRequest.getGenericData(AuthenticationManager.DATAID_INTERFEDERATIOIDP_RESPONSE) != null;
+				dblog.setInterfederatedSSOSession(isFederatedAuthentication);
 				
-				IMISMandate mandate = authData.getMISMandate();
-				if (mandate != null) {
+				if (isFederatedAuthentication) {
+					dblog.setBkutype(IOAAuthParameters.INDERFEDERATEDIDP);
+					dblog.setBkuurl(protocolRequest.getGenericData(AuthenticationManager.DATAID_INTERFEDERATIOIDP_ENTITYID, String.class));
 					
-					if (MiscUtil.isNotEmpty(mandate.getProfRep())) {
-						dblog.setMandatetype(mandate.getProfRep());
-						dblog.setPv(true);
-						dblog.setPvOID(mandate.getProfRep());
-						
-					} else {
-						dblog.setPv(false);
-					}
+				} else {
+					dblog.setBkuurl(moaAuthData.getBkuURL());
+					dblog.setBkutype(findBKUType(moaAuthData.getBkuURL(), dbOA));
 					
-					InputStream is = null;
-					try {
-						is = new ByteArrayInputStream(mandate.getMandate());
+				}
+				
+				//log MandateInforamtion
+				if (moaAuthData.isUseMandate()) {
+					dblog.setMandatelogin(moaAuthData.isUseMandate());
+					
+					IMISMandate mandate = moaAuthData.getMISMandate();
+					if (mandate != null) {
 						
-						JAXBContext jc = JAXBContext.newInstance(Mandate.class);
-						Unmarshaller u = jc.createUnmarshaller();
-						Object mismandateobj = u.unmarshal(is);
+						if (MiscUtil.isNotEmpty(mandate.getProfRep())) {
+							dblog.setMandatetype(mandate.getProfRep());
+							dblog.setPv(true);
+							dblog.setPvOID(mandate.getProfRep());
+							
+						} else {
+							dblog.setPv(false);
+						}
 						
-						if (mismandateobj != null && mismandateobj instanceof Mandate) {
-							Mandate mismandate = (Mandate) mismandateobj;
+						InputStream is = null;
+						try {
+							is = new ByteArrayInputStream(mandate.getMandate());
 							
-							if (MiscUtil.isEmpty(mandate.getProfRep()))
-								dblog.setMandatetype(mismandate.getAnnotation());
+							JAXBContext jc = JAXBContext.newInstance(Mandate.class);
+							Unmarshaller u = jc.createUnmarshaller();
+							Object mismandateobj = u.unmarshal(is);
 							
-							Mandator mandator = mismandate.getMandator();
-							CorporateBodyType corp = mandator.getCorporateBody();
-							if (corp != null) {
-								dblog.setMandatortype(MANTATORTYPE_JUR);
+							if (mismandateobj != null && mismandateobj instanceof Mandate) {
+								Mandate mismandate = (Mandate) mismandateobj;
+								
+								if (MiscUtil.isEmpty(mandate.getProfRep()))
+									dblog.setMandatetype(mismandate.getAnnotation());
+								
+								Mandator mandator = mismandate.getMandator();
+								CorporateBodyType corp = mandator.getCorporateBody();
+								if (corp != null) {
+									dblog.setMandatortype(MANTATORTYPE_JUR);
+									
+								} else {
+									dblog.setMandatortype(MANTATORTYPE_NAT);
+								}
+								
 								
 							} else {
-								dblog.setMandatortype(MANTATORTYPE_NAT);
+								Logger.warn("Advancted logging can not unmarshall MISMandate");
 							}
-							
-							
-						} else {
-							Logger.warn("Advancted logging can not unmarshall MISMandate");
-						}
 
-					} catch (JAXBException e) {
-						Logger.warn("Advancted logging can not parse mandate.", e);
-						
-					} finally {
-						if (is!=null) {
-							try {
-								is.close();
-								
-							} catch (IOException e) {
-								Logger.warn("Close InputStream failed." , e);
-								
+						} catch (JAXBException e) {
+							Logger.warn("Advancted logging can not parse mandate.", e);
+							
+						} finally {
+							if (is!=null) {
+								try {
+									is.close();
+									
+								} catch (IOException e) {
+									Logger.warn("Close InputStream failed." , e);
+									
+								}
 							}
 						}
-					}
-				}		
-			}
-			
+					}		
+				}
+				
+			} else
+				Logger.info("'AuthData' is NOT of type 'IMOAAuthData'. StatisticLogger logs only basic infos");
+						
 			try {
 				entityManager.persist(dblog);