diff --git a/pom.xml b/pom.xml index 425cfd2b..dd727428 100644 --- a/pom.xml +++ b/pom.xml @@ -60,11 +60,6 @@ commons-lang ${commonslang} - - commons-collections - commons-collections - ${commonscollections} - diff --git a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java index 71006c4b..1a8b41ef 100755 --- a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java @@ -15,14 +15,15 @@ */ package org.springframework.data.elasticsearch.core; -import static org.apache.commons.collections.CollectionUtils.isNotEmpty; -import static org.apache.commons.lang.StringUtils.*; +import static org.apache.commons.lang.StringUtils.isNotBlank; +import static org.apache.commons.lang.StringUtils.isBlank; import static org.elasticsearch.action.search.SearchType.*; import static org.elasticsearch.client.Requests.*; import static org.elasticsearch.cluster.metadata.AliasAction.Type.*; import static org.elasticsearch.index.VersionType.*; import static org.elasticsearch.index.query.QueryBuilders.*; import static org.springframework.data.elasticsearch.core.MappingBuilder.*; +import static org.springframework.util.CollectionUtils.isEmpty; import java.io.BufferedReader; import java.io.IOException; @@ -30,7 +31,6 @@ import java.io.InputStreamReader; import java.lang.reflect.Method; import java.util.*; -import org.apache.commons.collections.CollectionUtils; import org.elasticsearch.action.ListenableActionFuture; import org.elasticsearch.action.admin.indices.alias.get.GetAliasesRequest; import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder; @@ -465,8 +465,8 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati } private CountRequestBuilder prepareCount(Query query, Class clazz) { - String indexName[] = isNotEmpty(query.getIndices()) ? query.getIndices().toArray(new String[query.getIndices().size()]) : retrieveIndexNameFromPersistentEntity(clazz); - String types[] = isNotEmpty(query.getTypes()) ? query.getTypes().toArray(new String[query.getTypes().size()]) : retrieveTypeFromPersistentEntity(clazz); + String indexName[] = !isEmpty(query.getIndices()) ? query.getIndices().toArray(new String[query.getIndices().size()]) : retrieveIndexNameFromPersistentEntity(clazz); + String types[] = !isEmpty(query.getTypes()) ? query.getTypes().toArray(new String[query.getTypes().size()]) : retrieveTypeFromPersistentEntity(clazz); Assert.notNull(indexName, "No index defined for Query"); @@ -485,8 +485,8 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati private MultiGetResponse getMultiResponse(Query searchQuery, Class clazz) { - String indexName = isNotEmpty(searchQuery.getIndices()) ? searchQuery.getIndices().get(0) : getPersistentEntityFor(clazz).getIndexName(); - String type = isNotEmpty(searchQuery.getTypes()) ? searchQuery.getTypes().get(0) : getPersistentEntityFor(clazz).getIndexType(); + String indexName = !isEmpty(searchQuery.getIndices()) ? searchQuery.getIndices().get(0) : getPersistentEntityFor(clazz).getIndexName(); + String type = !isEmpty(searchQuery.getTypes()) ? searchQuery.getTypes().get(0) : getPersistentEntityFor(clazz).getIndexType(); Assert.notNull(indexName, "No index defined for Query"); Assert.notNull(type, "No type define for Query"); @@ -735,7 +735,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati .setScroll(TimeValue.timeValueMillis(scrollTimeInMillis)).setFrom(0) .setSize(query.getPageable().getPageSize()); - if (isNotEmpty(query.getFields())) { + if (!isEmpty(query.getFields())) { requestBuilder.addFields(toArray(query.getFields())); } @@ -817,7 +817,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati if (query.getMaxQueryTerms() != null) { moreLikeThisQueryBuilder.maxQueryTerms(query.getMaxQueryTerms()); } - if (isNotEmpty(query.getStopWords())) { + if (!isEmpty(query.getStopWords())) { moreLikeThisQueryBuilder.stopWords(toArray(query.getStopWords())); } if (query.getMinDocFreq() != null) { @@ -844,7 +844,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati searchRequest.setPostFilter(searchQuery.getFilter()); } - if (CollectionUtils.isNotEmpty(searchQuery.getElasticsearchSorts())) { + if (!isEmpty(searchQuery.getElasticsearchSorts())) { for (SortBuilder sort : searchQuery.getElasticsearchSorts()) { searchRequest.addSort(sort); } @@ -863,13 +863,13 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati } } - if (CollectionUtils.isNotEmpty(searchQuery.getIndicesBoost())) { + if (!isEmpty(searchQuery.getIndicesBoost())) { for (IndexBoost indexBoost : searchQuery.getIndicesBoost()) { searchRequest.addIndexBoost(indexBoost.getIndexName(), indexBoost.getBoost()); } } - if (CollectionUtils.isNotEmpty(searchQuery.getAggregations())) { + if (!isEmpty(searchQuery.getAggregations())) { for (AbstractAggregationBuilder aggregationBuilder : searchQuery.getAggregations()) { searchRequest.addAggregation(aggregationBuilder); } diff --git a/src/main/java/org/springframework/data/elasticsearch/core/query/AbstractQuery.java b/src/main/java/org/springframework/data/elasticsearch/core/query/AbstractQuery.java index 2b7f44b5..2031902c 100755 --- a/src/main/java/org/springframework/data/elasticsearch/core/query/AbstractQuery.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/query/AbstractQuery.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 the original author or authors. + * Copyright 2013-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,12 +15,10 @@ */ package org.springframework.data.elasticsearch.core.query; -import static org.apache.commons.collections.CollectionUtils.*; - +import static java.util.Collections.addAll; import java.util.ArrayList; import java.util.Collection; import java.util.List; - import org.elasticsearch.action.search.SearchType; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; diff --git a/src/main/java/org/springframework/data/elasticsearch/core/query/MoreLikeThisQuery.java b/src/main/java/org/springframework/data/elasticsearch/core/query/MoreLikeThisQuery.java index e2a5359a..0a7f0da0 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/query/MoreLikeThisQuery.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/query/MoreLikeThisQuery.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 the original author or authors. + * Copyright 2013-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ package org.springframework.data.elasticsearch.core.query; -import static org.apache.commons.collections.CollectionUtils.*; +import static java.util.Collections.addAll; import static org.springframework.data.elasticsearch.core.query.AbstractQuery.*; import java.util.ArrayList; diff --git a/src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQueryBuilder.java b/src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQueryBuilder.java index ff029898..3fd4cbfd 100755 --- a/src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQueryBuilder.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQueryBuilder.java @@ -15,11 +15,10 @@ */ package org.springframework.data.elasticsearch.core.query; +import static org.springframework.util.CollectionUtils.isEmpty; import java.util.ArrayList; import java.util.Collection; import java.util.List; - -import org.apache.commons.collections.CollectionUtils; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.search.aggregations.AbstractAggregationBuilder; @@ -165,11 +164,11 @@ public class NativeSearchQueryBuilder { nativeSearchQuery.setIndicesBoost(indicesBoost); } - if (CollectionUtils.isNotEmpty(scriptFields)) { + if (!isEmpty(scriptFields)) { nativeSearchQuery.setScriptFields(scriptFields); } - if (CollectionUtils.isNotEmpty(aggregationBuilders)) { + if (!isEmpty(aggregationBuilders)) { nativeSearchQuery.setAggregations(aggregationBuilders); } diff --git a/src/test/java/org/springframework/data/elasticsearch/core/DefaultResultMapperTests.java b/src/test/java/org/springframework/data/elasticsearch/core/DefaultResultMapperTests.java index f46a801c..5d6c2b37 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/DefaultResultMapperTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/DefaultResultMapperTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2014 the original author or authors. + * Copyright 2013-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import org.apache.commons.collections.iterators.ArrayIterator; +import com.fasterxml.jackson.databind.util.ArrayIterator; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.search.SearchHit;