[
https://issues.apache.org/jira/browse/CAMEL-12605?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16584660#comment-16584660
]
ASF GitHub Bot commented on CAMEL-12605:
davsclaus closed pull request #2482: [CAMEL-12605] Refactored name and package
of AS2 utilities
URL: https://github.com/apache/camel/pull/2482
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/protocol/RequestAS2.java
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/protocol/RequestAS2.java
index be1ee6a4bb6..852067c7710 100644
---
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/protocol/RequestAS2.java
+++
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/protocol/RequestAS2.java
@@ -22,7 +22,7 @@
import org.apache.camel.component.as2.api.AS2Constants;
import org.apache.camel.component.as2.api.AS2Header;
import org.apache.camel.component.as2.api.InvalidAS2NameException;
-import org.apache.camel.component.as2.api.Util;
+import org.apache.camel.component.as2.api.util.AS2Utils;
import org.apache.http.HttpException;
import org.apache.http.HttpRequest;
import org.apache.http.HttpRequestInterceptor;
@@ -61,7 +61,7 @@ public void process(HttpRequest request, HttpContext context)
throws HttpExcepti
/* AS2-From header */
String as2From = coreContext.getAttribute(AS2ClientManager.AS2_FROM,
String.class);
try {
-Util.validateAS2Name(as2From);
+AS2Utils.validateAS2Name(as2From);
} catch (InvalidAS2NameException e) {
throw new HttpException("Invalid AS-From name", e);
}
@@ -70,7 +70,7 @@ public void process(HttpRequest request, HttpContext context)
throws HttpExcepti
/* AS2-To header */
String as2To = coreContext.getAttribute(AS2ClientManager.AS2_TO,
String.class);
try {
-Util.validateAS2Name(as2To);
+AS2Utils.validateAS2Name(as2To);
} catch (InvalidAS2NameException e) {
throw new HttpException("Invalid AS-To name", e);
}
@@ -78,7 +78,7 @@ public void process(HttpRequest request, HttpContext context)
throws HttpExcepti
/* Message-Id header*/
// SHOULD be set to aid in message reconciliation
-request.addHeader(AS2Header.MESSAGE_ID,
Util.createMessageId(clientFQDN));
+request.addHeader(AS2Header.MESSAGE_ID,
AS2Utils.createMessageId(clientFQDN));
}
}
diff --git
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/protocol/RequestAsynchronousMDN.java
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/protocol/RequestAsynchronousMDN.java
index c4276288675..ed03fbbf820 100644
---
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/protocol/RequestAsynchronousMDN.java
+++
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/protocol/RequestAsynchronousMDN.java
@@ -21,7 +21,7 @@
import org.apache.camel.component.as2.api.AS2AsynchronousMDNManager;
import org.apache.camel.component.as2.api.AS2Constants;
import org.apache.camel.component.as2.api.AS2Header;
-import org.apache.camel.component.as2.api.Util;
+import org.apache.camel.component.as2.api.util.AS2Utils;
import org.apache.http.HttpException;
import org.apache.http.HttpRequest;
import org.apache.http.HttpRequestInterceptor;
@@ -51,7 +51,7 @@ public void process(HttpRequest request, HttpContext context)
throws HttpExcepti
/* Message-Id header */
// SHOULD be set to aid in message reconciliation
-request.addHeader(AS2Header.MESSAGE_ID,
Util.createMessageId(senderFQDN));
+request.addHeader(AS2Header.MESSAGE_ID,
AS2Utils.createMessageId(senderFQDN));
/* Recipient-Address header */
String recipientAddress =
coreContext.getAttribute(AS2AsynchronousMDNManager.RECIPIENT_ADDRESS,
String.class);
diff --git
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/protocol/ResponseMDN.java
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/protocol/ResponseMDN.java
index 98a72fa0400..e0aecbdf81d 100644
---
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/protocol/ResponseMDN.java
+++
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/protocol/ResponseMDN.java
@@ -28,13 +28,13 @@
import org.apache.camel.component.as2.api.AS2SignedDataGenerator;
import