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/12/17 08:37:51 UTC
[1/8] camel git commit: Fixed camel-spark component documentation.
Repository: camel
Updated Branches:
refs/heads/master 26dbc438c -> 5f9a4d792
Fixed camel-spark component documentation.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8f37aa87
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8f37aa87
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8f37aa87
Branch: refs/heads/master
Commit: 8f37aa87d22141f74761a06c1076a5455bed7e89
Parents: 26dbc43
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Dec 17 08:02:04 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Dec 17 08:02:04 2015 +0100
----------------------------------------------------------------------
components/camel-spark/pom.xml | 197 +++++++++---------
.../camel/component/spark/SparkComponent.java | 10 +-
.../camel/component/spark/SparkEndpoint.java | 58 ++++--
.../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../org/apache/camel/component/LICENSE.txt | 203 -------------------
.../org/apache/camel/component/NOTICE.txt | 11 -
7 files changed, 363 insertions(+), 330 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8f37aa87/components/camel-spark/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spark/pom.xml b/components/camel-spark/pom.xml
index 2d1d2d1..94293c8 100644
--- a/components/camel-spark/pom.xml
+++ b/components/camel-spark/pom.xml
@@ -1,114 +1,117 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-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
+ 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
+ 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.
+ 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.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>components</artifactId>
- <groupId>org.apache.camel</groupId>
- <version>2.17-SNAPSHOT</version>
- </parent>
+ <parent>
+ <artifactId>components</artifactId>
+ <groupId>org.apache.camel</groupId>
+ <version>2.17-SNAPSHOT</version>
+ </parent>
- <artifactId>camel-spark</artifactId>
- <packaging>bundle</packaging>
- <name>Camel :: Apache Spark</name>
- <description>Camel Apache Spark Support</description>
+ <artifactId>camel-spark</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: Apache Spark</name>
+ <description>Camel Apache Spark Support</description>
- <properties>
- <camel.osgi.export.pkg>org.apache.camel.component.spark.*</camel.osgi.export.pkg>
- <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=spark</camel.osgi.export.service>
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.component.spark.*</camel.osgi.export.pkg>
+ <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=spark</camel.osgi.export.service>
- <!-- Spark 1.5.1 requires Jackson 2.4.4 -->
- <jackson-version>2.4.4</jackson-version>
+ <!-- Spark 1.5.1 requires Jackson 2.4.4 -->
+ <jackson-version>2.4.4</jackson-version>
- <hadoop.version>2.2.0</hadoop.version>
- <mongo-hadoop-core.version>1.4.2</mongo-hadoop-core.version>
- <spark-version>1.5.1</spark-version>
- </properties>
+ <hadoop.version>2.2.0</hadoop.version>
+ <mongo-hadoop-core.version>1.4.2</mongo-hadoop-core.version>
+ <spark-version>1.5.1</spark-version>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-core_2.11</artifactId>
- <version>${spark-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-hive_2.11</artifactId>
- <version>${spark-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
+ <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-core</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
- <!-- Optional -->
- <dependency>
- <groupId>org.mongodb.mongo-hadoop</groupId>
- <artifactId>mongo-hadoop-core</artifactId>
- <version>${mongo-hadoop-core.version}</version>
- <optional>true</optional>
- </dependency>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-core_2.11</artifactId>
+ <version>${spark-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-hive_2.11</artifactId>
+ <version>${spark-version}</version>
+ </dependency>
- <!-- Testing -->
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.google.truth</groupId>
- <artifactId>truth</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <!-- Optional -->
+ <dependency>
+ <groupId>org.mongodb.mongo-hadoop</groupId>
+ <artifactId>mongo-hadoop-core</artifactId>
+ <version>${mongo-hadoop-core.version}</version>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- Testing -->
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${logback-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.truth</groupId>
+ <artifactId>truth</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/8f37aa87/components/camel-spark/src/main/java/org/apache/camel/component/spark/SparkComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/main/java/org/apache/camel/component/spark/SparkComponent.java b/components/camel-spark/src/main/java/org/apache/camel/component/spark/SparkComponent.java
index d82798b..b8e925e 100644
--- a/components/camel-spark/src/main/java/org/apache/camel/component/spark/SparkComponent.java
+++ b/components/camel-spark/src/main/java/org/apache/camel/component/spark/SparkComponent.java
@@ -25,7 +25,6 @@ import org.apache.spark.api.java.AbstractJavaRDDLike;
public class SparkComponent extends UriEndpointComponent {
private AbstractJavaRDDLike rdd;
-
private RddCallback rddCallback;
public SparkComponent() {
@@ -34,13 +33,17 @@ public class SparkComponent extends UriEndpointComponent {
@Override
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- return new SparkEndpoint(uri, this, EndpointType.valueOf(remaining));
+ EndpointType type = getCamelContext().getTypeConverter().mandatoryConvertTo(EndpointType.class, remaining);
+ return new SparkEndpoint(uri, this, type);
}
public AbstractJavaRDDLike getRdd() {
return rdd;
}
+ /**
+ * RDD to compute against.
+ */
public void setRdd(AbstractJavaRDDLike rdd) {
this.rdd = rdd;
}
@@ -49,6 +52,9 @@ public class SparkComponent extends UriEndpointComponent {
return rddCallback;
}
+ /**
+ * Function performing action against an RDD.
+ */
public void setRddCallback(RddCallback rddCallback) {
this.rddCallback = rddCallback;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/8f37aa87/components/camel-spark/src/main/java/org/apache/camel/component/spark/SparkEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/main/java/org/apache/camel/component/spark/SparkEndpoint.java b/components/camel-spark/src/main/java/org/apache/camel/component/spark/SparkEndpoint.java
index 17ebc2a..8bdb062 100644
--- a/components/camel-spark/src/main/java/org/apache/camel/component/spark/SparkEndpoint.java
+++ b/components/camel-spark/src/main/java/org/apache/camel/component/spark/SparkEndpoint.java
@@ -20,19 +20,21 @@ 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.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
+import org.apache.camel.spi.UriPath;
import org.apache.spark.api.java.AbstractJavaRDDLike;
import org.apache.spark.sql.DataFrame;
import org.slf4j.Logger;
import static org.slf4j.LoggerFactory.getLogger;
-
/**
* Spark endpoint can be used to create various type of producers, including RDD-, DataFrame- and Hive-based.
*/
-// @UriEndpoint(scheme = "spark", producerOnly = true, title = "Apache Spark", syntax = "spark:jobType", label = "bigdata,iot")
+@UriEndpoint(scheme = "spark", title = "Apache Spark", syntax = "spark:endpointType",
+ producerOnly = true, label = "bigdata,iot")
public class SparkEndpoint extends DefaultEndpoint {
// Logger
@@ -41,24 +43,20 @@ public class SparkEndpoint extends DefaultEndpoint {
// Endpoint collaborators
- @UriParam(name = "rdd", description = "RDD to compute against.")
+ @UriPath @Metadata(required = "true")
+ private EndpointType endpointType;
+ @UriParam
private AbstractJavaRDDLike rdd;
-
- @UriParam(name = "rddCallback", description = "Function performing action against an RDD.")
+ @UriParam
private RddCallback rddCallback;
-
- @UriParam(name = "dataFrame", description = "DataFrame to compute against.")
+ @UriParam
private DataFrame dataFrame;
-
- @UriParam(name = "dataFrameCallback", description = "Function performing action against an DataFrame.")
+ @UriParam
private DataFrameCallback dataFrameCallback;
// Endpoint configuration
- @UriParam(name = "endpointType", description = "Type of the endpoint (rdd, dataframe, hive).")
- private final EndpointType endpointType;
-
- @UriParam(name = "collect", description = "Indicates if results should be collected or counted.")
+ @UriParam(defaultValue = "true")
private boolean collect = true;
// Constructors
@@ -86,15 +84,15 @@ public class SparkEndpoint extends DefaultEndpoint {
@Override
public Producer createProducer() throws Exception {
- LOG.debug("Creating {} Spark producer.", endpointType);
+ LOG.trace("Creating {} Spark producer.", endpointType);
if (endpointType == EndpointType.rdd) {
- LOG.debug("About to create RDD producer.");
+ LOG.trace("About to create RDD producer.");
return new RddSparkProducer(this);
} else if (endpointType == EndpointType.dataframe) {
- LOG.debug("About to create DataFrame producer.");
+ LOG.trace("About to create DataFrame producer.");
return new DataFrameSparkProducer(this);
} else {
- LOG.debug("About to create Hive producer.");
+ LOG.trace("About to create Hive producer.");
return new HiveSparkProducer(this);
}
}
@@ -116,10 +114,24 @@ public class SparkEndpoint extends DefaultEndpoint {
return (SparkComponent) super.getComponent();
}
+ public EndpointType getEndpointType() {
+ return endpointType;
+ }
+
+ /**
+ * Type of the endpoint (rdd, dataframe, hive).
+ */
+ public void setEndpointType(EndpointType endpointType) {
+ this.endpointType = endpointType;
+ }
+
public AbstractJavaRDDLike getRdd() {
return rdd;
}
+ /**
+ * RDD to compute against.
+ */
public void setRdd(AbstractJavaRDDLike rdd) {
this.rdd = rdd;
}
@@ -128,6 +140,9 @@ public class SparkEndpoint extends DefaultEndpoint {
return rddCallback;
}
+ /**
+ * Function performing action against an RDD.
+ */
public void setRddCallback(RddCallback rddCallback) {
this.rddCallback = rddCallback;
}
@@ -136,6 +151,9 @@ public class SparkEndpoint extends DefaultEndpoint {
return dataFrame;
}
+ /**
+ * DataFrame to compute against.
+ */
public void setDataFrame(DataFrame dataFrame) {
this.dataFrame = dataFrame;
}
@@ -144,6 +162,9 @@ public class SparkEndpoint extends DefaultEndpoint {
return dataFrameCallback;
}
+ /**
+ * Function performing action against an DataFrame.
+ */
public void setDataFrameCallback(DataFrameCallback dataFrameCallback) {
this.dataFrameCallback = dataFrameCallback;
}
@@ -152,6 +173,9 @@ public class SparkEndpoint extends DefaultEndpoint {
return collect;
}
+ /**
+ * Indicates if results should be collected or counted.
+ */
public void setCollect(boolean collect) {
this.collect = collect;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/8f37aa87/components/camel-spark/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/main/resources/META-INF/LICENSE.txt b/components/camel-spark/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/components/camel-spark/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
http://git-wip-us.apache.org/repos/asf/camel/blob/8f37aa87/components/camel-spark/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/main/resources/META-INF/NOTICE.txt b/components/camel-spark/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/components/camel-spark/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Camel distribution. ==
+ =========================================================================
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Please read the different LICENSE files present in the licenses directory of
+ this distribution.
http://git-wip-us.apache.org/repos/asf/camel/blob/8f37aa87/components/camel-spark/src/main/resources/META-INF/services/org/apache/camel/component/LICENSE.txt
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/main/resources/META-INF/services/org/apache/camel/component/LICENSE.txt b/components/camel-spark/src/main/resources/META-INF/services/org/apache/camel/component/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/components/camel-spark/src/main/resources/META-INF/services/org/apache/camel/component/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
http://git-wip-us.apache.org/repos/asf/camel/blob/8f37aa87/components/camel-spark/src/main/resources/META-INF/services/org/apache/camel/component/NOTICE.txt
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/main/resources/META-INF/services/org/apache/camel/component/NOTICE.txt b/components/camel-spark/src/main/resources/META-INF/services/org/apache/camel/component/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/components/camel-spark/src/main/resources/META-INF/services/org/apache/camel/component/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
- =========================================================================
- == NOTICE file corresponding to the section 4 d of ==
- == the Apache License, Version 2.0, ==
- == in this case for the Apache Camel distribution. ==
- =========================================================================
-
- This product includes software developed by
- The Apache Software Foundation (http://www.apache.org/).
-
- Please read the different LICENSE files present in the licenses directory of
- this distribution.
[3/8] camel git commit: The option is required
Posted by da...@apache.org.
The option is required
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f412a01f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f412a01f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f412a01f
Branch: refs/heads/master
Commit: f412a01fb356449883466652ad2ea5f85d0ac47b
Parents: d162302
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Dec 17 08:04:31 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Dec 17 08:04:31 2015 +0100
----------------------------------------------------------------------
.../org/apache/camel/component/undertow/UndertowEndpoint.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f412a01f/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
index 4bb0f01..621c5fd 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
@@ -32,6 +32,7 @@ import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spi.HeaderFilterStrategyAware;
+import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
@@ -54,7 +55,7 @@ public class UndertowEndpoint extends DefaultEndpoint implements HeaderFilterStr
private SSLContext sslContext;
private OptionMap optionMap;
- @UriPath
+ @UriPath @Metadata(required = "true")
private URI httpURI;
@UriParam
private UndertowHttpBinding undertowHttpBinding;
[7/8] camel git commit: Dont have test files in root dir
Posted by da...@apache.org.
Dont have test files in root dir
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5f252c44
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5f252c44
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5f252c44
Branch: refs/heads/master
Commit: 5f252c440486bc4dee353ae46a7bee312eee0147
Parents: 87ce9cc
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Dec 17 08:34:48 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Dec 17 08:34:48 2015 +0100
----------------------------------------------------------------------
.../camel/component/spark/SparkProducerTest.java | 2 +-
.../camel-spark/src/test/resources/testrdd.txt | 19 +++++++++++++++++++
components/camel-spark/testrdd.txt | 19 -------------------
3 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5f252c44/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java b/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java
index 2cf548c..a1bf282 100644
--- a/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java
+++ b/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java
@@ -73,7 +73,7 @@ public class SparkProducerTest extends CamelTestSupport {
protected JndiRegistry createRegistry() throws Exception {
JndiRegistry registry = super.createRegistry();
- registry.bind("testFileRdd", sparkContext.textFile("testrdd.txt"));
+ registry.bind("testFileRdd", sparkContext.textFile("src/test/resources/testrdd.txt"));
if (shouldRunHive) {
registry.bind("hiveContext", hiveContext);
http://git-wip-us.apache.org/repos/asf/camel/blob/5f252c44/components/camel-spark/src/test/resources/testrdd.txt
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/test/resources/testrdd.txt b/components/camel-spark/src/test/resources/testrdd.txt
new file mode 100644
index 0000000..5bb464c
--- /dev/null
+++ b/components/camel-spark/src/test/resources/testrdd.txt
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+
+foo bar
+baz qux
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/5f252c44/components/camel-spark/testrdd.txt
----------------------------------------------------------------------
diff --git a/components/camel-spark/testrdd.txt b/components/camel-spark/testrdd.txt
deleted file mode 100644
index 5bb464c..0000000
--- a/components/camel-spark/testrdd.txt
+++ /dev/null
@@ -1,19 +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.
-#
-
-foo bar
-baz qux
\ No newline at end of file
[4/8] camel git commit: Use interface instead of abstract class
Posted by da...@apache.org.
Use interface instead of abstract class
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7294efba
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7294efba
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7294efba
Branch: refs/heads/master
Commit: 7294efba4b6be2b0ec5b531619c28a4a2de2c77b
Parents: f412a01
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Dec 17 08:12:01 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Dec 17 08:12:21 2015 +0100
----------------------------------------------------------------------
.../camel/component/spark/ConvertingRddCallback.java | 10 +++++-----
.../org/apache/camel/component/spark/RddCallback.java | 4 ++--
.../camel/component/spark/RddSparkProducer.java | 6 +++---
.../apache/camel/component/spark/SparkComponent.java | 8 ++++----
.../apache/camel/component/spark/SparkEndpoint.java | 8 ++++----
.../apache/camel/component/spark/VoidRddCallback.java | 6 +++---
.../spark/annotations/AnnotatedRddCallbackProxy.java | 7 +++----
.../camel/component/spark/SparkProducerTest.java | 14 +++++++-------
8 files changed, 31 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7294efba/components/camel-spark/src/main/java/org/apache/camel/component/spark/ConvertingRddCallback.java
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/main/java/org/apache/camel/component/spark/ConvertingRddCallback.java b/components/camel-spark/src/main/java/org/apache/camel/component/spark/ConvertingRddCallback.java
index ac75f38..4d149d0 100644
--- a/components/camel-spark/src/main/java/org/apache/camel/component/spark/ConvertingRddCallback.java
+++ b/components/camel-spark/src/main/java/org/apache/camel/component/spark/ConvertingRddCallback.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.component.spark;
-import static java.lang.String.format;
-
import org.apache.camel.CamelContext;
-import org.apache.spark.api.java.AbstractJavaRDDLike;
+import org.apache.spark.api.java.JavaRDDLike;
+
+import static java.lang.String.format;
public abstract class ConvertingRddCallback<T> implements RddCallback<T> {
@@ -33,7 +33,7 @@ public abstract class ConvertingRddCallback<T> implements RddCallback<T> {
}
@Override
- public T onRdd(AbstractJavaRDDLike rdd, Object... payloads) {
+ public T onRdd(JavaRDDLike rdd, Object... payloads) {
if (payloads.length != payloadsTypes.length) {
String message = format("Received %d payloads, but expected %d.", payloads.length, payloadsTypes.length);
throw new IllegalArgumentException(message);
@@ -44,6 +44,6 @@ public abstract class ConvertingRddCallback<T> implements RddCallback<T> {
return doOnRdd(rdd, payloads);
}
- public abstract T doOnRdd(AbstractJavaRDDLike rdd, Object... payloads);
+ public abstract T doOnRdd(JavaRDDLike rdd, Object... payloads);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7294efba/components/camel-spark/src/main/java/org/apache/camel/component/spark/RddCallback.java
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/main/java/org/apache/camel/component/spark/RddCallback.java b/components/camel-spark/src/main/java/org/apache/camel/component/spark/RddCallback.java
index ed514b6..919956b 100644
--- a/components/camel-spark/src/main/java/org/apache/camel/component/spark/RddCallback.java
+++ b/components/camel-spark/src/main/java/org/apache/camel/component/spark/RddCallback.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.spark;
-import org.apache.spark.api.java.AbstractJavaRDDLike;
+import org.apache.spark.api.java.JavaRDDLike;
/**
* Generic block of code with parameters which can be executed against RDD and return results.
@@ -25,6 +25,6 @@ import org.apache.spark.api.java.AbstractJavaRDDLike;
*/
public interface RddCallback<T> {
- T onRdd(AbstractJavaRDDLike rdd, Object... payloads);
+ T onRdd(JavaRDDLike rdd, Object... payloads);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7294efba/components/camel-spark/src/main/java/org/apache/camel/component/spark/RddSparkProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/main/java/org/apache/camel/component/spark/RddSparkProducer.java b/components/camel-spark/src/main/java/org/apache/camel/component/spark/RddSparkProducer.java
index 1977bed..9827d6f 100644
--- a/components/camel-spark/src/main/java/org/apache/camel/component/spark/RddSparkProducer.java
+++ b/components/camel-spark/src/main/java/org/apache/camel/component/spark/RddSparkProducer.java
@@ -20,8 +20,8 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultProducer;
-import org.apache.spark.api.java.AbstractJavaRDDLike;
import org.apache.spark.api.java.JavaRDD;
+import org.apache.spark.api.java.JavaRDDLike;
import static org.apache.camel.component.spark.SparkConstants.SPARK_RDD_CALLBACK_HEADER;
import static org.apache.camel.component.spark.SparkConstants.SPARK_RDD_HEADER;
@@ -34,7 +34,7 @@ public class RddSparkProducer extends DefaultProducer {
@Override
public void process(Exchange exchange) throws Exception {
- AbstractJavaRDDLike rdd = resolveRdd(exchange);
+ JavaRDDLike rdd = resolveRdd(exchange);
RddCallback rddCallback = resolveRddCallback(exchange);
Object body = exchange.getIn().getBody();
Object result = body instanceof List ? rddCallback.onRdd(rdd, ((List) body).toArray(new Object[0])) : rddCallback.onRdd(rdd, body);
@@ -62,7 +62,7 @@ public class RddSparkProducer extends DefaultProducer {
}
}
- protected AbstractJavaRDDLike resolveRdd(Exchange exchange) {
+ protected JavaRDDLike resolveRdd(Exchange exchange) {
if (exchange.getIn().getHeader(SPARK_RDD_HEADER) != null) {
return (JavaRDD) exchange.getIn().getHeader(SPARK_RDD_HEADER);
} else if (getEndpoint().getRdd() != null) {
http://git-wip-us.apache.org/repos/asf/camel/blob/7294efba/components/camel-spark/src/main/java/org/apache/camel/component/spark/SparkComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/main/java/org/apache/camel/component/spark/SparkComponent.java b/components/camel-spark/src/main/java/org/apache/camel/component/spark/SparkComponent.java
index b8e925e..5ea539e 100644
--- a/components/camel-spark/src/main/java/org/apache/camel/component/spark/SparkComponent.java
+++ b/components/camel-spark/src/main/java/org/apache/camel/component/spark/SparkComponent.java
@@ -20,11 +20,11 @@ import java.util.Map;
import org.apache.camel.Endpoint;
import org.apache.camel.impl.UriEndpointComponent;
-import org.apache.spark.api.java.AbstractJavaRDDLike;
+import org.apache.spark.api.java.JavaRDDLike;
public class SparkComponent extends UriEndpointComponent {
- private AbstractJavaRDDLike rdd;
+ private JavaRDDLike rdd;
private RddCallback rddCallback;
public SparkComponent() {
@@ -37,14 +37,14 @@ public class SparkComponent extends UriEndpointComponent {
return new SparkEndpoint(uri, this, type);
}
- public AbstractJavaRDDLike getRdd() {
+ public JavaRDDLike getRdd() {
return rdd;
}
/**
* RDD to compute against.
*/
- public void setRdd(AbstractJavaRDDLike rdd) {
+ public void setRdd(JavaRDDLike rdd) {
this.rdd = rdd;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7294efba/components/camel-spark/src/main/java/org/apache/camel/component/spark/SparkEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/main/java/org/apache/camel/component/spark/SparkEndpoint.java b/components/camel-spark/src/main/java/org/apache/camel/component/spark/SparkEndpoint.java
index 8bdb062..914bb9b 100644
--- a/components/camel-spark/src/main/java/org/apache/camel/component/spark/SparkEndpoint.java
+++ b/components/camel-spark/src/main/java/org/apache/camel/component/spark/SparkEndpoint.java
@@ -24,7 +24,7 @@ import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
-import org.apache.spark.api.java.AbstractJavaRDDLike;
+import org.apache.spark.api.java.JavaRDDLike;
import org.apache.spark.sql.DataFrame;
import org.slf4j.Logger;
@@ -46,7 +46,7 @@ public class SparkEndpoint extends DefaultEndpoint {
@UriPath @Metadata(required = "true")
private EndpointType endpointType;
@UriParam
- private AbstractJavaRDDLike rdd;
+ private JavaRDDLike rdd;
@UriParam
private RddCallback rddCallback;
@UriParam
@@ -125,14 +125,14 @@ public class SparkEndpoint extends DefaultEndpoint {
this.endpointType = endpointType;
}
- public AbstractJavaRDDLike getRdd() {
+ public JavaRDDLike getRdd() {
return rdd;
}
/**
* RDD to compute against.
*/
- public void setRdd(AbstractJavaRDDLike rdd) {
+ public void setRdd(JavaRDDLike rdd) {
this.rdd = rdd;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7294efba/components/camel-spark/src/main/java/org/apache/camel/component/spark/VoidRddCallback.java
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/main/java/org/apache/camel/component/spark/VoidRddCallback.java b/components/camel-spark/src/main/java/org/apache/camel/component/spark/VoidRddCallback.java
index 24e62bd..931c6ed 100644
--- a/components/camel-spark/src/main/java/org/apache/camel/component/spark/VoidRddCallback.java
+++ b/components/camel-spark/src/main/java/org/apache/camel/component/spark/VoidRddCallback.java
@@ -16,14 +16,14 @@
*/
package org.apache.camel.component.spark;
-import org.apache.spark.api.java.AbstractJavaRDDLike;
+import org.apache.spark.api.java.JavaRDDLike;
public abstract class VoidRddCallback implements RddCallback<Void> {
- public abstract void doOnRdd(AbstractJavaRDDLike rdd, Object... payloads);
+ public abstract void doOnRdd(JavaRDDLike rdd, Object... payloads);
@Override
- public Void onRdd(AbstractJavaRDDLike rdd, Object... payloads) {
+ public Void onRdd(JavaRDDLike rdd, Object... payloads) {
doOnRdd(rdd, payloads);
return null;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7294efba/components/camel-spark/src/main/java/org/apache/camel/component/spark/annotations/AnnotatedRddCallbackProxy.java
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/main/java/org/apache/camel/component/spark/annotations/AnnotatedRddCallbackProxy.java b/components/camel-spark/src/main/java/org/apache/camel/component/spark/annotations/AnnotatedRddCallbackProxy.java
index 5d2e9c9..66540ab 100644
--- a/components/camel-spark/src/main/java/org/apache/camel/component/spark/annotations/AnnotatedRddCallbackProxy.java
+++ b/components/camel-spark/src/main/java/org/apache/camel/component/spark/annotations/AnnotatedRddCallbackProxy.java
@@ -21,12 +21,11 @@ import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
-import static java.util.Arrays.asList;
-
import org.apache.camel.CamelContext;
import org.apache.camel.component.spark.RddCallback;
-import org.apache.spark.api.java.AbstractJavaRDDLike;
+import org.apache.spark.api.java.JavaRDDLike;
+import static java.util.Arrays.asList;
import static org.apache.camel.util.ObjectHelper.findMethodsWithAnnotation;
class AnnotatedRddCallbackProxy implements RddCallback {
@@ -51,7 +50,7 @@ class AnnotatedRddCallbackProxy implements RddCallback {
}
@Override
- public Object onRdd(AbstractJavaRDDLike rdd, Object... payloads) {
+ public Object onRdd(JavaRDDLike rdd, Object... payloads) {
try {
List<Object> arguments = new ArrayList<>(payloads.length + 1);
arguments.add(rdd);
http://git-wip-us.apache.org/repos/asf/camel/blob/7294efba/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java b/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java
index 11b6451..2cf548c 100644
--- a/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java
+++ b/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java
@@ -27,8 +27,8 @@ import com.google.common.truth.Truth;
import org.apache.camel.component.spark.annotations.RddCallback;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.spark.api.java.AbstractJavaRDDLike;
import org.apache.spark.api.java.JavaRDD;
+import org.apache.spark.api.java.JavaRDDLike;
import org.apache.spark.api.java.JavaSparkContext;
import org.apache.spark.sql.DataFrame;
import org.apache.spark.sql.Row;
@@ -84,7 +84,7 @@ public class SparkProducerTest extends CamelTestSupport {
registry.bind("countLinesTransformation", new org.apache.camel.component.spark.RddCallback() {
@Override
- public Object onRdd(AbstractJavaRDDLike rdd, Object... payloads) {
+ public Object onRdd(JavaRDDLike rdd, Object... payloads) {
return rdd.count();
}
});
@@ -97,7 +97,7 @@ public class SparkProducerTest extends CamelTestSupport {
public void shouldExecuteRddCallback() {
long linesCount = template.requestBodyAndHeader(sparkUri, null, SPARK_RDD_CALLBACK_HEADER, new org.apache.camel.component.spark.RddCallback() {
@Override
- public Long onRdd(AbstractJavaRDDLike rdd, Object... payloads) {
+ public Long onRdd(JavaRDDLike rdd, Object... payloads) {
return rdd.count();
}
}, Long.class);
@@ -108,7 +108,7 @@ public class SparkProducerTest extends CamelTestSupport {
public void shouldExecuteRddCallbackWithSinglePayload() {
long linesCount = template.requestBodyAndHeader(sparkUri, 10, SPARK_RDD_CALLBACK_HEADER, new org.apache.camel.component.spark.RddCallback() {
@Override
- public Long onRdd(AbstractJavaRDDLike rdd, Object... payloads) {
+ public Long onRdd(JavaRDDLike rdd, Object... payloads) {
return rdd.count() * (int) payloads[0];
}
}, Long.class);
@@ -119,7 +119,7 @@ public class SparkProducerTest extends CamelTestSupport {
public void shouldExecuteRddCallbackWithPayloads() {
long linesCount = template.requestBodyAndHeader(sparkUri, asList(10, 10), SPARK_RDD_CALLBACK_HEADER, new org.apache.camel.component.spark.RddCallback() {
@Override
- public Long onRdd(AbstractJavaRDDLike rdd, Object... payloads) {
+ public Long onRdd(JavaRDDLike rdd, Object... payloads) {
return rdd.count() * (int) payloads[0] * (int) payloads[1];
}
}, Long.class);
@@ -130,7 +130,7 @@ public class SparkProducerTest extends CamelTestSupport {
public void shouldExecuteRddCallbackWithTypedPayloads() {
ConvertingRddCallback rddCallback = new ConvertingRddCallback<Long>(context, int.class, int.class) {
@Override
- public Long doOnRdd(AbstractJavaRDDLike rdd, Object... payloads) {
+ public Long doOnRdd(JavaRDDLike rdd, Object... payloads) {
return rdd.count() * (int) payloads[0] * (int) payloads[1];
}
};
@@ -153,7 +153,7 @@ public class SparkProducerTest extends CamelTestSupport {
// When
template.sendBodyAndHeader(sparkUri, null, SPARK_RDD_CALLBACK_HEADER, new VoidRddCallback() {
@Override
- public void doOnRdd(AbstractJavaRDDLike rdd, Object... payloads) {
+ public void doOnRdd(JavaRDDLike rdd, Object... payloads) {
rdd.saveAsTextFile(output.getAbsolutePath());
}
});
[8/8] camel git commit: Use log file for testing
Posted by da...@apache.org.
Use log file for testing
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5f9a4d79
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5f9a4d79
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5f9a4d79
Branch: refs/heads/master
Commit: 5f9a4d7927b20e6436382acb13d567efa9c9df8c
Parents: 5f252c4
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Dec 17 08:37:41 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Dec 17 08:37:41 2015 +0100
----------------------------------------------------------------------
components/camel-spark/pom.xml | 11 +++---
.../src/test/resources/log4j.properties | 40 ++++++++++++++++++++
2 files changed, 45 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5f9a4d79/components/camel-spark/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spark/pom.xml b/components/camel-spark/pom.xml
index 94293c8..7efbd32 100644
--- a/components/camel-spark/pom.xml
+++ b/components/camel-spark/pom.xml
@@ -92,12 +92,6 @@
<!-- Testing -->
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<scope>test</scope>
@@ -112,6 +106,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/5f9a4d79/components/camel-spark/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/test/resources/log4j.properties b/components/camel-spark/src/test/resources/log4j.properties
new file mode 100644
index 0000000..e736366
--- /dev/null
+++ b/components/camel-spark/src/test/resources/log4j.properties
@@ -0,0 +1,40 @@
+## ------------------------------------------------------------------------
+## 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.
+## ------------------------------------------------------------------------
+
+#
+# The logging properties used for testing.
+#
+log4j.rootLogger=INFO, file
+
+# uncomment the following to enable camel debugging
+#log4j.logger.org.apache.camel.component.spark=DEBUG
+
+# CONSOLE appender not used by default
+log4j.appender.out=org.apache.log4j.ConsoleAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+# MDC
+#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %-10.10X{camel.breadcrumbId} - %-10.10X{camelexchangeId} - %-10.10X{camel.correlationId} - %-10.10X{camel.routeId} - %m%n
+
+# File appender
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.file=target/camel-spark-test.log
+log4j.appender.file.append=true
+log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+# MDC
+#log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %-10.10X{camel.breadcrumbId} - %-10.10X{camel.exchangeId} - %-10.10X{camel.correlationId} - %-10.10X{camel.routeId} - %m%n
[6/8] camel git commit: camel apt compiler plugin write error log.
Also fix problem for javac to scan/load hadoop/spark JARs
Posted by da...@apache.org.
camel apt compiler plugin write error log. Also fix problem for javac to scan/load hadoop/spark JARs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/87ce9cce
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/87ce9cce
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/87ce9cce
Branch: refs/heads/master
Commit: 87ce9ccef9b5a82fbbb694ddd7589b87e17d8f96
Parents: aa05030
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Dec 17 08:33:13 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Dec 17 08:33:13 2015 +0100
----------------------------------------------------------------------
.../tools/apt/AbstractAnnotationProcessor.java | 31 +++++++++++++++++++-
.../camel/tools/apt/EipAnnotationProcessor.java | 2 +-
.../tools/apt/EndpointAnnotationProcessor.java | 2 +-
3 files changed, 32 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/87ce9cce/tooling/apt/src/main/java/org/apache/camel/tools/apt/AbstractAnnotationProcessor.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/AbstractAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/AbstractAnnotationProcessor.java
index 9a49110..c5af901 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/AbstractAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/AbstractAnnotationProcessor.java
@@ -17,6 +17,7 @@
package org.apache.camel.tools.apt;
import java.io.File;
+import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
@@ -24,6 +25,7 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.Writer;
import java.net.URI;
+import java.util.Collections;
import java.util.List;
import java.util.Set;
import javax.annotation.processing.AbstractProcessor;
@@ -208,7 +210,7 @@ public abstract class AbstractAnnotationProcessor extends AbstractProcessor {
String packageName = className.substring(0, idx);
PackageElement pe = elementUtils.getPackageElement(packageName);
if (pe != null) {
- List<? extends Element> enclosedElements = pe.getEnclosedElements();
+ List<? extends Element> enclosedElements = getEnclosedElements(pe);
for (Element rootElement : enclosedElements) {
if (rootElement instanceof TypeElement) {
TypeElement typeElement = (TypeElement) rootElement;
@@ -224,6 +226,17 @@ public abstract class AbstractAnnotationProcessor extends AbstractProcessor {
return null;
}
+ @SuppressWarnings("unchecked")
+ private List<? extends Element> getEnclosedElements(PackageElement pe) {
+ // some components like hadoop/spark has bad classes that causes javac scanning issues
+ try {
+ return pe.getEnclosedElements();
+ } catch (Throwable e) {
+ // ignore
+ }
+ return Collections.EMPTY_LIST;
+ }
+
protected void findTypeElementChildren(RoundEnvironment roundEnv, Set<TypeElement> found, String superClassName) {
Elements elementUtils = processingEnv.getElementUtils();
@@ -350,4 +363,20 @@ public abstract class AbstractAnnotationProcessor extends AbstractProcessor {
return null;
}
+
+ protected void dumpExceptionToErrorFile(String fileName, String message, Throwable e) {
+ File file = new File(fileName);
+ try {
+ FileOutputStream fos = new FileOutputStream(file);
+ StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw);
+ e.printStackTrace(pw);
+ fos.write(sw.toString().getBytes());
+ pw.close();
+ sw.close();
+ fos.close();
+ } catch (Throwable t) {
+ // ignore
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/87ce9cce/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
index d124e39..e817d64 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
@@ -102,7 +102,7 @@ public class EipAnnotationProcessor extends AbstractAnnotationProcessor {
}
}
} catch (Throwable e) {
- // ignore
+ dumpExceptionToErrorFile("camel-apt-error.log", "Error processing EIP model", e);
}
return true;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/87ce9cce/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
index d7c6249..e662217 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
@@ -79,7 +79,7 @@ public class EndpointAnnotationProcessor extends AbstractAnnotationProcessor {
}
}
} catch (Throwable e) {
- // ignore
+ dumpExceptionToErrorFile("camel-apt-error.log", "Error processing @UriEndpoint", e);
}
return true;
}
[2/8] camel git commit: Make camel apt compiler plugin roboust in
case of weird error
Posted by da...@apache.org.
Make camel apt compiler plugin roboust in case of weird error
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d1623025
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d1623025
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d1623025
Branch: refs/heads/master
Commit: d16230254ec67cf02cc8182daba56ee7c6b4602c
Parents: 8f37aa8
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Dec 17 08:03:27 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Dec 17 08:03:27 2015 +0100
----------------------------------------------------------------------
.../camel/tools/apt/EipAnnotationProcessor.java | 18 +++++++++++-------
.../tools/apt/EndpointAnnotationProcessor.java | 18 +++++++++++-------
2 files changed, 22 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d1623025/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
index bab6360..d124e39 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
@@ -90,15 +90,19 @@ public class EipAnnotationProcessor extends AbstractAnnotationProcessor {
@Override
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
- if (roundEnv.processingOver()) {
- return true;
- }
+ try {
+ if (roundEnv.processingOver()) {
+ return true;
+ }
- Set<? extends Element> elements = roundEnv.getElementsAnnotatedWith(XmlRootElement.class);
- for (Element element : elements) {
- if (element instanceof TypeElement) {
- processModelClass(roundEnv, (TypeElement) element);
+ Set<? extends Element> elements = roundEnv.getElementsAnnotatedWith(XmlRootElement.class);
+ for (Element element : elements) {
+ if (element instanceof TypeElement) {
+ processModelClass(roundEnv, (TypeElement) element);
+ }
}
+ } catch (Throwable e) {
+ // ignore
}
return true;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d1623025/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
index 0f26084..d7c6249 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
@@ -68,14 +68,18 @@ public class EndpointAnnotationProcessor extends AbstractAnnotationProcessor {
private static final String HEADER_FILTER_STRATEGY_JAVADOC = "To use a custom HeaderFilterStrategy to filter header to and from Camel message.";
public boolean process(Set<? extends TypeElement> annotations, final RoundEnvironment roundEnv) {
- if (roundEnv.processingOver()) {
- return true;
- }
- Set<? extends Element> elements = roundEnv.getElementsAnnotatedWith(UriEndpoint.class);
- for (Element element : elements) {
- if (element instanceof TypeElement) {
- processEndpointClass(roundEnv, (TypeElement) element);
+ try {
+ if (roundEnv.processingOver()) {
+ return true;
+ }
+ Set<? extends Element> elements = roundEnv.getElementsAnnotatedWith(UriEndpoint.class);
+ for (Element element : elements) {
+ if (element instanceof TypeElement) {
+ processEndpointClass(roundEnv, (TypeElement) element);
+ }
}
+ } catch (Throwable e) {
+ // ignore
}
return true;
}
[5/8] camel git commit: Fixed CS
Posted by da...@apache.org.
Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/aa050307
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/aa050307
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/aa050307
Branch: refs/heads/master
Commit: aa050307476325fd07fb744a8300848635adc4ed
Parents: 7294efb
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Dec 17 08:13:30 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Dec 17 08:13:30 2015 +0100
----------------------------------------------------------------------
.../org/apache/camel/component/spark/ConvertingRddCallback.java | 4 ++--
.../component/spark/annotations/AnnotatedRddCallbackProxy.java | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/aa050307/components/camel-spark/src/main/java/org/apache/camel/component/spark/ConvertingRddCallback.java
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/main/java/org/apache/camel/component/spark/ConvertingRddCallback.java b/components/camel-spark/src/main/java/org/apache/camel/component/spark/ConvertingRddCallback.java
index 4d149d0..0574a77 100644
--- a/components/camel-spark/src/main/java/org/apache/camel/component/spark/ConvertingRddCallback.java
+++ b/components/camel-spark/src/main/java/org/apache/camel/component/spark/ConvertingRddCallback.java
@@ -16,11 +16,11 @@
*/
package org.apache.camel.component.spark;
+import static java.lang.String.format;
+
import org.apache.camel.CamelContext;
import org.apache.spark.api.java.JavaRDDLike;
-import static java.lang.String.format;
-
public abstract class ConvertingRddCallback<T> implements RddCallback<T> {
private final CamelContext camelContext;
http://git-wip-us.apache.org/repos/asf/camel/blob/aa050307/components/camel-spark/src/main/java/org/apache/camel/component/spark/annotations/AnnotatedRddCallbackProxy.java
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/main/java/org/apache/camel/component/spark/annotations/AnnotatedRddCallbackProxy.java b/components/camel-spark/src/main/java/org/apache/camel/component/spark/annotations/AnnotatedRddCallbackProxy.java
index 66540ab..dffdbc1 100644
--- a/components/camel-spark/src/main/java/org/apache/camel/component/spark/annotations/AnnotatedRddCallbackProxy.java
+++ b/components/camel-spark/src/main/java/org/apache/camel/component/spark/annotations/AnnotatedRddCallbackProxy.java
@@ -21,11 +21,12 @@ import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
+import static java.util.Arrays.asList;
+
import org.apache.camel.CamelContext;
import org.apache.camel.component.spark.RddCallback;
import org.apache.spark.api.java.JavaRDDLike;
-import static java.util.Arrays.asList;
import static org.apache.camel.util.ObjectHelper.findMethodsWithAnnotation;
class AnnotatedRddCallbackProxy implements RddCallback {