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 2017/01/19 11:06:43 UTC
[03/17] camel git commit: CAMEL-10721: Fixed CS
CAMEL-10721: Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c4e4a7e7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c4e4a7e7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c4e4a7e7
Branch: refs/heads/master
Commit: c4e4a7e7aeff33f3746f966a63523afe2fb47ca6
Parents: 6333ffc
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jan 18 17:39:28 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jan 19 11:00:00 2017 +0100
----------------------------------------------------------------------
.../java/org/foo/connector/BarComponent.java | 6 ++---
.../src/main/resources/camel-connector.json | 2 +-
.../src/main/java/org/foo/FooBarWineMain.java | 8 ++++++-
.../src/main/java/org/foo/FooBarWineRoute.java | 3 +++
.../src/test/java/org/foo/FooBarWineTest.java | 25 ++++++++++----------
.../java/org/foo/connector/FooComponent.java | 6 ++---
.../src/main/resources/camel-connector.json | 2 +-
.../java/org/foo/connector/WineComponent.java | 6 ++---
.../src/main/resources/camel-connector.json | 2 +-
9 files changed, 35 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c4e4a7e7/connectors/examples/bar-connector/src/main/java/org/foo/connector/BarComponent.java
----------------------------------------------------------------------
diff --git a/connectors/examples/bar-connector/src/main/java/org/foo/connector/BarComponent.java b/connectors/examples/bar-connector/src/main/java/org/foo/connector/BarComponent.java
index 3511227..838a644 100644
--- a/connectors/examples/bar-connector/src/main/java/org/foo/connector/BarComponent.java
+++ b/connectors/examples/bar-connector/src/main/java/org/foo/connector/BarComponent.java
@@ -20,8 +20,8 @@ import org.apache.camel.component.connector.DefaultConnectorComponent;
public class BarComponent extends DefaultConnectorComponent {
- public BarComponent() {
- super("bar", "org.foo.connector.BarComponent");
- }
+ public BarComponent() {
+ super("bar", "org.foo.connector.BarComponent");
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/c4e4a7e7/connectors/examples/bar-connector/src/main/resources/camel-connector.json
----------------------------------------------------------------------
diff --git a/connectors/examples/bar-connector/src/main/resources/camel-connector.json b/connectors/examples/bar-connector/src/main/resources/camel-connector.json
index 097d0cf..db4b0ae 100644
--- a/connectors/examples/bar-connector/src/main/resources/camel-connector.json
+++ b/connectors/examples/bar-connector/src/main/resources/camel-connector.json
@@ -9,7 +9,7 @@
"javaType" : "org.foo.connector.BarComponent",
"groupId" : "org.apache.camel",
"artifactId" : "wine-connector",
- "version" : "1.0.0",
+ "version" : "2.19.0-SNAPSHOT",
"description" : "To order two drinks from the bar",
"labels" : [ "bar" ],
"source" : "To",
http://git-wip-us.apache.org/repos/asf/camel/blob/c4e4a7e7/connectors/examples/foo-bar-wine-example/src/main/java/org/foo/FooBarWineMain.java
----------------------------------------------------------------------
diff --git a/connectors/examples/foo-bar-wine-example/src/main/java/org/foo/FooBarWineMain.java b/connectors/examples/foo-bar-wine-example/src/main/java/org/foo/FooBarWineMain.java
index def8b04..9e551d0 100644
--- a/connectors/examples/foo-bar-wine-example/src/main/java/org/foo/FooBarWineMain.java
+++ b/connectors/examples/foo-bar-wine-example/src/main/java/org/foo/FooBarWineMain.java
@@ -18,7 +18,13 @@ package org.foo;
import org.apache.camel.main.Main;
-public class FooBarWineMain {
+/**
+ * Main class to run this example
+ */
+public final class FooBarWineMain {
+
+ private FooBarWineMain() {
+ }
public static void main(String[] args) throws Exception {
Main main = new Main();
http://git-wip-us.apache.org/repos/asf/camel/blob/c4e4a7e7/connectors/examples/foo-bar-wine-example/src/main/java/org/foo/FooBarWineRoute.java
----------------------------------------------------------------------
diff --git a/connectors/examples/foo-bar-wine-example/src/main/java/org/foo/FooBarWineRoute.java b/connectors/examples/foo-bar-wine-example/src/main/java/org/foo/FooBarWineRoute.java
index 7163ce2..1bd3804 100644
--- a/connectors/examples/foo-bar-wine-example/src/main/java/org/foo/FooBarWineRoute.java
+++ b/connectors/examples/foo-bar-wine-example/src/main/java/org/foo/FooBarWineRoute.java
@@ -18,6 +18,9 @@ package org.foo;
import org.apache.camel.builder.RouteBuilder;
+/**
+ * Camel route that uses the foo, bar and wine connectors
+ */
public class FooBarWineRoute extends RouteBuilder {
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/c4e4a7e7/connectors/examples/foo-bar-wine-example/src/test/java/org/foo/FooBarWineTest.java
----------------------------------------------------------------------
diff --git a/connectors/examples/foo-bar-wine-example/src/test/java/org/foo/FooBarWineTest.java b/connectors/examples/foo-bar-wine-example/src/test/java/org/foo/FooBarWineTest.java
index 92e1c10..80c45c5 100644
--- a/connectors/examples/foo-bar-wine-example/src/test/java/org/foo/FooBarWineTest.java
+++ b/connectors/examples/foo-bar-wine-example/src/test/java/org/foo/FooBarWineTest.java
@@ -1,17 +1,18 @@
/**
- * Copyright 2005-2015 Red Hat, Inc.
- * <p>
- * Red Hat 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ * 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.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.foo;
@@ -29,7 +30,7 @@ public class FooBarWineTest extends CamelTestSupport {
mock.expectedMinimumMessageCount(2);
mock.setAssertPeriod(500);
-
+
assertMockEndpointsSatisfied();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/c4e4a7e7/connectors/examples/foo-connector/src/main/java/org/foo/connector/FooComponent.java
----------------------------------------------------------------------
diff --git a/connectors/examples/foo-connector/src/main/java/org/foo/connector/FooComponent.java b/connectors/examples/foo-connector/src/main/java/org/foo/connector/FooComponent.java
index 754fdd0..20318f5 100644
--- a/connectors/examples/foo-connector/src/main/java/org/foo/connector/FooComponent.java
+++ b/connectors/examples/foo-connector/src/main/java/org/foo/connector/FooComponent.java
@@ -20,8 +20,8 @@ import org.apache.camel.component.connector.DefaultConnectorComponent;
public class FooComponent extends DefaultConnectorComponent {
- public FooComponent() {
- super("foo", "org.foo.connector.FooComponent");
- }
+ public FooComponent() {
+ super("foo", "org.foo.connector.FooComponent");
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/c4e4a7e7/connectors/examples/foo-connector/src/main/resources/camel-connector.json
----------------------------------------------------------------------
diff --git a/connectors/examples/foo-connector/src/main/resources/camel-connector.json b/connectors/examples/foo-connector/src/main/resources/camel-connector.json
index 52cc2e2..8a3b89b 100644
--- a/connectors/examples/foo-connector/src/main/resources/camel-connector.json
+++ b/connectors/examples/foo-connector/src/main/resources/camel-connector.json
@@ -9,7 +9,7 @@
"javaType" : "org.foo.connector.FooComponent",
"groupId" : "org.foo",
"artifactId" : "foo-connector",
- "version" : "1.0.0",
+ "version" : "2.19.0-SNAPSHOT",
"description" : "Something cool",
"labels" : [ "foo", "timer" ],
"source" : "From",
http://git-wip-us.apache.org/repos/asf/camel/blob/c4e4a7e7/connectors/examples/wine-connector/src/main/java/org/foo/connector/WineComponent.java
----------------------------------------------------------------------
diff --git a/connectors/examples/wine-connector/src/main/java/org/foo/connector/WineComponent.java b/connectors/examples/wine-connector/src/main/java/org/foo/connector/WineComponent.java
index 5118d25..5b5ea92 100644
--- a/connectors/examples/wine-connector/src/main/java/org/foo/connector/WineComponent.java
+++ b/connectors/examples/wine-connector/src/main/java/org/foo/connector/WineComponent.java
@@ -20,8 +20,8 @@ import org.apache.camel.component.connector.DefaultConnectorComponent;
public class WineComponent extends DefaultConnectorComponent {
- public WineComponent() {
- super("wine", "org.foo.connector.WineComponent");
- }
+ public WineComponent() {
+ super("wine", "org.foo.connector.WineComponent");
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/c4e4a7e7/connectors/examples/wine-connector/src/main/resources/camel-connector.json
----------------------------------------------------------------------
diff --git a/connectors/examples/wine-connector/src/main/resources/camel-connector.json b/connectors/examples/wine-connector/src/main/resources/camel-connector.json
index a2e8ea8..17492f7 100644
--- a/connectors/examples/wine-connector/src/main/resources/camel-connector.json
+++ b/connectors/examples/wine-connector/src/main/resources/camel-connector.json
@@ -9,7 +9,7 @@
"javaType" : "org.foo.connector.WineComponent",
"groupId" : "org.apache.camel",
"artifactId" : "wine-connector",
- "version" : "1.0.0",
+ "version" : "2.19.0-SNAPSHOT",
"description" : "To order wine from the bar",
"labels" : [ "bar" ],
"source" : "To",