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/08/22 06:15:27 UTC
[camel] 01/07: CAMEL-13870: Fast property configuration of Camel
endpoints. Work in progress.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13870
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2505d0d2c3ddcd6b2e85d1e35bd42d64e05c2487
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Aug 22 06:18:03 2019 +0200
CAMEL-13870: Fast property configuration of Camel endpoints. Work in progress.
---
.../src/main/docs/milo-client-component.adoc | 2 +-
.../milo/client/MiloClientConfiguration.java | 6 ++--
.../dsl/MiloClientEndpointBuilderFactory.java | 40 ++--------------------
.../MiloClientComponentConfiguration.java | 7 ++--
4 files changed, 10 insertions(+), 45 deletions(-)
diff --git a/components/camel-milo/src/main/docs/milo-client-component.adoc b/components/camel-milo/src/main/docs/milo-client-component.adoc
index 354b964..f0ddf32 100644
--- a/components/camel-milo/src/main/docs/milo-client-component.adoc
+++ b/components/camel-milo/src/main/docs/milo-client-component.adoc
@@ -124,7 +124,7 @@ with the following path and query parameters:
| *keyPassword* (client) | The key password | | String
| *keyStorePassword* (client) | The keystore password | | String
| *keyStoreType* (client) | The key store type | | String
-| *keyStoreUrl* (client) | The URL where the key should be loaded from | | URL
+| *keyStoreUrl* (client) | The URL where the key should be loaded from | | String
| *maxPendingPublishRequests* (client) | The maximum number of pending publish requests | | Long
| *maxResponseMessageSize* (client) | The maximum number of bytes a response message may have | | Long
| *overrideHost* (client) | Override the server reported endpoint host with the host from the endpoint URI. | false | boolean
diff --git a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConfiguration.java b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConfiguration.java
index 25720f5..871bca9 100644
--- a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConfiguration.java
+++ b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConfiguration.java
@@ -86,7 +86,7 @@ public class MiloClientConfiguration implements Cloneable {
private Long maxResponseMessageSize;
@UriParam(label = "client")
- private URL keyStoreUrl;
+ private String keyStoreUrl;
@UriParam(label = "client")
private String keyStoreType = KeyStoreLoader.DEFAULT_KEY_STORE_TYPE;
@@ -277,11 +277,11 @@ public class MiloClientConfiguration implements Cloneable {
/**
* The URL where the key should be loaded from
*/
- public void setKeyStoreUrl(URL keyStoreUrl) {
+ public void setKeyStoreUrl(String keyStoreUrl) {
this.keyStoreUrl = keyStoreUrl;
}
- public URL getKeyStoreUrl() {
+ public String getKeyStoreUrl() {
return this.keyStoreUrl;
}
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MiloClientEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MiloClientEndpointBuilderFactory.java
index cd7f1ee..5f5dd3b 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MiloClientEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MiloClientEndpointBuilderFactory.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.builder.endpoint.dsl;
-import java.net.URL;
import java.util.Set;
import javax.annotation.Generated;
import org.apache.camel.ExchangePattern;
@@ -311,18 +310,7 @@ public interface MiloClientEndpointBuilderFactory {
/**
* The URL where the key should be loaded from.
*
- * The option is a: <code>java.net.URL</code> type.
- *
- * Group: client
- */
- default MiloClientEndpointConsumerBuilder keyStoreUrl(URL keyStoreUrl) {
- setProperty("keyStoreUrl", keyStoreUrl);
- return this;
- }
- /**
- * The URL where the key should be loaded from.
- *
- * The option will be converted to a <code>java.net.URL</code> type.
+ * The option is a: <code>java.lang.String</code> type.
*
* Group: client
*/
@@ -876,18 +864,7 @@ public interface MiloClientEndpointBuilderFactory {
/**
* The URL where the key should be loaded from.
*
- * The option is a: <code>java.net.URL</code> type.
- *
- * Group: client
- */
- default MiloClientEndpointProducerBuilder keyStoreUrl(URL keyStoreUrl) {
- setProperty("keyStoreUrl", keyStoreUrl);
- return this;
- }
- /**
- * The URL where the key should be loaded from.
- *
- * The option will be converted to a <code>java.net.URL</code> type.
+ * The option is a: <code>java.lang.String</code> type.
*
* Group: client
*/
@@ -1339,18 +1316,7 @@ public interface MiloClientEndpointBuilderFactory {
/**
* The URL where the key should be loaded from.
*
- * The option is a: <code>java.net.URL</code> type.
- *
- * Group: client
- */
- default MiloClientEndpointBuilder keyStoreUrl(URL keyStoreUrl) {
- setProperty("keyStoreUrl", keyStoreUrl);
- return this;
- }
- /**
- * The URL where the key should be loaded from.
- *
- * The option will be converted to a <code>java.net.URL</code> type.
+ * The option is a: <code>java.lang.String</code> type.
*
* Group: client
*/
diff --git a/platforms/spring-boot/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/client/springboot/MiloClientComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/client/springboot/MiloClientComponentConfiguration.java
index 0c6eabb..d975bac 100644
--- a/platforms/spring-boot/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/client/springboot/MiloClientComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/client/springboot/MiloClientComponentConfiguration.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.milo.client.springboot;
-import java.net.URL;
import java.util.Set;
import javax.annotation.Generated;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
@@ -168,7 +167,7 @@ public class MiloClientComponentConfiguration
/**
* The URL where the key should be loaded from
*/
- private URL keyStoreUrl;
+ private String keyStoreUrl;
/**
* The key store type
*/
@@ -292,11 +291,11 @@ public class MiloClientComponentConfiguration
this.maxResponseMessageSize = maxResponseMessageSize;
}
- public URL getKeyStoreUrl() {
+ public String getKeyStoreUrl() {
return keyStoreUrl;
}
- public void setKeyStoreUrl(URL keyStoreUrl) {
+ public void setKeyStoreUrl(String keyStoreUrl) {
this.keyStoreUrl = keyStoreUrl;
}