[
https://issues.apache.org/jira/browse/CAMEL-12605?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=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 org.apache.camel.component.as2.api.AS2TransferEncoding;
import org.apache.camel.component.as2.api.InvalidAS2NameException;
-import org.apache.camel.component.as2.api.Util;
import org.apache.camel.component.as2.api.entity.AS2DispositionType;
import org.apache.camel.component.as2.api.entity.DispositionMode;
import
org.apache.camel.component.as2.api.entity.DispositionNotificationMultipartReportEntity;
import
org.apache.camel.component.as2.api.entity.DispositionNotificationOptions;
import
org.apache.camel.component.as2.api.entity.DispositionNotificationOptionsParser;
import org.apache.camel.component.as2.api.entity.MultipartSignedEntity;
+import org.apache.camel.component.as2.api.util.AS2Utils;
import org.apache.camel.component.as2.api.util.EntityUtils;
import org.apache.camel.component.as2.api.util.HttpMessageUtils;
import org.apache.camel.component.as2.api.util.SigningUtils;
@@ -139,7 +139,7 @@ public void process(HttpResponse response, HttpContext
context) throws HttpExcep
/* AS2-From header */
String as2From = HttpMessageUtils.getHeaderValue(request,
AS2Header.AS2_TO);
try {
- Util.validateAS2Name(as2From);
+ AS2Utils.validateAS2Name(as2From);
} catch (InvalidAS2NameException e) {
throw new HttpException("Invalid AS-From name", e);
}
@@ -148,7 +148,7 @@ public void process(HttpResponse response, HttpContext
context) throws HttpExcep
/* AS2-To header */
String as2To = HttpMessageUtils.getHeaderValue(request,
AS2Header.AS2_FROM);
try {
- Util.validateAS2Name(as2To);
+ AS2Utils.validateAS2Name(as2To);
} catch (InvalidAS2NameException e) {
throw new HttpException("Invalid AS-To name", e);
}
@@ -156,7 +156,7 @@ public void process(HttpResponse response, HttpContext
context) throws HttpExcep
/* Message-Id header*/
// RFC4130 - 7.3 - A Message-ID header is added to support
message reconciliation
- response.addHeader(AS2Header.MESSAGE_ID,
Util.createMessageId(serverFQDN));
+ response.addHeader(AS2Header.MESSAGE_ID,
AS2Utils.createMessageId(serverFQDN));
AS2SignedDataGenerator gen = null;
if (dispositionNotificationOptions.getSignedReceiptProtocol() !=
null && signingCertificateChain != null
@@ -182,7 +182,7 @@ public void process(HttpResponse response, HttpContext
context) throws HttpExcep
}
}
- LOG.debug(Util.printMessage(response));
+ LOG.debug(AS2Utils.printMessage(response));
}
}
diff --git
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/Util.java
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/AS2Utils.java
similarity index 97%
rename from
components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/Util.java
rename to
components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/AS2Utils.java
index 3d8f4835f7c..d4c31616a6d 100644
---
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/Util.java
+++
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/AS2Utils.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.as2.api;
+package org.apache.camel.component.as2.api.util;
import java.awt.event.KeyEvent;
import java.io.ByteArrayOutputStream;
@@ -25,6 +25,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.camel.component.as2.api.InvalidAS2NameException;
import org.apache.http.Header;
import org.apache.http.HeaderIterator;
import org.apache.http.HttpEntity;
@@ -38,7 +39,7 @@
/**
* Utility Methods used in AS2 Component
*/
-public final class Util {
+public final class AS2Utils {
public static final String DQUOTE = "\"";
public static final String BACKSLASH = "\\\\";
@@ -54,7 +55,7 @@
private static Random generator = new Random();
- private Util() {
+ private AS2Utils() {
}
/**
diff --git
a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTest.java
b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTest.java
index 9d84709770f..f17e7c45826 100644
---
a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTest.java
+++
b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTest.java
@@ -39,6 +39,7 @@
import org.apache.camel.component.as2.api.entity.MimeEntity;
import org.apache.camel.component.as2.api.entity.MultipartSignedEntity;
import org.apache.camel.component.as2.api.entity.TextPlainEntity;
+import org.apache.camel.component.as2.api.util.AS2Utils;
import org.apache.camel.component.as2.api.util.EntityUtils;
import org.apache.camel.component.as2.api.util.HttpMessageUtils;
import org.apache.camel.component.as2.api.util.MicUtils;
@@ -207,7 +208,7 @@ public void handle(HttpRequest request, HttpResponse
response, HttpContext conte
org.apache.camel.component.as2.api.entity.EntityParser.parseAS2MessageEntity(request);
context.setAttribute(AS2ServerManager.SUBJECT, SUBJECT);
context.setAttribute(AS2ServerManager.FROM, AS2_NAME);
- LOG.debug(Util.printMessage(request));
+ LOG.debug(AS2Utils.printMessage(request));
} catch (Exception e) {
throw new HttpException("Failed to parse AS2 Message
Entity", e);
}
@@ -447,7 +448,7 @@ public void asynchronousMdnMessageTest() throws Exception {
HttpMessageUtils.setHeaderValue(request, AS2Header.DATE, httpdate);
HttpMessageUtils.setHeaderValue(request, AS2Header.AS2_TO, AS2_NAME);
HttpMessageUtils.setHeaderValue(request, AS2Header.AS2_FROM, AS2_NAME);
- String originalMessageId = Util.createMessageId(SERVER_FQDN);
+ String originalMessageId = AS2Utils.createMessageId(SERVER_FQDN);
HttpMessageUtils.setHeaderValue(request, AS2Header.MESSAGE_ID,
originalMessageId);
HttpMessageUtils.setHeaderValue(request,
AS2Header.DISPOSITION_NOTIFICATION_OPTIONS,
DISPOSITION_NOTIFICATION_OPTIONS);
@@ -500,7 +501,7 @@ public void asynchronousMdnMessageTest() throws Exception {
ReceivedContentMic mdnMic = mdnEntity.getReceivedContentMic();
assertEquals("Unexpected value for Recieved Content Mic",
expectedMic.getEncodedMessageDigest(),
mdnMic.getEncodedMessageDigest());
- LOG.debug("\r\n" + Util.printMessage(mndRequest));
+ LOG.debug("\r\n" + AS2Utils.printMessage(mndRequest));
}
}
diff --git
a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIntegrationTest.java
b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIntegrationTest.java
index df55e9215f3..899399f66b9 100644
---
a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIntegrationTest.java
+++
b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIntegrationTest.java
@@ -40,7 +40,6 @@
import org.apache.camel.component.as2.api.AS2ServerConnection;
import org.apache.camel.component.as2.api.AS2ServerManager;
import org.apache.camel.component.as2.api.AS2SignedDataGenerator;
-import org.apache.camel.component.as2.api.Util;
import org.apache.camel.component.as2.api.entity.AS2DispositionModifier;
import org.apache.camel.component.as2.api.entity.AS2DispositionType;
import
org.apache.camel.component.as2.api.entity.AS2MessageDispositionNotificationEntity;
@@ -50,6 +49,7 @@
import
org.apache.camel.component.as2.api.entity.DispositionNotificationMultipartReportEntity;
import org.apache.camel.component.as2.api.entity.MimeEntity;
import org.apache.camel.component.as2.api.entity.MultipartSignedEntity;
+import org.apache.camel.component.as2.api.util.AS2Utils;
import org.apache.camel.component.as2.api.util.EntityUtils;
import org.apache.camel.component.as2.api.util.HttpMessageUtils;
import org.apache.camel.component.as2.api.util.MicUtils;
@@ -378,7 +378,7 @@ public void asyncMDNTest() throws Exception {
HttpMessageUtils.setHeaderValue(request, AS2Header.DATE, httpdate);
HttpMessageUtils.setHeaderValue(request, AS2Header.AS2_TO, AS2_NAME);
HttpMessageUtils.setHeaderValue(request, AS2Header.AS2_FROM, AS2_NAME);
- String originalMessageId = Util.createMessageId(SERVER_FQDN);
+ String originalMessageId = AS2Utils.createMessageId(SERVER_FQDN);
HttpMessageUtils.setHeaderValue(request, AS2Header.MESSAGE_ID,
originalMessageId);
HttpMessageUtils.setHeaderValue(request,
AS2Header.DISPOSITION_NOTIFICATION_OPTIONS,
DISPOSITION_NOTIFICATION_OPTIONS);
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> Enhance the AS2 Component to send and receive encrypted AS2 messages
> --------------------------------------------------------------------
>
> Key: CAMEL-12605
> URL: https://issues.apache.org/jira/browse/CAMEL-12605
> Project: Camel
> Issue Type: Improvement
> Affects Versions: 2.23.0
> Reporter: William Collins
> Assignee: William Collins
> Priority: Major
>
> Enhance the AS2 Component to support encrypted AS2 messages per RFC4130
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
