Repository: camel Updated Branches: refs/heads/master b8d76be11 -> d62ac0f4e
Fix for CAMEL-7509 Expose the component options for Camel JGroups Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d62ac0f4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d62ac0f4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d62ac0f4 Branch: refs/heads/master Commit: d62ac0f4eb86d1e1eef4a5314a94e24e582dbbdd Parents: b8d76be Author: Kevin Earls <ke...@kevinearls.com> Authored: Mon Jun 16 12:03:27 2014 +0200 Committer: Kevin Earls <ke...@kevinearls.com> Committed: Mon Jun 16 12:03:27 2014 +0200 ---------------------------------------------------------------------- .../component/jgroups/JGroupsComponent.java | 8 ++- .../component/jgroups/JGroupsEndpoint.java | 7 +++ ...ponentConfigurationAndDocumentationTest.java | 55 ++++++++++++++++++++ 3 files changed, 68 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d62ac0f4/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsComponent.java b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsComponent.java index 17848a4..b7c906e 100644 --- a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsComponent.java +++ b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsComponent.java @@ -19,13 +19,13 @@ package org.apache.camel.component.jgroups; import java.util.Map; import org.apache.camel.Endpoint; -import org.apache.camel.impl.DefaultComponent; +import org.apache.camel.impl.UriEndpointComponent; import org.jgroups.Channel; /** * Component providing support for messages multicasted from- or to JGroups channels ({@code org.jgroups.Channel}). */ -public class JGroupsComponent extends DefaultComponent { +public class JGroupsComponent extends UriEndpointComponent { private Channel channel; @@ -33,6 +33,10 @@ public class JGroupsComponent extends DefaultComponent { private Boolean enableViewMessages; + public JGroupsComponent() { + super(JGroupsEndpoint.class); + } + @Override protected Endpoint createEndpoint(String uri, String clusterName, Map<String, Object> parameters) throws Exception { return new JGroupsEndpoint(uri, this, channel, clusterName, channelProperties, enableViewMessages); http://git-wip-us.apache.org/repos/asf/camel/blob/d62ac0f4/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java index 23af26c..283e3c3 100644 --- a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java +++ b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java @@ -22,11 +22,14 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.Producer; import org.apache.camel.impl.DefaultEndpoint; +import org.apache.camel.spi.UriEndpoint; +import org.apache.camel.spi.UriParam; import org.jgroups.Channel; import org.jgroups.JChannel; import org.jgroups.Message; import org.jgroups.View; +@UriEndpoint(scheme = "jgroups", consumerClass = JGroupsConsumer.class) public class JGroupsEndpoint extends DefaultEndpoint { public static final String HEADER_JGROUPS_ORIGINAL_MESSAGE = "JGROUPS_ORIGINAL_MESSAGE"; @@ -41,12 +44,16 @@ public class JGroupsEndpoint extends DefaultEndpoint { private Channel resolvedChannel; + @UriParam private String clusterName; + @UriParam private String channelProperties; + @UriParam private Boolean enableViewMessages; + @UriParam private boolean resolvedEnableViewMessages; public JGroupsEndpoint(String endpointUri, Component component, Channel channel, String clusterName, String channelProperties, Boolean enableViewMessages) { http://git-wip-us.apache.org/repos/asf/camel/blob/d62ac0f4/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsComponentConfigurationAndDocumentationTest.java b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsComponentConfigurationAndDocumentationTest.java new file mode 100644 index 0000000..d2fac3e --- /dev/null +++ b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsComponentConfigurationAndDocumentationTest.java @@ -0,0 +1,55 @@ +/** + * 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.jgroups; + +import org.apache.camel.CamelContext; +import org.apache.camel.ComponentConfiguration; +import org.apache.camel.EndpointConfiguration; +import org.apache.camel.impl.DefaultCamelContext; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Test; + +public class JGroupsComponentConfigurationAndDocumentationTest extends CamelTestSupport { + + @Override + public boolean isUseRouteBuilder() { + return false; + } + + @Test + public void testComponentConfiguration() throws Exception { + JGroupsComponent comp = context.getComponent("jgroups", JGroupsComponent.class); + EndpointConfiguration conf = comp.createConfiguration("jgroups:clusterName?enableViewMessages=true"); + + assertEquals("true", conf.getParameter("enableViewMessages")); + + ComponentConfiguration compConf = comp.createComponentConfiguration(); + String json = compConf.createParameterJsonSchema(); + assertNotNull(json); + + assertTrue(json.contains("\"channelProperties\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"resolvedEnableViewMessages\": { \"type\": \"boolean\" }")); + } + + @Test + public void testComponentDocumentation() throws Exception { + CamelContext context = new DefaultCamelContext(); + String html = context.getComponentDocumentation("jgroups"); + assertNotNull("Should have found some auto-generated HTML if on Java 7", html); + } + +}