X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-data-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fdata%2Fimpl%2Fschema%2Ftree%2FOperationWithModification.java;h=363f2499e2d35f85001b1715fb1d2b5bcc6e28d3;hb=9041b2200d7c48962615f414ed884cb54a7573df;hp=760e306c451db2d4b9bdaf196f13ef71197d74d4;hpb=c71add8878f29787db7cc898c4982b0da8e92d2d;p=yangtools.git

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/OperationWithModification.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/OperationWithModification.java
index 760e306c45..363f2499e2 100644
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/OperationWithModification.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/OperationWithModification.java
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.yangtools.yang.data.impl.schema.tree;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
+import java.util.Optional;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode;
@@ -19,8 +20,8 @@ final class OperationWithModification {
     private final ModifiedNode modification;
 
     private OperationWithModification(final ModificationApplyOperation op, final ModifiedNode mod) {
-        this.applyOperation = Preconditions.checkNotNull(op);
-        this.modification = Preconditions.checkNotNull(mod);
+        this.applyOperation = requireNonNull(op);
+        this.modification = requireNonNull(mod);
     }
 
     void write(final NormalizedNode<?, ?> value) {
@@ -28,7 +29,7 @@ final class OperationWithModification {
         /**
          * Fast validation of structure, full validation on written data will be run during seal.
          */
-        applyOperation.verifyStructure(value, false);
+        applyOperation.quickVerifyStructure(value);
     }
 
     void merge(final NormalizedNode<?, ?> data, final Version version) {
@@ -42,7 +43,7 @@ final class OperationWithModification {
          * We perform only quick validation here, full validation will be applied as-needed during
          * preparation, as the merge is reconciled with current state.
          */
-        applyOperation.verifyStructure(data, false);
+        applyOperation.quickVerifyStructure(data);
         applyOperation.mergeIntoModifiedNode(modification, data, version);
     }
 
@@ -53,35 +54,31 @@ final class OperationWithModification {
     /**
      * Read a particular child. If the child has been modified and does not have a stable
      * view, one will we instantiated with specified version.
-     *
-     * @param child
-     * @param version
-     * @return
      */
     Optional<NormalizedNode<?, ?>> read(final PathArgument child, final Version version) {
         final Optional<ModifiedNode> maybeChild = modification.getChild(child);
         if (maybeChild.isPresent()) {
             final ModifiedNode childNode = maybeChild.get();
 
-            Optional<TreeNode> snapshot = childNode.getSnapshot();
+            Optional<? extends TreeNode> snapshot = childNode.getSnapshot();
             if (snapshot == null) {
                 // Snapshot is not present, force instantiation
                 snapshot = applyOperation.getChild(child).get().apply(childNode, childNode.getOriginal(), version);
             }
 
-            return snapshot.transform(TreeNode::getData);
+            return snapshot.map(TreeNode::getData);
         }
 
-        Optional<TreeNode> snapshot = modification.getSnapshot();
+        Optional<? extends TreeNode> snapshot = modification.getSnapshot();
         if (snapshot == null) {
             snapshot = apply(modification.getOriginal(), version);
         }
 
         if (snapshot.isPresent()) {
-            return snapshot.get().getChild(child).transform(TreeNode::getData);
+            return snapshot.get().getChild(child).map(TreeNode::getData);
         }
 
-        return Optional.absent();
+        return Optional.empty();
     }
 
     public ModifiedNode getModification() {
@@ -92,7 +89,7 @@ final class OperationWithModification {
         return applyOperation;
     }
 
-    public Optional<TreeNode> apply(final Optional<TreeNode> data, final Version version) {
+    public Optional<? extends TreeNode> apply(final Optional<? extends TreeNode> data, final Version version) {
         return applyOperation.apply(modification, data, version);
     }