X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-common-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fcommon%2Fimpl%2Fservice%2FImmutableDataChangeEvent.java;h=a91799d45823a2e2a6c8f90e69cd0931df18584d;hp=776ff7bfb2005219c3fcb4635420647fa1a08c67;hb=59cb3e27630fb1fd965152f9e1584213e89fa62f;hpb=12fa7a97a6a83f2f0ca3cf6bd57e97a2d672f2e7 diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/ImmutableDataChangeEvent.java b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/ImmutableDataChangeEvent.java index 776ff7bfb2..a91799d458 100644 --- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/ImmutableDataChangeEvent.java +++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/ImmutableDataChangeEvent.java @@ -12,7 +12,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; -final class ImmutableDataChangeEvent

, D> implements DataChangeEvent { +public final class ImmutableDataChangeEvent

, D> implements DataChangeEvent { private final D updatedOperationalSubtree; private final Map updatedOperational; @@ -28,7 +28,7 @@ final class ImmutableDataChangeEvent

, D> implements DataChange private final Map createdConfiguration; - public ImmutableDataChangeEvent(Builder builder) { + private ImmutableDataChangeEvent(final Builder builder) { createdConfiguration = builder.getCreatedConfiguration().build(); createdOperational = builder.getCreatedOperational().build(); @@ -95,11 +95,11 @@ final class ImmutableDataChangeEvent

, D> implements DataChange return updatedOperationalSubtree; } - static final

,D> Builder builder() { + public static final

,D> Builder builder() { return new Builder<>(); } - static final class Builder

,D> { + public static final class Builder

,D> { private D updatedOperationalSubtree; private D originalOperationalSubtree; @@ -117,7 +117,10 @@ final class ImmutableDataChangeEvent

, D> implements DataChange private final ImmutableMap.Builder createdConfiguration = ImmutableMap.builder(); - protected Builder addTransaction(DataModification data, Predicate

keyFilter) { + + + + protected Builder addTransaction(final DataModification data, final Predicate

keyFilter) { updatedOperational.putAll(Maps.filterKeys(data.getUpdatedOperationalData(), keyFilter)); updatedConfiguration.putAll(Maps.filterKeys(data.getUpdatedConfigurationData(), keyFilter)); originalConfiguration.putAll(Maps.filterKeys(data.getOriginalConfigurationData(), keyFilter)); @@ -127,7 +130,7 @@ final class ImmutableDataChangeEvent

, D> implements DataChange return this; } - protected Builder addConfigurationChangeSet(RootedChangeSet changeSet) { + protected Builder addConfigurationChangeSet(final RootedChangeSet changeSet) { if(changeSet == null) { return this; } @@ -139,7 +142,7 @@ final class ImmutableDataChangeEvent

, D> implements DataChange return this; } - protected Builder addOperationalChangeSet(RootedChangeSet changeSet) { + protected Builder addOperationalChangeSet(final RootedChangeSet changeSet) { if(changeSet == null) { return this; } @@ -150,7 +153,7 @@ final class ImmutableDataChangeEvent

, D> implements DataChange return this; } - protected ImmutableDataChangeEvent build() { + public ImmutableDataChangeEvent build() { return new ImmutableDataChangeEvent(this); } @@ -158,7 +161,7 @@ final class ImmutableDataChangeEvent

, D> implements DataChange return updatedOperationalSubtree; } - protected Builder setUpdatedOperationalSubtree(D updatedOperationalSubtree) { + public Builder setUpdatedOperationalSubtree(final D updatedOperationalSubtree) { this.updatedOperationalSubtree = updatedOperationalSubtree; return this; } @@ -167,7 +170,7 @@ final class ImmutableDataChangeEvent

, D> implements DataChange return originalOperationalSubtree; } - protected Builder setOriginalOperationalSubtree(D originalOperationalSubtree) { + public Builder setOriginalOperationalSubtree(final D originalOperationalSubtree) { this.originalOperationalSubtree = originalOperationalSubtree; return this; } @@ -176,7 +179,7 @@ final class ImmutableDataChangeEvent

, D> implements DataChange return originalConfigurationSubtree; } - protected Builder setOriginalConfigurationSubtree(D originalConfigurationSubtree) { + public Builder setOriginalConfigurationSubtree(final D originalConfigurationSubtree) { this.originalConfigurationSubtree = originalConfigurationSubtree; return this; } @@ -185,7 +188,7 @@ final class ImmutableDataChangeEvent

, D> implements DataChange return updatedConfigurationSubtree; } - protected Builder setUpdatedConfigurationSubtree(D updatedConfigurationSubtree) { + public Builder setUpdatedConfigurationSubtree(final D updatedConfigurationSubtree) { this.updatedConfigurationSubtree = updatedConfigurationSubtree; return this; } @@ -221,6 +224,26 @@ final class ImmutableDataChangeEvent

, D> implements DataChange protected ImmutableMap.Builder getCreatedConfiguration() { return createdConfiguration; } + + public Builder putOriginalOperational(final Map originalData) { + originalOperational.putAll(originalData); + return this; + } + + public Builder putCreatedOperational(final Map originalData) { + createdOperational.putAll(originalData); + return this; + } + + public Builder putUpdatedOperational(final Map originalData) { + updatedOperational.putAll(originalData); + return this; + } + + public Builder putRemovedOperational(final Set originalData) { + removedOperational.addAll(originalData); + return this; + } } }