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 2015/11/18 14:51:36 UTC
[2/2] camel git commit: Fixed CS
Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/39174b7e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/39174b7e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/39174b7e
Branch: refs/heads/master
Commit: 39174b7e75e9d2e25c4b2849c00ca3179143818e
Parents: 6235274
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Nov 18 14:51:26 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Nov 18 14:51:26 2015 +0100
----------------------------------------------------------------------
.../undertow/DefaultUndertowHttpBinding.java | 4 ++--
.../component/undertow/UndertowComponent.java | 17 ++++++++--------
.../component/undertow/UndertowConsumer.java | 2 +-
.../undertow/UndertowConsumerResolver.java | 21 +++++++++++++++++---
.../component/undertow/UndertowProducer.java | 9 ++++-----
.../component/undertow/rest/RestGetTest.java | 2 +-
6 files changed, 34 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/39174b7e/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
----------------------------------------------------------------------
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 f3310e1..4fbd762 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
@@ -327,7 +327,7 @@ public class DefaultUndertowHttpBinding implements UndertowHttpBinding {
final ByteArrayOutputStream out = new ByteArrayOutputStream();
final ByteBuffer buffer = ByteBuffer.wrap(new byte[1024]);
- for (; ; ) {
+ for (;;) {
int res = source.read(buffer);
if (res == -1) {
return out.toByteArray();
@@ -335,7 +335,7 @@ public class DefaultUndertowHttpBinding implements UndertowHttpBinding {
source.getReadSetter().set(new ChannelListener<StreamSourceChannel>() {
@Override
public void handleEvent(StreamSourceChannel channel) {
- for (; ; ) {
+ for (;;) {
try {
int res = channel.read(buffer);
if (res == -1 || res == 0) {
http://git-wip-us.apache.org/repos/asf/camel/blob/39174b7e/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
index 28c4a2d..062a6c9 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
@@ -16,15 +16,6 @@
*/
package org.apache.camel.component.undertow;
-import io.undertow.Handlers;
-import io.undertow.Undertow;
-import io.undertow.attribute.ExchangeAttributes;
-import io.undertow.predicate.PathTemplatePredicate;
-import io.undertow.predicate.Predicate;
-import io.undertow.predicate.Predicates;
-import io.undertow.server.handlers.PathHandler;
-import io.undertow.server.handlers.PredicateHandler;
-
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
@@ -33,6 +24,14 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
+import io.undertow.Handlers;
+import io.undertow.Undertow;
+import io.undertow.attribute.ExchangeAttributes;
+import io.undertow.predicate.PathTemplatePredicate;
+import io.undertow.predicate.Predicate;
+import io.undertow.predicate.Predicates;
+import io.undertow.server.handlers.PathHandler;
+import io.undertow.server.handlers.PredicateHandler;
import org.apache.camel.CamelContext;
import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
http://git-wip-us.apache.org/repos/asf/camel/blob/39174b7e/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowConsumer.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowConsumer.java
index 9eca7a3..f7d9ace 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowConsumer.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowConsumer.java
@@ -68,7 +68,7 @@ public class UndertowConsumer extends DefaultConsumer {
httpCamelHandler.connectConsumer(this);
host.validateEndpointURI(httpUri);
- host.registerHandler(httpUri.getPath(), httpCamelHandler) ;
+ host.registerHandler(httpUri.getPath(), httpCamelHandler);
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/39174b7e/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowConsumerResolver.java
----------------------------------------------------------------------
diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowConsumerResolver.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowConsumerResolver.java
index f8f4ec3..9a56c2a 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowConsumerResolver.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowConsumerResolver.java
@@ -1,12 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.camel.component.undertow;
-import io.undertow.server.HttpServerExchange;
-import io.undertow.util.HttpString;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import io.undertow.server.HttpServerExchange;
+import io.undertow.util.HttpString;
import org.apache.camel.support.RestConsumerContextPathMatcher;
public class UndertowConsumerResolver {
http://git-wip-us.apache.org/repos/asf/camel/blob/39174b7e/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java
index 641cdbd..c74b7c3 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java
@@ -16,6 +16,10 @@
*/
package org.apache.camel.component.undertow;
+import java.io.IOException;
+import java.net.URI;
+import java.nio.ByteBuffer;
+
import io.undertow.client.ClientCallback;
import io.undertow.client.ClientConnection;
import io.undertow.client.ClientExchange;
@@ -25,11 +29,6 @@ import io.undertow.server.DefaultByteBufferPool;
import io.undertow.util.Headers;
import io.undertow.util.HttpString;
import io.undertow.util.Protocols;
-
-import java.io.IOException;
-import java.net.URI;
-import java.nio.ByteBuffer;
-
import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
http://git-wip-us.apache.org/repos/asf/camel/blob/39174b7e/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestGetTest.java
----------------------------------------------------------------------
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestGetTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestGetTest.java
index 5474278..40ec680 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestGetTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestGetTest.java
@@ -44,7 +44,7 @@ public class RestGetTest extends BaseUndertowTest {
String id = exchange.getIn().getHeader("id", String.class);
exchange.getOut().setBody(id + ";Donald Duck");
}
- });
+ });
}
};
}