Merge branch 'master' of https://github.com/phax/phase4.git

phax · Aug 11, 2023 · 5bf31d7 · 5bf31d7
2 parents 6e21f73 + b4df5dc
commit 5bf31d7
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,8 +12,11 @@ private-*.properties*
 release.properties
 Main*ReceiverProd.java
 zz
+pom.xml.versionsBackup
 
 .idea/
 .settings/ 
 target/
 generated/
+
+*.code-workspace
diff --git a/phase4-bdew-client/src/main/java/com/helger/phase4/bdew/Phase4BDEWSender.java b/phase4-bdew-client/src/main/java/com/helger/phase4/bdew/Phase4BDEWSender.java
@@ -95,6 +95,7 @@ protected AbstractBDEWUserMessageBuilder ()
         // Other crypt parameters are located in the PMode security part
         cryptParams ().setKeyIdentifierType (DEFAULT_KEY_IDENTIFIER_TYPE);
         cryptParams ().setKeyEncAlgorithm (ECryptoKeyEncryptionAlgorithm.ECDH_ES_KEYWRAP_AES_128);
+        cryptParams ().setEncryptSymmetricSessionKey (false);
 
         /**
          * Assumption: the BST "ValueType" attribute is set to

diff --git a/phase4-lib/src/main/java/com/helger/phase4/crypto/AS4IncomingSecurityConfiguration.java b/phase4-lib/src/main/java/com/helger/phase4/crypto/AS4IncomingSecurityConfiguration.java
@@ -66,6 +66,12 @@ public AS4IncomingSecurityConfiguration setSecurityProviderCrypt (@Nullable fina
     return this;
   }
 
+  @Nonnull
+  public AS4IncomingSecurityConfiguration setSecurityProvider (@Nullable final Provider a)
+  {
+    return setSecurityProviderSign (a).setSecurityProviderCrypt (a);
+  }
+
   @Nullable
   public IAS4DecryptParameterModifier getDecryptParameterModifier ()
   {

diff --git a/phase4-lib/src/main/java/com/helger/phase4/messaging/domain/AS4ReceiptMessage.java b/phase4-lib/src/main/java/com/helger/phase4/messaging/domain/AS4ReceiptMessage.java
@@ -172,7 +172,7 @@ public static AS4ReceiptMessage create (@Nonnull final ESoapVersion eSoapVersion
                                           @Nonnull @Nonempty final String sMessageID,
                                           @Nullable final Ebms3UserMessage aEbms3UserMessage,
                                           @Nullable final Node aSoapDocument,
-                                          @Nonnull final boolean bShouldUseNonRepudiation)
+                                          final boolean bShouldUseNonRepudiation)
   {
     // Only for signed messages
     final ICommonsList <ReferenceType> aDSRefs = getAllDSigReferences (aSoapDocument);

diff --git a/phase4-lib/src/main/java/com/helger/phase4/model/EMEPBinding.java b/phase4-lib/src/main/java/com/helger/phase4/model/EMEPBinding.java
@@ -76,7 +76,7 @@ public enum EMEPBinding implements IHasID <String>
   private final String m_sURI;
   private final int m_nRequiredLegs;
 
-  EMEPBinding (@Nonnull @Nonempty final String sID, @Nonnull @Nonempty final String sURI, @Nonnull final int nRequiredLegs)
+  EMEPBinding (@Nonnull @Nonempty final String sID, @Nonnull @Nonempty final String sURI, final int nRequiredLegs)
   {
     m_sID = sID;
     m_sURI = sURI;

diff --git a/phase4-lib/src/main/java/com/helger/phase4/model/pmode/IPModeManager.java b/phase4-lib/src/main/java/com/helger/phase4/model/pmode/IPModeManager.java
@@ -62,7 +62,6 @@ public interface IPModeManager
    * @param aPMode
    *        The PMode to be created or updated.
    */
-  @Nonnull
   void createOrUpdatePMode (@Nonnull PMode aPMode);
 
   /**

diff --git a/phase4-lib/src/main/java/com/helger/phase4/model/pmode/PMode.java b/phase4-lib/src/main/java/com/helger/phase4/model/pmode/PMode.java
@@ -38,7 +38,6 @@
  *
  * @author Philip Helger
  */
-@Nonnull
 @MustImplementEqualsAndHashcode
 public class PMode extends AbstractBusinessObject implements IPMode
 {

diff --git a/phase4-lib/src/main/java/com/helger/phase4/model/pmode/PModeManager.java b/phase4-lib/src/main/java/com/helger/phase4/model/pmode/PModeManager.java
@@ -128,7 +128,6 @@ public EChange updatePMode (@Nonnull final IPMode aPMode)
     return EChange.CHANGED;
   }
 
-  @Nonnull
   public void createOrUpdatePMode (@Nonnull final PMode aPMode)
   {
     ValueEnforcer.notNull (aPMode, "PMode");

diff --git a/phase4-lib/src/main/java/com/helger/phase4/model/pmode/PModeManagerInMemory.java b/phase4-lib/src/main/java/com/helger/phase4/model/pmode/PModeManagerInMemory.java
@@ -129,7 +129,6 @@ public EChange updatePMode (@Nonnull final IPMode aNewPMode)
     return EChange.CHANGED;
   }
 
-  @Nonnull
   public void createOrUpdatePMode (@Nonnull final PMode aPMode)
   {
     ValueEnforcer.notNull (aPMode, "PMode");

diff --git a/phase4-lib/src/main/java/com/helger/phase4/model/pmode/leg/PModePayloadProfile.java b/phase4-lib/src/main/java/com/helger/phase4/model/pmode/leg/PModePayloadProfile.java
@@ -209,7 +209,7 @@ public final EChange setMaxSizeKB (@Nullable final Integer aMaxSizeKB)
    * @since 0.12.0
    */
   @Nonnull
-  public final EChange setMaxSizeKB (@Nullable final int nMaxSizeKB)
+  public final EChange setMaxSizeKB (final int nMaxSizeKB)
   {
     return setMaxSizeKB (Integer.valueOf (nMaxSizeKB));
   }