From 853a8c22790f17aed228019c310b4bf8f6fc827a Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Wed, 5 Apr 2017 10:44:25 +0200 Subject: change form-validation result again --- .../egovernment/moa/spss/util/AdESResultUtils.java | 47 +++++++++++++--------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/AdESResultUtils.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/AdESResultUtils.java index 41d363d..b6bba93 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/AdESResultUtils.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/AdESResultUtils.java @@ -113,29 +113,38 @@ public class AdESResultUtils { //add only the completed form result to response String completedForm = adesFormVerification.getCompleteForm(); - if (MiscUtil.isNotEmpty(completedForm)) { - Logger.info("Form-validation found completed form: " + completedForm); - AdESVerificationResult subResult = adesFormVerification.getSubResult(completedForm); - checkSubResult(subResult, completedForm, adesList); - if (Logger.isDebugEnabled()) - Logger.debug("Detailed Result: \n" + subResult.getInfo()); - - } else - Logger.info("Form-valdition found NO completed form."); + Logger.info("Find complete Form: " + completedForm); - if (Logger.isDebugEnabled()) - Logger.debug("Full form-validation result: \n" + adesFormVerification.getInfo()); + /* + * This code only returns the result of the completed form + */ +// if (MiscUtil.isNotEmpty(completedForm)) { +// Logger.info("Form-validation found completed form: " + completedForm); +// AdESVerificationResult subResult = adesFormVerification.getSubResult(completedForm); +// checkSubResult(subResult, completedForm, adesList); +// if (Logger.isDebugEnabled()) +// Logger.debug("Detailed Result: \n" + subResult.getInfo()); +// +// } else +// Logger.info("Form-valdition found NO completed form."); +// +// if (Logger.isDebugEnabled()) +// Logger.debug("Full form-validation result: \n" + adesFormVerification.getInfo()); + + /* + * This code returns the result for all forms + */ //add results for all form types to response -// checkSubResult(adesFormVerification.getSubResult(SignatureVerificationProfile.LEVEL_LTA), -// SignatureVerificationProfile.LEVEL_LTA, adesList); -// checkSubResult(adesFormVerification.getSubResult(SignatureVerificationProfile.LEVEL_LT), -// SignatureVerificationProfile.LEVEL_LT, adesList); -// checkSubResult(adesFormVerification.getSubResult(SignatureVerificationProfile.LEVEL_T), -// SignatureVerificationProfile.LEVEL_T, adesList); -// checkSubResult(adesFormVerification.getSubResult(SignatureVerificationProfile.LEVEL_B), -// SignatureVerificationProfile.LEVEL_B, adesList); + checkSubResult(adesFormVerification.getSubResult(SignatureVerificationProfile.LEVEL_LTA), + SignatureVerificationProfile.LEVEL_LTA, adesList); + checkSubResult(adesFormVerification.getSubResult(SignatureVerificationProfile.LEVEL_LT), + SignatureVerificationProfile.LEVEL_LT, adesList); + checkSubResult(adesFormVerification.getSubResult(SignatureVerificationProfile.LEVEL_T), + SignatureVerificationProfile.LEVEL_T, adesList); + checkSubResult(adesFormVerification.getSubResult(SignatureVerificationProfile.LEVEL_B), + SignatureVerificationProfile.LEVEL_B, adesList); return adesList; } -- cgit v1.2.3