You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2018/04/17 19:47:30 UTC
[camel] 02/05: polish
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 43d92335bac6dfa4df39133dbd8ed3860db358a6
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Tue Apr 17 21:45:10 2018 +0200
polish
---
.../elasticsearch/ElasticsearchProducer.java | 4 +--
.../elasticsearch/ElasticsearchBaseTest.java | 2 +-
...asticsearchGetSearchDeleteExistsUpdateTest.java | 4 +--
.../elasticsearch/ElasticsearchComponent.java | 2 +-
.../elasticsearch/ElasticsearchProducer.java | 2 +-
.../elasticsearch/ElasticsearchBaseTest.java | 2 +-
.../elasticsearch/ElasticsearchBulkTest.java | 2 +-
.../ElasticsearchClusterBaseTest.java | 2 +-
.../ElasticsearchClusterIndexTest.java | 8 +++---
...asticsearchGetSearchDeleteExistsUpdateTest.java | 22 +++++++--------
.../elasticsearch/ElasticsearchIndexTest.java | 4 +--
.../elasticsearch5/ElasticsearchComponent.java | 2 +-
.../elasticsearch5/ElasticsearchProducer.java | 4 +--
.../elasticsearch5/ElasticsearchBaseTest.java | 2 +-
.../elasticsearch5/ElasticsearchBulkTest.java | 2 +-
.../ElasticsearchClusterBaseTest.java | 2 +-
.../ElasticsearchClusterIndexTest.java | 6 ++--
...asticsearchGetSearchDeleteExistsUpdateTest.java | 32 +++++++++++-----------
.../elasticsearch5/ElasticsearchIndexTest.java | 4 +--
.../camel/component/elsql/ElsqlComponent.java | 1 -
.../camel/component/elsql/ElsqlEndpoint.java | 2 +-
.../component/eventadmin/EventAdminConsumer.java | 2 +-
.../component/eventadmin/EventAdminProducer.java | 4 +--
.../camel/component/exec/impl/ExecParseUtils.java | 4 +--
.../exec/ExecJavaProcessRecipientListTest.java | 2 +-
.../camel/component/exec/ExecJavaProcessTest.java | 4 +--
26 files changed, 63 insertions(+), 64 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 753c217..6c2ec92 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
@@ -87,9 +87,9 @@ public class ElasticsearchProducer extends DefaultProducer {
} else if (request instanceof BulkRequest) {
// do we want bulk or bulk_index?
if (configuration.getOperation() == ElasticsearchOperation.BulkIndex) {
- return configuration.getOperation().BulkIndex;
+ return ElasticsearchOperation.BulkIndex;
} else {
- return configuration.getOperation().Bulk;
+ return ElasticsearchOperation.Bulk;
}
} else if (request instanceof DeleteRequest) {
return ElasticsearchOperation.Delete;
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 927797f..07b954c 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
@@ -111,7 +111,7 @@ public class ElasticsearchBaseTest extends CamelTestSupport {
String value = prefix + "value";
log.info("Creating indexed data using the key/value pair {} => {}", key, value);
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put(key, value);
return map;
}
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 a6ac9f6..c97064d 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
@@ -155,7 +155,7 @@ public class ElasticsearchGetSearchDeleteExistsUpdateTest extends ElasticsearchB
headers.put(ElasticsearchConstants.PARAM_INDEX_NAME, "twitter");
headers.put(ElasticsearchConstants.PARAM_INDEX_TYPE, "tweet");
- String indexId = template.requestBodyAndHeaders("direct:start", map, headers, String.class);
+ template.requestBodyAndHeaders("direct:start", map, headers, String.class);
//now, verify GET
headers.put(ElasticsearchConstants.PARAM_OPERATION, ElasticsearchOperation.Exists);
@@ -174,7 +174,7 @@ public class ElasticsearchGetSearchDeleteExistsUpdateTest extends ElasticsearchB
headers.put(ElasticsearchConstants.PARAM_INDEX_NAME, "twitter");
headers.put(ElasticsearchConstants.PARAM_INDEX_TYPE, "tweet");
- String indexId = template.requestBodyAndHeaders("direct:start", map, headers, String.class);
+ template.requestBodyAndHeaders("direct:start", map, headers, String.class);
//now, verify GET
headers.put(ElasticsearchConstants.PARAM_OPERATION, ElasticsearchOperation.Exists);
diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchComponent.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchComponent.java
index 4bfbae1..3306cda 100644
--- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchComponent.java
+++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchComponent.java
@@ -76,7 +76,7 @@ public class ElasticsearchComponent extends UriEndpointComponent {
return null;
}
List<String> addressesStr = Arrays.asList(ipsString.split(ElasticsearchConstants.TRANSPORT_ADDRESSES_SEPARATOR_REGEX));
- List<InetSocketTransportAddress> addressesTrAd = new ArrayList<InetSocketTransportAddress>(addressesStr.size());
+ List<InetSocketTransportAddress> addressesTrAd = new ArrayList<>(addressesStr.size());
for (String address : addressesStr) {
String[] split = address.split(ElasticsearchConstants.IP_PORT_SEPARATOR_REGEX);
String hostname;
diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
index 55e9d3c..fdf2e0c 100644
--- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
+++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
@@ -152,7 +152,7 @@ public class ElasticsearchProducer extends DefaultProducer {
message.setBody(client.bulk(bulkRequest).actionGet());
} else if (ElasticsearchConstants.OPERATION_BULK_INDEX.equals(operation)) {
BulkRequest bulkRequest = message.getBody(BulkRequest.class);
- List<String> indexedIds = new ArrayList<String>();
+ List<String> indexedIds = new ArrayList<>();
for (BulkItemResponse response : client.bulk(bulkRequest).actionGet().getItems()) {
indexedIds.add(response.getId());
}
diff --git a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchBaseTest.java b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchBaseTest.java
index 7ac2730..048c1b4 100644
--- a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchBaseTest.java
+++ b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchBaseTest.java
@@ -95,7 +95,7 @@ public class ElasticsearchBaseTest extends CamelTestSupport {
String value = prefix + "value";
log.info("Creating indexed data using the key/value pair {} => {}", key, value);
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put(key, value);
return map;
}
diff --git a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchBulkTest.java b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchBulkTest.java
index 5aee873..f208999 100644
--- a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchBulkTest.java
+++ b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchBulkTest.java
@@ -34,7 +34,7 @@ public class ElasticsearchBulkTest extends ElasticsearchBaseTest {
@Test
public void testBulkIndex() throws Exception {
- List<Map<String, String>> documents = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> documents = new ArrayList<>();
Map<String, String> document1 = createIndexedData("1");
Map<String, String> document2 = createIndexedData("2");
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 74f7454..51175fc 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
@@ -113,7 +113,7 @@ public class ElasticsearchClusterBaseTest extends CamelTestSupport {
String value = prefix + "value";
log.info("Creating indexed data using the key/value pair {} => {}", key, value);
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put(key, value);
return map;
}
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 578324b..d3335ba 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
@@ -27,7 +27,7 @@ public class ElasticsearchClusterIndexTest extends ElasticsearchClusterBaseTest
@Test
public void indexWithIp() throws Exception {
Map<String, String> map = createIndexedData();
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(ElasticsearchConstants.PARAM_OPERATION, ElasticsearchConstants.OPERATION_INDEX);
headers.put(ElasticsearchConstants.PARAM_INDEX_NAME, "twitter");
headers.put(ElasticsearchConstants.PARAM_INDEX_TYPE, "tweet");
@@ -55,7 +55,7 @@ public class ElasticsearchClusterIndexTest extends ElasticsearchClusterBaseTest
@Test
public void indexWithIpAndPort() throws Exception {
Map<String, String> map = createIndexedData();
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(ElasticsearchConstants.PARAM_OPERATION, ElasticsearchConstants.OPERATION_INDEX);
headers.put(ElasticsearchConstants.PARAM_INDEX_NAME, "instagram");
headers.put(ElasticsearchConstants.PARAM_INDEX_TYPE, "photo");
@@ -71,7 +71,7 @@ public class ElasticsearchClusterIndexTest extends ElasticsearchClusterBaseTest
@Test
public void indexWithTransportAddresses() throws Exception {
Map<String, String> map = createIndexedData();
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(ElasticsearchConstants.PARAM_OPERATION, ElasticsearchConstants.OPERATION_INDEX);
headers.put(ElasticsearchConstants.PARAM_INDEX_NAME, "facebook");
headers.put(ElasticsearchConstants.PARAM_INDEX_TYPE, "post");
@@ -87,7 +87,7 @@ public class ElasticsearchClusterIndexTest extends ElasticsearchClusterBaseTest
@Test
public void indexWithIpAndTransportAddresses() throws Exception {
Map<String, String> map = createIndexedData();
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(ElasticsearchConstants.PARAM_OPERATION, ElasticsearchConstants.OPERATION_INDEX);
headers.put(ElasticsearchConstants.PARAM_INDEX_NAME, "ebay");
headers.put(ElasticsearchConstants.PARAM_INDEX_TYPE, "search");
diff --git a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java
index 40cf6d8..6e4240e 100644
--- a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java
+++ b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java
@@ -86,11 +86,11 @@ public class ElasticsearchGetSearchDeleteExistsUpdateTest extends ElasticsearchB
sendBody("direct:index", map);
//now, verify GET succeeded
- Map<String, Object> actualQuery = new HashMap<String, Object>();
+ Map<String, Object> actualQuery = new HashMap<>();
actualQuery.put("content", "searchtest");
- Map<String, Object> match = new HashMap<String, Object>();
+ Map<String, Object> match = new HashMap<>();
match.put("match", actualQuery);
- Map<String, Object> query = new HashMap<String, Object>();
+ Map<String, Object> query = new HashMap<>();
query.put("query", match);
SearchResponse response = template.requestBody("direct:search", query, SearchResponse.class);
assertNotNull("response should not be null", response);
@@ -115,7 +115,7 @@ public class ElasticsearchGetSearchDeleteExistsUpdateTest extends ElasticsearchB
public void testGetWithHeaders() throws Exception {
//first, INDEX a value
Map<String, String> map = createIndexedData();
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(ElasticsearchConstants.PARAM_OPERATION, ElasticsearchConstants.OPERATION_INDEX);
headers.put(ElasticsearchConstants.PARAM_INDEX_NAME, "twitter");
headers.put(ElasticsearchConstants.PARAM_INDEX_TYPE, "tweet");
@@ -133,12 +133,12 @@ public class ElasticsearchGetSearchDeleteExistsUpdateTest extends ElasticsearchB
public void testExistsWithHeaders() throws Exception {
//first, INDEX a value
Map<String, String> map = createIndexedData();
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(ElasticsearchConstants.PARAM_OPERATION, ElasticsearchConstants.OPERATION_INDEX);
headers.put(ElasticsearchConstants.PARAM_INDEX_NAME, "twitter");
headers.put(ElasticsearchConstants.PARAM_INDEX_TYPE, "tweet");
- String indexId = template.requestBodyAndHeaders("direct:start", map, headers, String.class);
+ template.requestBodyAndHeaders("direct:start", map, headers, String.class);
//now, verify GET
headers.put(ElasticsearchConstants.PARAM_OPERATION, ElasticsearchConstants.OPERATION_EXISTS);
@@ -152,7 +152,7 @@ public class ElasticsearchGetSearchDeleteExistsUpdateTest extends ElasticsearchB
public void testMultiGet() throws Exception {
//first, INDEX two values
Map<String, String> map = createIndexedData();
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(ElasticsearchConstants.PARAM_OPERATION, ElasticsearchConstants.OPERATION_INDEX);
headers.put(ElasticsearchConstants.PARAM_INDEX_NAME, "twitter");
headers.put(ElasticsearchConstants.PARAM_INDEX_TYPE, "tweet");
@@ -174,7 +174,7 @@ public class ElasticsearchGetSearchDeleteExistsUpdateTest extends ElasticsearchB
Item item1 = new Item("twitter", "tweet", "1");
Item item2 = new Item("facebook", "status", "2");
Item item3 = new Item("instagram", "latest", "3");
- List<Item> list = new ArrayList<Item>();
+ List<Item> list = new ArrayList<>();
list.add(item1);
list.add(item2);
list.add(item3);
@@ -192,7 +192,7 @@ public class ElasticsearchGetSearchDeleteExistsUpdateTest extends ElasticsearchB
@Test
public void testMultiSearch() throws Exception {
//first, INDEX two values
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
node.client().prepareIndex("test", "type", "1").setSource("field", "xxx").execute().actionGet();
node.client().prepareIndex("test", "type", "2").setSource("field", "yyy").execute().actionGet();
@@ -220,7 +220,7 @@ public class ElasticsearchGetSearchDeleteExistsUpdateTest extends ElasticsearchB
public void testDeleteWithHeaders() throws Exception {
//first, INDEX a value
Map<String, String> map = createIndexedData();
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(ElasticsearchConstants.PARAM_OPERATION, ElasticsearchConstants.OPERATION_INDEX);
headers.put(ElasticsearchConstants.PARAM_INDEX_NAME, "twitter");
headers.put(ElasticsearchConstants.PARAM_INDEX_TYPE, "tweet");
@@ -248,7 +248,7 @@ public class ElasticsearchGetSearchDeleteExistsUpdateTest extends ElasticsearchB
@Test
public void testUpdateWithIDInHeader() throws Exception {
Map<String, String> map = createIndexedData();
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(ElasticsearchConstants.PARAM_OPERATION, ElasticsearchConstants.OPERATION_INDEX);
headers.put(ElasticsearchConstants.PARAM_INDEX_NAME, "twitter");
headers.put(ElasticsearchConstants.PARAM_INDEX_TYPE, "tweet");
diff --git a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchIndexTest.java b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchIndexTest.java
index 050d044..4fd2479 100644
--- a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchIndexTest.java
+++ b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchIndexTest.java
@@ -48,7 +48,7 @@ public class ElasticsearchIndexTest extends ElasticsearchBaseTest {
@Test
public void testIndexWithHeaders() throws Exception {
Map<String, String> map = createIndexedData();
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(ElasticsearchConstants.PARAM_OPERATION, ElasticsearchConstants.OPERATION_INDEX);
headers.put(ElasticsearchConstants.PARAM_INDEX_NAME, "twitter");
headers.put(ElasticsearchConstants.PARAM_INDEX_TYPE, "tweet");
@@ -60,7 +60,7 @@ public class ElasticsearchIndexTest extends ElasticsearchBaseTest {
@Test
public void testIndexWithIDInHeader() throws Exception {
Map<String, String> map = createIndexedData();
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(ElasticsearchConstants.PARAM_OPERATION, ElasticsearchConstants.OPERATION_INDEX);
headers.put(ElasticsearchConstants.PARAM_INDEX_NAME, "twitter");
headers.put(ElasticsearchConstants.PARAM_INDEX_TYPE, "tweet");
diff --git a/components/camel-elasticsearch5/src/main/java/org/apache/camel/component/elasticsearch5/ElasticsearchComponent.java b/components/camel-elasticsearch5/src/main/java/org/apache/camel/component/elasticsearch5/ElasticsearchComponent.java
index ed8a060..ee2d01f 100644
--- a/components/camel-elasticsearch5/src/main/java/org/apache/camel/component/elasticsearch5/ElasticsearchComponent.java
+++ b/components/camel-elasticsearch5/src/main/java/org/apache/camel/component/elasticsearch5/ElasticsearchComponent.java
@@ -62,7 +62,7 @@ public class ElasticsearchComponent extends UriEndpointComponent {
return null;
}
List<String> addressesStr = Arrays.asList(ipsString.split(ElasticsearchConstants.TRANSPORT_ADDRESSES_SEPARATOR_REGEX));
- List<InetSocketTransportAddress> addressesTrAd = new ArrayList<InetSocketTransportAddress>(addressesStr.size());
+ List<InetSocketTransportAddress> addressesTrAd = new ArrayList<>(addressesStr.size());
for (String address : addressesStr) {
String[] split = address.split(ElasticsearchConstants.IP_PORT_SEPARATOR_REGEX);
String hostname;
diff --git a/components/camel-elasticsearch5/src/main/java/org/apache/camel/component/elasticsearch5/ElasticsearchProducer.java b/components/camel-elasticsearch5/src/main/java/org/apache/camel/component/elasticsearch5/ElasticsearchProducer.java
index ad74f7a..80f0210 100644
--- a/components/camel-elasticsearch5/src/main/java/org/apache/camel/component/elasticsearch5/ElasticsearchProducer.java
+++ b/components/camel-elasticsearch5/src/main/java/org/apache/camel/component/elasticsearch5/ElasticsearchProducer.java
@@ -160,7 +160,7 @@ public class ElasticsearchProducer extends DefaultProducer {
message.setBody(client.bulk(bulkRequest).actionGet());
} else if (operation == ElasticsearchOperation.BULK_INDEX) {
BulkRequest bulkRequest = message.getBody(BulkRequest.class);
- List<String> indexedIds = new ArrayList<String>();
+ List<String> indexedIds = new ArrayList<>();
for (BulkItemResponse response : client.bulk(bulkRequest).actionGet().getItems()) {
indexedIds.add(response.getId());
}
@@ -222,7 +222,7 @@ public class ElasticsearchProducer extends DefaultProducer {
if (configuration.getIp() != null) {
client = createClient().addTransportAddress(new InetSocketTransportAddress(InetAddress.getByName(configuration.getIp()), configuration.getPort()));
} else if (configuration.getTransportAddressesList() != null && !configuration.getTransportAddressesList().isEmpty()) {
- List<TransportAddress> addresses = new ArrayList<TransportAddress>(configuration.getTransportAddressesList().size());
+ List<TransportAddress> addresses = new ArrayList<>(configuration.getTransportAddressesList().size());
addresses.addAll(configuration.getTransportAddressesList());
client = createClient().addTransportAddresses(addresses.toArray(new TransportAddress[addresses.size()]));
} else {
diff --git a/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchBaseTest.java b/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchBaseTest.java
index 99885ff..9230b81 100644
--- a/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchBaseTest.java
+++ b/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchBaseTest.java
@@ -109,7 +109,7 @@ public class ElasticsearchBaseTest extends CamelTestSupport {
String value = prefix + "value";
log.info("Creating indexed data using the key/value pair {} => {}", key, value);
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put(key, value);
return map;
}
diff --git a/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchBulkTest.java b/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchBulkTest.java
index ba302c1..c54e1cd 100644
--- a/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchBulkTest.java
+++ b/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchBulkTest.java
@@ -34,7 +34,7 @@ public class ElasticsearchBulkTest extends ElasticsearchBaseTest {
@Test
public void testBulkIndex() throws Exception {
- List<Map<String, String>> documents = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> documents = new ArrayList<>();
Map<String, String> document1 = createIndexedData("1");
Map<String, String> document2 = createIndexedData("2");
diff --git a/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchClusterBaseTest.java b/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchClusterBaseTest.java
index 89245bf..cadc99c 100644
--- a/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchClusterBaseTest.java
+++ b/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchClusterBaseTest.java
@@ -122,7 +122,7 @@ public class ElasticsearchClusterBaseTest extends CamelTestSupport {
String value = prefix + "value";
log.info("Creating indexed data using the key/value pair {} => {}", key, value);
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put(key, value);
return map;
}
diff --git a/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchClusterIndexTest.java b/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchClusterIndexTest.java
index 3336513..f84b665 100644
--- a/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchClusterIndexTest.java
+++ b/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchClusterIndexTest.java
@@ -27,7 +27,7 @@ public class ElasticsearchClusterIndexTest extends ElasticsearchClusterBaseTest
@Test
public void indexWithIpAndPort() throws Exception {
Map<String, String> map = createIndexedData();
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(ElasticsearchConstants.PARAM_OPERATION, ElasticsearchOperation.INDEX);
headers.put(ElasticsearchConstants.PARAM_INDEX_NAME, "twitter");
headers.put(ElasticsearchConstants.PARAM_INDEX_TYPE, "tweet");
@@ -54,7 +54,7 @@ public class ElasticsearchClusterIndexTest extends ElasticsearchClusterBaseTest
@Test
public void indexWithTransportAddresses() throws Exception {
Map<String, String> map = createIndexedData();
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(ElasticsearchConstants.PARAM_OPERATION, ElasticsearchOperation.INDEX);
headers.put(ElasticsearchConstants.PARAM_INDEX_NAME, "facebook");
headers.put(ElasticsearchConstants.PARAM_INDEX_TYPE, "post");
@@ -70,7 +70,7 @@ public class ElasticsearchClusterIndexTest extends ElasticsearchClusterBaseTest
@Test
public void indexWithIpAndTransportAddresses() throws Exception {
Map<String, String> map = createIndexedData();
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(ElasticsearchConstants.PARAM_OPERATION, ElasticsearchOperation.INDEX);
headers.put(ElasticsearchConstants.PARAM_INDEX_NAME, "ebay");
headers.put(ElasticsearchConstants.PARAM_INDEX_TYPE, "search");
diff --git a/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchGetSearchDeleteExistsUpdateTest.java b/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchGetSearchDeleteExistsUpdateTest.java
index 62a0f23..60c19bb 100644
--- a/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchGetSearchDeleteExistsUpdateTest.java
+++ b/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchGetSearchDeleteExistsUpdateTest.java
@@ -86,11 +86,11 @@ public class ElasticsearchGetSearchDeleteExistsUpdateTest extends ElasticsearchB
sendBody("direct:index", map);
//now, verify GET succeeded
- Map<String, Object> actualQuery = new HashMap<String, Object>();
+ Map<String, Object> actualQuery = new HashMap<>();
actualQuery.put("content", "searchtest");
- Map<String, Object> match = new HashMap<String, Object>();
+ Map<String, Object> match = new HashMap<>();
match.put("match", actualQuery);
- Map<String, Object> query = new HashMap<String, Object>();
+ Map<String, Object> query = new HashMap<>();
query.put("query", match);
SearchResponse response = template.requestBody("direct:search", query, SearchResponse.class);
assertNotNull("response should not be null", response);
@@ -104,11 +104,11 @@ public class ElasticsearchGetSearchDeleteExistsUpdateTest extends ElasticsearchB
sendBody("direct:index", map);
//now, verify GET succeeded
- Map<String, Object> actualQuery = new HashMap<String, Object>();
+ Map<String, Object> actualQuery = new HashMap<>();
actualQuery.put("content", "searchtest");
- Map<String, Object> match = new HashMap<String, Object>();
+ Map<String, Object> match = new HashMap<>();
match.put("match", actualQuery);
- Map<String, Object> query = new HashMap<String, Object>();
+ Map<String, Object> query = new HashMap<>();
query.put("query", match);
query.put("size", "5");
query.put("from", "0");
@@ -161,7 +161,7 @@ public class ElasticsearchGetSearchDeleteExistsUpdateTest extends ElasticsearchB
public void testGetWithHeaders() throws Exception {
//first, INDEX a value
Map<String, String> map = createIndexedData();
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(ElasticsearchConstants.PARAM_OPERATION, ElasticsearchOperation.INDEX);
headers.put(ElasticsearchConstants.PARAM_INDEX_NAME, "twitter");
headers.put(ElasticsearchConstants.PARAM_INDEX_TYPE, "tweet");
@@ -179,12 +179,12 @@ public class ElasticsearchGetSearchDeleteExistsUpdateTest extends ElasticsearchB
public void testExistsWithHeaders() throws Exception {
//first, INDEX a value
Map<String, String> map = createIndexedData();
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(ElasticsearchConstants.PARAM_OPERATION, ElasticsearchOperation.INDEX);
headers.put(ElasticsearchConstants.PARAM_INDEX_NAME, "twitter");
headers.put(ElasticsearchConstants.PARAM_INDEX_TYPE, "tweet");
- String indexId = template.requestBodyAndHeaders("direct:start", map, headers, String.class);
+ template.requestBodyAndHeaders("direct:start", map, headers, String.class);
//now, verify GET
headers.put(ElasticsearchConstants.PARAM_OPERATION, ElasticsearchOperation.EXISTS);
@@ -198,12 +198,12 @@ public class ElasticsearchGetSearchDeleteExistsUpdateTest extends ElasticsearchB
public void testNotExistsWithHeaders() throws Exception {
//first, INDEX a value
Map<String, String> map = createIndexedData();
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(ElasticsearchConstants.PARAM_OPERATION, ElasticsearchOperation.INDEX);
headers.put(ElasticsearchConstants.PARAM_INDEX_NAME, "twitter");
headers.put(ElasticsearchConstants.PARAM_INDEX_TYPE, "tweet");
- String indexId = template.requestBodyAndHeaders("direct:start", map, headers, String.class);
+ template.requestBodyAndHeaders("direct:start", map, headers, String.class);
//now, verify GET
headers.put(ElasticsearchConstants.PARAM_OPERATION, ElasticsearchOperation.EXISTS);
@@ -217,7 +217,7 @@ public class ElasticsearchGetSearchDeleteExistsUpdateTest extends ElasticsearchB
public void testMultiGet() throws Exception {
//first, INDEX two values
Map<String, String> map = createIndexedData();
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(ElasticsearchConstants.PARAM_OPERATION, ElasticsearchOperation.INDEX);
headers.put(ElasticsearchConstants.PARAM_INDEX_NAME, "twitter");
headers.put(ElasticsearchConstants.PARAM_INDEX_TYPE, "tweet");
@@ -239,7 +239,7 @@ public class ElasticsearchGetSearchDeleteExistsUpdateTest extends ElasticsearchB
Item item1 = new Item("twitter", "tweet", "1");
Item item2 = new Item("facebook", "status", "2");
Item item3 = new Item("instagram", "latest", "3");
- List<Item> list = new ArrayList<Item>();
+ List<Item> list = new ArrayList<>();
list.add(item1);
list.add(item2);
list.add(item3);
@@ -257,7 +257,7 @@ public class ElasticsearchGetSearchDeleteExistsUpdateTest extends ElasticsearchB
@Test
public void testMultiSearch() throws Exception {
//first, INDEX two values
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
node.client().prepareIndex("test", "type", "1").setSource("field", "xxx").execute().actionGet();
node.client().prepareIndex("test", "type", "2").setSource("field", "yyy").execute().actionGet();
@@ -285,7 +285,7 @@ public class ElasticsearchGetSearchDeleteExistsUpdateTest extends ElasticsearchB
public void testDeleteWithHeaders() throws Exception {
//first, INDEX a value
Map<String, String> map = createIndexedData();
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(ElasticsearchConstants.PARAM_OPERATION, ElasticsearchOperation.INDEX);
headers.put(ElasticsearchConstants.PARAM_INDEX_NAME, "twitter");
headers.put(ElasticsearchConstants.PARAM_INDEX_TYPE, "tweet");
@@ -313,7 +313,7 @@ public class ElasticsearchGetSearchDeleteExistsUpdateTest extends ElasticsearchB
@Test
public void testUpdateWithIDInHeader() throws Exception {
Map<String, String> map = createIndexedData();
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(ElasticsearchConstants.PARAM_OPERATION, ElasticsearchOperation.INDEX);
headers.put(ElasticsearchConstants.PARAM_INDEX_NAME, "twitter");
headers.put(ElasticsearchConstants.PARAM_INDEX_TYPE, "tweet");
diff --git a/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchIndexTest.java b/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchIndexTest.java
index ce773ce..e2206bc 100644
--- a/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchIndexTest.java
+++ b/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchIndexTest.java
@@ -41,7 +41,7 @@ public class ElasticsearchIndexTest extends ElasticsearchBaseTest {
@Test
public void testIndexWithHeaders() throws Exception {
Map<String, String> map = createIndexedData();
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(ElasticsearchConstants.PARAM_OPERATION, ElasticsearchOperation.INDEX);
headers.put(ElasticsearchConstants.PARAM_INDEX_NAME, "twitter");
headers.put(ElasticsearchConstants.PARAM_INDEX_TYPE, "tweet");
@@ -53,7 +53,7 @@ public class ElasticsearchIndexTest extends ElasticsearchBaseTest {
@Test
public void testIndexWithIDInHeader() throws Exception {
Map<String, String> map = createIndexedData();
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(ElasticsearchConstants.PARAM_OPERATION, ElasticsearchOperation.INDEX);
headers.put(ElasticsearchConstants.PARAM_INDEX_NAME, "twitter");
headers.put(ElasticsearchConstants.PARAM_INDEX_TYPE, "tweet");
diff --git a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlComponent.java b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlComponent.java
index 1c3d001..1a5a7e5 100644
--- a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlComponent.java
+++ b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlComponent.java
@@ -23,7 +23,6 @@ import com.opengamma.elsql.ElSqlConfig;
import org.apache.camel.Endpoint;
import org.apache.camel.impl.UriEndpointComponent;
import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.UriParam;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.IntrospectionSupport;
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
diff --git a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java
index 8bd5759..c8bb40c 100644
--- a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java
+++ b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java
@@ -120,7 +120,7 @@ public class ElsqlEndpoint extends DefaultSqlEndpoint {
// there can be multiple resources
// so we have all this lovely code to turn that into an URL[]
- final List<URL> list = new ArrayList<URL>();
+ final List<URL> list = new ArrayList<>();
final Iterable it = ObjectHelper.createIterable(resourceUri);
for (final Object path : it) {
final URL url = ResourceHelper.resolveMandatoryResourceAsUrl(getCamelContext().getClassResolver(), path.toString());
diff --git a/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminConsumer.java b/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminConsumer.java
index 79d5eb9..a8d6b0f 100644
--- a/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminConsumer.java
+++ b/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminConsumer.java
@@ -59,7 +59,7 @@ public class EventAdminConsumer extends DefaultConsumer implements EventHandler
@Override
protected void doStart() throws Exception {
super.doStart();
- Dictionary<String, String> props = new Hashtable<String, String>();
+ Dictionary<String, String> props = new Hashtable<>();
props.put(EventConstants.EVENT_TOPIC, endpoint.getTopic());
registration = endpoint.getComponent().getBundleContext().registerService(EventHandler.class.getName(), this, props);
}
diff --git a/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminProducer.java b/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminProducer.java
index fc5f053..56d68f3 100644
--- a/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminProducer.java
+++ b/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminProducer.java
@@ -42,7 +42,7 @@ public class EventAdminProducer extends DefaultProducer {
public EventAdminProducer(EventAdminEndpoint endpoint) {
super(endpoint);
this.endpoint = endpoint;
- this.tracker = new ServiceTracker<Object, Object>(endpoint.getComponent().getBundleContext(), EventAdmin.class.getName(), null);
+ this.tracker = new ServiceTracker<>(endpoint.getComponent().getBundleContext(), EventAdmin.class.getName(), null);
}
@Override
@@ -99,7 +99,7 @@ public class EventAdminProducer extends DefaultProducer {
Message in = exchange.getIn();
CamelContext context = endpoint.getCamelContext();
Map<?, ?> map = context.getTypeConverter().convertTo(Map.class, exchange, in.getBody());
- Dictionary<String, Object> dict = new Hashtable<String, Object>();
+ Dictionary<String, Object> dict = new Hashtable<>();
for (Entry<?, ?> entry : map.entrySet()) {
String keyString = CamelContextHelper.convertTo(context, String.class, entry.getKey());
if (keyString != null) {
diff --git a/components/camel-exec/src/main/java/org/apache/camel/component/exec/impl/ExecParseUtils.java b/components/camel-exec/src/main/java/org/apache/camel/component/exec/impl/ExecParseUtils.java
index 8f241d7..da390d8 100644
--- a/components/camel-exec/src/main/java/org/apache/camel/component/exec/impl/ExecParseUtils.java
+++ b/components/camel-exec/src/main/java/org/apache/camel/component/exec/impl/ExecParseUtils.java
@@ -52,10 +52,10 @@ public final class ExecParseUtils {
*/
public static List<String> splitToWhiteSpaceSeparatedTokens(String input) {
if (input == null) {
- return new ArrayList<String>();
+ return new ArrayList<>();
}
StringTokenizer tokenizer = new StringTokenizer(input.trim(), QUOTE_CHAR + WHITESPACE, true);
- List<String> tokens = new ArrayList<String>();
+ List<String> tokens = new ArrayList<>();
StringBuilder quotedText = new StringBuilder();
diff --git a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessRecipientListTest.java b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessRecipientListTest.java
index 512f0df..ff4c70a 100644
--- a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessRecipientListTest.java
+++ b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessRecipientListTest.java
@@ -275,7 +275,7 @@ public class ExecJavaProcessRecipientListTest extends CamelTestSupport {
List<String> buildArgs(Object commandArgument) {
String classpath = System.getProperty("java.class.path");
- List<String> args = new ArrayList<String>();
+ List<String> args = new ArrayList<>();
args.add("-cp");
args.add(classpath);
args.add(EXECUTABLE_PROGRAM_ARG);
diff --git a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java
index 4e75df0..2beea55 100644
--- a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java
+++ b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java
@@ -450,7 +450,7 @@ public class ExecJavaProcessTest extends CamelTestSupport {
List<String> buildArgs(Object commandArgument) {
String classpath = System.getProperty("java.class.path");
- List<String> args = new ArrayList<String>();
+ List<String> args = new ArrayList<>();
args.add("-cp");
args.add(classpath);
args.add(EXECUTABLE_PROGRAM_ARG);
@@ -463,7 +463,7 @@ public class ExecJavaProcessTest extends CamelTestSupport {
*/
List<String> buildFailArgs(Object commandArgument) {
String classpath = System.getProperty("java.class.path");
- List<String> args = new ArrayList<String>();
+ List<String> args = new ArrayList<>();
args.add("-failArg");
args.add(classpath);
args.add(EXECUTABLE_PROGRAM_ARG);
--
To stop receiving notification emails like this one, please contact
bvahdat@apache.org.