diff --git a/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryIntegrationTests.java index 229ed0e8f..f6e68ca2f 100644 --- a/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryIntegrationTests.java +++ b/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryIntegrationTests.java @@ -38,14 +38,13 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; import org.springframework.data.couchbase.core.query.Query; import org.springframework.data.couchbase.core.query.QueryCriteria; import org.springframework.data.couchbase.domain.Address; import org.springframework.data.couchbase.domain.Airport; import org.springframework.data.couchbase.domain.AssessmentDO; -import org.springframework.data.couchbase.domain.Course; import org.springframework.data.couchbase.domain.Config; +import org.springframework.data.couchbase.domain.Course; import org.springframework.data.couchbase.domain.NaiveAuditorAware; import org.springframework.data.couchbase.domain.PersonWithMaps; import org.springframework.data.couchbase.domain.Submission; @@ -152,7 +151,7 @@ void findById() { person1.setReleaseVersions(releaseVersions); couchbaseTemplate.upsertById(PersonWithMaps.class).one(person1); PersonWithMaps person2 = couchbaseTemplate.findById(PersonWithMaps.class).one(person1.getId()); - assertEquals(person1, person2); + assertEquals(person1, person2); couchbaseTemplate.removeById(PersonWithMaps.class).oneEntity(person1); } @@ -184,11 +183,11 @@ void findAssessmentDO() { ado = couchbaseTemplate.upsertById(AssessmentDO.class).one(ado); Query specialUsers = new Query(QueryCriteria.where(i("id")).is(ado.getId())); - final List foundUsers = couchbaseTemplate.findByQuery(AssessmentDO.class) + final List assementDOs = couchbaseTemplate.findByQuery(AssessmentDO.class) .withConsistency(REQUEST_PLUS).matching(specialUsers).all(); - assertEquals("123", foundUsers.get(0).getId(), "id"); - assertEquals("44444444", foundUsers.get(0).getDocumentId(), "documentId"); - assertEquals(ado, foundUsers.get(0)); + assertEquals("123", assementDOs.get(0).getId(), "id"); + assertEquals("44444444", assementDOs.get(0).getDocumentId(), "documentId"); + assertEquals(ado, assementDOs.get(0)); couchbaseTemplate.removeById(AssessmentDO.class).one(ado.getDocumentId()); } diff --git a/src/test/java/org/springframework/data/couchbase/domain/AssessmentDO.java b/src/test/java/org/springframework/data/couchbase/domain/AssessmentDO.java index 0146709af..56fd0ce57 100644 --- a/src/test/java/org/springframework/data/couchbase/domain/AssessmentDO.java +++ b/src/test/java/org/springframework/data/couchbase/domain/AssessmentDO.java @@ -16,9 +16,6 @@ package org.springframework.data.couchbase.domain; -import lombok.Data; -import lombok.NoArgsConstructor; - import org.springframework.data.annotation.Id; import org.springframework.data.couchbase.core.mapping.Document; import org.springframework.data.couchbase.core.mapping.Field; @@ -30,8 +27,6 @@ * @author Michael Reiche */ @Document() -@Data -@NoArgsConstructor public class AssessmentDO { @Id @GeneratedValue(strategy = GenerationStrategy.USE_ATTRIBUTES) private String documentId; @@ -40,4 +35,38 @@ public class AssessmentDO { @Field("docType") private String documentType; @Field private String id; + + public String getId() { + return id; + } + + public String getDocumentId() { + return documentId; + } + + public void setEventTimestamp(long eventTimestamp) { + this.eventTimestamp = eventTimestamp; + } + + public void setId(String id) { + this.id = id; + } + + public boolean equals(Object other) { + if (other == null || !(other instanceof AssessmentDO)) { + return false; + } + AssessmentDO that = (AssessmentDO) other; + return equals(this.id, that.id) && equals(this.documentId, that.documentId) + && equals(this.eventTimestamp, that.eventTimestamp) && equals(this.documentType, that.documentType); + } + + boolean equals(Object s0, Object s1) { + if (s0 == null && s1 == null || s0 == s1) { + return true; + } + Object sa = s0 != null ? s0 : s1; + Object sb = s0 != null ? s1 : s0; + return sa.equals(sb); + } } diff --git a/src/test/java/org/springframework/data/couchbase/domain/MutableUser.java b/src/test/java/org/springframework/data/couchbase/domain/MutableUser.java index ffaee64f7..3cb2bf04a 100644 --- a/src/test/java/org/springframework/data/couchbase/domain/MutableUser.java +++ b/src/test/java/org/springframework/data/couchbase/domain/MutableUser.java @@ -1,28 +1,42 @@ package org.springframework.data.couchbase.domain; -import lombok.Getter; -import lombok.Setter; -import org.springframework.data.couchbase.core.mapping.Document; - import java.util.List; +import org.springframework.data.couchbase.core.mapping.Document; + @Document public class MutableUser extends User{ public MutableUser(String id, String firstname, String lastname) { super(id, firstname, lastname); } - - @Getter - @Setter + private Address address; - @Getter - @Setter private MutableUser subuser; - @Getter - @Setter private List roles; - - + + public void setRoles(List roles) { + this.roles = roles; + } + + public List getRoles() { + return roles; + } + + public void setAddress(Address address) { + this.address = address; + } + + public Address getAddress() { + return address; + } + + public void setSubuser(MutableUser subuser) { + this.subuser = subuser; + } + + public MutableUser getSubuser() { + return subuser; + } } diff --git a/src/test/java/org/springframework/data/couchbase/domain/PersonValue.java b/src/test/java/org/springframework/data/couchbase/domain/PersonValue.java index 10f68a803..78265ba2b 100644 --- a/src/test/java/org/springframework/data/couchbase/domain/PersonValue.java +++ b/src/test/java/org/springframework/data/couchbase/domain/PersonValue.java @@ -15,8 +15,6 @@ */ package org.springframework.data.couchbase.domain; -import lombok.Value; -import lombok.With; import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Version; import org.springframework.data.couchbase.core.mapping.Document; @@ -30,16 +28,13 @@ * @author Michael Reiche */ -@Value @Document public class PersonValue { @Id @GeneratedValue(strategy = GenerationStrategy.UNIQUE) - @With String id; - @Version - @With - long version; - @Field String firstname; - @Field String lastname; + private final String id; + @Version private final long version; + @Field private final String firstname; + @Field private final String lastname; public PersonValue(String id, long version, String firstname, String lastname) { this.id = id; @@ -48,10 +43,26 @@ public PersonValue(String id, long version, String firstname, String lastname) { this.lastname = lastname; } + public PersonValue withId(String id) { + return new PersonValue(id, this.version, this.firstname, this.lastname); + } + + public PersonValue withVersion(Long version) { + return new PersonValue(this.id, version, this.firstname, this.lastname); + } + + public PersonValue withFirstname(String firstname) { + return new PersonValue(this.id, this.version, firstname, this.lastname); + } + + public PersonValue withLastname(String lastname) { + return new PersonValue(this.id, this.version, this.firstname, lastname); + } + public String toString() { StringBuilder sb = new StringBuilder(); sb.append("PersonValue : {"); - sb.append(" id : " + getId()); + sb.append(" id : " + id); sb.append(", version : " + version); sb.append(", firstname : " + firstname); sb.append(", lastname : " + lastname); @@ -59,4 +70,29 @@ public String toString() { return sb.toString(); } + public String getId() { + return id; + } + + public long getVersion() { + return version; + } + + public boolean equals(Object other) { + if (other == null || !(other instanceof PersonValue)) { + return false; + } + PersonValue that = (PersonValue) other; + return equals(this.getId(), that.getId()) && equals(this.version, that.version) + && equals(this.firstname, that.firstname) && equals(this.lastname, that.lastname); + } + + boolean equals(Object s0, Object s1) { + if (s0 == null && s1 == null || s0 == s1) { + return true; + } + Object sa = s0 != null ? s0 : s1; + Object sb = s0 != null ? s1 : s0; + return sa.equals(sb); + } } diff --git a/src/test/java/org/springframework/data/couchbase/domain/PersonWithMaps.java b/src/test/java/org/springframework/data/couchbase/domain/PersonWithMaps.java index 87b5cb2ed..285ccf2db 100644 --- a/src/test/java/org/springframework/data/couchbase/domain/PersonWithMaps.java +++ b/src/test/java/org/springframework/data/couchbase/domain/PersonWithMaps.java @@ -1,16 +1,15 @@ package org.springframework.data.couchbase.domain; -import com.couchbase.client.core.deps.com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.Data; +import java.util.Map; +import java.util.Set; + import org.springframework.data.annotation.Id; import org.springframework.data.couchbase.core.mapping.Document; import org.springframework.data.couchbase.core.mapping.Field; -import java.util.Map; -import java.util.Set; +import com.couchbase.client.core.deps.com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; -@Data @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_NULL) @Document @@ -24,6 +23,40 @@ public class PersonWithMaps { private Map> releaseVersions; public PersonWithMaps(){ + } + public void setId(String id) { + this.id = id; } + + public void setVersions(Map> versions) { + this.versions = versions; + } + + public void setReleaseVersions(Map> releaseVersions) { + this.releaseVersions = releaseVersions; + } + + public String getId() { + return id; + } + + public boolean equals(Object other) { + if (other == null || !(other instanceof PersonWithMaps)) { + return false; + } + PersonWithMaps that = (PersonWithMaps) other; + return equals(this.getId(), that.getId()) && equals(this.versions, that.versions) + && equals(this.releaseVersions, that.releaseVersions); + } + + boolean equals(Object s0, Object s1) { + if (s0 == null && s1 == null || s0 == s1) { + return true; + } + Object sa = s0 != null ? s0 : s1; + Object sb = s0 != null ? s1 : s0; + return sa.equals(sb); + } + } diff --git a/src/test/java/org/springframework/data/couchbase/domain/SubscriptionToken.java b/src/test/java/org/springframework/data/couchbase/domain/SubscriptionToken.java index 85dc710e2..dc1451b9b 100644 --- a/src/test/java/org/springframework/data/couchbase/domain/SubscriptionToken.java +++ b/src/test/java/org/springframework/data/couchbase/domain/SubscriptionToken.java @@ -16,9 +16,6 @@ package org.springframework.data.couchbase.domain; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.ToString; import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Version; import org.springframework.data.couchbase.core.mapping.Document; @@ -31,9 +28,6 @@ * * @author Michael Reiche */ -@Getter -@ToString -@EqualsAndHashCode @Document public class SubscriptionToken { private @Id @@ -72,4 +66,12 @@ public SubscriptionToken( public void setType(String type) { type = type; } + + public long getVersion() { + return version; + } + + public String getId() { + return id; + } } diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserSubmission.java b/src/test/java/org/springframework/data/couchbase/domain/UserSubmission.java index 7f05b2cba..efeef6944 100644 --- a/src/test/java/org/springframework/data/couchbase/domain/UserSubmission.java +++ b/src/test/java/org/springframework/data/couchbase/domain/UserSubmission.java @@ -16,8 +16,6 @@ package org.springframework.data.couchbase.domain; -import lombok.Data; - import java.util.List; import org.springframework.data.annotation.TypeAlias; @@ -31,7 +29,6 @@ * * @author Michael Reiche */ -@Data @Document @TypeAlias("user") @CompositeQueryIndex(fields = { "id", "username", "email" }) @@ -56,4 +53,43 @@ public void setCourses(List courses) { this.courses = courses; } + public void setId(String id) { + this.id = id; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getId() { + return id; + } + + public Address getAddress() { + return address; + } + + public List getCourses() { + return courses; + } + + public String getUsername() { + return username; + } + + public List
getOtherAddresses() { + return otherAddresses; + } + + public List getSubmissions() { + return submissions; + } + + public void setRoles(List roles) { + this.roles = roles; + } + + public void setAddress(Address address) { + this.address = address; + } } diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotated.java b/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotated.java index 3ca25accf..1624142d5 100644 --- a/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotated.java +++ b/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotated.java @@ -16,23 +16,20 @@ package org.springframework.data.couchbase.domain; -import lombok.Data; +import java.util.List; + import org.springframework.data.annotation.TypeAlias; import org.springframework.data.couchbase.core.mapping.Document; -import org.springframework.data.couchbase.core.mapping.Field; import org.springframework.data.couchbase.core.query.FetchType; import org.springframework.data.couchbase.core.query.N1qlJoin; import org.springframework.data.couchbase.repository.Collection; import org.springframework.data.couchbase.repository.Scope; -import java.util.List; - /** * UserSubmissionAnnotated entity for tests * * @author Michael Reiche */ -@Data @Document @TypeAlias("user") @Scope("my_scope") @@ -57,4 +54,23 @@ public void setCourses(List courses) { this.courses = courses; } + public void setId(String id) { + this.id = id; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getId() { + return id; + } + + public List getOtherAddresses() { + return otherAddresses; + } + + public String getUsername() { + return username; + } } diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionProjected.java b/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionProjected.java index db4d17f7c..286ac77b8 100644 --- a/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionProjected.java +++ b/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionProjected.java @@ -16,8 +16,6 @@ package org.springframework.data.couchbase.domain; -import lombok.Data; - import java.util.List; import org.springframework.data.annotation.TypeAlias; @@ -29,7 +27,6 @@ * * @author Michael Reiche */ -@Data @Document @TypeAlias("user") @CompositeQueryIndex(fields = { "id", "username", "email" }) @@ -44,4 +41,19 @@ public void setCourses(List courses) { this.courses = courses; } + public String getUsername() { + return username; + } + + public String getId() { + return id; + } + + public List getCourses() { + return courses; + } + + public Address getAddress() { + return address; + } } diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotated.java b/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotated.java index a6bdf8609..2a4d40025 100644 --- a/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotated.java +++ b/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotated.java @@ -16,8 +16,6 @@ package org.springframework.data.couchbase.domain; -import lombok.Data; - import java.util.List; import org.springframework.data.annotation.TypeAlias; @@ -31,7 +29,6 @@ * * @author Michael Reiche */ -@Data @Document // there is no @Scope annotation on this entity @Collection("my_collection") @@ -56,4 +53,23 @@ public void setCourses(List courses) { this.courses = courses; } + public void setId(String id) { + this.id = id; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getId() { + return id; + } + + public String getUsername() { + return username; + } + + public List getOtherAddresses() { + return otherAddresses; + } } diff --git a/src/test/java/org/springframework/data/couchbase/transactions/AfterTransactionAssertion.java b/src/test/java/org/springframework/data/couchbase/transactions/AfterTransactionAssertion.java index bd9857325..5a9e619a0 100644 --- a/src/test/java/org/springframework/data/couchbase/transactions/AfterTransactionAssertion.java +++ b/src/test/java/org/springframework/data/couchbase/transactions/AfterTransactionAssertion.java @@ -16,8 +16,6 @@ package org.springframework.data.couchbase.transactions; -import lombok.Data; - import org.springframework.data.domain.Persistable; /** @@ -25,12 +23,16 @@ * * @author Michael Reiche */ -@Data + public class AfterTransactionAssertion { private final T persistable; private boolean expectToBePresent; + public AfterTransactionAssertion(T persistable) { + this.persistable = persistable; + } + public void isPresent() { expectToBePresent = true; } diff --git a/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionIntegrationTests.java index a59bb2e18..d8dd84d9b 100644 --- a/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionIntegrationTests.java +++ b/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionIntegrationTests.java @@ -21,8 +21,6 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import lombok.Data; -import org.springframework.test.annotation.DirtiesContext; import reactor.core.publisher.Mono; import java.util.List; @@ -52,6 +50,7 @@ import org.springframework.data.couchbase.util.ClusterType; import org.springframework.data.couchbase.util.IgnoreWhen; import org.springframework.data.couchbase.util.JavaIntegrationTests; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.transaction.reactive.TransactionalOperator; @@ -326,7 +325,6 @@ public void replaceWithCasConflictResolvedViaRetryAnnotated() { assertTrue(tryCount.get() > 1, "should have been more than one try. tries: " + tryCount.get()); } - @Data static class EventLog { public EventLog() {}; // don't remove this @@ -346,6 +344,10 @@ public String toString() { sb.append(", action: " + action); return sb.toString(); } + + private String getId() { + return id; + } } } diff --git a/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionReactiveIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionReactiveIntegrationTests.java index afe451aff..1e9f3d2b6 100644 --- a/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionReactiveIntegrationTests.java +++ b/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionReactiveIntegrationTests.java @@ -18,8 +18,6 @@ import static com.couchbase.client.java.query.QueryScanConsistency.REQUEST_PLUS; -import lombok.Data; -import org.springframework.test.annotation.DirtiesContext; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; @@ -45,6 +43,7 @@ import org.springframework.data.couchbase.util.ClusterType; import org.springframework.data.couchbase.util.IgnoreWhen; import org.springframework.data.couchbase.util.JavaIntegrationTests; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import com.couchbase.client.java.Cluster; @@ -217,8 +216,6 @@ public void errorAfterTxShouldNotAffectPreviousStep() { .verifyComplete(); } - @Data - // @AllArgsConstructor static class EventLog { public EventLog() {}