X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-manager-facade-xml%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Ffacade%2Fxml%2Fmapping%2Fconfig%2FInstanceConfigElementResolved.java;fp=opendaylight%2Fconfig%2Fconfig-manager-facade-xml%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Ffacade%2Fxml%2Fmapping%2Fconfig%2FInstanceConfigElementResolved.java;h=4c4fb78f4531c48a92aac7adf9c4ce5294e37515;hb=d266f4384d4850af9049d7cddd2bbac8f75ba61e;hp=76cf9dbf2a568b057032292ab72d3c90b235b176;hpb=b197d75e803beac663033287d769dce62c108490;p=controller.git diff --git a/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/config/InstanceConfigElementResolved.java b/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/config/InstanceConfigElementResolved.java index 76cf9dbf2a..4c4fb78f45 100644 --- a/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/config/InstanceConfigElementResolved.java +++ b/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/config/InstanceConfigElementResolved.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2015, 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, @@ -24,26 +24,26 @@ public class InstanceConfigElementResolved { private final EditStrategyType editStrategy; private final Map configuration; - public InstanceConfigElementResolved(final String currentStrategy, final Map configuration, - final EditStrategyType defaultStrategy) + public InstanceConfigElementResolved(final String currentStrategy, + final Map configuration, final EditStrategyType defaultStrategy) throws DocumentedException { this.editStrategy = parseStrategy(currentStrategy, defaultStrategy); this.configuration = configuration; } - public InstanceConfigElementResolved(final Map configuration, final EditStrategyType defaultStrategy) { + public InstanceConfigElementResolved(final Map configuration, + final EditStrategyType defaultStrategy) { editStrategy = defaultStrategy; this.configuration = configuration; } - - static EditStrategyType parseStrategy(final String currentStrategy, final EditStrategyType defaultStrategy) throws OperationNotPermittedException { + static EditStrategyType parseStrategy(final String currentStrategy, final EditStrategyType defaultStrategy) + throws OperationNotPermittedException { EditStrategyType parsedStrategy = EditStrategyType.valueOf(currentStrategy); - EditStrategyType.compareParsedStrategyToDefaultEnforcing(parsedStrategy,defaultStrategy); + EditStrategyType.compareParsedStrategyToDefaultEnforcing(parsedStrategy, defaultStrategy); return parsedStrategy; } - public EditConfigStrategy getEditStrategy() { return editStrategy.getFittingStrategy(); }