SLIDER-875 add helper method for getMetaInfo(null)
diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
index 7594d51..2ab5c6f 100644
--- a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
+++ b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
@@ -1435,8 +1435,7 @@
// identify client component
Component client = null;
- for (Component component : getMetaInfo(null).getApplication()
- .getComponents()) {
+ for (Component component : getMetaInfo().getApplication().getComponents()) {
if (component.getCategory().equals("CLIENT")) {
client = component;
break;
@@ -1466,8 +1465,7 @@
throw new IOException(e);
}
- for (ConfigFile configFile : getMetaInfo(null)
- .getComponentConfigFiles(client.getName())) {
+ for (ConfigFile configFile : getMetaInfo().getComponentConfigFiles(client.getName())) {
addNamedConfiguration(configFile.getDictionaryName(),
appConf.getGlobalOptions().options, configurations, tokens, null,
client.getName(), client.getName());
@@ -1481,8 +1479,7 @@
//do a final replacement of re-used configs
dereferenceAllConfigs(configurations);
- for (ConfigFile configFile : getMetaInfo(null)
- .getComponentConfigFiles(client.getName())) {
+ for (ConfigFile configFile : getMetaInfo().getComponentConfigFiles(client.getName())) {
ConfigFormat configFormat = ConfigFormat.resolve(configFile.getType());
Map<String, String> config = configurations.get(configFile.getDictionaryName());
@@ -1598,6 +1595,10 @@
return workFolderExports;
}
+ protected Metainfo getMetaInfo() {
+ return getMetaInfo(null);
+ }
+
@VisibleForTesting
protected Metainfo getMetaInfo(String roleGroup) {
String mapKey = DEFAULT_METAINFO_MAP_KEY;
