You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2015/12/22 13:27:22 UTC
camel git commit: Fixed CS
Repository: camel
Updated Branches:
refs/heads/master 55120abf7 -> 1eec4f75e
Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1eec4f75
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1eec4f75
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1eec4f75
Branch: refs/heads/master
Commit: 1eec4f75e84c924cbc8fa54f0eba0089b6fbdbc8
Parents: 55120ab
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Dec 22 13:26:53 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Dec 22 13:26:53 2015 +0100
----------------------------------------------------------------------
.../ElasticsearchActionRequestConverter.java | 2 +-
.../ElasticsearchClusterBaseTest.java | 4 ++--
.../ElasticsearchClusterIndexTest.java | 18 +++++++++++++++++-
3 files changed, 20 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1eec4f75/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java
----------------------------------------------------------------------
diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java
index 7c638ee..98957c9 100644
--- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java
+++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java
@@ -120,7 +120,7 @@ public final class ElasticsearchActionRequestConverter {
@Converter
public static ExistsRequest toExistsRequest(String id, Exchange exchange) {
- return new ExistsRequest(exchange.getIn().getHeader(
+ return new ExistsRequest(exchange.getIn().getHeader(
ElasticsearchConstants.PARAM_INDEX_NAME, String.class));
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1eec4f75/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterBaseTest.java
----------------------------------------------------------------------
diff --git a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterBaseTest.java b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterBaseTest.java
index 83de307..74f7454 100644
--- a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterBaseTest.java
+++ b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterBaseTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.elasticsearch;
-import static org.codelibs.elasticsearch.runner.ElasticsearchClusterRunner.newConfigs;
-
import java.util.HashMap;
import java.util.Map;
@@ -30,6 +28,8 @@ import org.elasticsearch.node.Node;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import static org.codelibs.elasticsearch.runner.ElasticsearchClusterRunner.newConfigs;
+
public class ElasticsearchClusterBaseTest extends CamelTestSupport {
public static ElasticsearchClusterRunner runner;
http://git-wip-us.apache.org/repos/asf/camel/blob/1eec4f75/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterIndexTest.java
----------------------------------------------------------------------
diff --git a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterIndexTest.java b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterIndexTest.java
index b9aec08..578324b 100644
--- a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterIndexTest.java
+++ b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterIndexTest.java
@@ -1,3 +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.
+ */
package org.apache.camel.component.elasticsearch;
import java.util.HashMap;
@@ -94,7 +110,7 @@ public class ElasticsearchClusterIndexTest extends ElasticsearchClusterBaseTest
from("direct:indexWithIpAndPort").to("elasticsearch://elasticsearch?operation=INDEX&indexName=twitter&indexType=tweet&ip=localhost&port=9300");
from("direct:indexWithTransportAddresses").to("elasticsearch://elasticsearch?operation=INDEX&indexName=twitter&indexType=tweet&transportAddresses=localhost:9300,localhost:9301");
from("direct:indexWithIpAndTransportAddresses").
- to("elasticsearch://elasticsearch?operation=INDEX&indexName=twitter&indexType=tweet&ip=localhost&port=9300&transportAddresses=localhost:4444,localhost:5555");
+ to("elasticsearch://elasticsearch?operation=INDEX&indexName=twitter&indexType=tweet&ip=localhost&port=9300&transportAddresses=localhost:4444,localhost:5555");
}
};
}