Skip to content

Commit

Permalink
Remove transitive dependency on commons-lang
Browse files Browse the repository at this point in the history
  • Loading branch information
@VanRoy
Chris Hall authored and VanRoy committed Aug 2, 2018
1 parent 8b5da6d commit 0052bda
Show file tree
Hide file tree
Showing 5 changed files with 98 additions and 100 deletions.
33 changes: 16 additions & 17 deletions ...-data-jest/src/main/java/com/github/vanroy/springdata/jest/JestElasticsearchTemplate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,11 @@
import java.util.function.Supplier;

import static com.github.vanroy.springdata.jest.MappingBuilder.buildMapping;
import static org.apache.commons.lang.StringUtils.isBlank;
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.elasticsearch.index.VersionType.EXTERNAL;
import static org.elasticsearch.index.query.QueryBuilders.moreLikeThisQuery;
import static org.elasticsearch.index.query.QueryBuilders.wrapperQuery;
import static org.springframework.util.CollectionUtils.isEmpty;
import static org.springframework.util.StringUtils.hasText;

/**
* Jest implementation of ElasticsearchOperations.
Expand Down Expand Up @@ -208,9 +207,9 @@ public <T> boolean createIndex(Class<T> clazz, Object settings) {
public <T> boolean putMapping(Class<T> clazz) {
if (clazz.isAnnotationPresent(Mapping.class)) {
String mappingPath = clazz.getAnnotation(Mapping.class).mappingPath();
if (isNotBlank(mappingPath)) {
if (hasText(mappingPath)) {
String mappings = readFileFromClasspath(mappingPath);
if (isNotBlank(mappings)) {
if (hasText(mappings)) {
return putMapping(clazz, mappings);
}
} else {
Expand Down Expand Up @@ -753,8 +752,8 @@ public <T> String delete(Class<T> clazz, String id) {
@SuppressWarnings("unchecked")
public <T> void delete(DeleteQuery deleteQuery, Class<T> clazz) {

String indexName = isNotBlank(deleteQuery.getIndex()) ? deleteQuery.getIndex() : getPersistentEntityFor(clazz).getIndexName();
String typeName = isNotBlank(deleteQuery.getType()) ? deleteQuery.getType() : getPersistentEntityFor(clazz).getIndexType();
String indexName = hasText(deleteQuery.getIndex()) ? deleteQuery.getIndex() : getPersistentEntityFor(clazz).getIndexName();
String typeName = hasText(deleteQuery.getType()) ? deleteQuery.getType() : getPersistentEntityFor(clazz).getIndexType();
Integer pageSize = deleteQuery.getPageSize() != null ? deleteQuery.getPageSize() : 1000;
Long scrollTimeInMillis = deleteQuery.getScrollTimeInMillis() != null ? deleteQuery.getScrollTimeInMillis() : 10000L;

Expand Down Expand Up @@ -1100,8 +1099,8 @@ public <T> Page<T> scroll(String scrollId, long scrollTimeInMillis, JestScrollRe
@Override
public <T> Page<T> moreLikeThis(MoreLikeThisQuery query, Class<T> clazz) {
ElasticsearchPersistentEntity persistentEntity = getPersistentEntityFor(clazz);
String indexName = isNotBlank(query.getIndexName()) ? query.getIndexName() : persistentEntity.getIndexName();
String type = isNotBlank(query.getType()) ? query.getType() : persistentEntity.getIndexType();
String indexName = hasText(query.getIndexName()) ? query.getIndexName() : persistentEntity.getIndexName();
String type = hasText(query.getType()) ? query.getType() : persistentEntity.getIndexType();

Assert.notNull(indexName, "No 'indexName' defined for MoreLikeThisQuery");
Assert.notNull(type, "No 'type' defined for MoreLikeThisQuery");
Expand Down Expand Up @@ -1148,11 +1147,11 @@ public Boolean addAlias(AliasQuery query) {
// aliasAction.setFilter(query.getFilterBuilder());
} else if (query.getFilter() != null) {
aliasAction.setFilter(query.getFilter());
} else if (isNotBlank(query.getRouting())) {
} else if (hasText(query.getRouting())) {
aliasAction.addRouting(query.getRouting());
} else if (isNotBlank(query.getSearchRouting())) {
} else if (hasText(query.getSearchRouting())) {
aliasAction.addSearchRouting(query.getSearchRouting());
} else if (isNotBlank(query.getIndexRouting())) {
} else if (hasText(query.getIndexRouting())) {
aliasAction.addIndexRouting(query.getIndexRouting());
}
return executeWithAcknowledge(new ModifyAliases.Builder(aliasAction.build()).build());
Expand Down Expand Up @@ -1326,9 +1325,9 @@ private SearchResult executeSearch(Query query, SearchSourceBuilder request) {

private Index prepareIndex(IndexQuery query) {
try {
String indexName = isBlank(query.getIndexName()) ? retrieveIndexNameFromPersistentEntity(query.getObject()
String indexName = !hasText(query.getIndexName()) ? retrieveIndexNameFromPersistentEntity(query.getObject()
.getClass())[0] : query.getIndexName();
String type = isBlank(query.getType()) ? retrieveTypeFromPersistentEntity(query.getObject().getClass())[0]
String type = !hasText(query.getType()) ? retrieveTypeFromPersistentEntity(query.getObject().getClass())[0]
: query.getType();

Index.Builder indexBuilder;
Expand Down Expand Up @@ -1373,8 +1372,8 @@ private Index prepareIndex(IndexQuery query) {
}

private Update prepareUpdate(UpdateQuery query) {
String indexName = isNotBlank(query.getIndexName()) ? query.getIndexName() : getPersistentEntityFor(query.getClazz()).getIndexName();
String type = isNotBlank(query.getType()) ? query.getType() : getPersistentEntityFor(query.getClazz()).getIndexType();
String indexName = hasText(query.getIndexName()) ? query.getIndexName() : getPersistentEntityFor(query.getClazz()).getIndexName();
String type = hasText(query.getType()) ? query.getType() : getPersistentEntityFor(query.getClazz()).getIndexType();
Assert.notNull(indexName, "No index defined for Query");
Assert.notNull(type, "No type define for Query");
Assert.notNull(query.getId(), "No Id define for Query");
Expand Down Expand Up @@ -1429,9 +1428,9 @@ private <T> boolean createIndexIfNotCreated(Class<T> clazz) {
private <T> boolean createIndexWithSettings(Class<T> clazz) {
if (clazz.isAnnotationPresent(Setting.class)) {
String settingPath = clazz.getAnnotation(Setting.class).settingPath();
if (isNotBlank(settingPath)) {
if (hasText(settingPath)) {
String settings = readFileFromClasspath(settingPath);
if (isNotBlank(settings)) {
if (hasText(settings)) {
return createIndex(getPersistentEntityFor(clazz).getIndexName(), settings);
}
} else {
Expand Down
19 changes: 9 additions & 10 deletions spring-data-jest/src/main/java/com/github/vanroy/springdata/jest/MappingBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package com.github.vanroy.springdata.jest;

import static org.apache.commons.lang.StringUtils.*;
import static org.elasticsearch.common.xcontent.XContentFactory.*;
import static org.springframework.util.StringUtils.*;

Expand Down Expand Up @@ -82,7 +81,7 @@ static XContentBuilder buildMapping(Class clazz, String indexType, String idFiel
// Properties
XContentBuilder xContentBuilder = mapping.startObject(FIELD_PROPERTIES);

mapEntity(xContentBuilder, clazz, true, idFieldName, EMPTY, false, FieldType.Auto, null);
mapEntity(xContentBuilder, clazz, true, idFieldName, "", false, FieldType.Auto, null);

return xContentBuilder.endObject().endObject().endObject();
}
Expand Down Expand Up @@ -113,7 +112,7 @@ private static void mapEntity(XContentBuilder xContentBuilder, Class clazz, bool

if (field.isAnnotationPresent(Mapping.class)) {
String mappingPath = field.getAnnotation(Mapping.class).mappingPath();
if (isNotBlank(mappingPath)) {
if (hasText(mappingPath)) {
ClassPathResource mappings = new ClassPathResource(mappingPath);
if (mappings.exists()) {
xContentBuilder.rawField(field.getName(), mappings.getInputStream(), XContentType.JSON);
Expand All @@ -131,7 +130,7 @@ private static void mapEntity(XContentBuilder xContentBuilder, Class clazz, bool
continue;
}
boolean nestedOrObject = isNestedOrObjectField(field);
mapEntity(xContentBuilder, getFieldType(field), false, EMPTY, field.getName(), nestedOrObject, singleField.type(), field.getAnnotation(Field.class));
mapEntity(xContentBuilder, getFieldType(field), false, "", field.getName(), nestedOrObject, singleField.type(), field.getAnnotation(Field.class));
if (nestedOrObject) {
continue;
}
Expand Down Expand Up @@ -212,10 +211,10 @@ private static void applyCompletionFieldMapping(XContentBuilder xContentBuilder,
xContentBuilder.field(COMPLETION_MAX_INPUT_LENGTH, annotation.maxInputLength());
xContentBuilder.field(COMPLETION_PRESERVE_POSITION_INCREMENTS, annotation.preservePositionIncrements());
xContentBuilder.field(COMPLETION_PRESERVE_SEPARATORS, annotation.preserveSeparators());
if (isNotBlank(annotation.searchAnalyzer())) {
if (hasText(annotation.searchAnalyzer())) {
xContentBuilder.field(FIELD_SEARCH_ANALYZER, annotation.searchAnalyzer());
}
if (isNotBlank(annotation.analyzer())) {
if (hasText(annotation.analyzer())) {
xContentBuilder.field(FIELD_INDEX_ANALYZER, annotation.analyzer());
}
}
Expand Down Expand Up @@ -255,10 +254,10 @@ private static void addSingleFieldMapping(XContentBuilder xContentBuilder, java.
if(!fieldAnnotation.index()) {
xContentBuilder.field(FIELD_INDEX, fieldAnnotation.index());
}
if (isNotBlank(fieldAnnotation.searchAnalyzer())) {
if (hasText(fieldAnnotation.searchAnalyzer())) {
xContentBuilder.field(FIELD_SEARCH_ANALYZER, fieldAnnotation.searchAnalyzer());
}
if (isNotBlank(fieldAnnotation.analyzer())) {
if (hasText(fieldAnnotation.analyzer())) {
xContentBuilder.field(FIELD_INDEX_ANALYZER, fieldAnnotation.analyzer());
}
xContentBuilder.endObject();
Expand All @@ -279,10 +278,10 @@ private static void addNestedFieldMapping(XContentBuilder builder, java.lang.ref
if(!annotation.index()) {
builder.field(FIELD_INDEX, annotation.index());
}
if (isNotBlank(annotation.searchAnalyzer())) {
if (hasText(annotation.searchAnalyzer())) {
builder.field(FIELD_SEARCH_ANALYZER, annotation.searchAnalyzer());
}
if (isNotBlank(annotation.indexAnalyzer())) {
if (hasText(annotation.indexAnalyzer())) {
builder.field(FIELD_INDEX_ANALYZER, annotation.indexAnalyzer());
}
if (annotation.fielddata()) {
Expand Down
4 changes: 2 additions & 2 deletions ...jest/src/main/java/com/github/vanroy/springdata/jest/mapper/DefaultJestResultsMapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import java.util.LinkedList;
import java.util.List;

import static org.apache.commons.lang.StringUtils.isBlank;
import static org.springframework.util.StringUtils.hasText;

/**
* Jest implementation of Spring Data Elasticsearch results mapper.
Expand Down Expand Up @@ -139,7 +139,7 @@ private <T> T mapEntity(Collection<SearchHitField> values, Class<T> clazz) {
}

private <T> T mapEntity(String source, Class<T> clazz) {
if (isBlank(source)) {
if (!hasText(source)) {
return null;
}
try {
Expand Down
Loading

0 comments on commit 0052bda

Please sign in to comment.