X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fconfig-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fconfignetconfconnector%2Fmapping%2Fconfig%2FInstanceConfigElementResolved.java;h=ef5ba753d320d8198cbe5c1a09925835a4cc8533;hp=c9605af5868db41a4910523d61347d2d83ae1729;hb=8720a3f3498bbc6fab675431f4200d26641a8ec8;hpb=027bc8f87341f432654c3aaa7771658c25d2ca7d diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/config/InstanceConfigElementResolved.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/config/InstanceConfigElementResolved.java index c9605af586..ef5ba753d3 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/config/InstanceConfigElementResolved.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/config/InstanceConfigElementResolved.java @@ -8,7 +8,6 @@ package org.opendaylight.controller.netconf.confignetconfconnector.mapping.config; -import com.google.common.collect.Multimap; import java.util.Map; import org.opendaylight.controller.netconf.api.NetconfDocumentedException; import org.opendaylight.controller.netconf.confignetconfconnector.exception.OperationNotPermittedException; @@ -24,20 +23,17 @@ public class InstanceConfigElementResolved { private final EditStrategyType editStrategy; private final Map configuration; - private final Multimap providedServices; - public InstanceConfigElementResolved(String currentStrategy, Map configuration, EditStrategyType defaultStrategy, Multimap providedServices) throws NetconfDocumentedException { - EditStrategyType valueOf = null; - valueOf = parseStrategy(currentStrategy, defaultStrategy); - this.editStrategy = valueOf; + public InstanceConfigElementResolved(String currentStrategy, Map configuration, + EditStrategyType defaultStrategy) + throws NetconfDocumentedException { + this.editStrategy = parseStrategy(currentStrategy, defaultStrategy); this.configuration = configuration; - this.providedServices = providedServices; } - public InstanceConfigElementResolved(Map configuration, EditStrategyType defaultStrategy, Multimap providedServices) { + public InstanceConfigElementResolved(Map configuration, EditStrategyType defaultStrategy) { editStrategy = defaultStrategy; this.configuration = configuration; - this.providedServices = providedServices; } @@ -49,7 +45,7 @@ public class InstanceConfigElementResolved { public EditConfigStrategy getEditStrategy() { - return editStrategy.getFittingStrategy(providedServices); + return editStrategy.getFittingStrategy(); } public Map getConfiguration() {