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%2FAbstractDataModification.java;fp=opendaylight%2Fmd-sal%2Fsal-common-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fcommon%2Fimpl%2FAbstractDataModification.java;h=5d76717ab6ab0d5128bb2eb578f05bda48120a7f;hp=e786b7443b3fd5c1cfa6dac19198cf732be6ea9c;hb=a3dbf5335c352c7463674e31314ce2b5285cb6fe;hpb=8c8e6489429fadeef138a33cbd0880f60379c438 diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/AbstractDataModification.java b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/AbstractDataModification.java index e786b7443b..5d76717ab6 100644 --- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/AbstractDataModification.java +++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/AbstractDataModification.java @@ -11,36 +11,34 @@ import org.opendaylight.yangtools.concepts.Path; import static org.opendaylight.controller.md.sal.common.api.TransactionStatus.NEW; -public abstract class AbstractDataModification

, D> implements DataModification { +public abstract class AbstractDataModification

*/, D> implements DataModification { - private final Map configurationUpdate; - private final Map operationalUpdate; + private final Map configurationUpdate; + private final Map operationalUpdate; private final Set

configurationRemove; private final Set

operationalRemove; - + private final Map unmodifiable_configurationUpdate; private final Map unmodifiable_operationalUpdate; private final Set

unmodifiable_configurationRemove; private final Set

unmodifiable_OperationalRemove; - - public AbstractDataModification(Map configurationUpdate, Map operationalUpdate, Set

configurationRemove, Set

operationalRemove) { this.configurationUpdate = configurationUpdate; this.operationalUpdate = operationalUpdate; this.configurationRemove = configurationRemove; this.operationalRemove = operationalRemove; - + unmodifiable_configurationUpdate = Collections.unmodifiableMap(configurationUpdate); unmodifiable_operationalUpdate = Collections.unmodifiableMap(operationalUpdate); unmodifiable_configurationRemove = Collections.unmodifiableSet(configurationRemove); unmodifiable_OperationalRemove = Collections.unmodifiableSet(operationalRemove); } - + public AbstractDataModification() { - this(new HashMap(), new HashMap(), new HashSet

(), new HashSet

()); + this(new HashMap(), new HashMap(), new HashSet

(), new HashSet

()); } @Override @@ -49,21 +47,21 @@ public abstract class AbstractDataModification

, D> implements configurationUpdate.put(path, data); configurationRemove.remove(path); } - + @Override public final void putRuntimeData(P path, D data) { checkMutable(); operationalUpdate.put(path, data); operationalRemove.remove(path); } - + @Override public final void removeRuntimeData(P path) { checkMutable(); operationalUpdate.remove(path); operationalRemove.add(path); } - + @Override public final void removeConfigurationData(P path) { checkMutable(); @@ -72,12 +70,13 @@ public abstract class AbstractDataModification

, D> implements } private final void checkMutable() { - if(!NEW.equals(this.getStatus())) throw new IllegalStateException("Transaction was already submitted"); + if (!NEW.equals(this.getStatus())) + throw new IllegalStateException("Transaction was already submitted"); } @Override public Map getUpdatedConfigurationData() { - + return unmodifiable_configurationUpdate; } @@ -90,7 +89,7 @@ public abstract class AbstractDataModification

, D> implements public Set

getRemovedConfigurationData() { return unmodifiable_configurationRemove; } - + @Override public Set

getRemovedOperationalData() { return unmodifiable_OperationalRemove;