From 178ebab612c3ddd338e759ca7e929c25c623b0b3 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 26 Nov 2019 15:31:49 +0100 Subject: [PATCH] Bail faster on not found module If we fail to find config for a particular module, we can bail directly without going through another empty check. Change-Id: I47dc844d51ecbe1ca3f22fd355532539e07f798b Signed-off-by: Robert Varga --- .../datastore/config/ConfigurationImpl.java | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImpl.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImpl.java index fcfa615f7e..ab52385893 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImpl.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImpl.java @@ -95,27 +95,29 @@ public class ConfigurationImpl implements Configuration { @Override public String getModuleNameFromNameSpace(final String nameSpace) { - requireNonNull(nameSpace, "nameSpace should not be null"); - - return namespaceToModuleName.get(nameSpace); + return namespaceToModuleName.get(requireNonNull(nameSpace, "nameSpace should not be null")); } @Override public ShardStrategy getStrategyForModule(final String moduleName) { - requireNonNull(moduleName, "moduleName should not be null"); - - ModuleConfig moduleConfig = moduleConfigMap.get(moduleName); + ModuleConfig moduleConfig = getModuleConfig(moduleName); return moduleConfig != null ? moduleConfig.getShardStrategy() : null; } @Override public String getShardNameForModule(final String moduleName) { - requireNonNull(moduleName, "moduleName should not be null"); + ModuleConfig moduleConfig = getModuleConfig(moduleName); + if (moduleConfig != null) { + Collection shardConfigs = moduleConfig.getShardConfigs(); + if (!shardConfigs.isEmpty()) { + return shardConfigs.iterator().next().getName(); + } + } + return null; + } - ModuleConfig moduleConfig = moduleConfigMap.get(moduleName); - Collection shardConfigs = moduleConfig != null ? moduleConfig.getShardConfigs() : - Collections.emptySet(); - return !shardConfigs.isEmpty() ? shardConfigs.iterator().next().getName() : null; + private ModuleConfig getModuleConfig(final String moduleName) { + return moduleConfigMap.get(requireNonNull(moduleName, "moduleName should not be null")); } @Override -- 2.36.6