From 8aa23f3e8a5e8e107b2f2f40b938ffec544691db Mon Sep 17 00:00:00 2001 From: Jon Rios Date: Mon, 24 Jun 2024 09:49:51 +0200 Subject: [PATCH 1/3] Add agreementType to EuCtpPullRequestBuilder Correct naming --- .../helger/phase4/euctp/AbstractEuCtpUserMessageBuilder.java | 1 + .../java/com/helger/phase4/euctp/EuCtpPullRequestBuilder.java | 1 + .../main/java/com/helger/phase4/euctp/Phase4EuCtpSender.java | 2 +- .../main/java/com/helger/phase4/profile/euctp/EuCtpPMode.java | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/AbstractEuCtpUserMessageBuilder.java b/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/AbstractEuCtpUserMessageBuilder.java index 9b7127654..500fe0b33 100644 --- a/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/AbstractEuCtpUserMessageBuilder.java +++ b/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/AbstractEuCtpUserMessageBuilder.java @@ -58,6 +58,7 @@ protected AbstractEuCtpUserMessageBuilder () conversationID (UUID.randomUUID ().toString ()); agreementRef (EuCtpPMode.DEFAULT_AGREEMENT_ID); + agreementType(EuCtpPMode.DEFAULT_AGREEMENT_TYPE); forceMimeMessage (true); } diff --git a/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/EuCtpPullRequestBuilder.java b/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/EuCtpPullRequestBuilder.java index 798fe6a3f..4ea229ec0 100644 --- a/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/EuCtpPullRequestBuilder.java +++ b/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/EuCtpPullRequestBuilder.java @@ -8,6 +8,7 @@ import com.helger.phase4.crypto.ECryptoAlgorithmC14N; import com.helger.phase4.crypto.ECryptoKeyEncryptionAlgorithm; +import com.helger.phase4.crypto.ECryptoKeyIdentifierType; import com.helger.phase4.sender.AbstractAS4PullRequestBuilder; public class EuCtpPullRequestBuilder extends AbstractAS4PullRequestBuilder diff --git a/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/Phase4EuCtpSender.java b/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/Phase4EuCtpSender.java index 0f2c5d471..b4349a6cc 100644 --- a/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/Phase4EuCtpSender.java +++ b/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/Phase4EuCtpSender.java @@ -40,7 +40,7 @@ private Phase4EuCtpSender () * Never null. */ @Nonnull - public static EuctpUserMessageBuilder builder () + public static EuCtpUserMessageBuilder builder () { return new EuctpUserMessageBuilder (); } diff --git a/phase4-profile-euctp/src/main/java/com/helger/phase4/profile/euctp/EuCtpPMode.java b/phase4-profile-euctp/src/main/java/com/helger/phase4/profile/euctp/EuCtpPMode.java index f2faae913..75a8cc479 100644 --- a/phase4-profile-euctp/src/main/java/com/helger/phase4/profile/euctp/EuCtpPMode.java +++ b/phase4-profile-euctp/src/main/java/com/helger/phase4/profile/euctp/EuCtpPMode.java @@ -54,6 +54,7 @@ public final class EuCtpPMode { public static final String DEFAULT_AGREEMENT_ID = "EU-ICS2-TI-V2.0"; + public static final String DEFAULT_AGREEMENT_TYPE = "ics2-interface-version"; public static final String DEFAULT_PARTY_TYPE_ID = "urn:oasis:names:tc:ebcore:partyid-type:unregistered:eu-customs:EORI"; public static final String DEFAULT_CUSTOMS_PARTY_TYPE_ID = "urn:oasis:names:tc:ebcore:partyid-type:unregistered:eu-customs:auth"; From 1a0c95504b5075591aa82c6b58318a14ba5e2001 Mon Sep 17 00:00:00 2001 From: Jon Rios Date: Mon, 24 Jun 2024 09:57:45 +0200 Subject: [PATCH 2/3] Correct name --- .../java/com/helger/phase4/euctp/Phase4EuCtpSender.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/Phase4EuCtpSender.java b/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/Phase4EuCtpSender.java index b4349a6cc..57d184440 100644 --- a/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/Phase4EuCtpSender.java +++ b/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/Phase4EuCtpSender.java @@ -42,7 +42,7 @@ private Phase4EuCtpSender () @Nonnull public static EuCtpUserMessageBuilder builder () { - return new EuctpUserMessageBuilder (); + return new EuCtpUserMessageBuilder(); } /** @@ -52,9 +52,9 @@ public static EuCtpUserMessageBuilder builder () * * @author Ulrik Stehling */ - public static class EuctpUserMessageBuilder extends AbstractEuCtpUserMessageBuilder + public static class EuCtpUserMessageBuilder extends AbstractEuCtpUserMessageBuilder { - public EuctpUserMessageBuilder () + public EuCtpUserMessageBuilder() { super (); } From 788bf8ed29a21f16fdcd3f596798f94f46fbf2ea Mon Sep 17 00:00:00 2001 From: Jon Rios Date: Mon, 24 Jun 2024 09:57:45 +0200 Subject: [PATCH 3/3] Correct name --- .../helger/phase4/euctp/AbstractEuCtpUserMessageBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/AbstractEuCtpUserMessageBuilder.java b/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/AbstractEuCtpUserMessageBuilder.java index 500fe0b33..c9e8a4016 100644 --- a/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/AbstractEuCtpUserMessageBuilder.java +++ b/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/AbstractEuCtpUserMessageBuilder.java @@ -58,7 +58,7 @@ protected AbstractEuCtpUserMessageBuilder () conversationID (UUID.randomUUID ().toString ()); agreementRef (EuCtpPMode.DEFAULT_AGREEMENT_ID); - agreementType(EuCtpPMode.DEFAULT_AGREEMENT_TYPE); + agreementType(EuCtpPMode.DEFAULT_AGREEMENT_TYPE); forceMimeMessage (true); }