Commit eb51d62a authored by Maxym Borodenko's avatar Maxym Borodenko

Upgrade to Spring Data ElasticSearch 3.2.5.RELEASE

parent 0d222104
......@@ -26,7 +26,6 @@ import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedBy;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldIndex;
import org.springframework.data.elasticsearch.annotations.FieldType;
import com.fasterxml.jackson.annotation.JsonProperty;
......@@ -48,7 +47,7 @@ public abstract class AuditedVersionedModel extends VersionedModel {
@CreatedBy
@Column(updatable = false)
@JsonSerialize(converter = JsonSidConverter.class)
@Field(type = FieldType.String, index = FieldIndex.not_analyzed)
@Field(type = FieldType.Text, index = false)
@JsonProperty(access = Access.READ_ONLY)
private Long createdBy;
......@@ -62,7 +61,7 @@ public abstract class AuditedVersionedModel extends VersionedModel {
@JsonView(JsonViews.Protected.class)
@LastModifiedBy
@JsonSerialize(converter = JsonSidConverter.class)
@Field(type = FieldType.String, index = FieldIndex.not_analyzed)
@Field(type = FieldType.Text, index = false)
@JsonProperty(access = Access.READ_ONLY)
private Long lastModifiedBy;
......
......@@ -26,7 +26,6 @@ import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedBy;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldIndex;
import org.springframework.data.elasticsearch.annotations.FieldType;
import com.fasterxml.jackson.annotation.JsonProperty;
......@@ -48,7 +47,7 @@ public abstract class AuditedVersionedModelWithoutId extends VersionedModelWitho
@CreatedBy
@Column(updatable = false)
@JsonSerialize(converter = JsonSidConverter.class)
@Field(type = FieldType.String, index = FieldIndex.not_analyzed)
@Field(type = FieldType.Text, index = false)
@JsonProperty(access = Access.READ_ONLY)
private Long createdBy;
......@@ -62,7 +61,7 @@ public abstract class AuditedVersionedModelWithoutId extends VersionedModelWitho
@JsonView(JsonViews.Protected.class)
@LastModifiedBy
@JsonSerialize(converter = JsonSidConverter.class)
@Field(type = FieldType.String, index = FieldIndex.not_analyzed)
@Field(type = FieldType.Text, index = false)
@JsonProperty(access = Access.READ_ONLY)
private Long lastModifiedBy;
......
......@@ -23,7 +23,6 @@ import javax.persistence.PrePersist;
import org.hibernate.annotations.Type;
import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldIndex;
import org.springframework.data.elasticsearch.annotations.FieldType;
import com.fasterxml.jackson.annotation.JsonIdentityInfo;
......@@ -42,7 +41,7 @@ public abstract class UuidModel extends AuditedVersionedModel implements IdUUID
/** The uuid. */
@Column(unique = true, updatable = false, nullable = false)
@Type(type = "uuid-binary")
@Field(type = FieldType.String, store = false, index = FieldIndex.not_analyzed)
@Field(type = FieldType.Text, index = false)
protected UUID uuid;
/**
......
......@@ -220,7 +220,7 @@
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-elasticsearch</artifactId>
<version>2.1.15.RELEASE</version>
<version>3.2.5.RELEASE</version>
<scope>provided</scope>
<exclusions>
<exclusion>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment