Updated implementation of broker (data services, generated code), added Integration...

[controller.git] / opendaylight / md-sal / sal-common-impl / src / main / java / org / opendaylight / controller / md / sal / common / impl / AbstractDataModification.java

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 e786b7443b3fd5c1cfa6dac19198cf732be6ea9c..5d76717ab6ab0d5128bb2eb578f05bda48120a7f 100644 (file)
--- 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;
 
 
 import static org.opendaylight.controller.md.sal.common.api.TransactionStatus.NEW;
 

-public abstract class AbstractDataModification<P extends Path<P>, D> implements DataModification<P, D>  {
+public abstract class AbstractDataModification<P /*extends Path<P>*/, D> implements DataModification<P, D> {

 
 

-    private final Map<P,D> configurationUpdate;
-    private final Map<P,D> operationalUpdate;
+    private final Map<P, D> configurationUpdate;
+    private final Map<P, D> operationalUpdate;

 
     private final Set<P> configurationRemove;
     private final Set<P> operationalRemove;
 
     private final Set<P> configurationRemove;
     private final Set<P> operationalRemove;

-   
+

     private final Map<P, D> unmodifiable_configurationUpdate;
     private final Map<P, D> unmodifiable_operationalUpdate;
     private final Set<P> unmodifiable_configurationRemove;
     private final Set<P> unmodifiable_OperationalRemove;
 
     private final Map<P, D> unmodifiable_configurationUpdate;
     private final Map<P, D> unmodifiable_operationalUpdate;
     private final Set<P> unmodifiable_configurationRemove;
     private final Set<P> unmodifiable_OperationalRemove;
 

-    
-

     public AbstractDataModification(Map<P, D> configurationUpdate, Map<P, D> operationalUpdate,
             Set<P> configurationRemove, Set<P> operationalRemove) {
         this.configurationUpdate = configurationUpdate;
         this.operationalUpdate = operationalUpdate;
         this.configurationRemove = configurationRemove;
         this.operationalRemove = operationalRemove;
     public AbstractDataModification(Map<P, D> configurationUpdate, Map<P, D> operationalUpdate,
             Set<P> configurationRemove, Set<P> 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);
     }
         unmodifiable_configurationUpdate = Collections.unmodifiableMap(configurationUpdate);
         unmodifiable_operationalUpdate = Collections.unmodifiableMap(operationalUpdate);
         unmodifiable_configurationRemove = Collections.unmodifiableSet(configurationRemove);
         unmodifiable_OperationalRemove = Collections.unmodifiableSet(operationalRemove);
     }

-    
+

     public AbstractDataModification() {
     public AbstractDataModification() {

-        this(new HashMap<P,D>(), new HashMap<P,D>(), new HashSet<P>(), new HashSet<P>());
+        this(new HashMap<P, D>(), new HashMap<P, D>(), new HashSet<P>(), new HashSet<P>());

     }
 
     @Override
     }
 
     @Override


@@ -49,21 +47,21 @@ public abstract class AbstractDataModification<P extends Path<P>, D> implements
         configurationUpdate.put(path, data);
         configurationRemove.remove(path);
     }
         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 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 removeRuntimeData(P path) {
         checkMutable();
         operationalUpdate.remove(path);
         operationalRemove.add(path);
     }

-    
+

     @Override
     public final void removeConfigurationData(P path) {
         checkMutable();
     @Override
     public final void removeConfigurationData(P path) {
         checkMutable();


@@ -72,12 +70,13 @@ public abstract class AbstractDataModification<P extends Path<P>, D> implements
     }
 
     private final void checkMutable() {
     }
 
     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<P, D> getUpdatedConfigurationData() {
     }
 
     @Override
     public Map<P, D> getUpdatedConfigurationData() {

-        
+

         return unmodifiable_configurationUpdate;
     }
 
         return unmodifiable_configurationUpdate;
     }
 


@@ -90,7 +89,7 @@ public abstract class AbstractDataModification<P extends Path<P>, D> implements
     public Set<P> getRemovedConfigurationData() {
         return unmodifiable_configurationRemove;
     }
     public Set<P> getRemovedConfigurationData() {
         return unmodifiable_configurationRemove;
     }

-    
+

     @Override
     public Set<P> getRemovedOperationalData() {
         return unmodifiable_OperationalRemove;
     @Override
     public Set<P> getRemovedOperationalData() {
         return unmodifiable_OperationalRemove;