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/04/28 08:07:41 UTC
[1/5] camel git commit: Component docs
Repository: camel
Updated Branches:
refs/heads/master d57437c66 -> 9dd120a53
Component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c3990f51
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c3990f51
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c3990f51
Branch: refs/heads/master
Commit: c3990f5184af3d69df71dcdbc9e95ad4f401a14b
Parents: d57437c
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Apr 28 07:30:01 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Apr 28 07:30:01 2015 +0200
----------------------------------------------------------------------
.../component/springldap/LdapOperation.java | 1 -
.../springldap/SpringLdapEndpoint.java | 131 ++++++-------------
.../springldap/SpringLdapProducer.java | 2 +-
.../springldap/SpringLdapEndpointTest.java | 101 --------------
.../springldap/SpringLdapProducerTest.java | 2 +-
5 files changed, 40 insertions(+), 197 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c3990f51/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/LdapOperation.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/LdapOperation.java b/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/LdapOperation.java
index dd0acc5..2710acc 100644
--- a/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/LdapOperation.java
+++ b/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/LdapOperation.java
@@ -20,7 +20,6 @@ package org.apache.camel.component.springldap;
* The list of supported LDAP operations. Currently supported operations are
* search, bind, and unbind. Modify is currently not supported.
*/
-
public enum LdapOperation {
SEARCH, BIND, UNBIND
}
http://git-wip-us.apache.org/repos/asf/camel/blob/c3990f51/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapEndpoint.java b/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapEndpoint.java
index fe63ad5..3e54c27 100644
--- a/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapEndpoint.java
+++ b/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapEndpoint.java
@@ -16,9 +16,6 @@
*/
package org.apache.camel.component.springldap;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
import javax.naming.directory.SearchControls;
import org.apache.camel.Consumer;
@@ -38,141 +35,89 @@ public class SpringLdapEndpoint extends DefaultEndpoint {
private static final String ONELEVEL_SCOPE_NAME = "onelevel";
private static final String SUBTREE_SCOPE_NAME = "subtree";
- private static Map<String, LdapOperation> operationMap;
- private static Map<String, Integer> scopeMap;
-
private LdapTemplate ldapTemplate;
@UriPath @Metadata(required = "true")
private String templateName;
- @UriParam
+ @UriParam @Metadata(required = "true")
private LdapOperation operation;
- @UriParam(defaultValue = "2")
- private int scope = SearchControls.SUBTREE_SCOPE;
+ @UriParam(defaultValue = "subtree", enums = "object,onelevel,subtree")
+ private String scope = SUBTREE_SCOPE_NAME;
/**
* Initializes the SpringLdapEndpoint using the provided template
+ *
* @param templateName name of the LDAP template
* @param ldapTemplate LDAP template, see org.springframework.ldap.core.LdapTemplate
*/
public SpringLdapEndpoint(String templateName, LdapTemplate ldapTemplate) {
this.templateName = templateName;
this.ldapTemplate = ldapTemplate;
- if (null == operationMap) {
- initializeOperationMap();
- }
-
- if (null == scopeMap) {
- initializeScopeMap();
- }
- }
-
- private static void initializeScopeMap() {
- scopeMap = new HashMap<String, Integer>();
-
- scopeMap.put(OBJECT_SCOPE_NAME, SearchControls.OBJECT_SCOPE);
- scopeMap.put(ONELEVEL_SCOPE_NAME, SearchControls.ONELEVEL_SCOPE);
- scopeMap.put(SUBTREE_SCOPE_NAME, SearchControls.SUBTREE_SCOPE);
- }
-
- private static void initializeOperationMap() {
- operationMap = new HashMap<String, LdapOperation>();
-
- operationMap.put(LdapOperation.SEARCH.name(), LdapOperation.SEARCH);
- operationMap.put(LdapOperation.BIND.name(), LdapOperation.BIND);
- operationMap.put(LdapOperation.UNBIND.name(), LdapOperation.UNBIND);
}
- /**
- * Creates a Producer using this SpringLdapEndpoint
- */
@Override
public Producer createProducer() throws Exception {
return new SpringLdapProducer(this);
}
- /**
- * Consumer endpoints are not supported.
- * @throw UnsupportedOperationException
- */
-
@Override
public Consumer createConsumer(Processor processor) throws Exception {
- throw new UnsupportedOperationException(
- "spring-ldap endpoint supports producer enrpoint only.");
+ throw new UnsupportedOperationException("spring-ldap endpoint supports producer enrpoint only.");
}
- /**
- * returns false (constant)
- */
@Override
public boolean isSingleton() {
return false;
}
- int getScope() {
- return scope;
+ @Override
+ public String createEndpointUri() {
+ return "spring-ldap://" + templateName + "?operation=" + operation.name() + "&scope=" + getScope();
}
- /**
- * sets the scope of the LDAP operation. The scope string must be one of "object = 0", "onelevel = 1", or "subtree = 2"
- */
- public void setScope(String scope) {
- for (Entry<String, Integer> allowedScope : scopeMap.entrySet()) {
- if (allowedScope.getKey().equals(scope)) {
- this.scope = allowedScope.getValue();
- return;
- }
- }
- throw new UnsupportedOperationException(
- "Search scope '"
- + scope
- + "' is not supported. The supported scopes are 'object', 'onelevel', and 'subtree'.");
+ public LdapTemplate getLdapTemplate() {
+ return ldapTemplate;
}
- LdapTemplate getLdapTemplate() {
- return ldapTemplate;
+ public String getTemplateName() {
+ return templateName;
}
/**
- * @return URI used to create this endpoint
+ * Name of the Spring LDAP Template bean
*/
- @Override
- public String createEndpointUri() {
- return "spring-ldap://" + templateName + "?operation=" + operation.name() + "&scope=" + getScopeName();
+ public void setTemplateName(String templateName) {
+ this.templateName = templateName;
}
- private String getScopeName() {
- for (String key : scopeMap.keySet()) {
- if (scope == scopeMap.get(key)) {
- return key;
- }
- }
-
- throw new UnsupportedOperationException(
- "Search scope '"
- + scope
- + "' is not supported. The supported scopes are 'object', 'onelevel', and 'subtree'.");
-
+ public LdapOperation getOperation() {
+ return operation;
}
- LdapOperation getOperation() {
- return operation;
+ /**
+ * The LDAP operation to be performed.
+ */
+ public void setOperation(LdapOperation operation) {
+ this.operation = operation;
+ }
+
+ public String getScope() {
+ return scope;
}
/**
- * Sets the LDAP operation to be performed. The supported operations are defined in org.apache.camel.component.springldap.LdapOperation.
+ * The scope of the search operation.
*/
- public void setOperation(String operation) {
- for (Entry<String, LdapOperation> allowedOperation : operationMap
- .entrySet()) {
- if (allowedOperation.getKey().equalsIgnoreCase(operation)) {
- this.operation = allowedOperation.getValue();
- return;
- }
+ public void setScope(String scope) {
+ this.scope = scope;
+ }
+
+ public int scopeValue() {
+ if (scope.equals(OBJECT_SCOPE_NAME)) {
+ return SearchControls.OBJECT_SCOPE;
+ } else if (scope.equals(ONELEVEL_SCOPE_NAME)) {
+ return SearchControls.ONELEVEL_SCOPE;
+ } else {
+ return SearchControls.SUBTREE_SCOPE;
}
- throw new UnsupportedOperationException(
- "LDAP operation '"
- + operation
- + "' is not supported. The supported operations are 'search', 'bind', and 'unbind'.");
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/c3990f51/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapProducer.java b/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapProducer.java
index a8ea9a6..2649427 100644
--- a/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapProducer.java
+++ b/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapProducer.java
@@ -84,7 +84,7 @@ public class SpringLdapProducer extends DefaultProducer {
switch (operation) {
case SEARCH:
String filter = (String) body.get(FILTER);
- exchange.getIn().setBody(ldapTemplate.search(dn, filter, endpoint.getScope(), mapper));
+ exchange.getIn().setBody(ldapTemplate.search(dn, filter, endpoint.scopeValue(), mapper));
break;
case BIND:
Attributes attributes = (Attributes) body.get(ATTRIBUTES);
http://git-wip-us.apache.org/repos/asf/camel/blob/c3990f51/components/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapEndpointTest.java b/components/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapEndpointTest.java
deleted file mode 100644
index 58b01bd..0000000
--- a/components/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapEndpointTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * 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.springldap;
-
-import javax.naming.directory.SearchControls;
-
-import org.apache.camel.Processor;
-
-import org.junit.Test;
-
-import org.mockito.Mockito;
-
-import org.springframework.ldap.core.LdapTemplate;
-
-import static org.junit.Assert.assertEquals;
-
-public class SpringLdapEndpointTest {
- private LdapTemplate ldapTemplate = Mockito.mock(LdapTemplate.class);
-
- @Test(expected = UnsupportedOperationException.class)
- public void testCreateConsumer() throws Exception {
- SpringLdapEndpoint endpoint = new SpringLdapEndpoint("some name", ldapTemplate);
- endpoint.createConsumer(Mockito.mock(Processor.class));
- }
-
- @Test
- public void testOneLevelScope() {
- SpringLdapEndpoint endpoint = new SpringLdapEndpoint("some name", ldapTemplate);
-
- endpoint.setScope("onelevel");
- assertEquals(SearchControls.ONELEVEL_SCOPE, endpoint.getScope());
- }
-
- @Test
- public void testObjectScope() {
- SpringLdapEndpoint endpoint = new SpringLdapEndpoint("some name", ldapTemplate);
-
- endpoint.setScope("object");
- assertEquals(SearchControls.OBJECT_SCOPE, endpoint.getScope());
- }
-
- @Test
- public void testSubtreeScope() {
- SpringLdapEndpoint endpoint = new SpringLdapEndpoint("some name", ldapTemplate);
-
- endpoint.setScope("subtree");
- assertEquals(SearchControls.SUBTREE_SCOPE, endpoint.getScope());
- }
-
- @Test(expected = UnsupportedOperationException.class)
- public void testUnsupportedScope() {
- SpringLdapEndpoint endpoint = new SpringLdapEndpoint("some name", ldapTemplate);
-
- endpoint.setScope("some other scope");
- }
-
- @Test
- public void testBindOperation() {
- SpringLdapEndpoint endpoint = new SpringLdapEndpoint("some name", ldapTemplate);
-
- endpoint.setOperation("BinD");
- assertEquals(LdapOperation.BIND, endpoint.getOperation());
- }
-
- @Test
- public void testSearchOperation() {
- SpringLdapEndpoint endpoint = new SpringLdapEndpoint("some name", ldapTemplate);
-
- endpoint.setOperation("SeaRCH");
- assertEquals(LdapOperation.SEARCH, endpoint.getOperation());
- }
-
- @Test
- public void testUnbindOperation() {
- SpringLdapEndpoint endpoint = new SpringLdapEndpoint("some name", ldapTemplate);
-
- endpoint.setOperation("UnBinD");
- assertEquals(LdapOperation.UNBIND, endpoint.getOperation());
- }
-
- @Test(expected = UnsupportedOperationException.class)
- public void testUnsupportedOperation() {
- SpringLdapEndpoint endpoint = new SpringLdapEndpoint("some name", ldapTemplate);
-
- endpoint.setOperation("BinDD");
- }
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/c3990f51/components/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapProducerTest.java b/components/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapProducerTest.java
index de9557a..ea014ed 100644
--- a/components/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapProducerTest.java
+++ b/components/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapProducerTest.java
@@ -137,7 +137,7 @@ public class SpringLdapProducerTest extends CamelTestSupport {
body.put(SpringLdapProducer.FILTER, filter);
when(ldapEndpoint.getOperation()).thenReturn(LdapOperation.SEARCH);
- when(ldapEndpoint.getScope()).thenReturn(scope);
+ when(ldapEndpoint.scopeValue()).thenReturn(scope);
processBody(exchange, in, body);
verify(ldapTemplate).search(eq(dn), eq(filter), eq(scope),
[3/5] camel git commit: Component docs
Posted by da...@apache.org.
Component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7f28a1e5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7f28a1e5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7f28a1e5
Branch: refs/heads/master
Commit: 7f28a1e5c63b664e7f656f87b9b87bd7bc5722b3
Parents: be2e819
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Apr 28 07:45:54 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Apr 28 07:45:54 2015 +0200
----------------------------------------------------------------------
.../integration/SpringIntegrationEndpoint.java | 24 +++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7f28a1e5/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
index d8d1239..f3f816a 100644
--- a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
+++ b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
@@ -36,13 +36,13 @@ import org.springframework.integration.MessageChannel;
@UriEndpoint(scheme = "spring-integration", title = "Spring Integration", syntax = "spring-integration:defaultChannel",
consumerClass = SpringIntegrationConsumer.class, label = "spring,eventbus")
public class SpringIntegrationEndpoint extends DefaultEndpoint {
+ private MessageChannel messageChannel;
@UriPath @Metadata(required = "true")
private String defaultChannel;
- @UriParam
+ @UriParam(label = "consumer")
private String inputChannel;
- @UriParam
+ @UriParam(label = "producer")
private String outputChannel;
- private MessageChannel messageChannel;
@UriParam
private boolean inOut;
@@ -73,6 +73,9 @@ public class SpringIntegrationEndpoint extends DefaultEndpoint {
return answer;
}
+ /**
+ * The Spring integration input channel name that this endpoint wants to consume from Spring integration.
+ */
public void setInputChannel(String input) {
inputChannel = input;
}
@@ -81,6 +84,9 @@ public class SpringIntegrationEndpoint extends DefaultEndpoint {
return inputChannel;
}
+ /**
+ * The Spring integration output channel name that is used to send messages to Spring integration.
+ */
public void setOutputChannel(String output) {
outputChannel = output;
}
@@ -89,6 +95,14 @@ public class SpringIntegrationEndpoint extends DefaultEndpoint {
return outputChannel;
}
+ /**
+ * The default channel name which is used by the Spring Integration Spring context.
+ * It will equal to the inputChannel name for the Spring Integration consumer and the outputChannel name for the Spring Integration provider.
+ */
+ public void setDefaultChannel(String defaultChannel) {
+ this.defaultChannel = defaultChannel;
+ }
+
public String getDefaultChannel() {
return defaultChannel;
}
@@ -102,6 +116,10 @@ public class SpringIntegrationEndpoint extends DefaultEndpoint {
return false;
}
+ /**
+ * The exchange pattern that the Spring integration endpoint should use.
+ * If inOut=true then a reply channel is expected, either from the Spring Integration Message header or configured on the endpoint.
+ */
public void setInOut(boolean inOut) {
this.inOut = inOut;
}
[5/5] camel git commit: Component docs
Posted by da...@apache.org.
Component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9dd120a5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9dd120a5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9dd120a5
Branch: refs/heads/master
Commit: 9dd120a53914fa169796181f005cf9822a91535d
Parents: aff019f
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Apr 28 08:10:46 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Apr 28 08:10:46 2015 +0200
----------------------------------------------------------------------
.../component/javaspace/JavaSpaceComponent.java | 2 +-
.../component/javaspace/JavaSpaceEndpoint.java | 80 +++++++++++---------
2 files changed, 44 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9dd120a5/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceComponent.java b/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceComponent.java
index cea22a0..69849f3 100644
--- a/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceComponent.java
+++ b/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceComponent.java
@@ -40,7 +40,7 @@ public class JavaSpaceComponent extends UriEndpointComponent {
@Override
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- JavaSpaceEndpoint endpoint = new JavaSpaceEndpoint(uri, remaining, parameters, this);
+ JavaSpaceEndpoint endpoint = new JavaSpaceEndpoint(uri, remaining, this);
endpoint.setExchangePattern(ExchangePattern.InOnly);
return endpoint;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9dd120a5/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceEndpoint.java b/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceEndpoint.java
index 4b9e6ff..f05d882 100644
--- a/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceEndpoint.java
+++ b/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceEndpoint.java
@@ -34,43 +34,30 @@ import org.apache.camel.spi.UriPath;
@UriEndpoint(scheme = "javaspace", title = "JavaSpace", syntax = "javaspace:url", consumerClass = JavaSpaceConsumer.class, label = "messaging")
public class JavaSpaceEndpoint extends DefaultEndpoint {
- private final Map<?, ?> parameters;
-
@UriPath @Metadata(required = "true")
private final String url;
- @UriParam(defaultValue = "1")
- private int concurrentConsumers = 1;
- @UriParam
+ @UriParam @Metadata(required = "true")
private String spaceName;
+ @UriParam(label = "consumer", defaultValue = "1")
+ private int concurrentConsumers = 1;
+ @UriParam(label = "consumer", defaultValue = "take", enums = "take,read")
+ private String verb = "take";
+ @UriParam(label = "consumer")
+ private String templateId;
@UriParam
private boolean transactional;
@UriParam
private long transactionTimeout = Long.MAX_VALUE;
- @UriParam(defaultValue = "take")
- private String verb = "take";
- @UriParam
- private String templateId;
- public JavaSpaceEndpoint(String endpointUri, String remaining, Map<?, ?> parameters, JavaSpaceComponent component) {
+ public JavaSpaceEndpoint(String endpointUri, String remaining, JavaSpaceComponent component) {
super(endpointUri, component);
this.url = remaining;
- this.parameters = parameters;
- }
-
- public boolean isTransactional() {
- return transactional;
}
- public String getVerb() {
- return verb;
- }
-
- public void setVerb(String verb) {
- this.verb = verb;
- }
-
- public void setTransactional(boolean transactional) {
- this.transactional = transactional;
+ public Consumer createConsumer(Processor processor) throws Exception {
+ JavaSpaceConsumer answer = new JavaSpaceConsumer(this, processor);
+ configureConsumer(answer);
+ return answer;
}
public Producer createProducer() throws Exception {
@@ -86,28 +73,38 @@ public class JavaSpaceEndpoint extends DefaultEndpoint {
return true;
}
+ public String getVerb() {
+ return verb;
+ }
+
/**
- * @deprecated use {@link #getUrl()}
+ * Specifies the verb for getting JavaSpace entries.
*/
- @Deprecated
- public String getRemaining() {
- return url;
+ public void setVerb(String verb) {
+ this.verb = verb;
}
- public String getUrl() {
- return url;
+ public boolean isTransactional() {
+ return transactional;
}
- public Map<?, ?> getParameters() {
- return parameters;
+ /**
+ * If true, sending and receiving entries is performed within a transaction.
+ */
+ public void setTransactional(boolean transactional) {
+ this.transactional = transactional;
}
- public Consumer createConsumer(Processor processor) throws Exception {
- JavaSpaceConsumer answer = new JavaSpaceConsumer(this, processor);
- configureConsumer(answer);
- return answer;
+ /**
+ * The URL to the JavaSpace server
+ */
+ public String getUrl() {
+ return url;
}
+ /**
+ * Specifies the number of concurrent consumers getting entries from the JavaSpace.
+ */
public void setConcurrentConsumers(int concurrentConsumers) {
this.concurrentConsumers = concurrentConsumers;
}
@@ -120,6 +117,9 @@ public class JavaSpaceEndpoint extends DefaultEndpoint {
return spaceName;
}
+ /**
+ * Specifies the JavaSpace name.
+ */
public void setSpaceName(String spaceName) {
this.spaceName = spaceName;
}
@@ -128,6 +128,9 @@ public class JavaSpaceEndpoint extends DefaultEndpoint {
return templateId;
}
+ /**
+ * If present, this option specifies the Spring bean ID of the template to use for reading/taking entries.
+ */
public void setTemplateId(String templateId) {
this.templateId = templateId;
}
@@ -136,6 +139,9 @@ public class JavaSpaceEndpoint extends DefaultEndpoint {
return transactionTimeout;
}
+ /**
+ * Specifies the transaction timeout in millis. By default there is no timeout.
+ */
public void setTransactionTimeout(long transactionTimeout) {
this.transactionTimeout = transactionTimeout;
}
[4/5] camel git commit: Component docs
Posted by da...@apache.org.
Component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/aff019f0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/aff019f0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/aff019f0
Branch: refs/heads/master
Commit: aff019f0a7c8d708ecf856035f741b279257153e
Parents: 7f28a1e
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Apr 28 07:58:26 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Apr 28 07:59:38 2015 +0200
----------------------------------------------------------------------
.../apache/camel/component/redis/Command.java | 2 +-
.../component/redis/CommandDispatcher.java | 12 +++---
.../component/redis/RedisConfiguration.java | 41 ++++++++++++++++----
.../camel/component/redis/RedisConsumer.java | 15 +++----
.../camel/component/redis/RedisEndpoint.java | 4 +-
5 files changed, 50 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/aff019f0/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/Command.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/Command.java b/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/Command.java
index 71e4a53..5aa6d25 100755
--- a/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/Command.java
+++ b/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/Command.java
@@ -31,5 +31,5 @@ public enum Command {
ZREMRANGEBYRANK, ZREMRANGEBYSCORE, ZUNIONSTORE, ZINTERSTORE, SAVE, BGSAVE,
BGREWRITEAOF, LASTSAVE, SHUTDOWN, INFO, MONITOR, SLAVEOF, CONFIG, STRLEN,
SYNC, LPUSHX, PERSIST, RPUSHX, ECHO, LINSERT, DEBUG, BRPOPLPUSH, SETBIT,
- GETBIT, SETRANGE, GETRANGE, PEXPIRE, PEXPIREAT;
+ GETBIT, SETRANGE, GETRANGE, PEXPIRE, PEXPIREAT
}
http://git-wip-us.apache.org/repos/asf/camel/blob/aff019f0/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/CommandDispatcher.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/CommandDispatcher.java b/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/CommandDispatcher.java
index ee3a22d..79daceb 100755
--- a/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/CommandDispatcher.java
+++ b/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/CommandDispatcher.java
@@ -34,10 +34,10 @@ public class CommandDispatcher {
this.exchange = exchange;
}
- // TODO: This method is longer than maximally allowed 200 lines
// CHECKSTYLE:OFF
public void execute(final RedisClient redisClient) {
- switch (determineCommand()) {
+ final Command command = determineCommand();
+ switch (command) {
case PING:
setResult(redisClient.ping());
@@ -337,20 +337,20 @@ public class CommandDispatcher {
setResult(redisClient.getrange(getKey(), getStart(), getEnd()));
break;
default:
- throw new RuntimeExchangeException("Unsupported command", exchange);
+ throw new RuntimeExchangeException("Unsupported command: " + command, exchange);
}
}
// CHECKSTYLE:ON
private Command determineCommand() {
- String command = exchange.getIn().getHeader(RedisConstants.COMMAND, String.class);
+ Command command = exchange.getIn().getHeader(RedisConstants.COMMAND, Command.class);
if (command == null) {
command = configuration.getCommand();
}
if (command == null) {
- return Command.SET;
+ command = Command.SET;
}
- return Command.valueOf(command);
+ return command;
}
private static <T> T getInHeaderValue(Exchange exchange, String key, Class<T> aClass) {
http://git-wip-us.apache.org/repos/asf/camel/blob/aff019f0/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisConfiguration.java b/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisConfiguration.java
index 0c48845..9369e33 100755
--- a/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisConfiguration.java
+++ b/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisConfiguration.java
@@ -29,12 +29,15 @@ import org.springframework.data.redis.serializer.RedisSerializer;
@UriParams
public class RedisConfiguration {
+ private boolean managedListenerContainer;
+ private boolean managedConnectionFactory;
+
@UriPath @Metadata(required = "true")
private String host;
@UriPath @Metadata(required = "true")
private Integer port;
- @UriParam
- private String command;
+ @UriParam(defaultValue = "SET")
+ private Command command = Command.SET;
@UriParam
private String channels;
@UriParam
@@ -45,16 +48,17 @@ public class RedisConfiguration {
private RedisConnectionFactory connectionFactory;
@UriParam
private RedisSerializer serializer;
- @UriParam
- private boolean managedListenerContainer;
- @UriParam
- private boolean managedConnectionFactory;
- public String getCommand() {
+ public Command getCommand() {
return command;
}
- public void setCommand(String command) {
+ /**
+ * Default command, which can be overridden by message header.
+ * <p/>
+ * Notice the consumer only supports the following commands: PSUBSCRIBE and SUBSCRIBE
+ */
+ public void setCommand(Command command) {
this.command = command;
}
@@ -62,6 +66,9 @@ public class RedisConfiguration {
return port;
}
+ /**
+ * Redis server port number
+ */
public void setPort(Integer port) {
this.port = port;
}
@@ -70,6 +77,9 @@ public class RedisConfiguration {
return host;
}
+ /**
+ * The host where Redis server is running.
+ */
public void setHost(String host) {
this.host = host;
}
@@ -78,6 +88,9 @@ public class RedisConfiguration {
return redisTemplate != null ? redisTemplate : createDefaultTemplate();
}
+ /**
+ * Reference to a pre-configured RedisTemplate instance to use.
+ */
public void setRedisTemplate(RedisTemplate redisTemplate) {
this.redisTemplate = redisTemplate;
}
@@ -86,6 +99,9 @@ public class RedisConfiguration {
return listenerContainer != null ? listenerContainer : createDefaultListenerContainer();
}
+ /**
+ * Reference to a pre-configured RedisMessageListenerContainer instance to use.
+ */
public void setListenerContainer(RedisMessageListenerContainer listenerContainer) {
this.listenerContainer = listenerContainer;
}
@@ -94,10 +110,16 @@ public class RedisConfiguration {
return channels;
}
+ /**
+ * List of topic names or name patterns to subscribe to. Multiple names can be separated by comma.
+ */
public void setChannels(String channels) {
this.channels = channels;
}
+ /**
+ * Reference to a pre-configured RedisConnectionFactory instance to use.
+ */
public void setConnectionFactory(RedisConnectionFactory connectionFactory) {
this.connectionFactory = connectionFactory;
}
@@ -110,6 +132,9 @@ public class RedisConfiguration {
return serializer != null ? serializer : createDefaultSerializer();
}
+ /**
+ * Reference to a pre-configured RedisSerializer instance to use.
+ */
public void setSerializer(RedisSerializer serializer) {
this.serializer = serializer;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/aff019f0/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisConsumer.java b/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisConsumer.java
index 4afdc5a..84d2338 100755
--- a/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisConsumer.java
+++ b/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisConsumer.java
@@ -23,14 +23,14 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.component.direct.DirectConsumer;
+import org.apache.camel.impl.DefaultConsumer;
import org.springframework.data.redis.connection.Message;
import org.springframework.data.redis.connection.MessageListener;
import org.springframework.data.redis.listener.ChannelTopic;
import org.springframework.data.redis.listener.PatternTopic;
import org.springframework.data.redis.listener.Topic;
-public class RedisConsumer extends DirectConsumer implements MessageListener {
+public class RedisConsumer extends DefaultConsumer implements MessageListener {
private final RedisConfiguration redisConfiguration;
public RedisConsumer(RedisEndpoint redisEndpoint, Processor processor,
@@ -50,12 +50,13 @@ public class RedisConsumer extends DirectConsumer implements MessageListener {
String[] channelsArrays = channels.split(",");
List<Topic> topics = new ArrayList<Topic>();
for (String channel : channelsArrays) {
- if (Command.PSUBSCRIBE.toString().equals(redisConfiguration.getCommand())) {
- topics.add(new PatternTopic(channel));
- } else if (Command.SUBSCRIBE.toString().equals(redisConfiguration.getCommand())) {
- topics.add(new ChannelTopic(channel));
+ String name = channel.trim();
+ if (Command.PSUBSCRIBE.equals(redisConfiguration.getCommand())) {
+ topics.add(new PatternTopic(name));
+ } else if (Command.SUBSCRIBE.equals(redisConfiguration.getCommand())) {
+ topics.add(new ChannelTopic(name));
} else {
- throw new RuntimeException("Unsupported Command");
+ throw new IllegalArgumentException("Unsupported Command " + redisConfiguration.getCommand());
}
}
return topics;
http://git-wip-us.apache.org/repos/asf/camel/blob/aff019f0/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisEndpoint.java b/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisEndpoint.java
index d790f7e..2952dd6 100755
--- a/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisEndpoint.java
+++ b/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisEndpoint.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.redis;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-import org.apache.camel.component.direct.DirectEndpoint;
+import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
@@ -27,7 +27,7 @@ import org.apache.camel.spi.UriParam;
* Represents a Redis endpoint.
*/
@UriEndpoint(scheme = "spring-redis", title = "Spring Redis", syntax = "spring-redist:host:port", consumerClass = RedisConsumer.class, label = "spring,nosql")
-public class RedisEndpoint extends DirectEndpoint {
+public class RedisEndpoint extends DefaultEndpoint {
@UriParam
private RedisConfiguration configuration;
[2/5] camel git commit: Component docs
Posted by da...@apache.org.
Component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/be2e8198
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/be2e8198
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/be2e8198
Branch: refs/heads/master
Commit: be2e8198389984ac6b7dbe2caaa757d3f2dcb34f
Parents: c3990f5
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Apr 28 07:41:00 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Apr 28 07:41:00 2015 +0200
----------------------------------------------------------------------
.../spring/batch/SpringBatchComponent.java | 8 ++++-
.../spring/batch/SpringBatchEndpoint.java | 31 +++++++++++++++++---
2 files changed, 34 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/be2e8198/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchComponent.java b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchComponent.java
index 7e4a23c..9f7d10c 100644
--- a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchComponent.java
+++ b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchComponent.java
@@ -47,8 +47,14 @@ public class SpringBatchComponent extends UriEndpointComponent {
allResolvedJobLaunchers = getCamelContext().getRegistry().findByTypeWithName(JobLauncher.class);
}
+ public JobLauncher getJobLauncher() {
+ return jobLauncher;
+ }
+
+ /**
+ * Explicitly specifies a JobLauncher to be used.
+ */
public void setJobLauncher(JobLauncher jobLauncher) {
this.jobLauncher = jobLauncher;
}
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/be2e8198/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
index f90e023..0592d20 100644
--- a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
+++ b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
@@ -43,15 +43,11 @@ public class SpringBatchEndpoint extends DefaultEndpoint {
*/
@Deprecated
private String jobLauncherRef;
-
@UriParam
private JobLauncher jobLauncher;
- @UriParam
private JobLauncher defaultResolvedJobLauncher;
-
private Map<String, JobLauncher> allResolvedJobLaunchers;
-
private Job job;
public SpringBatchEndpoint(String endpointUri, Component component,
@@ -111,10 +107,37 @@ public class SpringBatchEndpoint extends DefaultEndpoint {
throw new IllegalStateException("Cannot find Spring Batch JobLauncher.");
}
+ public String getJobName() {
+ return jobName;
+ }
+
+ /**
+ * The name of the Spring Batch job located in the registry.
+ */
+ public void setJobName(String jobName) {
+ this.jobName = jobName;
+ }
+
+ @Deprecated
+ public String getJobLauncherRef() {
+ return jobLauncherRef;
+ }
+
+ /**
+ * Explicitly specifies a JobLauncher to be used looked up from the registry.
+ */
+ @Deprecated
public void setJobLauncherRef(String jobLauncherRef) {
this.jobLauncherRef = jobLauncherRef;
}
+ public JobLauncher getJobLauncher() {
+ return jobLauncher;
+ }
+
+ /**
+ * Explicitly specifies a JobLauncher to be used.
+ */
public void setJobLauncher(JobLauncher jobLauncher) {
this.jobLauncher = jobLauncher;
}