Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Bug 714 - Fixed creating DOM Document's element with namespace"
[controller.git]
/
opendaylight
/
netconf
/
config-netconf-connector
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
netconf
/
confignetconfconnector
/
operations
/
editconfig
/
EditStrategyType.java
diff --git
a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditStrategyType.java
b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditStrategyType.java
index cb03342a1e1febf8d883b1a47ac271ade2c96637..06560b2d2724d2efb7996736649a2d90219e168c 100644
(file)
--- a/
opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditStrategyType.java
+++ b/
opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditStrategyType.java
@@
-8,10
+8,11
@@
package org.opendaylight.controller.netconf.confignetconfconnector.operations.editconfig;
package org.opendaylight.controller.netconf.confignetconfconnector.operations.editconfig;
+import com.google.common.collect.Multimap;
+
import java.util.EnumSet;
import java.util.Set;
import java.util.EnumSet;
import java.util.Set;
-//FIXME: make thread safe
public enum EditStrategyType {
// can be default
merge, replace, none,
public enum EditStrategyType {
// can be default
merge, replace, none,
@@
-40,14
+41,14
@@
public enum EditStrategyType {
}
}
}
}
- public EditConfigStrategy getFittingStrategy() {
+ public EditConfigStrategy getFittingStrategy(
Multimap<String, String> providedServices
) {
switch (this) {
case merge:
switch (this) {
case merge:
- return new MergeEditConfigStrategy();
+ return new MergeEditConfigStrategy(
providedServices
);
case replace:
case replace:
- return new ReplaceEditConfigStrategy();
+ return new ReplaceEditConfigStrategy(
providedServices
);
case delete:
case delete:
- return new DeleteEditConfigStrategy();
+ return new DeleteEditConfigStrategy(
providedServices
);
case remove:
return new RemoveEditConfigStrategy();
case none:
case remove:
return new RemoveEditConfigStrategy();
case none: