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 2019/10/11 10:49:28 UTC
[camel] 01/02: CAMEL-14025: Fixed CS
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 eab9046e4156f96ae16778b2693ba07e292b1aac
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Oct 11 12:45:53 2019 +0200
CAMEL-14025: Fixed CS
---
.../camel/component/undertow/DefaultUndertowHttpBinding.java | 7 ++-----
.../org/apache/camel/component/undertow/UndertowEndpoint.java | 5 +++--
.../org/apache/camel/component/undertow/UndertowHttpBinding.java | 2 +-
.../camel/component/undertow/UndertowMuteExceptionTest.java | 9 ++-------
4 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
index f04f6d0..778e6a2 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
@@ -47,7 +47,6 @@ import org.apache.camel.Message;
import org.apache.camel.TypeConverter;
import org.apache.camel.attachment.AttachmentMessage;
import org.apache.camel.attachment.DefaultAttachment;
-import org.apache.camel.attachment.DefaultAttachmentMessage;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.support.DefaultMessage;
import org.apache.camel.support.ExchangeHelper;
@@ -375,10 +374,8 @@ public class DefaultUndertowHttpBinding implements UndertowHttpBinding {
// and mark the exception as failure handled, as we handled it by returning it as the response
ExchangeHelper.setFailureHandled(message.getExchange());
- }
- else if (exception != null && isMuteException()) {
-
- // mark the exception as failure handled, as we handled it by actively muting it
+ } else if (exception != null && isMuteException()) {
+ // mark the exception as failure handled, as we handled it by actively muting it
ExchangeHelper.setFailureHandled(message.getExchange());
}
diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
index bf1b934..f2932e7 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
@@ -16,12 +16,13 @@
*/
package org.apache.camel.component.undertow;
-import io.undertow.server.HttpServerExchange;
-import io.undertow.server.handlers.accesslog.AccessLogReceiver;
import java.net.URI;
import java.util.Locale;
import java.util.Map;
import javax.net.ssl.SSLContext;
+
+import io.undertow.server.HttpServerExchange;
+import io.undertow.server.handlers.accesslog.AccessLogReceiver;
import org.apache.camel.AsyncEndpoint;
import org.apache.camel.Consumer;
import org.apache.camel.Exchange;
diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowHttpBinding.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowHttpBinding.java
index e0f03c9..17c35c8 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowHttpBinding.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowHttpBinding.java
@@ -48,6 +48,6 @@ public interface UndertowHttpBinding {
void setTransferException(Boolean transferException);
- void setMuteException(Boolean MuteException);
+ void setMuteException(Boolean muteException);
}
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowMuteExceptionTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowMuteExceptionTest.java
index 5fe5d37..970815e 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowMuteExceptionTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowMuteExceptionTest.java
@@ -22,13 +22,10 @@ import org.apache.commons.httpclient.methods.GetMethod;
import org.junit.Assert;
import org.junit.Test;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-
public class UndertowMuteExceptionTest extends BaseUndertowTest {
@Test
- public void muteExceptionTest() throws IOException, ClassNotFoundException {
+ public void muteExceptionTest() throws Exception {
HttpClient client = new HttpClient();
GetMethod get = new GetMethod("http://localhost:" + getPort() + "/test/mute");
get.setRequestHeader("Accept", "application/text");
@@ -40,9 +37,8 @@ public class UndertowMuteExceptionTest extends BaseUndertowTest {
Assert.assertEquals(500, get.getStatusCode());
}
-
@Test
- public void muteExceptionWithTransferExceptionTest() throws IOException, ClassNotFoundException {
+ public void muteExceptionWithTransferExceptionTest() throws Exception {
HttpClient client = new HttpClient();
GetMethod get = new GetMethod("http://localhost:" + getPort() + "/test/muteWithTransfer");
get.setRequestHeader("Accept", "application/text");
@@ -59,7 +55,6 @@ public class UndertowMuteExceptionTest extends BaseUndertowTest {
return new RouteBuilder() {
public void configure() {
-
from("undertow:http://localhost:" + getPort() + "/test/mute?muteException=true").to("mock:input")
.throwException(new IllegalArgumentException("Camel cannot do this"));