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 1850 - The earlier patch missed out on removing the unnecessary call to...
[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 6b81603dcd01cdffa0ce3d4b5c9486fc66db2b8d..25d772f4ac565c5ecd4d1e84c1b98d302b810f52 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,12
+8,10
@@
package org.opendaylight.controller.netconf.confignetconfconnector.operations.editconfig;
package org.opendaylight.controller.netconf.confignetconfconnector.operations.editconfig;
-import com.google.common.collect.Multimap;
-import org.opendaylight.controller.netconf.api.NetconfDocumentedException;
-import org.opendaylight.controller.netconf.confignetconfconnector.exception.OperationNotPermittedException;
-
import java.util.EnumSet;
import java.util.Set;
import java.util.EnumSet;
import java.util.Set;
+import org.opendaylight.controller.netconf.api.NetconfDocumentedException;
+import org.opendaylight.controller.netconf.confignetconfconnector.exception.OperationNotPermittedException;
public enum EditStrategyType {
// can be default
public enum EditStrategyType {
// can be default
@@
-58,12
+56,12
@@
public enum EditStrategyType {
}
}
}
}
- public EditConfigStrategy getFittingStrategy(
Multimap<String, String> providedServices
) {
+ public EditConfigStrategy getFittingStrategy() {
switch (this) {
case merge:
switch (this) {
case merge:
- return new MergeEditConfigStrategy(
providedServices
);
+ return new MergeEditConfigStrategy();
case replace:
case replace:
- return new ReplaceEditConfigStrategy(
providedServices
);
+ return new ReplaceEditConfigStrategy();
case delete:
return new DeleteEditConfigStrategy();
case remove:
case delete:
return new DeleteEditConfigStrategy();
case remove: