X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-inmemory-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fdom%2Fstore%2Fimpl%2FDOMImmutableDataChangeEvent.java;h=e47d5351137732e8e8dd7bb148b5546556f1b1a5;hb=401577076374485afea34caeb33bce474563f752;hp=f457e3b9e9603bb2d409ac1d8b3d6fe8b1ea35eb;hpb=11c04a3f6124f93c1255d7087f79c8c84c33837a;p=controller.git diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/DOMImmutableDataChangeEvent.java b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/DOMImmutableDataChangeEvent.java index f457e3b9e9..e47d535113 100644 --- a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/DOMImmutableDataChangeEvent.java +++ b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/DOMImmutableDataChangeEvent.java @@ -8,13 +8,11 @@ package org.opendaylight.controller.md.sal.dom.store.impl; import com.google.common.base.Preconditions; - import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; - import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; @@ -24,7 +22,6 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; public final class DOMImmutableDataChangeEvent implements AsyncDataChangeEvent> { - private static final RemoveEventFactory REMOVE_EVENT_FACTORY = new RemoveEventFactory(); private static final CreateEventFactory CREATE_EVENT_FACTORY = new CreateEventFactory(); @@ -36,8 +33,6 @@ public final class DOMImmutableDataChangeEvent implements private final Set removedPaths; private final DataChangeScope scope; - - private DOMImmutableDataChangeEvent(final Builder change) { original = change.before; updated = change.after; @@ -48,7 +43,7 @@ public final class DOMImmutableDataChangeEvent implements scope = change.scope; } - public static final Builder builder(final DataChangeScope scope) { + public static Builder builder(final DataChangeScope scope) { return new Builder(scope); } @@ -93,9 +88,7 @@ public final class DOMImmutableDataChangeEvent implements } /** - * Simple event factory which creates event based on path and data - * - * + * Simple event factory which creates event based on path and data. */ public interface SimpleEventFactory { DOMImmutableDataChangeEvent create(YangInstanceIdentifier path, NormalizedNode data); @@ -104,30 +97,31 @@ public final class DOMImmutableDataChangeEvent implements /** * Event factory which takes after state and creates event for it. * + *

* Factory for events based on path and after state. * After state is set as {@link #getUpdatedSubtree()} and is path, * state mapping is also present in {@link #getUpdatedData()}. - * - * @return */ - public static final SimpleEventFactory getCreateEventFactory() { + public static SimpleEventFactory getCreateEventFactory() { return CREATE_EVENT_FACTORY; } /** * Event factory which takes before state and creates event for it. * + *

* Factory for events based on path and after state. * After state is set as {@link #getOriginalSubtree()} and is path, * state mapping is also present in {@link #getOriginalSubtree()}. * + *

* Path is present in {@link #getRemovedPaths()}. - * @return */ - public static final SimpleEventFactory getRemoveEventFactory() { + public static SimpleEventFactory getRemoveEventFactory() { return REMOVE_EVENT_FACTORY; } - public static class Builder { + + public static final class Builder { public DataChangeScope scope; private NormalizedNode after; @@ -139,8 +133,7 @@ public final class DOMImmutableDataChangeEvent implements private final Set removed = new HashSet<>(); private Builder(final DataChangeScope scope) { - Preconditions.checkNotNull(scope, "Data change scope should not be null."); - this.scope = scope; + this.scope = Preconditions.checkNotNull(scope, "Data change scope should not be null."); } public Builder setAfter(final NormalizedNode node) { @@ -178,10 +171,10 @@ public final class DOMImmutableDataChangeEvent implements return this; } - public Builder addUpdated(final YangInstanceIdentifier path, final NormalizedNode before, - final NormalizedNode after) { - original.put(path, before); - updated.put(path, after); + public Builder addUpdated(final YangInstanceIdentifier path, final NormalizedNode nodeBefore, + final NormalizedNode nodeAfter) { + original.put(path, nodeBefore); + updated.put(path, nodeAfter); return this; } @@ -193,7 +186,8 @@ public final class DOMImmutableDataChangeEvent implements private static final class RemoveEventFactory implements SimpleEventFactory { @Override - public DOMImmutableDataChangeEvent create(final YangInstanceIdentifier path, final NormalizedNode data) { + public DOMImmutableDataChangeEvent create(final YangInstanceIdentifier path, + final NormalizedNode data) { return builder(DataChangeScope.BASE) // .setBefore(data) // .addRemoved(path, data) // @@ -205,12 +199,12 @@ public final class DOMImmutableDataChangeEvent implements private static final class CreateEventFactory implements SimpleEventFactory { @Override - public DOMImmutableDataChangeEvent create(final YangInstanceIdentifier path, final NormalizedNode data) { + public DOMImmutableDataChangeEvent create(final YangInstanceIdentifier path, + final NormalizedNode data) { return builder(DataChangeScope.BASE) // .setAfter(data) // .addCreated(path, data) // .build(); } } - }