Skip to content

Commit 1d709f6

Browse files
sothawosothawo
authored
Code cleanup.
Original Pull Request #2890 Closes #2888
1 parent 0beca99 commit 1d709f6

File tree

97 files changed

+566
-491
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+566
-491
lines changed

‎src/main/java/org/springframework/data/elasticsearch/annotations/IndexedIndexName.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,17 @@
1515
*/
1616
package org.springframework.data.elasticsearch.annotations;
1717

18-
import org.springframework.data.annotation.ReadOnlyProperty;
19-
import org.springframework.data.annotation.Transient;
20-
2118
import java.lang.annotation.Documented;
2219
import java.lang.annotation.ElementType;
2320
import java.lang.annotation.Retention;
2421
import java.lang.annotation.RetentionPolicy;
2522
import java.lang.annotation.Target;
2623

2724
/**
28-
* Annotation to mark a String property of an entity to be filled with the name of the index where the entity was
29-
* stored after it is indexed into Elasticsearch. This can be used when the name of the index is dynamically created
30-
* or when a document was indexed into a write alias.
31-
*
25+
* Annotation to mark a String property of an entity to be filled with the name of the index where the entity was stored
26+
* after it is indexed into Elasticsearch. This can be used when the name of the index is dynamically created or when a
27+
* document was indexed into a write alias.
28+
* <p>
3229
* This can not be used to specify the index where an entity should be written to.
3330
*
3431
* @author Peter-Josef Meisch

‎src/main/java/org/springframework/data/elasticsearch/annotations/Mapping.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,6 @@
8282
MappingAlias[] aliases() default {};
8383

8484
enum Detection {
85-
DEFAULT, TRUE, FALSE;
85+
DEFAULT, TRUE, FALSE
8686
}
8787
}

‎src/main/java/org/springframework/data/elasticsearch/client/elc/AutoCloseableElasticsearchClient.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package org.springframework.data.elasticsearch.client.elc;
1717

1818
import co.elastic.clients.elasticsearch.ElasticsearchClient;
19-
import co.elastic.clients.elasticsearch.cluster.ElasticsearchClusterClient;
2019
import co.elastic.clients.transport.ElasticsearchTransport;
2120

2221
import org.elasticsearch.client.RestClient;
@@ -40,9 +39,4 @@ public AutoCloseableElasticsearchClient(ElasticsearchTransport transport) {
4039
public void close() throws Exception {
4140
transport.close();
4241
}
43-
44-
@Override
45-
public ElasticsearchClusterClient cluster() {
46-
return super.cluster();
47-
}
4842
}

‎src/main/java/org/springframework/data/elasticsearch/client/elc/CriteriaQueryProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ private static String orQueryString(Iterable<?> iterable) {
365365

366366
if (item != null) {
367367

368-
if (sb.length() > 0) {
368+
if (!sb.isEmpty()) {
369369
sb.append(' ');
370370
}
371371
sb.append('"');

‎src/main/java/org/springframework/data/elasticsearch/client/elc/JsonUtils.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import jakarta.json.stream.JsonGenerator;
2020

2121
import java.io.ByteArrayOutputStream;
22-
import java.io.UnsupportedEncodingException;
2322
import java.nio.charset.StandardCharsets;
2423

2524
import org.apache.commons.logging.Log;
@@ -44,17 +43,13 @@ public static String toJson(Object object, JsonpMapper mapper) {
4443
mapper.serialize(object, generator);
4544
generator.close();
4645
String json = "{}";
47-
try {
48-
json = baos.toString("UTF-8");
49-
} catch (UnsupportedEncodingException e) {
50-
LOGGER.warn("could not read json", e);
51-
}
52-
46+
json = baos.toString(StandardCharsets.UTF_8);
5347
return json;
5448
}
5549

5650
@Nullable
57-
public static String queryToJson(@Nullable co.elastic.clients.elasticsearch._types.query_dsl.Query query, JsonpMapper mapper) {
51+
public static String queryToJson(@Nullable co.elastic.clients.elasticsearch._types.query_dsl.Query query,
52+
JsonpMapper mapper) {
5853

5954
if (query == null) {
6055
return null;

‎src/main/java/org/springframework/data/elasticsearch/client/elc/NativeQueryBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ public class NativeQueryBuilder extends BaseQueryBuilder<NativeQuery, NativeQuer
4747
private final Map<String, Aggregation> aggregations = new LinkedHashMap<>();
4848
@Nullable private Suggester suggester;
4949
@Nullable private FieldCollapse fieldCollapse;
50-
private List<SortOptions> sortOptions = new ArrayList<>();
51-
private Map<String, JsonData> searchExtensions = new LinkedHashMap<>();
50+
private final List<SortOptions> sortOptions = new ArrayList<>();
51+
private final Map<String, JsonData> searchExtensions = new LinkedHashMap<>();
5252

5353
@Nullable private org.springframework.data.elasticsearch.core.query.Query springDataQuery;
5454
@Nullable private KnnQuery knnQuery;

‎src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ public co.elastic.clients.elasticsearch.cluster.PutComponentTemplateRequest clus
157157
aliasActions.getActions().forEach(aliasAction -> {
158158
if (aliasAction instanceof AliasAction.Add add) {
159159
var parameters = add.getParameters();
160-
// noinspection DuplicatedCode
161160
String[] parametersAliases = parameters.getAliases();
162161
if (parametersAliases != null) {
163162
for (String aliasName : parametersAliases) {
@@ -173,7 +172,6 @@ public co.elastic.clients.elasticsearch.cluster.PutComponentTemplateRequest clus
173172

174173
private Alias.Builder buildAlias(AliasActionParameters parameters, Alias.Builder aliasBuilder) {
175174

176-
// noinspection DuplicatedCode
177175
if (parameters.getRouting() != null) {
178176
aliasBuilder.routing(parameters.getRouting());
179177
}
@@ -416,7 +414,6 @@ public co.elastic.clients.elasticsearch.indices.PutTemplateRequest indicesPutTem
416414
if (aliasActions != null) {
417415
aliasActions.getActions().forEach(aliasAction -> {
418416
AliasActionParameters parameters = aliasAction.getParameters();
419-
// noinspection DuplicatedCode
420417
String[] parametersAliases = parameters.getAliases();
421418

422419
if (parametersAliases != null) {
@@ -450,7 +447,6 @@ public co.elastic.clients.elasticsearch.indices.PutIndexTemplateRequest indicesP
450447
aliasActions.getActions().forEach(aliasAction -> {
451448
if (aliasAction instanceof AliasAction.Add add) {
452449
var parameters = add.getParameters();
453-
// noinspection DuplicatedCode
454450
String[] parametersAliases = parameters.getAliases();
455451
if (parametersAliases != null) {
456452
for (String aliasName : parametersAliases) {

‎src/main/java/org/springframework/data/elasticsearch/client/elc/ResponseConverter.java

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@
1515
*/
1616
package org.springframework.data.elasticsearch.client.elc;
1717

18-
import static org.springframework.data.elasticsearch.client.elc.JsonUtils.toJson;
19-
import static org.springframework.data.elasticsearch.client.elc.TypeUtils.removePrefixFromJson;
20-
import static org.springframework.data.elasticsearch.client.elc.TypeUtils.typeMapping;
18+
import static org.springframework.data.elasticsearch.client.elc.JsonUtils.*;
19+
import static org.springframework.data.elasticsearch.client.elc.TypeUtils.*;
2120

2221
import co.elastic.clients.elasticsearch._types.BulkIndexByScrollFailure;
2322
import co.elastic.clients.elasticsearch._types.ErrorCause;
@@ -36,7 +35,12 @@
3635
import co.elastic.clients.elasticsearch.indices.get_mapping.IndexMappingRecord;
3736
import co.elastic.clients.json.JsonpMapper;
3837

39-
import java.util.*;
38+
import java.util.ArrayList;
39+
import java.util.HashMap;
40+
import java.util.HashSet;
41+
import java.util.List;
42+
import java.util.Map;
43+
import java.util.Set;
4044
import java.util.function.Function;
4145
import java.util.stream.Collectors;
4246

@@ -47,7 +51,11 @@
4751
import org.springframework.data.elasticsearch.core.MultiGetItem;
4852
import org.springframework.data.elasticsearch.core.cluster.ClusterHealth;
4953
import org.springframework.data.elasticsearch.core.document.Document;
50-
import org.springframework.data.elasticsearch.core.index.*;
54+
import org.springframework.data.elasticsearch.core.index.AliasData;
55+
import org.springframework.data.elasticsearch.core.index.Settings;
56+
import org.springframework.data.elasticsearch.core.index.TemplateData;
57+
import org.springframework.data.elasticsearch.core.index.TemplateResponse;
58+
import org.springframework.data.elasticsearch.core.index.TemplateResponseData;
5159
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
5260
import org.springframework.data.elasticsearch.core.query.ByQueryResponse;
5361
import org.springframework.data.elasticsearch.core.query.StringQuery;
@@ -182,7 +190,7 @@ public Document indicesGetMapping(GetMappingResponse getMappingResponse, IndexCo
182190

183191
Map<String, IndexMappingRecord> mappings = getMappingResponse.result();
184192

185-
if (mappings == null || mappings.size() == 0) {
193+
if (mappings == null || mappings.isEmpty()) {
186194
return Document.create();
187195
}
188196

‎src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@ public String delete(String id, Class<?> entityType) {
299299
}
300300

301301
@Override
302+
@Deprecated
302303
public ByQueryResponse delete(Query query, Class<?> clazz) {
303304
return delete(query, clazz, getIndexCoordinatesFor(clazz));
304305
}

‎src/main/java/org/springframework/data/elasticsearch/core/AbstractReactiveElasticsearchTemplate.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,7 @@ public Mono<String> delete(String id, IndexCoordinates index) {
409409
abstract protected Mono<String> doDeleteById(String id, @Nullable String routing, IndexCoordinates index);
410410

411411
@Override
412+
@Deprecated
412413
public Mono<ByQueryResponse> delete(Query query, Class<?> entityType) {
413414
return delete(query, entityType, getIndexCoordinatesFor(entityType));
414415
}

‎src/main/java/org/springframework/data/elasticsearch/core/DocumentOperations.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@ default void bulkUpdate(List<UpdateQuery> queries, IndexCoordinates index) {
282282
* @since 4.1
283283
* @deprecated since 5.3.0, use {@link #delete(DeleteQuery, Class)}
284284
*/
285+
@Deprecated
285286
ByQueryResponse delete(Query query, Class<?> clazz);
286287

287288
/**
@@ -305,6 +306,7 @@ default void bulkUpdate(List<UpdateQuery> queries, IndexCoordinates index) {
305306
* @return response with detailed information
306307
* @deprecated since 5.3.0, use {@link #delete(DeleteQuery, Class, IndexCoordinates)}
307308
*/
309+
@Deprecated
308310
ByQueryResponse delete(Query query, Class<?> clazz, IndexCoordinates index);
309311

310312
/**

‎src/main/java/org/springframework/data/elasticsearch/core/ReactiveDocumentOperations.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,7 @@ default Mono<Void> bulkUpdate(List<UpdateQuery> queries, IndexCoordinates index)
334334
* @return a {@link Mono} emitting the number of the removed documents.
335335
* @deprecated since 5.3.0, use {@link #delete(DeleteQuery, Class)}
336336
*/
337+
@Deprecated
337338
Mono<ByQueryResponse> delete(Query query, Class<?> entityType);
338339

339340
/**
@@ -355,6 +356,7 @@ default Mono<Void> bulkUpdate(List<UpdateQuery> queries, IndexCoordinates index)
355356
* @return a {@link Mono} emitting the number of the removed documents.
356357
* @deprecated since 5.3.0, use {@link #delete(DeleteQuery, Class, IndexCoordinates)}
357358
*/
359+
@Deprecated
358360
Mono<ByQueryResponse> delete(Query query, Class<?> entityType, IndexCoordinates index);
359361

360362
/**

‎src/main/java/org/springframework/data/elasticsearch/core/RefreshPolicy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@
2222
* @since 4.2
2323
*/
2424
public enum RefreshPolicy {
25-
NONE, IMMEDIATE, WAIT_UNTIL;
25+
NONE, IMMEDIATE, WAIT_UNTIL
2626
}

‎src/main/java/org/springframework/data/elasticsearch/core/SearchHitMapping.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ private Map<String, SearchHits<?>> mapInnerHits(SearchDocument searchDocument) {
167167
Map<String, SearchHits<?>> innerHits = new LinkedHashMap<>();
168168
Map<String, SearchDocumentResponse> documentInnerHits = searchDocument.getInnerHits();
169169

170-
if (documentInnerHits != null && documentInnerHits.size() > 0) {
170+
if (documentInnerHits != null && !documentInnerHits.isEmpty()) {
171171

172172
SearchHitMapping<SearchDocument> searchDocumentSearchHitMapping = SearchHitMapping
173173
.mappingFor(SearchDocument.class, converter);
@@ -287,8 +287,8 @@ private ElasticsearchPersistentEntityWithNestedMetaData getPersistentEntity(
287287
}
288288

289289
private static class ElasticsearchPersistentEntityWithNestedMetaData {
290-
@Nullable private ElasticsearchPersistentEntity<?> entity;
291-
private NestedMetaData nestedMetaData;
290+
@Nullable private final ElasticsearchPersistentEntity<?> entity;
291+
private final NestedMetaData nestedMetaData;
292292

293293
public ElasticsearchPersistentEntityWithNestedMetaData(@Nullable ElasticsearchPersistentEntity<?> entity,
294294
NestedMetaData nestedMetaData) {

‎src/main/java/org/springframework/data/elasticsearch/core/SearchHitSupport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323

2424
import org.springframework.data.domain.PageImpl;
2525
import org.springframework.data.domain.Pageable;
26-
import org.springframework.data.repository.util.ReactiveWrappers;
2726
import org.springframework.data.util.CloseableIterator;
27+
import org.springframework.data.util.ReactiveWrappers;
2828
import org.springframework.lang.Nullable;
2929

3030
/**

‎src/main/java/org/springframework/data/elasticsearch/core/SearchHitsImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class SearchHitsImpl<T> implements SearchScrollHits<T> {
4242
private final Lazy<List<SearchHit<T>>> unmodifiableSearchHits;
4343
@Nullable private final AggregationsContainer<?> aggregations;
4444
@Nullable private final Suggest suggest;
45-
@Nullable private String pointInTimeId;
45+
@Nullable private final String pointInTimeId;
4646
@Nullable private final SearchShardStatistics searchShardStatistics;
4747

4848
/**

‎src/main/java/org/springframework/data/elasticsearch/core/StreamQueries.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ static <T> SearchHitsIterator<T> streamResults(int maxCount, SearchScrollHits<T>
6161

6262
return new SearchHitsIterator<>() {
6363

64-
private volatile AtomicInteger currentCount = new AtomicInteger();
64+
private final AtomicInteger currentCount = new AtomicInteger();
6565
private volatile Iterator<SearchHit<T>> currentScrollHits = searchHits.iterator();
6666
private volatile boolean continueScroll = currentScrollHits.hasNext();
67-
private volatile ScrollState scrollState = new ScrollState(searchHits.getScrollId());
67+
private final ScrollState scrollState = new ScrollState(searchHits.getScrollId());
6868
private volatile boolean isClosed = false;
6969

7070
@Override

‎src/main/java/org/springframework/data/elasticsearch/core/convert/ElasticsearchConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,6 @@ default Document mapObject(@Nullable Object source) {
110110
* @return a String wihere the property names are replaced with field names
111111
* @since 5.2
112112
*/
113-
public String updateFieldNames(String propertyPath, ElasticsearchPersistentEntity<?> persistentEntity);
113+
String updateFieldNames(String propertyPath, ElasticsearchPersistentEntity<?> persistentEntity);
114114
// endregion
115115
}

‎src/main/java/org/springframework/data/elasticsearch/core/convert/GeoConverters.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ public GeoJsonPolygon convert(Map<String, Object> source) {
344344
String type = GeoConverters.getGeoJsonType(source);
345345
Assert.isTrue(type.equalsIgnoreCase(GeoJsonPolygon.TYPE), "does not contain a type 'Polygon'");
346346
List<GeoJsonLineString> lines = geoJsonLineStringsFromMap(source);
347-
Assert.isTrue(lines.size() > 0, "no linestrings defined in polygon");
347+
Assert.isTrue(!lines.isEmpty(), "no linestrings defined in polygon");
348348
GeoJsonPolygon geoJsonPolygon = GeoJsonPolygon.of(lines.get(0));
349349
for (int i = 1; i < lines.size(); i++) {
350350
geoJsonPolygon = geoJsonPolygon.withInnerRing(lines.get(i));

0 commit comments

Comments
 (0)