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 2016/01/05 09:32:57 UTC
[3/5] camel git commit: Camel component docs - Should include
information if an endpoint is lenient properties
Camel component docs - Should include information if an endpoint is lenient properties
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6742fb77
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6742fb77
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6742fb77
Branch: refs/heads/master
Commit: 6742fb77f3e91811dad3bd6893692e2079ef15a8
Parents: e178218
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jan 5 09:31:57 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jan 5 09:31:57 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/component/stub/StubEndpoint.java | 6 +-----
.../java/org/apache/camel/catalog/DefaultCamelCatalog.java | 7 ++++---
.../test/java/org/apache/camel/catalog/CamelCatalogTest.java | 6 +++++-
3 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6742fb77/camel-core/src/main/java/org/apache/camel/component/stub/StubEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/stub/StubEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/stub/StubEndpoint.java
index 9a96e9d..cd24eba 100644
--- a/camel-core/src/main/java/org/apache/camel/component/stub/StubEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/stub/StubEndpoint.java
@@ -36,7 +36,7 @@ import org.apache.camel.spi.UriEndpoint;
* query arguments will usually fail. Stub won't though, as it basically ignores all query parameters
* to let you quickly stub out one or more endpoints in your route temporarily.
*/
-@UriEndpoint(scheme = "stub", title = "Stub", syntax = "stub:name", consumerClass = VmConsumer.class, label = "core,testing", lenientProperties = true)
+@UriEndpoint(scheme = "stub", title = "Stub", syntax = "stub:name", consumerClass = VmConsumer.class, label = "core,testing")
public class StubEndpoint extends VmEndpoint {
public StubEndpoint(String endpointUri, Component component, BlockingQueue<Exchange> queue) {
@@ -56,8 +56,4 @@ public class StubEndpoint extends VmEndpoint {
return new StubConsumer(this, processor);
}
- @Override
- public boolean isLenientProperties() {
- return true;
- }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6742fb77/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 83b9c58..5a023c9 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -738,11 +738,12 @@ public class DefaultCamelCatalog implements CamelCatalog {
Map<String, String> properties;
List<Map<String, String>> rows;
boolean lenientProperties;
+ String scheme;
try {
// parse the uri
URI u = normalizeUri(uri);
- String scheme = u.getScheme();
+ scheme = u.getScheme();
String json = componentJSonSchema(scheme);
if (json == null) {
result.addUnknownComponent(scheme);
@@ -785,9 +786,9 @@ public class DefaultCamelCatalog implements CamelCatalog {
if (row == null) {
// unknown option
- // only add as error if the component is not lenient properties
+ // only add as error if the component is not lenient properties, or not stub component
// as if we are lenient then the option is a dynamic extra option which we cannot validate
- if (!lenientProperties) {
+ if (!lenientProperties && !"stub".equals(scheme)) {
result.addUnknown(name);
if (suggestionStrategy != null) {
String[] suggestions = suggestionStrategy.suggestEndpointOptions(getNames(rows), name);
http://git-wip-us.apache.org/repos/asf/camel/blob/6742fb77/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index fc804aa..f32597a 100644
--- a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -485,9 +485,13 @@ public class CamelCatalogTest {
result = catalog.validateEndpointProperties("file:inbox?delay=5000&scheduler.foo=123&scheduler.bar=456");
assertTrue(result.isSuccess());
- // lenient
+ // stub
result = catalog.validateEndpointProperties("stub:foo?me=123&you=456");
assertTrue(result.isSuccess());
+
+ // lenient
+ result = catalog.validateEndpointProperties("dataformat:string:marshal?foo=bar");
+ assertTrue(result.isSuccess());
}
@Test