DATAES-799 - Polishing.

Author: sothawo

src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchExceptionTranslator.java

@@ -79,8 +79,7 @@ private boolean isSeqNoConflict(ElasticsearchException exception) {
 
 		if (exception instanceof ElasticsearchStatusException) {
 			ElasticsearchStatusException statusException = (ElasticsearchStatusException) exception;
-			return statusException.status() == RestStatus.CONFLICT
-					&& statusException.getMessage() != null
+			return statusException.status() == RestStatus.CONFLICT && statusException.getMessage() != null
 					&& statusException.getMessage().contains("type=version_conflict_engine_exception")
 					&& statusException.getMessage().contains("version conflict, required seqNo");
 		}

src/main/java/org/springframework/data/elasticsearch/core/EntityOperations.java

@@ -272,7 +272,8 @@ interface AdaptibleEntity<T> extends Entity<T> {
 		 *
 		 * @return SeqNoPrimaryTerm, may be {@literal null}
 		 */
-		@Nullable SeqNoPrimaryTerm getSeqNoPrimaryTerm();
+		@Nullable
+		SeqNoPrimaryTerm getSeqNoPrimaryTerm();
 	}
 
 	/**

src/main/java/org/springframework/data/elasticsearch/core/RequestFactory.java

@@ -709,7 +709,8 @@ private boolean hasSeqNoPrimaryTermProperty(@Nullable Class<?> entityClass) {
 			return false;
 		}
 
-		ElasticsearchPersistentEntity<?> entity = elasticsearchConverter.getMappingContext().getRequiredPersistentEntity(entityClass);
+		ElasticsearchPersistentEntity<?> entity = elasticsearchConverter.getMappingContext()
+				.getRequiredPersistentEntity(entityClass);
 		return entity.hasSeqNoPrimaryTermProperty();
 	}
 

src/main/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverter.java

@@ -15,8 +15,17 @@
  */
 package org.springframework.data.elasticsearch.core.convert;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.InitializingBean;
@@ -297,7 +306,8 @@ private <R> R readCollectionValue(@Nullable List<?> source, ElasticsearchPersist
 				if (value instanceof List) {
 					target.add(readValue(value, property, property.getTypeInformation().getActualType()));
 				} else if (value instanceof Map) {
-					target.add(readMapValue((Map<String, Object>) value, property, property.getTypeInformation().getActualType()));
+					target
+							.add(readMapValue((Map<String, Object>) value, property, property.getTypeInformation().getActualType()));
 				} else {
 					target.add(readEntity(computeGenericValueTypeForRead(property, value), (Map<String, Object>) value));
 				}

src/main/java/org/springframework/data/elasticsearch/core/document/Document.java

@@ -182,8 +182,8 @@ default boolean hasSeqNo() {
 	 * {@link #hasSeqNo()} prior to calling this method.
 	 *
 	 * @return the seq_no associated with this {@link Document}.
-	 * @throws IllegalStateException if the underlying implementation supports seq_no's but no seq_no was yet
-	 * 		   associated with the document.
+	 * @throws IllegalStateException if the underlying implementation supports seq_no's but no seq_no was yet associated
+	 *           with the document.
 	 */
 	default long getSeqNo() {
 		throw new UnsupportedOperationException();
@@ -214,8 +214,8 @@ default boolean hasPrimaryTerm() {
 	 * {@link #hasPrimaryTerm()} prior to calling this method.
 	 *
 	 * @return the primary_term associated with this {@link Document}.
-	 * @throws IllegalStateException if the underlying implementation supports primary_term's but no primary_term was
-	 * 			 yet associated with the document.
+	 * @throws IllegalStateException if the underlying implementation supports primary_term's but no primary_term was yet
+	 *           associated with the document.
 	 */
 	default long getPrimaryTerm() {
 		throw new UnsupportedOperationException();

src/main/java/org/springframework/data/elasticsearch/core/document/DocumentAdapters.java

@@ -77,8 +77,8 @@ public static Document from(GetResponse source) {
 		}
 
 		if (source.isSourceEmpty()) {
-			return fromDocumentFields(source, source.getId(), source.getVersion(),
-					source.getSeqNo(), source.getPrimaryTerm());
+			return fromDocumentFields(source, source.getId(), source.getVersion(), source.getSeqNo(),
+					source.getPrimaryTerm());
 		}
 
 		Document document = Document.from(source.getSourceAsMap());
@@ -108,8 +108,8 @@ public static Document from(GetResult source) {
 		}
 
 		if (source.isSourceEmpty()) {
-			return fromDocumentFields(source, source.getId(), source.getVersion(),
-					source.getSeqNo(), source.getPrimaryTerm());
+			return fromDocumentFields(source, source.getId(), source.getVersion(), source.getSeqNo(),
+					source.getPrimaryTerm());
 		}
 
 		Document document = Document.from(source.getSource());
@@ -157,8 +157,7 @@ public static SearchDocument from(SearchHit source) {
 
 		if (sourceRef == null || sourceRef.length() == 0) {
 			return new SearchDocumentAdapter(source.getScore(), source.getSortValues(), source.getFields(), highlightFields,
-					fromDocumentFields(source, source.getId(), source.getVersion(),
-							source.getSeqNo(), source.getPrimaryTerm()));
+					fromDocumentFields(source, source.getId(), source.getVersion(), source.getSeqNo(), source.getPrimaryTerm()));
 		}
 
 		Document document = Document.from(source.getSourceAsMap());
@@ -180,8 +179,8 @@ public static SearchDocument from(SearchHit source) {
 	 * @param documentFields the {@link DocumentField}s backing the {@link Document}.
 	 * @return the adapted {@link Document}.
 	 */
-	public static Document fromDocumentFields(Iterable<DocumentField> documentFields, String id, long version,
-			long seqNo, long primaryTerm) {
+	public static Document fromDocumentFields(Iterable<DocumentField> documentFields, String id, long version, long seqNo,
+			long primaryTerm) {
 
 		if (documentFields instanceof Collection) {
 			return new DocumentFieldAdapter((Collection<DocumentField>) documentFields, id, version, seqNo, primaryTerm);
@@ -204,8 +203,8 @@ static class DocumentFieldAdapter implements Document {
 		private final long seqNo;
 		private final long primaryTerm;
 
-		DocumentFieldAdapter(Collection<DocumentField> documentFields, String id, long version,
-				long seqNo, long primaryTerm) {
+		DocumentFieldAdapter(Collection<DocumentField> documentFields, String id, long version, long seqNo,
+				long primaryTerm) {
 			this.documentFields = documentFields;
 			this.id = id;
 			this.version = version;
@@ -618,7 +617,7 @@ public long getVersion() {
 		public void setVersion(long version) {
 			delegate.setVersion(version);
 		}
-		
+
 		/*
 		 * (non-Javadoc)
 		 * @see org.springframework.data.elasticsearch.core.document.Document#hasSeqNo()
@@ -645,7 +644,7 @@ public long getSeqNo() {
 		public void setSeqNo(long seqNo) {
 			delegate.setSeqNo(seqNo);
 		}
-		
+
 		/*
 		 * (non-Javadoc)
 		 * @see org.springframework.data.elasticsearch.core.document.Document#hasPrimaryTerm()

src/main/java/org/springframework/data/elasticsearch/core/index/MappingBuilder.java

@@ -170,7 +170,7 @@ private void mapEntity(XContentBuilder builder, @Nullable ElasticsearchPersisten
 					if (property.isSeqNoPrimaryTermProperty()) {
 						if (property.isAnnotationPresent(Field.class)) {
 							logger.warn("Property {} of {} is annotated for inclusion in mapping, but its type is " + //
-											"SeqNoPrimaryTerm that is never mapped, so it is skipped", //
+							"SeqNoPrimaryTerm that is never mapped, so it is skipped", //
 									property.getFieldName(), entity.getType());
 						}
 						return;

src/main/java/org/springframework/data/elasticsearch/core/mapping/ElasticsearchPersistentEntity.java

@@ -60,7 +60,8 @@ public interface ElasticsearchPersistentEntity<T> extends PersistentEntity<T, El
 
 	String settingPath();
 
-	@Nullable VersionType getVersionType();
+	@Nullable
+	VersionType getVersionType();
 
 	boolean isCreateIndexAndMapping();
 
@@ -109,11 +110,11 @@ public interface ElasticsearchPersistentEntity<T> extends PersistentEntity<T, El
 	boolean hasSeqNoPrimaryTermProperty();
 
 	/**
-	 * Returns the {@link SeqNoPrimaryTerm} property of the {@link ElasticsearchPersistentEntity}. Can be
-	 * {@literal null} in case no such property is available on the entity.
+	 * Returns the {@link SeqNoPrimaryTerm} property of the {@link ElasticsearchPersistentEntity}. Can be {@literal null}
+	 * in case no such property is available on the entity.
 	 *
 	 * @return the {@link SeqNoPrimaryTerm} {@link ElasticsearchPersistentProperty} of the {@link PersistentEntity} or
-	 * {@literal null} if not defined.
+	 *         {@literal null} if not defined.
 	 * @since 4.0
 	 */
 	@Nullable
@@ -131,8 +132,8 @@ default ElasticsearchPersistentProperty getRequiredSeqNoPrimaryTermProperty() {
 		if (property != null) {
 			return property;
 		} else {
-			throw new IllegalStateException(String.format("Required SeqNoPrimaryTerm property not found for %s!",
-					this.getType()));
+			throw new IllegalStateException(
+					String.format("Required SeqNoPrimaryTerm property not found for %s!", this.getType()));
 		}
 	}
 }

src/main/java/org/springframework/data/elasticsearch/core/mapping/ElasticsearchPersistentProperty.java

@@ -43,8 +43,8 @@ public interface ElasticsearchPersistentProperty extends PersistentProperty<Elas
 	 * Returns whether the current property is a <em>potential</em> score property of the owning
 	 * {@link ElasticsearchPersistentEntity}. This method is mainly used by {@link ElasticsearchPersistentEntity}
 	 * implementation to discover score property candidates on {@link ElasticsearchPersistentEntity} creation you should
-	 * rather call {@link ElasticsearchPersistentEntity#getScoreProperty()} to determine whether the
-	 * current property is the score property of that {@link ElasticsearchPersistentEntity} under consideration.
+	 * rather call {@link ElasticsearchPersistentEntity#getScoreProperty()} to determine whether the current property is
+	 * the score property of that {@link ElasticsearchPersistentEntity} under consideration.
 	 *
 	 * @return
 	 * @since 3.1

src/main/java/org/springframework/data/elasticsearch/core/query/SeqNoPrimaryTerm.java

@@ -18,21 +18,25 @@
 import java.util.Objects;
 
 /**
- * <p>A container for seq_no and primary_term values. When an entity class contains a field of this type,
- * it will be automatically filled with SeqNoPrimaryTerm instance on read operations (like get or search),
- * and also, when the SeqNoPrimaryTerm is not {@literal null} and filled with seq_no and primary_term,
- * they will be sent to Elasticsearch when indexing such an entity.
+ * <p>
+ * A container for seq_no and primary_term values. When an entity class contains a field of this type, it will be
+ * automatically filled with SeqNoPrimaryTerm instance on read operations (like get or search), and also, when the
+ * SeqNoPrimaryTerm is not {@literal null} and filled with seq_no and primary_term, they will be sent to Elasticsearch
+ * when indexing such an entity.
  * </p>
- * <p>This allows to implement optimistic locking pattern for full-update scenario, when an entity is first
- * read from Elasticsearch and then gets reindexed with new _content.
- * Index operations will throw an {@link org.springframework.dao.OptimisticLockingFailureException} if the
- * seq_no + primary_term pair already has different values for the given document. See Elasticsearch documentation
- * for more information: https://www.elastic.co/guide/en/elasticsearch/reference/current/optimistic-concurrency-control.html
+ * <p>
+ * This allows to implement optimistic locking pattern for full-update scenario, when an entity is first read from
+ * Elasticsearch and then gets reindexed with new _content. Index operations will throw an
+ * {@link org.springframework.dao.OptimisticLockingFailureException} if the seq_no + primary_term pair already has
+ * different values for the given document. See Elasticsearch documentation for more information:
+ * https://www.elastic.co/guide/en/elasticsearch/reference/current/optimistic-concurrency-control.html
  * </p>
- * <p>A property of this type is implicitly @{@link org.springframework.data.annotation.Transient} and never gets included
+ * <p>
+ * A property of this type is implicitly @{@link org.springframework.data.annotation.Transient} and never gets included
  * into a mapping at Elasticsearch side.
  * </p>
- * <p>A SeqNoPrimaryTerm instance cannot contain an invalid or unassigned seq_no or primary_term.
+ * <p>
+ * A SeqNoPrimaryTerm instance cannot contain an invalid or unassigned seq_no or primary_term.
  * </p>
  *
  * @author Roman Puchkovskiy
@@ -44,11 +48,11 @@ public final class SeqNoPrimaryTerm {
 
 	/**
 	 * Creates an instance of SeqNoPrimaryTerm with the given seq_no and primary_term. The passed values are validated:
-	 * sequenceNumber must be non-negative, primaryTerm must be positive. If validation fails,
-	 * an IllegalArgumentException is thrown.
+	 * sequenceNumber must be non-negative, primaryTerm must be positive. If validation fails, an IllegalArgumentException
+	 * is thrown.
 	 *
 	 * @param sequenceNumber seq_no, must not be negative
-	 * @param primaryTerm    primary_term, must be positive
+	 * @param primaryTerm primary_term, must be positive
 	 * @throws IllegalArgumentException if seq_no or primary_term is not valid
 	 */
 	public SeqNoPrimaryTerm(long sequenceNumber, long primaryTerm) {
@@ -73,10 +77,7 @@ public long getPrimaryTerm() {
 
 	@Override
 	public String toString() {
-		return "SeqNoPrimaryTerm{" +
-				"sequenceNumber=" + sequenceNumber +
-				", primaryTerm=" + primaryTerm +
-				'}';
+		return "SeqNoPrimaryTerm{" + "sequenceNumber=" + sequenceNumber + ", primaryTerm=" + primaryTerm + '}';
 	}
 
 	@Override
@@ -88,8 +89,7 @@ public boolean equals(Object o) {
 			return false;
 		}
 		SeqNoPrimaryTerm that = (SeqNoPrimaryTerm) o;
-		return sequenceNumber == that.sequenceNumber &&
-				primaryTerm == that.primaryTerm;
+		return sequenceNumber == that.sequenceNumber && primaryTerm == that.primaryTerm;
 	}
 
 	@Override