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/12/21 15:30:01 UTC
[camel] branch master updated (bd36440 -> a569ba3)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from bd36440 CAMEL-13027 - Regen and docs
new 6706a0f CAMEL-13028: camel-undertow - When using SSL with rest-dsl and api-doc then you can get a port already bound exception
new 4c158a4 CAMEL-13029: camel-swagger-java - Should default use scheme from rest-dsl configuration in swagger doc
new a6cc16d Fixed CS
new bcc3cf9 Fixed CS
new a569ba3 Fixed CS
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/camel/swagger/RestSwaggerReader.java | 3 +--
.../main/java/org/apache/camel/swagger/RestSwaggerSupport.java | 2 +-
.../apache/camel/swagger/SwaggerRestApiProcessorFactory.java | 8 ++++++++
.../camel/swagger/producer/DummyRestProducerFactory.java | 2 +-
.../camel/component/undertow/DefaultUndertowHttpBinding.java | 5 ++---
.../org/apache/camel/component/undertow/UndertowEndpoint.java | 5 ++---
.../org/apache/camel/component/undertow/UndertowHostKey.java | 10 ++++------
7 files changed, 19 insertions(+), 16 deletions(-)
[camel] 01/05: CAMEL-13028: camel-undertow - When using SSL with
rest-dsl and api-doc then you can get a port already bound exception
Posted by da...@apache.org.
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 6706a0fd7f75daed147ff6553a9167fd9fe59a58
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Dec 21 16:03:07 2018 +0100
CAMEL-13028: camel-undertow - When using SSL with rest-dsl and api-doc then you can get a port already bound exception
---
.../apache/camel/component/undertow/UndertowHostKey.java | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowHostKey.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowHostKey.java
index be64d09..8f09a18 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowHostKey.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowHostKey.java
@@ -5,9 +5,9 @@
* 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
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
* 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.
@@ -24,6 +24,8 @@ import javax.net.ssl.SSLContext;
public final class UndertowHostKey {
private final String host;
private final int port;
+
+ // SSLContext should not be part of the equals/hashCode contract
private final SSLContext sslContext;
public UndertowHostKey(String host, int port, SSLContext ssl) {
@@ -49,12 +51,8 @@ public final class UndertowHostKey {
if (!(target instanceof UndertowHostKey)) {
return false;
}
- UndertowHostKey targetKey = (UndertowHostKey)target;
+ UndertowHostKey targetKey = (UndertowHostKey) target;
boolean answer = true;
- if (this.sslContext != null || targetKey.sslContext != null) {
- answer = this.sslContext != null && targetKey.sslContext != null
- && this.sslContext.equals(targetKey.sslContext);
- }
return answer && this.host != null && targetKey.host != null
&& this.host.equals(targetKey.host) && this.port == targetKey.port;
}
@@ -63,6 +61,6 @@ public final class UndertowHostKey {
public int hashCode() {
int answer = host.hashCode();
answer = answer * 31 + Integer.hashCode(port);
- return answer * 31 + (sslContext != null ? sslContext.hashCode() : 0);
+ return answer;
}
}
\ No newline at end of file
[camel] 05/05: Fixed CS
Posted by da...@apache.org.
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 a569ba3672b105bf902638603baec9ace6b0cad6
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Dec 21 16:25:56 2018 +0100
Fixed CS
---
.../apache/camel/component/undertow/DefaultUndertowHttpBinding.java | 5 ++---
.../java/org/apache/camel/component/undertow/UndertowEndpoint.java | 5 ++---
2 files changed, 4 insertions(+), 6 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 2602ce1..42af72f 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
@@ -28,7 +28,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
-
import javax.activation.FileDataSource;
import io.undertow.client.ClientExchange;
@@ -46,13 +45,13 @@ import io.undertow.util.Methods;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.TypeConverter;
+import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.support.DefaultAttachment;
import org.apache.camel.support.DefaultMessage;
-import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.support.ExchangeHelper;
-import org.apache.camel.util.IOHelper;
import org.apache.camel.support.MessageHelper;
import org.apache.camel.support.ObjectHelper;
+import org.apache.camel.util.IOHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xnio.channels.BlockingReadableByteChannel;
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 0884d9b..b4eaef6 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
@@ -19,7 +19,6 @@ package org.apache.camel.component.undertow;
import java.net.URI;
import java.util.Locale;
import java.util.Map;
-
import javax.net.ssl.SSLContext;
import io.undertow.server.HttpServerExchange;
@@ -36,15 +35,15 @@ import org.apache.camel.cloud.ServiceDefinition;
import org.apache.camel.component.undertow.UndertowConstants.EventType;
import org.apache.camel.component.undertow.handlers.CamelWebSocketHandler;
import org.apache.camel.http.common.cookie.CookieHandler;
-import org.apache.camel.support.DefaultEndpoint;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spi.HeaderFilterStrategyAware;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
-import org.apache.camel.util.CollectionHelper;
+import org.apache.camel.support.DefaultEndpoint;
import org.apache.camel.support.jsse.SSLContextParameters;
+import org.apache.camel.util.CollectionHelper;
import org.xnio.Option;
import org.xnio.OptionMap;
import org.xnio.Options;
[camel] 02/05: CAMEL-13029: camel-swagger-java - Should default use
scheme from rest-dsl configuration in swagger doc
Posted by da...@apache.org.
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 4c158a4df8c73435bdc269bcb4a772c80c3cf661
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Dec 21 16:16:28 2018 +0100
CAMEL-13029: camel-swagger-java - Should default use scheme from rest-dsl configuration in swagger doc
---
.../org/apache/camel/swagger/SwaggerRestApiProcessorFactory.java | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/SwaggerRestApiProcessorFactory.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/SwaggerRestApiProcessorFactory.java
index 7d89b9a..dfdaf84 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/SwaggerRestApiProcessorFactory.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/SwaggerRestApiProcessorFactory.java
@@ -56,6 +56,14 @@ public class SwaggerRestApiProcessorFactory implements RestApiProcessorFactory {
}
}
}
+ // and include the default scheme as well if not explicit configured
+ if (!options.containsKey("schemes") && !options.containsKey("schemas")) {
+ // NOTE schemas is a typo but kept for backwards compatible
+ String scheme = configuration.getScheme();
+ if (scheme != null) {
+ options.put("schemes", scheme);
+ }
+ }
// and context path is the base.path
String path = configuration.getContextPath();
if (path != null) {
[camel] 04/05: Fixed CS
Posted by da...@apache.org.
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 bcc3cf97d2873aaa4dbf11723370185491d30ab5
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Dec 21 16:25:27 2018 +0100
Fixed CS
---
.../java/org/apache/camel/component/undertow/UndertowHostKey.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowHostKey.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowHostKey.java
index 8f09a18..beb580d 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowHostKey.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowHostKey.java
@@ -5,9 +5,9 @@
* 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ * 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.
[camel] 03/05: Fixed CS
Posted by da...@apache.org.
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 a6cc16d0778c24dfb2bceb31c76ead69648ed943
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Dec 21 16:18:09 2018 +0100
Fixed CS
---
.../src/main/java/org/apache/camel/swagger/RestSwaggerReader.java | 3 +--
.../src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java | 2 +-
.../org/apache/camel/swagger/producer/DummyRestProducerFactory.java | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
index e4d08f1..bd1316b 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
@@ -21,7 +21,6 @@ import java.lang.invoke.MethodType;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
-import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Locale;
@@ -78,8 +77,8 @@ import org.apache.camel.model.rest.RestSecurityOAuth2;
import org.apache.camel.model.rest.SecurityDefinition;
import org.apache.camel.model.rest.VerbDefinition;
import org.apache.camel.spi.ClassResolver;
-import org.apache.camel.util.FileUtil;
import org.apache.camel.support.ObjectHelper;
+import org.apache.camel.util.FileUtil;
/**
* A Camel REST-DSL swagger reader that parse the rest-dsl into a swagger model representation.
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
index 2bda5451..1996feb 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
@@ -44,10 +44,10 @@ import org.apache.camel.model.rest.RestDefinition;
import org.apache.camel.model.rest.RestsDefinition;
import org.apache.camel.spi.ClassResolver;
import org.apache.camel.spi.RestConfiguration;
+import org.apache.camel.support.EndpointHelper;
import org.apache.camel.util.CamelVersionHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
-import org.apache.camel.support.EndpointHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/DummyRestProducerFactory.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/DummyRestProducerFactory.java
index a4a6463..7b16c12 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/DummyRestProducerFactory.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/DummyRestProducerFactory.java
@@ -22,9 +22,9 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
-import org.apache.camel.support.DefaultProducer;
import org.apache.camel.spi.RestConfiguration;
import org.apache.camel.spi.RestProducerFactory;
+import org.apache.camel.support.DefaultProducer;
import org.apache.camel.util.StringHelper;
public class DummyRestProducerFactory implements RestProducerFactory {