Improved error messages

phax · Jan 20, 2021 · 497c610 · 497c610
1 parent aa13471
commit 497c610
Showing 1 changed file with 5 additions and 12 deletions.
diff --git a/.../java/com/helger/phase4/servlet/soap/SOAPHeaderElementProcessorExtractEbms3Messaging.java b/.../java/com/helger/phase4/servlet/soap/SOAPHeaderElementProcessorExtractEbms3Messaging.java
@@ -213,7 +213,6 @@ public ESuccess processHeaderElement (@Nonnull final Document aSOAPDoc,
       for (final IError aError : aCVEH.getErrorList ())
       {
         LOGGER.error ("Header error: " + aError.getAsString (aLocale));
-
         aErrorList.add (SingleError.builder (aError).setErrorID (EEbmsError.EBMS_INVALID_HEADER.getErrorCode ()).build ());
       }
       return ESuccess.FAILURE;
@@ -227,7 +226,6 @@ public ESuccess processHeaderElement (@Nonnull final Document aSOAPDoc,
     if (nUserMessages > 1)
     {
       LOGGER.error ("Too many UserMessage objects (" + nUserMessages + ") contained.");
-
       aErrorList.add (EEbmsError.EBMS_VALUE_INCONSISTENT.getAsError (aLocale));
       return ESuccess.FAILURE;
     }
@@ -237,7 +235,6 @@ public ESuccess processHeaderElement (@Nonnull final Document aSOAPDoc,
     if (nSignalMessages > 1)
     {
       LOGGER.error ("Too many SignalMessage objects (" + nSignalMessages + ") contained.");
-
       aErrorList.add (EEbmsError.EBMS_VALUE_INCONSISTENT.getAsError (aLocale));
       return ESuccess.FAILURE;
     }
@@ -302,11 +299,10 @@ public ESuccess processHeaderElement (@Nonnull final Document aSOAPDoc,
                                                 sAgreementRef,
                                                 sResponderAddress);
 
-        // Should be screened by the xsd conversion already
+        // Should be screened by the XSD conversion already
         if (aPMode == null)
         {
           LOGGER.error ("Failed to resolve PMode '" + sPModeID + "' using resolver " + m_aPModeResolver);
-
           aErrorList.add (EEbmsError.EBMS_PROCESSING_MODE_MISMATCH.getAsError (aLocale));
           return ESuccess.FAILURE;
         }
@@ -357,7 +353,6 @@ public ESuccess processHeaderElement (@Nonnull final Document aSOAPDoc,
         if (aEffectiveMPC == null)
         {
           LOGGER.error ("Error processing the UserMessage, effective MPC ID '" + sEffectiveMPCID + "' is unknown!");
-
           aErrorList.add (EEbmsError.EBMS_VALUE_INCONSISTENT.getAsError (aLocale));
           return ESuccess.FAILURE;
         }
@@ -371,8 +366,7 @@ public ESuccess processHeaderElement (@Nonnull final Document aSOAPDoc,
       {
         if (bHasSoapBodyPayload)
         {
-          LOGGER.error ("No PartInfo is specified, so no SOAP body payload is allowed.");
-
+          LOGGER.error ("No PayloadInfo/PartInfo is specified, so no SOAP body payload is allowed.");
           aErrorList.add (EEbmsError.EBMS_VALUE_INCONSISTENT.getAsError (aLocale));
           return ESuccess.FAILURE;
         }
@@ -381,8 +375,7 @@ public ESuccess processHeaderElement (@Nonnull final Document aSOAPDoc,
         // attachments in the message
         if (aAttachments.isNotEmpty ())
         {
-          LOGGER.error ("No PartInfo is specified, so no attachments are allowed.");
-
+          LOGGER.error ("No PayloadInfo/PartInfo is specified, so no attachments are allowed.");
           aErrorList.add (EEbmsError.EBMS_EXTERNAL_PAYLOAD_ERROR.getAsError (aLocale));
           return ESuccess.FAILURE;
         }
@@ -397,7 +390,6 @@ public ESuccess processHeaderElement (@Nonnull final Document aSOAPDoc,
                         " but having " +
                         aAttachments.size () +
                         " attachments.");
-
           aErrorList.add (EEbmsError.EBMS_EXTERNAL_PAYLOAD_ERROR.getAsError (aLocale));
           return ESuccess.FAILURE;
         }
@@ -413,7 +405,6 @@ public ESuccess processHeaderElement (@Nonnull final Document aSOAPDoc,
             if (!bHasSoapBodyPayload)
             {
               LOGGER.error ("Error processing the UserMessage. Expected a SOAPBody Payload but there is none present.");
-
               aErrorList.add (EEbmsError.EBMS_VALUE_INCONSISTENT.getAsError (aLocale));
               return ESuccess.FAILURE;
             }
@@ -428,10 +419,12 @@ public ESuccess processHeaderElement (@Nonnull final Document aSOAPDoc,
             final String sAttachmentID = StringHelper.trimStart (aPartInfo.getHref (), MessageHelperMethods.PREFIX_CID);
             final WSS4JAttachment aIncomingAttachment = aAttachments.findFirst (x -> EqualsHelper.equals (x.getId (), sAttachmentID));
             if (aIncomingAttachment == null)
+            {
               LOGGER.warn ("Failed to resolve MIME attachment '" +
                            sAttachmentID +
                            "' in list of " +
                            aAttachments.getAllMapped (WSS4JAttachment::getId));
+            }
 
             boolean bMimeTypePresent = false;
             boolean bCompressionTypePresent = false;