You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2015/01/14 11:42:32 UTC
[1/2] camel git commit: CAMEL-8220 camel-archetype-component - Should
be component doc ready
Repository: camel
Updated Branches:
refs/heads/master c106e0279 -> 68c39f77d
CAMEL-8220 camel-archetype-component - Should be component doc ready
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/68c39f77
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/68c39f77
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/68c39f77
Branch: refs/heads/master
Commit: 68c39f77dba7b202c97c4652ca5757322cf8454a
Parents: 67bcf32
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed Jan 14 18:41:47 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed Jan 14 18:42:12 2015 +0800
----------------------------------------------------------------------
.../src/main/resources/archetype-resources/pom.xml | 7 +++++++
.../src/main/java/__name__Component.java | 14 ++++++++++++--
.../src/main/java/__name__Endpoint.java | 5 +++++
3 files changed, 24 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/68c39f77/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
index 60182d2..eae7042 100644
--- a/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
+++ b/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
@@ -38,6 +38,13 @@
<artifactId>camel-core</artifactId>
<version>${camel-version}</version>
</dependency>
+
+ <!-- support camel documentation -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>apt</artifactId>
+ <version>${camel-version}</version>
+ </dependency>
<!-- logging -->
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/68c39f77/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Component.java
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Component.java b/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Component.java
index a87f1f4..41ff044 100644
--- a/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Component.java
+++ b/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Component.java
@@ -18,13 +18,23 @@ package ${package};
import java.util.Map;
+import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
-import org.apache.camel.impl.DefaultComponent;
+
+import org.apache.camel.impl.UriEndpointComponent;
/**
* Represents the component that manages {@link ${name}Endpoint}.
*/
-public class ${name}Component extends DefaultComponent {
+public class ${name}Component extends UriEndpointComponent {
+
+ public ${name}Component() {
+ super(${name}Endpoint.class);
+ }
+
+ public ${name}Component(CamelContext context) {
+ super(context, ${name}Endpoint.class);
+ }
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
Endpoint endpoint = new ${name}Endpoint(uri, this);
http://git-wip-us.apache.org/repos/asf/camel/blob/68c39f77/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Endpoint.java
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Endpoint.java b/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Endpoint.java
index 9c25c8e..227aeb4 100644
--- a/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Endpoint.java
+++ b/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Endpoint.java
@@ -20,11 +20,16 @@ import org.apache.camel.Consumer;
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;
/**
* Represents a ${name} endpoint.
*/
+@UriEndpoint(scheme = "${scheme}", consumerClass = ${name}Consumer.class, label = "${name}")
public class ${name}Endpoint extends DefaultEndpoint {
+ @UriParam(defaultValue = "10")
+ private int option1 = 10;
public ${name}Endpoint() {
}
[2/2] camel git commit: Fixed some eclipse warning in camel-aws
Posted by ni...@apache.org.
Fixed some eclipse warning in camel-aws
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/67bcf32e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/67bcf32e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/67bcf32e
Branch: refs/heads/master
Commit: 67bcf32eaa66dadf906eb18240e72606fa98cc70
Parents: c106e02
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Jan 13 22:05:43 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed Jan 14 18:42:12 2015 +0800
----------------------------------------------------------------------
.../java/org/apache/camel/component/aws/s3/S3Component.java | 1 -
.../org/apache/camel/component/aws/sqs/SqsComponent.java | 1 -
.../camel/component/aws/swf/CamelSWFActivityClient.java | 8 ++++----
.../camel/component/aws/swf/CamelSWFWorkflowClient.java | 2 +-
.../camel/component/aws/swf/CamelWorkflowDefinition.java | 8 ++++----
.../apache/camel/component/aws/swf/SWFWorkflowProducer.java | 2 +-
6 files changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/67bcf32e/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Component.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Component.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Component.java
index c0e0cb3..06c43da 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Component.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Component.java
@@ -20,7 +20,6 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
-import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.impl.UriEndpointComponent;
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/67bcf32e/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsComponent.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsComponent.java
index aeb8505..e6aa9c0 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsComponent.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsComponent.java
@@ -20,7 +20,6 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
-import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.impl.UriEndpointComponent;
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/67bcf32e/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelSWFActivityClient.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelSWFActivityClient.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelSWFActivityClient.java
index f75b7de..df30288 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelSWFActivityClient.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelSWFActivityClient.java
@@ -35,13 +35,13 @@ public class CamelSWFActivityClient {
activity.setName(eventName);
activity.setVersion(version);
- Promise[] promises = asPromiseArray(input);
+ Promise<?>[] promises = asPromiseArray(input);
Promise<?> promise = dynamicActivitiesClient.scheduleActivity(activity, promises, configuration.getActivitySchedulingOptions(), Object.class, null);
return promise;
}
- protected Promise[] asPromiseArray(Object input) {
- Promise[] promises;
+ protected Promise<?>[] asPromiseArray(Object input) {
+ Promise<?>[] promises;
if (input instanceof Object[]) {
Object[] inputArray = (Object[])input;
promises = new Promise[inputArray.length];
@@ -51,7 +51,7 @@ public class CamelSWFActivityClient {
} else {
promises = new Promise[1];
if (input instanceof Promise) {
- promises[0] = (Promise) input;
+ promises[0] = (Promise<?>) input;
} else {
promises[0] = Promise.asPromise(input);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/67bcf32e/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowClient.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowClient.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowClient.java
index f4ce393..6cb3cb0 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowClient.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowClient.java
@@ -46,7 +46,7 @@ public class CamelSWFWorkflowClient {
dynamicWorkflowClientExternal.signalWorkflowExecution(signalName, toArray(arguments));
}
- public Object getWorkflowExecutionState(String workflowId, String runId, Class aClass) throws Throwable {
+ public Object getWorkflowExecutionState(String workflowId, String runId, Class<?> aClass) throws Throwable {
DynamicWorkflowClientExternal dynamicWorkflowClientExternal = getDynamicWorkflowClient(workflowId, runId);
return dynamicWorkflowClientExternal.getWorkflowExecutionState(aClass);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/67bcf32e/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinition.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinition.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinition.java
index ba95fea..c9848e1 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinition.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinition.java
@@ -54,7 +54,7 @@ public class CamelWorkflowDefinition extends WorkflowDefinition {
@Override
public Promise<String> execute(final String input) throws WorkflowException {
final Settable<String> result = new Settable<String>();
- final AtomicReference<Promise> methodResult = new AtomicReference<Promise>();
+ final AtomicReference<Promise<?>> methodResult = new AtomicReference<Promise<?>>();
new TryCatchFinally() {
@Override
@@ -66,9 +66,9 @@ public class CamelWorkflowDefinition extends WorkflowDefinition {
Object r = swfWorkflowConsumer.processWorkflow(parameters, startTime, replaying);
if (r instanceof Promise) {
- methodResult.set((Promise) r);
+ methodResult.set((Promise<?>) r);
} else if (r != null) {
- methodResult.set(new Settable(r));
+ methodResult.set(new Settable<Object>(r));
}
}
@@ -81,7 +81,7 @@ public class CamelWorkflowDefinition extends WorkflowDefinition {
@Override
protected void doFinally() throws Throwable {
- Promise r = methodResult.get();
+ Promise<?> r = methodResult.get();
if (r == null || r.isReady()) {
Object workflowResult = r == null ? null : r.get();
String convertedResult = dataConverter.toData(workflowResult);
http://git-wip-us.apache.org/repos/asf/camel/blob/67bcf32e/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowProducer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowProducer.java
index aa6913b..36b8fec 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowProducer.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowProducer.java
@@ -128,7 +128,7 @@ public class SWFWorkflowProducer extends DefaultProducer {
return exchange.getIn().getHeader(SWFConstants.RUN_ID, String.class);
}
- private Class getResultType(Exchange exchange) throws ClassNotFoundException {
+ private Class<?> getResultType(Exchange exchange) throws ClassNotFoundException {
String type = exchange.getIn().getHeader(SWFConstants.STATE_RESULT_TYPE, String.class);
if (type == null) {
type = configuration.getStateResultType();