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 2018/02/05 10:43:24 UTC
[camel] 02/04: CAMEL-12224 - Fixed CS and tests
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e4eae0e76cd4ba8c249f65087012d386d3256b8f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Feb 5 11:31:29 2018 +0100
CAMEL-12224 - Fixed CS and tests
---
.../apache/camel/component/elasticsearch/ElasticsearchProducer.java | 4 ++--
.../apache/camel/component/elasticsearch/ElasticsearchBaseTest.java | 4 +---
.../camel/component/elasticsearch/ElasticsearchClusterBaseTest.java | 2 +-
.../camel/component/elasticsearch/ElasticsearchClusterIndexTest.java | 2 --
.../elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java | 4 +---
.../apache/camel/component/elasticsearch/ElasticsearchIndexTest.java | 2 --
6 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
index 4a303cb..5d636eb 100644
--- a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
+++ b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
@@ -299,9 +299,9 @@ public class ElasticsearchProducer extends DefaultProducer {
return client;
}
- private class HighLevelClient extends RestHighLevelClient {
+ private final class HighLevelClient extends RestHighLevelClient {
private HighLevelClient(RestClient restClient) {
- super(restClient, (client) -> {}, Collections.emptyList());
+ super(restClient, (client) -> { }, Collections.emptyList());
}
}
}
\ No newline at end of file
diff --git a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchBaseTest.java b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchBaseTest.java
index bf3aae1..927797f 100644
--- a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchBaseTest.java
+++ b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchBaseTest.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.camel.CamelContext;
-import org.apache.camel.component.elasticsearch.ElasticsearchComponent;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.http.HttpHost;
@@ -123,7 +122,6 @@ public class ElasticsearchBaseTest extends CamelTestSupport {
}
RestClient getClient() {
- return client;
+ return client;
}
-
}
diff --git a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterBaseTest.java b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterBaseTest.java
index f7fd56f..22ddfb8 100644
--- a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterBaseTest.java
+++ b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterBaseTest.java
@@ -73,7 +73,7 @@ public class ElasticsearchClusterBaseTest extends CamelTestSupport {
@AfterClass
public static void teardownOnce() throws Exception {
if (restClient != null) {
- restClient.close();
+ restClient.close();
}
if (runner != null) {
// close runner
diff --git a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterIndexTest.java b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterIndexTest.java
index 410d4db..c69fc8e 100644
--- a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterIndexTest.java
+++ b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterIndexTest.java
@@ -20,8 +20,6 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.elasticsearch.ElasticsearchConstants;
-import org.apache.camel.component.elasticsearch.ElasticsearchOperation;
import org.apache.http.impl.client.BasicResponseHandler;
import org.elasticsearch.action.get.GetRequest;
import org.junit.Test;
diff --git a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java
index b97dad1..a6ac9f6 100644
--- a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java
+++ b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java
@@ -20,8 +20,6 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.elasticsearch.ElasticsearchConstants;
-import org.apache.camel.component.elasticsearch.ElasticsearchOperation;
import org.elasticsearch.action.DocWriteResponse;
import org.elasticsearch.action.delete.DeleteRequest;
import org.elasticsearch.action.delete.DeleteResponse;
@@ -94,7 +92,7 @@ public class ElasticsearchGetSearchDeleteExistsUpdateTest extends ElasticsearchB
query.put("query", match);
SearchHits response = template.requestBody("direct:search", match, SearchHits.class);
assertNotNull("response should not be null", response);
- assertEquals("response hits should be == 1", 1, response.totalHits);
+ assertEquals("response hits should be == 0", 0, response.totalHits);
}
@Test
diff --git a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchIndexTest.java b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchIndexTest.java
index abdfd67..4ce89e0 100644
--- a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchIndexTest.java
+++ b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchIndexTest.java
@@ -20,8 +20,6 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.elasticsearch.ElasticsearchConstants;
-import org.apache.camel.component.elasticsearch.ElasticsearchOperation;
import org.junit.Test;
public class ElasticsearchIndexTest extends ElasticsearchBaseTest {
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.