Commit 73f5ecb7 authored by Matija Obreza's avatar Matija Obreza

Removed spring-data-elasticsearch dependency

parent 1df3ec60
...@@ -25,8 +25,6 @@ import org.springframework.data.annotation.CreatedBy; ...@@ -25,8 +25,6 @@ import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedBy; import org.springframework.data.annotation.LastModifiedBy;
import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldType;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty.Access; import com.fasterxml.jackson.annotation.JsonProperty.Access;
...@@ -47,7 +45,6 @@ public abstract class AuditedVersionedModel extends VersionedModel { ...@@ -47,7 +45,6 @@ public abstract class AuditedVersionedModel extends VersionedModel {
@CreatedBy @CreatedBy
@Column(updatable = false) @Column(updatable = false)
@JsonSerialize(converter = JsonSidConverter.class) @JsonSerialize(converter = JsonSidConverter.class)
@Field(type = FieldType.Text, index = false)
@JsonProperty(access = Access.READ_ONLY) @JsonProperty(access = Access.READ_ONLY)
private Long createdBy; private Long createdBy;
...@@ -61,7 +58,6 @@ public abstract class AuditedVersionedModel extends VersionedModel { ...@@ -61,7 +58,6 @@ public abstract class AuditedVersionedModel extends VersionedModel {
@JsonView(JsonViews.Protected.class) @JsonView(JsonViews.Protected.class)
@LastModifiedBy @LastModifiedBy
@JsonSerialize(converter = JsonSidConverter.class) @JsonSerialize(converter = JsonSidConverter.class)
@Field(type = FieldType.Text, index = false)
@JsonProperty(access = Access.READ_ONLY) @JsonProperty(access = Access.READ_ONLY)
private Long lastModifiedBy; private Long lastModifiedBy;
......
...@@ -25,8 +25,6 @@ import org.springframework.data.annotation.CreatedBy; ...@@ -25,8 +25,6 @@ import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedBy; import org.springframework.data.annotation.LastModifiedBy;
import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldType;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty.Access; import com.fasterxml.jackson.annotation.JsonProperty.Access;
...@@ -47,7 +45,6 @@ public abstract class AuditedVersionedModelWithoutId extends VersionedModelWitho ...@@ -47,7 +45,6 @@ public abstract class AuditedVersionedModelWithoutId extends VersionedModelWitho
@CreatedBy @CreatedBy
@Column(updatable = false) @Column(updatable = false)
@JsonSerialize(converter = JsonSidConverter.class) @JsonSerialize(converter = JsonSidConverter.class)
@Field(type = FieldType.Text, index = false)
@JsonProperty(access = Access.READ_ONLY) @JsonProperty(access = Access.READ_ONLY)
private Long createdBy; private Long createdBy;
...@@ -61,7 +58,6 @@ public abstract class AuditedVersionedModelWithoutId extends VersionedModelWitho ...@@ -61,7 +58,6 @@ public abstract class AuditedVersionedModelWithoutId extends VersionedModelWitho
@JsonView(JsonViews.Protected.class) @JsonView(JsonViews.Protected.class)
@LastModifiedBy @LastModifiedBy
@JsonSerialize(converter = JsonSidConverter.class) @JsonSerialize(converter = JsonSidConverter.class)
@Field(type = FieldType.Text, index = false)
@JsonProperty(access = Access.READ_ONLY) @JsonProperty(access = Access.READ_ONLY)
private Long lastModifiedBy; private Long lastModifiedBy;
......
...@@ -22,8 +22,6 @@ import javax.persistence.MappedSuperclass; ...@@ -22,8 +22,6 @@ import javax.persistence.MappedSuperclass;
import javax.persistence.PrePersist; import javax.persistence.PrePersist;
import org.hibernate.annotations.Type; import org.hibernate.annotations.Type;
import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldType;
import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.JsonIdentityInfo;
import com.fasterxml.jackson.annotation.ObjectIdGenerators; import com.fasterxml.jackson.annotation.ObjectIdGenerators;
...@@ -41,7 +39,6 @@ public abstract class UuidModel extends AuditedVersionedModel implements IdUUID ...@@ -41,7 +39,6 @@ public abstract class UuidModel extends AuditedVersionedModel implements IdUUID
/** The uuid. */ /** The uuid. */
@Column(unique = true, updatable = false, nullable = false) @Column(unique = true, updatable = false, nullable = false)
@Type(type = "uuid-binary") @Type(type = "uuid-binary")
@Field(type = FieldType.Text, index = false)
protected UUID uuid; protected UUID uuid;
/** /**
......
...@@ -217,19 +217,6 @@ ...@@ -217,19 +217,6 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-elasticsearch</artifactId>
<version>3.2.5.RELEASE</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Test dependencies --> <!-- Test dependencies -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
......
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