You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2018/05/13 10:21:10 UTC
[camel] 02/02: [CAMEL-11257] Fixed checkstyle warnings
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2c27df31aaca1458e7f19f2dba12775a1a902be7
Author: William Collins <pu...@gmail.com>
AuthorDate: Fri May 11 13:10:18 2018 -0400
[CAMEL-11257] Fixed checkstyle warnings
---
.../component/as2/api/entity/ApplicationEDIEntity.java | 2 +-
.../camel/component/as2/api/entity/EntityParser.java | 4 ++--
.../camel/component/as2/api/util/EntityUtils.java | 18 +++++++++---------
.../apache/camel/component/as2/api/AS2MessageTest.java | 11 +++++------
4 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/ApplicationEDIEntity.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/ApplicationEDIEntity.java
index f5610e8..086e744 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/ApplicationEDIEntity.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/ApplicationEDIEntity.java
@@ -47,7 +47,7 @@ public abstract class ApplicationEDIEntity extends MimeEntity {
public void writeTo(OutputStream outstream) throws IOException {
NoCloseOutputStream ncos = new NoCloseOutputStream(outstream);
try (CanonicalOutputStream canonicalOutstream = new CanonicalOutputStream(ncos, AS2Charset.US_ASCII);
- OutputStream transferEncodedStream = EntityUtils.encode(canonicalOutstream, getContentTransferEncodingValue())) {
+ OutputStream transferEncodedStream = EntityUtils.encode(canonicalOutstream, getContentTransferEncodingValue())) {
// Write out mime part headers if this is not the main body of message.
if (!isMainBody()) {
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
index 76c6491c..ff154f2 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
@@ -596,7 +596,7 @@ public final class EntityParser {
String text = parseBodyPartText(inbuffer, boundary);
if (contentTransferEncoding != null) {
- text = EntityUtils.decode(text, charset, contentTransferEncoding);
+ text = EntityUtils.decode(text, charset, contentTransferEncoding);
}
return new TextPlainEntity(text, charsetName, contentTransferEncoding, false);
} catch (Exception e) {
@@ -724,7 +724,7 @@ public final class EntityParser {
String ediMessageBodyPartContent = parseBodyPartText(inbuffer, boundary);
if (contentTransferEncoding != null) {
- ediMessageBodyPartContent = EntityUtils.decode(ediMessageBodyPartContent, charset, contentTransferEncoding);
+ ediMessageBodyPartContent = EntityUtils.decode(ediMessageBodyPartContent, charset, contentTransferEncoding);
}
ApplicationEDIEntity applicationEDIEntity = EntityUtils.createEDIEntity(ediMessageBodyPartContent,
ediMessageContentType, contentTransferEncoding, false);
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/EntityUtils.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/EntityUtils.java
index 576d679..17b81a9 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/EntityUtils.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/EntityUtils.java
@@ -82,8 +82,8 @@ public final class EntityUtils {
}
public static String encode(String data, Charset charset, String encoding) throws Exception {
- byte[] encoded = encode(data.getBytes(charset), encoding);
- return new String(encoded, charset);
+ byte[] encoded = encode(data.getBytes(charset), encoding);
+ return new String(encoded, charset);
}
public static byte[] encode(byte[] data, String encoding) throws Exception {
@@ -134,8 +134,8 @@ public final class EntityUtils {
}
public static String decode(String data, Charset charset, String encoding) throws Exception {
- byte[] decoded = decode(data.getBytes(charset), encoding);
- return new String(decoded, charset);
+ byte[] decoded = decode(data.getBytes(charset), encoding);
+ return new String(decoded, charset);
}
public static byte[] decode(byte[] data, String encoding) throws Exception {
@@ -255,16 +255,16 @@ public final class EntityUtils {
}
public static void printEntity(PrintStream out, HttpEntity entity) throws IOException {
- entity.writeTo(out);
+ entity.writeTo(out);
}
- public static String printEntity(HttpEntity entity) throws IOException {
- try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ public static String printEntity(HttpEntity entity) throws IOException {
+ try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
PrintStream ps = new PrintStream(baos, true, "utf-8")) {
- printEntity(ps, entity);
+ printEntity(ps, entity);
String content = new String(baos.toByteArray(), StandardCharsets.UTF_8);
return content;
- }
+ }
}
}
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 01a5200..e155028 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
@@ -16,11 +16,6 @@
*/
package org.apache.camel.component.as2.api;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
import java.io.IOException;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
@@ -37,7 +32,6 @@ import org.apache.camel.component.as2.api.entity.ApplicationPkcs7SignatureEntity
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.HttpMessageUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpException;
import org.apache.http.HttpRequest;
@@ -68,6 +62,11 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public class AS2MessageTest {
public static final String EDI_MESSAGE = "UNB+UNOA:1+005435656:1+006415160:1+060515:1434+00000000000778'\n"
--
To stop receiving notification emails like this one, please contact
davsclaus@apache.org.