From 28208ac2b1b9e068c51eee79cf1bfedc6a818195 Mon Sep 17 00:00:00 2001 From: Maros Marsalek Date: Tue, 12 Apr 2016 10:13:37 +0200 Subject: HONEYCOMB-9: Migrate Interface listener Change-Id: Iffde1ee21b749a8c8efa96c243f7f8bb0811b4c7 Signed-off-by: Maros Marsalek --- .../v3po/translate/impl/TraversalType.java | 37 +++++++ .../impl/read/AbstractCompositeReader.java | 41 +++++--- .../translate/impl/read/CompositeChildReader.java | 21 +++- .../translate/impl/read/CompositeListReader.java | 20 +++- .../translate/impl/read/CompositeRootReader.java | 21 +++- .../impl/write/AbstractCompositeWriter.java | 107 +++++++++++++++------ .../translate/impl/write/CompositeChildWriter.java | 27 ++++-- .../translate/impl/write/CompositeListWriter.java | 33 +++++-- .../translate/impl/write/CompositeRootWriter.java | 24 +++-- 9 files changed, 264 insertions(+), 67 deletions(-) create mode 100644 v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/TraversalType.java (limited to 'v3po/translate-impl') diff --git a/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/TraversalType.java b/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/TraversalType.java new file mode 100644 index 000000000..3fa0f8d24 --- /dev/null +++ b/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/TraversalType.java @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2016 Cisco and/or its affiliates. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.fd.honeycomb.v3po.translate.impl; + +/** + * Type of traversal to be used by readers/writers in a tree + */ +public enum TraversalType { + + /** + * Read current attributes before reading from children + */ + PREORDER, + + /** + * Read from children before reading current attributes + */ + POSTORDER + + // TODO implement different traversal types as injectable iterators + // TODO implement above traversal types in readers + +} \ No newline at end of file diff --git a/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/read/AbstractCompositeReader.java b/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/read/AbstractCompositeReader.java index f9fa0eeaa..e8d79c538 100644 --- a/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/read/AbstractCompositeReader.java +++ b/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/read/AbstractCompositeReader.java @@ -22,6 +22,7 @@ import com.google.common.annotations.Beta; import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; +import io.fd.honeycomb.v3po.translate.impl.TraversalType; import io.fd.honeycomb.v3po.translate.util.ReflectionUtils; import io.fd.honeycomb.v3po.translate.util.RWUtils; import io.fd.honeycomb.v3po.translate.read.ChildReader; @@ -52,10 +53,13 @@ abstract class AbstractCompositeReader, ChildReader>> childReaders; private final Map, ChildReader>> augReaders; private final InstanceIdentifier instanceIdentifier; + private final TraversalType traversalType; AbstractCompositeReader(final Class managedDataObjectType, final List>> childReaders, - final List>> augReaders) { + final List>> augReaders, + final TraversalType traversalType) { + this.traversalType = traversalType; this.childReaders = RWUtils.uniqueLinkedIndex(childReaders, RWUtils.MANAGER_CLASS_FUNCTION); this.augReaders = RWUtils.uniqueLinkedIndex(augReaders, RWUtils.MANAGER_CLASS_AUG_FUNCTION); this.instanceIdentifier = InstanceIdentifier.create(managedDataObjectType); @@ -78,9 +82,31 @@ abstract class AbstractCompositeReader read = built.equals(emptyValue) + ? Optional.absent() + : Optional.of(built); + + LOG.debug("{}: Current node read successfully. Result: {}", this, read); + return read; + } + private void readChildren(final InstanceIdentifier id, final @Nonnull ReadContext ctx, final B builder) + throws ReadFailedException { // TODO expect exceptions from reader for (ChildReader> child : childReaders.values()) { LOG.debug("{}: Reading child from: {}", this, child); @@ -91,15 +117,6 @@ abstract class AbstractCompositeReader read = built.equals(emptyValue) - ? Optional.absent() - : Optional.of(built); - - LOG.debug("{}: Current node read successfully. Result: {}", this, read); - return read; } @Nonnull diff --git a/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/read/CompositeChildReader.java b/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/read/CompositeChildReader.java index 46a59bb90..1984cd86d 100644 --- a/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/read/CompositeChildReader.java +++ b/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/read/CompositeChildReader.java @@ -18,6 +18,7 @@ package io.fd.honeycomb.v3po.translate.impl.read; import com.google.common.annotations.Beta; import com.google.common.base.Optional; +import io.fd.honeycomb.v3po.translate.impl.TraversalType; import io.fd.honeycomb.v3po.translate.read.ReadContext; import io.fd.honeycomb.v3po.translate.read.ReadFailedException; import io.fd.honeycomb.v3po.translate.util.RWUtils; @@ -56,7 +57,25 @@ public final class CompositeChildReader>> childReaders, @Nonnull final List>> augReaders, @Nonnull final ChildReaderCustomizer customizer) { - super(managedDataObjectType, childReaders, augReaders); + this(managedDataObjectType, childReaders, augReaders, customizer, TraversalType.PREORDER); + } + + /** + * Create new {@link CompositeChildReader} + * + * @param managedDataObjectType Class object for managed data type + * @param childReaders Child nodes(container, list) readers + * @param augReaders Child augmentations readers + * @param customizer Customizer instance to customize this generic reader + * @param traversalType Type of traversal to use in the tree of readers + * + */ + public CompositeChildReader(@Nonnull final Class managedDataObjectType, + @Nonnull final List>> childReaders, + @Nonnull final List>> augReaders, + @Nonnull final ChildReaderCustomizer customizer, + @Nonnull final TraversalType traversalType) { + super(managedDataObjectType, childReaders, augReaders, traversalType); this.customizer = customizer; } diff --git a/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/read/CompositeListReader.java b/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/read/CompositeListReader.java index fd7b279ca..de32ee723 100644 --- a/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/read/CompositeListReader.java +++ b/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/read/CompositeListReader.java @@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkArgument; import com.google.common.annotations.Beta; import com.google.common.base.Optional; +import io.fd.honeycomb.v3po.translate.impl.TraversalType; import io.fd.honeycomb.v3po.translate.read.ReadFailedException; import io.fd.honeycomb.v3po.translate.util.RWUtils; import io.fd.honeycomb.v3po.translate.read.ChildReader; @@ -68,7 +69,24 @@ public final class CompositeListReader, K @Nonnull final List>> childReaders, @Nonnull final List>> augReaders, @Nonnull final ListReaderCustomizer customizer) { - super(managedDataObjectType, childReaders, augReaders); + this(managedDataObjectType, childReaders, augReaders, customizer, TraversalType.PREORDER); + } + + /** + * Create new {@link CompositeListReader} + * + * @param managedDataObjectType Class object for managed data type. Must come from a list node type. + * @param childReaders Child nodes(container, list) readers + * @param augReaders Child augmentations readers + * @param customizer Customizer instance to customize this generic reader + * @param traversalType Type of traversal to use in the tree of readers + */ + public CompositeListReader(@Nonnull final Class managedDataObjectType, + @Nonnull final List>> childReaders, + @Nonnull final List>> augReaders, + @Nonnull final ListReaderCustomizer customizer, + @Nonnull final TraversalType traversalType) { + super(managedDataObjectType, childReaders, augReaders, traversalType); this.customizer = customizer; } diff --git a/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/read/CompositeRootReader.java b/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/read/CompositeRootReader.java index f297abb76..0abae70be 100644 --- a/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/read/CompositeRootReader.java +++ b/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/read/CompositeRootReader.java @@ -17,6 +17,7 @@ package io.fd.honeycomb.v3po.translate.impl.read; import com.google.common.annotations.Beta; +import io.fd.honeycomb.v3po.translate.impl.TraversalType; import io.fd.honeycomb.v3po.translate.read.ReadFailedException; import io.fd.honeycomb.v3po.translate.util.RWUtils; import io.fd.honeycomb.v3po.translate.read.ChildReader; @@ -55,7 +56,25 @@ public final class CompositeRootReader>> childReaders, @Nonnull final List>> augReaders, @Nonnull final RootReaderCustomizer customizer) { - super(managedDataObjectType, childReaders, augReaders); + this(managedDataObjectType, childReaders, augReaders, customizer, TraversalType.PREORDER); + } + + /** + * Create new {@link CompositeRootReader} + * + * @param managedDataObjectType Class object for managed data type + * @param childReaders Child nodes(container, list) readers + * @param augReaders Child augmentations readers + * @param customizer Customizer instance to customize this generic reader + * @param traversalType Type of traversal to use in the tree of readers + * + */ + public CompositeRootReader(@Nonnull final Class managedDataObjectType, + @Nonnull final List>> childReaders, + @Nonnull final List>> augReaders, + @Nonnull final RootReaderCustomizer customizer, + @Nonnull final TraversalType traversalType) { + super(managedDataObjectType, childReaders, augReaders, traversalType); this.customizer = customizer; } diff --git a/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/write/AbstractCompositeWriter.java b/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/write/AbstractCompositeWriter.java index e971fbeff..1e4d1361a 100644 --- a/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/write/AbstractCompositeWriter.java +++ b/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/write/AbstractCompositeWriter.java @@ -20,10 +20,11 @@ import static com.google.common.base.Preconditions.checkArgument; import com.google.common.base.Optional; import com.google.common.collect.Lists; -import io.fd.honeycomb.v3po.translate.TranslationException; +import io.fd.honeycomb.v3po.translate.impl.TraversalType; +import io.fd.honeycomb.v3po.translate.util.RWUtils; import io.fd.honeycomb.v3po.translate.write.ChildWriter; import io.fd.honeycomb.v3po.translate.write.WriteContext; -import io.fd.honeycomb.v3po.translate.util.RWUtils; +import io.fd.honeycomb.v3po.translate.write.WriteFailedException; import io.fd.honeycomb.v3po.translate.write.Writer; import java.util.ArrayList; import java.util.Collection; @@ -46,21 +47,42 @@ public abstract class AbstractCompositeWriter implements W private final Map, ChildWriter>> childWriters; private final Map, ChildWriter>> augWriters; private final InstanceIdentifier instanceIdentifier; + private TraversalType traversalType; public AbstractCompositeWriter(final Class type, final List>> childWriters, - final List>> augWriters) { + final List>> augWriters, + final TraversalType traversalType) { + this.traversalType = traversalType; this.instanceIdentifier = InstanceIdentifier.create(type); this.childWriters = RWUtils.uniqueLinkedIndex(childWriters, RWUtils.MANAGER_CLASS_FUNCTION); this.augWriters = RWUtils.uniqueLinkedIndex(augWriters, RWUtils.MANAGER_CLASS_AUG_FUNCTION); } - protected void writeCurrent(final InstanceIdentifier id, final D data, final WriteContext ctx) { + protected void writeCurrent(final InstanceIdentifier id, final D data, final WriteContext ctx) + throws WriteFailedException { LOG.debug("{}: Writing current: {} data: {}", this, id, data); - LOG.trace("{}: Writing current attributes", this); - writeCurrentAttributes(id, data, ctx); + switch (traversalType) { + case PREORDER: { + LOG.trace("{}: Writing current attributes", this); + writeCurrentAttributes(id, data, ctx); + writeChildren(id, data, ctx); + break; + } + case POSTORDER: { + writeChildren(id, data, ctx); + LOG.trace("{}: Writing current attributes", this); + writeCurrentAttributes(id, data, ctx); + break; + } + } + LOG.debug("{}: Current node written successfully", this); + } + + private void writeChildren(final InstanceIdentifier id, final D data, final WriteContext ctx) + throws WriteFailedException { for (ChildWriter> child : childWriters.values()) { LOG.debug("{}: Writing child in: {}", this, child); child.writeChild(id, data, ctx); @@ -70,23 +92,38 @@ public abstract class AbstractCompositeWriter implements W LOG.debug("{}: Writing augment in: {}", this, child); child.writeChild(id, data, ctx); } - - LOG.debug("{}: Current node written successfully", this); } protected void updateCurrent(final InstanceIdentifier id, final D dataBefore, final D dataAfter, - final WriteContext ctx) { + final WriteContext ctx) throws WriteFailedException { LOG.debug("{}: Updating current: {} dataBefore: {}, datAfter: {}", this, id, dataBefore, dataAfter); - if(dataBefore.equals(dataAfter)) { + if (dataBefore.equals(dataAfter)) { LOG.debug("{}: Skipping current(no update): {}", this, id); // No change, ignore return; } - LOG.trace("{}: Updating current attributes", this); - updateCurrentAttributes(id, dataBefore, dataAfter, ctx); + switch (traversalType) { + case PREORDER: { + LOG.trace("{}: Updating current attributes", this); + updateCurrentAttributes(id, dataBefore, dataAfter, ctx); + updateChildren(id, dataBefore, dataAfter, ctx); + break; + } + case POSTORDER: { + updateChildren(id, dataBefore, dataAfter, ctx); + LOG.trace("{}: Updating current attributes", this); + updateCurrentAttributes(id, dataBefore, dataAfter, ctx); + break; + } + } + + LOG.debug("{}: Current node updated successfully", this); + } + private void updateChildren(final InstanceIdentifier id, final D dataBefore, final D dataAfter, + final WriteContext ctx) throws WriteFailedException { for (ChildWriter> child : childWriters.values()) { LOG.debug("{}: Updating child in: {}", this, child); child.updateChild(id, dataBefore, dataAfter, ctx); @@ -96,14 +133,30 @@ public abstract class AbstractCompositeWriter implements W LOG.debug("{}: Updating augment in: {}", this, child); child.updateChild(id, dataBefore, dataAfter, ctx); } - - LOG.debug("{}: Current node updated successfully", this); } - protected void deleteCurrent(final InstanceIdentifier id, final D dataBefore, final WriteContext ctx) { + protected void deleteCurrent(final InstanceIdentifier id, final D dataBefore, final WriteContext ctx) + throws WriteFailedException { LOG.debug("{}: Deleting current: {} dataBefore: {}", this, id, dataBefore); - // delete in reversed order + switch (traversalType) { + case PREORDER: { + deleteChildren(id, dataBefore, ctx); + LOG.trace("{}: Deleting current attributes", this); + deleteCurrentAttributes(id, dataBefore, ctx); + break; + } + case POSTORDER: { + LOG.trace("{}: Deleting current attributes", this); + deleteCurrentAttributes(id, dataBefore, ctx); + deleteChildren(id, dataBefore, ctx); + break; + } + } + } + + private void deleteChildren(final InstanceIdentifier id, final D dataBefore, final WriteContext ctx) + throws WriteFailedException { for (ChildWriter> child : reverseCollection(augWriters.values())) { LOG.debug("{}: Deleting augment in: {}", this, child); child.deleteChild(id, dataBefore, ctx); @@ -113,9 +166,6 @@ public abstract class AbstractCompositeWriter implements W LOG.debug("{}: Deleting child in: {}", this, child); child.deleteChild(id, dataBefore, ctx); } - - LOG.trace("{}: Deleting current attributes", this); - deleteCurrentAttributes(id, dataBefore, ctx); } @SuppressWarnings("unchecked") @@ -123,7 +173,7 @@ public abstract class AbstractCompositeWriter implements W public void update(@Nonnull final InstanceIdentifier id, @Nullable final DataObject dataBefore, @Nullable final DataObject dataAfter, - @Nonnull final WriteContext ctx) throws TranslationException { + @Nonnull final WriteContext ctx) throws WriteFailedException { LOG.debug("{}: Updating : {}", this, id); LOG.trace("{}: Updating : {}, from: {} to: {}", this, id, dataBefore, dataAfter); @@ -168,7 +218,7 @@ public abstract class AbstractCompositeWriter implements W } private void writeSubtree(final InstanceIdentifier id, - final DataObject dataAfter, final WriteContext ctx) throws TranslationException { + final DataObject dataAfter, final WriteContext ctx) throws WriteFailedException { LOG.debug("{}: Writing subtree: {}", this, id); final Writer> writer = getNextWriter(id); @@ -190,9 +240,8 @@ public abstract class AbstractCompositeWriter implements W return id.getTargetType().equals(getManagedDataObjectType().getTargetType()); } - @SuppressWarnings("unchecked") private void deleteSubtree(final InstanceIdentifier id, - final DataObject dataBefore, final WriteContext ctx) throws TranslationException { + final DataObject dataBefore, final WriteContext ctx) throws WriteFailedException { LOG.debug("{}: Deleting subtree: {}", this, id); final Writer> writer = getNextWriter(id); @@ -205,7 +254,8 @@ public abstract class AbstractCompositeWriter implements W } @SuppressWarnings("unchecked") - private void updateSubtreeFromCurrent(final InstanceIdentifier id, final WriteContext ctx) { + private void updateSubtreeFromCurrent(final InstanceIdentifier id, final WriteContext ctx) + throws WriteFailedException { final InstanceIdentifier currentId = RWUtils.cutId(id, getManagedDataObjectType()); Optional currentDataBefore = ctx.readBefore(currentId); Optional currentDataAfter = ctx.readAfter(currentId); @@ -215,11 +265,10 @@ public abstract class AbstractCompositeWriter implements W castToManaged(currentDataAfter.orNull()), ctx); } - @SuppressWarnings("unchecked") private void updateSubtree(final InstanceIdentifier id, final DataObject dataBefore, final DataObject dataAfter, - final WriteContext ctx) throws TranslationException { + final WriteContext ctx) throws WriteFailedException { LOG.debug("{}: Updating subtree: {}", this, id); final Writer> writer = getNextWriter(id); @@ -245,16 +294,16 @@ public abstract class AbstractCompositeWriter implements W protected abstract void writeCurrentAttributes(@Nonnull final InstanceIdentifier id, @Nonnull final D data, - @Nonnull final WriteContext ctx); + @Nonnull final WriteContext ctx) throws WriteFailedException; protected abstract void deleteCurrentAttributes(@Nonnull final InstanceIdentifier id, @Nonnull final D dataBefore, - @Nonnull final WriteContext ctx); + @Nonnull final WriteContext ctx) throws WriteFailedException; protected abstract void updateCurrentAttributes(@Nonnull final InstanceIdentifier id, @Nonnull final D dataBefore, @Nonnull final D dataAfter, - @Nonnull final WriteContext ctx); + @Nonnull final WriteContext ctx) throws WriteFailedException; @Nonnull @Override diff --git a/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/write/CompositeChildWriter.java b/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/write/CompositeChildWriter.java index fbfeffbdb..512eb44d9 100644 --- a/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/write/CompositeChildWriter.java +++ b/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/write/CompositeChildWriter.java @@ -17,10 +17,12 @@ package io.fd.honeycomb.v3po.translate.impl.write; import com.google.common.base.Optional; +import io.fd.honeycomb.v3po.translate.impl.TraversalType; import io.fd.honeycomb.v3po.translate.write.ChildWriter; import io.fd.honeycomb.v3po.translate.write.WriteContext; import io.fd.honeycomb.v3po.translate.util.RWUtils; import io.fd.honeycomb.v3po.translate.spi.write.ChildWriterCustomizer; +import io.fd.honeycomb.v3po.translate.write.WriteFailedException; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yangtools.yang.binding.Augmentation; @@ -37,7 +39,16 @@ public class CompositeChildWriter extends AbstractComposit @Nonnull final List>> childWriters, @Nonnull final List>> augWriters, @Nonnull final ChildWriterCustomizer customizer) { - super(type, childWriters, augWriters); + this(type, childWriters, augWriters, customizer, TraversalType.PREORDER); + } + + + public CompositeChildWriter(@Nonnull final Class type, + @Nonnull final List>> childWriters, + @Nonnull final List>> augWriters, + @Nonnull final ChildWriterCustomizer customizer, + @Nonnull final TraversalType traversalType) { + super(type, childWriters, augWriters, traversalType); this.customizer = customizer; } @@ -54,25 +65,27 @@ public class CompositeChildWriter extends AbstractComposit @Override protected void writeCurrentAttributes(@Nonnull final InstanceIdentifier id, @Nonnull final D data, - @Nonnull final WriteContext ctx) { + @Nonnull final WriteContext ctx) throws WriteFailedException { customizer.writeCurrentAttributes(id, data, ctx.getContext()); } @Override protected void deleteCurrentAttributes(@Nonnull final InstanceIdentifier id, @Nonnull final D dataBefore, - @Nonnull WriteContext ctx) { + @Nonnull WriteContext ctx) throws WriteFailedException { customizer.deleteCurrentAttributes(id, dataBefore, ctx.getContext()); } @Override protected void updateCurrentAttributes(@Nonnull final InstanceIdentifier id, @Nonnull final D dataBefore, - @Nonnull final D dataAfter, @Nonnull WriteContext ctx) { + @Nonnull final D dataAfter, @Nonnull WriteContext ctx) + throws WriteFailedException { customizer.updateCurrentAttributes(id, dataBefore, dataAfter, ctx.getContext()); } @Override public void writeChild(@Nonnull final InstanceIdentifier parentId, - @Nonnull final DataObject parentData, @Nonnull WriteContext ctx) { + @Nonnull final DataObject parentData, @Nonnull WriteContext ctx) + throws WriteFailedException { final InstanceIdentifier currentId = RWUtils.appendTypeToId(parentId, getManagedDataObjectType()); final Optional currentData = customizer.extract(currentId, parentData); if(currentData.isPresent()) { @@ -83,7 +96,7 @@ public class CompositeChildWriter extends AbstractComposit @Override public void deleteChild(@Nonnull final InstanceIdentifier parentId, @Nonnull final DataObject parentData, - @Nonnull final WriteContext ctx) { + @Nonnull final WriteContext ctx) throws WriteFailedException { final InstanceIdentifier currentId = RWUtils.appendTypeToId(parentId, getManagedDataObjectType()); final Optional currentData = customizer.extract(currentId, parentData); if(currentData.isPresent()) { @@ -94,7 +107,7 @@ public class CompositeChildWriter extends AbstractComposit @Override public void updateChild(@Nonnull final InstanceIdentifier parentId, @Nonnull final DataObject parentDataBefore, @Nonnull final DataObject parentDataAfter, - @Nonnull final WriteContext ctx) { + @Nonnull final WriteContext ctx) throws WriteFailedException { final InstanceIdentifier currentId = RWUtils.appendTypeToId(parentId, getManagedDataObjectType()); final Optional before = customizer.extract(currentId, parentDataBefore); final Optional after = customizer.extract(currentId, parentDataAfter); diff --git a/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/write/CompositeListWriter.java b/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/write/CompositeListWriter.java index dc924fe39..967edb6a9 100644 --- a/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/write/CompositeListWriter.java +++ b/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/write/CompositeListWriter.java @@ -20,10 +20,12 @@ import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import io.fd.honeycomb.v3po.translate.impl.TraversalType; import io.fd.honeycomb.v3po.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.v3po.translate.write.ChildWriter; import io.fd.honeycomb.v3po.translate.write.WriteContext; import io.fd.honeycomb.v3po.translate.util.RWUtils; +import io.fd.honeycomb.v3po.translate.write.WriteFailedException; import java.util.List; import java.util.Map; import javax.annotation.Nonnull; @@ -54,7 +56,15 @@ public class CompositeListWriter, K exten @Nonnull final List>> childWriters, @Nonnull final List>> augWriters, @Nonnull final ListWriterCustomizer customizer) { - super(type, childWriters, augWriters); + this(type, childWriters, augWriters, customizer, TraversalType.PREORDER); + } + + public CompositeListWriter(@Nonnull final Class type, + @Nonnull final List>> childWriters, + @Nonnull final List>> augWriters, + @Nonnull final ListWriterCustomizer customizer, + @Nonnull final TraversalType traversalType) { + super(type, childWriters, augWriters, traversalType); this.customizer = customizer; } @@ -72,26 +82,27 @@ public class CompositeListWriter, K exten @Override protected void writeCurrentAttributes(@Nonnull final InstanceIdentifier id, @Nonnull final D data, - @Nonnull final WriteContext ctx) { + @Nonnull final WriteContext ctx) throws WriteFailedException { customizer.writeCurrentAttributes(id, data, ctx.getContext()); } @Override protected void deleteCurrentAttributes(@Nonnull final InstanceIdentifier id, @Nonnull final D dataBefore, - @Nonnull final WriteContext ctx) { + @Nonnull final WriteContext ctx) throws WriteFailedException { customizer.deleteCurrentAttributes(id, dataBefore, ctx.getContext()); } @Override protected void updateCurrentAttributes(@Nonnull final InstanceIdentifier id, @Nonnull final D dataBefore, - @Nonnull final D dataAfter, @Nonnull final WriteContext ctx) { + @Nonnull final D dataAfter, @Nonnull final WriteContext ctx) + throws WriteFailedException { customizer.updateCurrentAttributes(id, dataBefore, dataAfter, ctx.getContext()); } @Override public void writeChild(@Nonnull final InstanceIdentifier parentId, @Nonnull final DataObject parentData, - @Nonnull final WriteContext ctx) { + @Nonnull final WriteContext ctx) throws WriteFailedException { final InstanceIdentifier currentId = RWUtils.appendTypeToId(parentId, getManagedDataObjectType()); final List currentData = customizer.extract(currentId, parentData); for (D entry : currentData) { @@ -102,7 +113,7 @@ public class CompositeListWriter, K exten @Override public void deleteChild(@Nonnull final InstanceIdentifier parentId, @Nonnull final DataObject parentDataBefore, - @Nonnull final WriteContext ctx) { + @Nonnull final WriteContext ctx) throws WriteFailedException { final InstanceIdentifier currentId = RWUtils.appendTypeToId(parentId, getManagedDataObjectType()); final List dataBefore = customizer.extract(currentId, parentDataBefore); for (D entry : dataBefore) { @@ -113,7 +124,7 @@ public class CompositeListWriter, K exten @Override public void updateChild(@Nonnull final InstanceIdentifier parentId, @Nonnull final DataObject parentDataBefore, @Nonnull final DataObject parentDataAfter, - @Nonnull final WriteContext ctx) { + @Nonnull final WriteContext ctx) throws WriteFailedException { final InstanceIdentifier currentId = RWUtils.appendTypeToId(parentId, getManagedDataObjectType()); final ImmutableMap dataBefore = Maps.uniqueIndex(customizer.extract(currentId, parentDataBefore), INDEX_FUNCTION); @@ -138,7 +149,8 @@ public class CompositeListWriter, K exten } @Override - protected void writeCurrent(final InstanceIdentifier id, final D data, final WriteContext ctx) { + protected void writeCurrent(final InstanceIdentifier id, final D data, final WriteContext ctx) + throws WriteFailedException { // Make sure the key is present if(isWildcarded(id)) { super.writeCurrent(getSpecificId(id, data), data, ctx); @@ -149,7 +161,7 @@ public class CompositeListWriter, K exten @Override protected void updateCurrent(final InstanceIdentifier id, final D dataBefore, final D dataAfter, - final WriteContext ctx) { + final WriteContext ctx) throws WriteFailedException { // Make sure the key is present if(isWildcarded(id)) { super.updateCurrent(getSpecificId(id, dataBefore), dataBefore, dataAfter, ctx); @@ -159,7 +171,8 @@ public class CompositeListWriter, K exten } @Override - protected void deleteCurrent(final InstanceIdentifier id, final D dataBefore, final WriteContext ctx) { + protected void deleteCurrent(final InstanceIdentifier id, final D dataBefore, final WriteContext ctx) + throws WriteFailedException { // Make sure the key is present if(isWildcarded(id)) { super.deleteCurrent(getSpecificId(id, dataBefore), dataBefore, ctx); diff --git a/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/write/CompositeRootWriter.java b/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/write/CompositeRootWriter.java index acf2cfd2e..5e4ff86ad 100644 --- a/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/write/CompositeRootWriter.java +++ b/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/write/CompositeRootWriter.java @@ -16,10 +16,12 @@ package io.fd.honeycomb.v3po.translate.impl.write; -import io.fd.honeycomb.v3po.translate.write.WriteContext; -import io.fd.honeycomb.v3po.translate.util.RWUtils; +import io.fd.honeycomb.v3po.translate.impl.TraversalType; import io.fd.honeycomb.v3po.translate.spi.write.RootWriterCustomizer; +import io.fd.honeycomb.v3po.translate.util.RWUtils; import io.fd.honeycomb.v3po.translate.write.ChildWriter; +import io.fd.honeycomb.v3po.translate.write.WriteContext; +import io.fd.honeycomb.v3po.translate.write.WriteFailedException; import java.util.List; import javax.annotation.Nonnull; import org.opendaylight.yangtools.yang.binding.Augmentation; @@ -35,7 +37,15 @@ public class CompositeRootWriter extends AbstractComposite @Nonnull final List>> childWriters, @Nonnull final List>> augWriters, @Nonnull final RootWriterCustomizer customizer) { - super(type, childWriters, augWriters); + this(type, childWriters, augWriters, customizer, TraversalType.PREORDER); + } + + public CompositeRootWriter(@Nonnull final Class type, + @Nonnull final List>> childWriters, + @Nonnull final List>> augWriters, + @Nonnull final RootWriterCustomizer customizer, + @Nonnull final TraversalType traversalType) { + super(type, childWriters, augWriters, traversalType); this.customizer = customizer; } @@ -52,13 +62,15 @@ public class CompositeRootWriter extends AbstractComposite @Override protected void writeCurrentAttributes(@Nonnull final InstanceIdentifier id, @Nonnull final D data, - @Nonnull final WriteContext ctx) { + @Nonnull final WriteContext ctx) throws WriteFailedException { + // TODO wrap all customizer invocations in try catch, and wrap runtime exceptions in ReadFailed + // TODO same for readers customizer.writeCurrentAttributes(id, data, ctx.getContext()); } @Override protected void deleteCurrentAttributes(@Nonnull final InstanceIdentifier id, @Nonnull final D dataBefore, - @Nonnull final WriteContext ctx) { + @Nonnull final WriteContext ctx) throws WriteFailedException { customizer.deleteCurrentAttributes(id, dataBefore, ctx.getContext()); } @@ -66,7 +78,7 @@ public class CompositeRootWriter extends AbstractComposite protected void updateCurrentAttributes(@Nonnull final InstanceIdentifier id, @Nonnull final D dataBefore, @Nonnull final D dataAfter, - @Nonnull final WriteContext ctx) { + @Nonnull final WriteContext ctx) throws WriteFailedException { customizer.updateCurrentAttributes(id, dataBefore, dataAfter, ctx.getContext()); } } -- cgit 1.2.3-korg