This is an automated email from the ASF dual-hosted git repository. rnewson pushed a commit to branch nouveau-ibrowse-improvements in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit bb1126a294d072740bcb534ce3254426636cc8f6 Author: Robert Newson <[email protected]> AuthorDate: Mon Sep 4 22:15:25 2023 +0100 Make some classes immutable --- .../couchdb/nouveau/api/DocumentDeleteRequest.java | 17 ++++------------ .../couchdb/nouveau/api/DocumentUpdateRequest.java | 23 ++++++++-------------- .../couchdb/nouveau/api/IndexInfoRequest.java | 8 ++++---- 3 files changed, 16 insertions(+), 32 deletions(-) diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DocumentDeleteRequest.java b/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DocumentDeleteRequest.java index 99f6f5d9f..615d60488 100644 --- a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DocumentDeleteRequest.java +++ b/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DocumentDeleteRequest.java @@ -14,23 +14,16 @@ package org.apache.couchdb.nouveau.api; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.PropertyNamingStrategies; -import com.fasterxml.jackson.databind.annotation.JsonNaming; import jakarta.validation.constraints.Positive; -@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class) -public class DocumentDeleteRequest { +public final class DocumentDeleteRequest { @Positive - private long seq; + private final long seq; - private boolean purge; + private final boolean purge; - public DocumentDeleteRequest() { - // Jackson deserialization - } - - public DocumentDeleteRequest(long seq, final boolean purge) { + public DocumentDeleteRequest(@JsonProperty("seq") final long seq, @JsonProperty("purge") final boolean purge) { if (seq < 1) { throw new IllegalArgumentException("seq must be 1 or greater"); } @@ -38,12 +31,10 @@ public class DocumentDeleteRequest { this.purge = purge; } - @JsonProperty public long getSeq() { return seq; } - @JsonProperty public boolean isPurge() { return purge; } diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequest.java b/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequest.java index 2fbd01e3b..8b07e7880 100644 --- a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequest.java +++ b/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequest.java @@ -14,41 +14,35 @@ package org.apache.couchdb.nouveau.api; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.PropertyNamingStrategies; -import com.fasterxml.jackson.databind.annotation.JsonNaming; import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.Positive; import java.util.Collection; -@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class) -public class DocumentUpdateRequest { +public final class DocumentUpdateRequest { @Positive - private long seq; + private final long seq; - private String partition; + private final String partition; @NotEmpty @Valid - private Collection<Field> fields; + private final Collection<Field> fields; - public DocumentUpdateRequest() { - // Jackson deserialization - } - - public DocumentUpdateRequest(long seq, String partition, Collection<Field> fields) { + public DocumentUpdateRequest( + @JsonProperty("seq") final long seq, + @JsonProperty("partition") final String partition, + @JsonProperty("fields") final Collection<Field> fields) { this.seq = seq; this.partition = partition; this.fields = fields; } - @JsonProperty public long getSeq() { return seq; } - @JsonProperty public String getPartition() { return partition; } @@ -57,7 +51,6 @@ public class DocumentUpdateRequest { return partition != null; } - @JsonProperty public Collection<Field> getFields() { return fields; } diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/IndexInfoRequest.java b/nouveau/src/main/java/org/apache/couchdb/nouveau/api/IndexInfoRequest.java index 67e806018..949528259 100644 --- a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/IndexInfoRequest.java +++ b/nouveau/src/main/java/org/apache/couchdb/nouveau/api/IndexInfoRequest.java @@ -19,13 +19,13 @@ import java.util.OptionalLong; public final class IndexInfoRequest { - private OptionalLong updateSeq; + private final OptionalLong updateSeq; - private OptionalLong purgeSeq; + private final OptionalLong purgeSeq; public IndexInfoRequest( - @JsonProperty("update_seq") @Positive OptionalLong updateSeq, - @JsonProperty("purge_seq") @Positive OptionalLong purgeSeq) { + @JsonProperty("update_seq") @Positive final OptionalLong updateSeq, + @JsonProperty("purge_seq") @Positive final OptionalLong purgeSeq) { this.updateSeq = updateSeq; this.purgeSeq = purgeSeq; }
