X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fconfig-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fconfignetconfconnector%2Fmapping%2Fconfig%2FModuleElementDefinition.java;h=88a18adcfe18302361c74aa265e1511b76eaa0be;hb=e773a75ec0a88fb88c3314f89ce92d951401e585;hp=b772eee0d7a9f3b37a5c8854cfe6b9d1650270b2;hpb=4fee0ccd36697c748340eb0d836864699e213da9;p=controller.git diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/config/ModuleElementDefinition.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/config/ModuleElementDefinition.java index b772eee0d7..88a18adcfe 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/config/ModuleElementDefinition.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/config/ModuleElementDefinition.java @@ -23,7 +23,7 @@ public class ModuleElementDefinition { private final String instanceName; private final EditStrategyType editStrategy; - private static final Logger logger = LoggerFactory.getLogger(ModuleElementDefinition.class); + private static final Logger LOG = LoggerFactory.getLogger(ModuleElementDefinition.class); public ModuleElementDefinition(String instanceName, String currentStrategy, EditStrategyType defaultStrategy) { this.instanceName = instanceName; @@ -35,7 +35,7 @@ public class ModuleElementDefinition { _edStrategy = InstanceConfigElementResolved.parseStrategy(currentStrategy, defaultStrategy); } catch (OperationNotPermittedException e) { _edStrategy = defaultStrategy; - logger.warn("Operation not permitted on current strategy {} while default strategy is {}. Element definition strategy set to default.", + LOG.warn("Operation not permitted on current strategy {} while default strategy is {}. Element definition strategy set to default.", currentStrategy, defaultStrategy, e); @@ -49,16 +49,14 @@ public class ModuleElementDefinition { return instanceName; } - public EditStrategyType getEditStrategyType() { - return editStrategy; - } - public EditConfigStrategy getEditStrategy() { switch (editStrategy) { - case delete : - case remove : - case none : return NONE_EDIT_CONFIG_STRATEGY; - default : return MISSING_INSTANCE_HANDLING_STRATEGY; + case delete : + case remove : + case none : + return NONE_EDIT_CONFIG_STRATEGY; + default : + return MISSING_INSTANCE_HANDLING_STRATEGY; } } }