This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 2b3213c (chores) camel-as2: code cleanups (#5694)
2b3213c is described below
commit 2b3213c60f40ce31cae732fb9e6741496e930092
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Thu Jun 17 15:07:42 2021 +0200
(chores) camel-as2: code cleanups (#5694)
- removed exceptions not thrown from method signatures
- adjusted the log configuration to send test logs to file
---
.../camel/component/as2/api/AS2ClientConnection.java | 3 +--
.../camel/component/as2/api/AS2ServerConnection.java | 2 +-
.../apache/camel/component/as2/api/AS2ServerManager.java | 14 ++------------
.../as2/api/entity/ApplicationPkcs7SignatureEntity.java | 3 +--
.../DispositionNotificationMultipartReportEntity.java | 3 +--
.../component/as2/api/entity/MultipartReportEntity.java | 4 +---
.../camel/component/as2/api/protocol/ResponseMDN.java | 2 +-
.../camel/component/as2/internal/AS2ConnectionHelper.java | 3 +--
.../src/test/resources/log4j2.properties | 11 ++++++++++-
9 files changed, 19 insertions(+), 26 deletions(-)
diff --git
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ClientConnection.java
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ClientConnection.java
index 2124fca..dd86e97 100644
---
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ClientConnection.java
+++
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ClientConnection.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.as2.api;
import java.io.IOException;
import java.net.Socket;
-import java.net.UnknownHostException;
import org.apache.camel.component.as2.api.io.AS2BHttpClientConnection;
import org.apache.camel.component.as2.api.protocol.RequestAS2;
@@ -50,7 +49,7 @@ public class AS2ClientConnection {
private String clientFqdn;
public AS2ClientConnection(String as2Version, String userAgent, String
clientFqdn, String targetHostName,
- Integer targetPortNumber) throws
UnknownHostException, IOException {
+ Integer targetPortNumber) throws IOException {
this.as2Version = Args.notNull(as2Version, "as2Version");
this.userAgent = Args.notNull(userAgent, "userAgent");
diff --git
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ServerConnection.java
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ServerConnection.java
index 48cd101..6cbb0d9 100644
---
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ServerConnection.java
+++
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ServerConnection.java
@@ -238,7 +238,7 @@ public class AS2ServerConnection {
}
}
- public void listen(String requestUri, HttpRequestHandler handler) throws
IOException {
+ public void listen(String requestUri, HttpRequestHandler handler) {
if (listenerThread != null) {
synchronized (listenerThread) {
listenerThread.registerHandler(requestUri, handler);
diff --git
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ServerManager.java
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ServerManager.java
index 1d9b723c..b79491a 100644
---
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ServerManager.java
+++
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ServerManager.java
@@ -16,10 +16,7 @@
*/
package org.apache.camel.component.as2.api;
-import java.io.IOException;
-
import org.apache.http.HttpEntityEnclosingRequest;
-import org.apache.http.HttpException;
import org.apache.http.HttpResponse;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpRequestHandler;
@@ -59,13 +56,7 @@ public class AS2ServerManager {
}
public void listen(String requestUriPattern, HttpRequestHandler handler) {
- try {
- as2ServerConnection.listen(requestUriPattern, handler);
- } catch (IOException e) {
- LOG.error("Failed to listen for '{}' requests: {}",
requestUriPattern, e.getMessage(), e);
- throw new RuntimeException("Failed to listen for '" +
requestUriPattern + "' requests: " + e.getMessage(), e);
- }
-
+ as2ServerConnection.listen(requestUriPattern, handler);
}
public void stopListening(String requestUri) {
@@ -73,8 +64,7 @@ public class AS2ServerManager {
}
public void handleMDNResponse(
- HttpEntityEnclosingRequest request, HttpResponse response,
HttpContext httpContext, String subject, String from)
- throws HttpException {
+ HttpEntityEnclosingRequest request, HttpResponse response,
HttpContext httpContext, String subject, String from) {
// Add Context attributes for Response
httpContext.setAttribute(SUBJECT, subject);
httpContext.setAttribute(FROM, from);
diff --git
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/ApplicationPkcs7SignatureEntity.java
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/ApplicationPkcs7SignatureEntity.java
index 87e8248..22ca710 100644
---
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/ApplicationPkcs7SignatureEntity.java
+++
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/ApplicationPkcs7SignatureEntity.java
@@ -65,8 +65,7 @@ public class ApplicationPkcs7SignatureEntity extends
MimeEntity {
public ApplicationPkcs7SignatureEntity(byte[] signature,
String charset,
String contentTransferEncoding,
- boolean isMainBody)
- throws
HttpException {
+ boolean isMainBody) {
this.signature = Args.notNull(signature, "signature");
ContentType contentType = ContentType
diff --git
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/DispositionNotificationMultipartReportEntity.java
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/DispositionNotificationMultipartReportEntity.java
index a1ed766..f6ddce0 100644
---
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/DispositionNotificationMultipartReportEntity.java
+++
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/DispositionNotificationMultipartReportEntity.java
@@ -71,8 +71,7 @@ public class DispositionNotificationMultipartReportEntity
extends MultipartRepor
return AS2MimeType.MULTIPART_REPORT + ";
report-type=disposition-notification; boundary=\"" + boundary + "\"";
}
- protected TextPlainEntity buildPlainTextReport(String mdnMessage)
- throws HttpException {
+ protected TextPlainEntity buildPlainTextReport(String mdnMessage) {
return new TextPlainEntity(mdnMessage, AS2Charset.US_ASCII,
AS2TransferEncoding.SEVENBIT, false);
}
diff --git
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/MultipartReportEntity.java
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/MultipartReportEntity.java
index 3ecc828..5dd5728 100644
---
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/MultipartReportEntity.java
+++
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/MultipartReportEntity.java
@@ -17,15 +17,13 @@
package org.apache.camel.component.as2.api.entity;
import org.apache.camel.component.as2.api.AS2MimeType;
-import org.apache.http.HttpException;
import org.apache.http.entity.ContentType;
public class MultipartReportEntity extends MultipartMimeEntity {
public MultipartReportEntity(String charset,
boolean isMainBody,
- String boundary)
- throws HttpException {
+ String boundary) {
super(ContentType.create(AS2MimeType.MULTIPART_REPORT, charset),
isMainBody, boundary);
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 6c4c152..48c70db 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
@@ -293,7 +293,7 @@ public class ResponseMDN implements HttpResponseInterceptor
{
}
}
- private synchronized VelocityEngine getVelocityEngine() throws Exception {
+ private synchronized VelocityEngine getVelocityEngine() {
if (velocityEngine == null) {
velocityEngine = new VelocityEngine();
diff --git
a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/internal/AS2ConnectionHelper.java
b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/internal/AS2ConnectionHelper.java
index f221f67..20d661f 100644
---
a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/internal/AS2ConnectionHelper.java
+++
b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/internal/AS2ConnectionHelper.java
@@ -50,8 +50,7 @@ public final class AS2ConnectionHelper {
* @throws UnknownHostException Failed to establish connection due to
unknown host.
* @throws IOException - Failed to establish connection.
*/
- public static AS2ClientConnection
createAS2ClientConnection(AS2Configuration configuration)
- throws UnknownHostException, IOException {
+ public static AS2ClientConnection
createAS2ClientConnection(AS2Configuration configuration) throws IOException {
return new AS2ClientConnection(
configuration.getAs2Version(), configuration.getUserAgent(),
configuration.getClientFqdn(),
configuration.getTargetHostname(),
configuration.getTargetPortNumber());
diff --git
a/components/camel-as2/camel-as2-component/src/test/resources/log4j2.properties
b/components/camel-as2/camel-as2-component/src/test/resources/log4j2.properties
index d9f0508..0ccffda 100644
---
a/components/camel-as2/camel-as2-component/src/test/resources/log4j2.properties
+++
b/components/camel-as2/camel-as2-component/src/test/resources/log4j2.properties
@@ -15,9 +15,18 @@
## limitations under the License.
## ---------------------------------------------------------------------------
+appender.file.type = File
+appender.file.name = file
+appender.file.fileName = target/camel-as2-test.log
+appender.file.layout.type = PatternLayout
+appender.file.layout.pattern = %d %-5p %c{1} - %m %n
appender.out.type = Console
appender.out.name = out
appender.out.layout.type = PatternLayout
appender.out.layout.pattern = [%30.30t] %-30.30c{1} %-5p %m%n
+
+logger.hz.name = org.apache.camel.component.as2
+logger.hz.level = debug
+
rootLogger.level = INFO
-rootLogger.appenderRef.out.ref = out
+rootLogger.appenderRef.file.ref = file
