From 967826d6a537419cdf2d65af570ff9f7d0f58d65 Mon Sep 17 00:00:00 2001 From: Matija Obreza Date: Thu, 27 Dec 2018 16:25:19 +0100 Subject: [PATCH] ES: Set createdBy, lastModifiedBy to not_analyzed string type --- .../blocks/model/AuditedVersionedModel.java | 7 ++++--- .../model/AuditedVersionedModelWithoutId.java | 15 ++++++++------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/core/src/main/java/org/genesys/blocks/model/AuditedVersionedModel.java b/core/src/main/java/org/genesys/blocks/model/AuditedVersionedModel.java index bf03857..56358d5 100644 --- a/core/src/main/java/org/genesys/blocks/model/AuditedVersionedModel.java +++ b/core/src/main/java/org/genesys/blocks/model/AuditedVersionedModel.java @@ -27,10 +27,11 @@ 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.JsonView; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty.Access; +import com.fasterxml.jackson.annotation.JsonView; import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** @@ -47,7 +48,7 @@ public abstract class AuditedVersionedModel extends VersionedModel { @CreatedBy @Column(updatable = false) @JsonSerialize(converter = JsonSidConverter.class) - @Field(index = FieldIndex.no) + @Field(type = FieldType.String, index = FieldIndex.not_analyzed) @JsonProperty(access = Access.READ_ONLY) private Long createdBy; @@ -61,7 +62,7 @@ public abstract class AuditedVersionedModel extends VersionedModel { @JsonView(JsonViews.Protected.class) @LastModifiedBy @JsonSerialize(converter = JsonSidConverter.class) - @Field(index = FieldIndex.no) + @Field(type = FieldType.String, index = FieldIndex.not_analyzed) @JsonProperty(access = Access.READ_ONLY) private Long lastModifiedBy; diff --git a/core/src/main/java/org/genesys/blocks/model/AuditedVersionedModelWithoutId.java b/core/src/main/java/org/genesys/blocks/model/AuditedVersionedModelWithoutId.java index 6a35932..0ebe788 100644 --- a/core/src/main/java/org/genesys/blocks/model/AuditedVersionedModelWithoutId.java +++ b/core/src/main/java/org/genesys/blocks/model/AuditedVersionedModelWithoutId.java @@ -20,11 +20,6 @@ import java.util.Date; import javax.persistence.Column; import javax.persistence.MappedSuperclass; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonView; -import com.fasterxml.jackson.annotation.JsonProperty.Access; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; - import org.genesys.blocks.util.JsonSidConverter; import org.springframework.data.annotation.CreatedBy; import org.springframework.data.annotation.CreatedDate; @@ -32,6 +27,12 @@ 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; +import com.fasterxml.jackson.annotation.JsonProperty.Access; +import com.fasterxml.jackson.annotation.JsonView; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** * The Class AuditedVersionedModelWithoutId. @@ -47,7 +48,7 @@ public abstract class AuditedVersionedModelWithoutId extends VersionedModelWitho @CreatedBy @Column(updatable = false) @JsonSerialize(converter = JsonSidConverter.class) - @Field(index = FieldIndex.no) + @Field(type = FieldType.String, index = FieldIndex.not_analyzed) @JsonProperty(access = Access.READ_ONLY) private Long createdBy; @@ -61,7 +62,7 @@ public abstract class AuditedVersionedModelWithoutId extends VersionedModelWitho @JsonView(JsonViews.Protected.class) @LastModifiedBy @JsonSerialize(converter = JsonSidConverter.class) - @Field(index = FieldIndex.no) + @Field(type = FieldType.String, index = FieldIndex.not_analyzed) @JsonProperty(access = Access.READ_ONLY) private Long lastModifiedBy; -- GitLab