diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2021-02-04 20:55:27 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2021-02-04 20:55:27 +0100 |
commit | 1a60a997ebb7b46c2e518ba8116f87afae6627f5 (patch) | |
tree | 1b245f257821055818f3bd830844b0b1e0acfc2c /document/src | |
parent | ec48c8496cc0853e52ca94b6346cc81ad6382a84 (diff) |
Test for equal condition in DocumentOperation subclasses
Diffstat (limited to 'document/src')
3 files changed, 11 insertions, 6 deletions
diff --git a/document/src/main/java/com/yahoo/document/DocumentPut.java b/document/src/main/java/com/yahoo/document/DocumentPut.java index e24388cd65f..25246dc9a9e 100644 --- a/document/src/main/java/com/yahoo/document/DocumentPut.java +++ b/document/src/main/java/com/yahoo/document/DocumentPut.java @@ -54,7 +54,7 @@ public class DocumentPut extends DocumentOperation { if (o == null || getClass() != o.getClass()) return false; DocumentPut that = (DocumentPut) o; return document.equals(that.document) && - getCondition().equals(that.getCondition()); + Objects.equals(getCondition(), that.getCondition()); } @Override diff --git a/document/src/main/java/com/yahoo/document/DocumentRemove.java b/document/src/main/java/com/yahoo/document/DocumentRemove.java index 79f80713c44..a815d9c0a5a 100644 --- a/document/src/main/java/com/yahoo/document/DocumentRemove.java +++ b/document/src/main/java/com/yahoo/document/DocumentRemove.java @@ -1,6 +1,8 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; +import java.util.Objects; + /** * @author baldersheim */ @@ -21,9 +23,10 @@ public class DocumentRemove extends DocumentOperation { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof DocumentRemove)) return false; + if ( ! (o instanceof DocumentRemove)) return false; DocumentRemove that = (DocumentRemove) o; - if (!docId.equals(that.docId)) return false; + if ( ! docId.equals(that.docId)) return false; + if ( ! Objects.equals(getCondition(), that.getCondition())) return false; return true; } diff --git a/document/src/main/java/com/yahoo/document/DocumentUpdate.java b/document/src/main/java/com/yahoo/document/DocumentUpdate.java index 5c748f48f15..cba51ee999e 100644 --- a/document/src/main/java/com/yahoo/document/DocumentUpdate.java +++ b/document/src/main/java/com/yahoo/document/DocumentUpdate.java @@ -19,6 +19,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; /** @@ -362,9 +363,10 @@ public class DocumentUpdate extends DocumentOperation implements Iterable<FieldP if (docId != null ? !docId.equals(that.docId) : that.docId != null) return false; if (documentType != null ? !documentType.equals(that.documentType) : that.documentType != null) return false; - if (!fieldPathUpdates.equals(that.fieldPathUpdates)) return false; - if (!id2FieldUpdates.equals(that.id2FieldUpdates)) return false; - if (this.getCreateIfNonExistent() != ((DocumentUpdate) o).getCreateIfNonExistent()) return false; + if ( ! fieldPathUpdates.equals(that.fieldPathUpdates)) return false; + if ( ! id2FieldUpdates.equals(that.id2FieldUpdates)) return false; + if (this.getCreateIfNonExistent() != that.getCreateIfNonExistent()) return false; + if ( ! Objects.equals(getCondition(), that.getCondition())) return false; return true; } |