avoid tracing "null" when default app config is used

Author: RolefH

com.ibm.streamsx.messagehub/impl/java/src/com/ibm/streamsx/messagehub/operators/MessageHubConsumerOperator.java

@@ -88,13 +88,14 @@ protected void loadProperties() throws Exception {
 
     @Override
     protected void loadFromAppConfig() throws Exception {
-        final KafkaOperatorProperties appCfgProps = MessageHubOperatorUtil.loadMessageHubCredsFromAppConfig(getOperatorContext(), appConfigName);
+        final String appCfgName = appConfigName == null? MessageHubOperatorUtil.DEFAULT_MESSAGE_HUB_APP_CONFIG_NAME: appConfigName;
+        final KafkaOperatorProperties appCfgProps = MessageHubOperatorUtil.loadMessageHubCredsFromAppConfig(getOperatorContext(), appCfgName);
         if (appConfigRequired && (appCfgProps == null || appCfgProps.isEmpty())) {
             final String msg = "Message Hub credentials not found in properties file nor in an Application Configuration";
             logger.error(msg);
             throw new RuntimeException(msg);
         }
-        logger.info ("kafka properties derived from App Config " + appConfigName + " (" 
+        logger.info ("kafka properties derived from App Config " + appCfgName + " (" 
                 + MessageHubOperatorUtil.DEFAULT_MESSAGE_HUB_CREDS_PROPERTY_NAME + "): "
                 + appCfgProps.keySet());
 

com.ibm.streamsx.messagehub/impl/java/src/com/ibm/streamsx/messagehub/operators/MessageHubProducerOperator.java

@@ -59,13 +59,14 @@ protected void loadProperties() throws Exception {
 
     @Override
     protected void loadFromAppConfig() throws Exception {
-        final KafkaOperatorProperties appCfgProps = MessageHubOperatorUtil.loadMessageHubCredsFromAppConfig(getOperatorContext(), appConfigName);
+        final String appCfgName = appConfigName == null? MessageHubOperatorUtil.DEFAULT_MESSAGE_HUB_APP_CONFIG_NAME: appConfigName;
+        final KafkaOperatorProperties appCfgProps = MessageHubOperatorUtil.loadMessageHubCredsFromAppConfig(getOperatorContext(), appCfgName);
         if (appConfigRequired && (appCfgProps == null || appCfgProps.isEmpty())) {
             final String msg = "Message Hub credentials not found in properties file nor in an Application Configuration";
             logger.error(msg);
             throw new RuntimeException(msg);
         }
-        logger.info ("kafka properties derived from App Config " + appConfigName + " (" 
+        logger.info ("kafka properties derived from App Config " + appCfgName + " (" 
                 + MessageHubOperatorUtil.DEFAULT_MESSAGE_HUB_CREDS_PROPERTY_NAME + "): "
                 + appCfgProps.keySet());
         // When we are here, we might have read the properties derived from a JSON credentials file. In this case 'appConfigRequired' is false.