@@ -1747,20 +1747,24 @@ private void maskValues(KeyManagerConfigurationDTO keyManagerConfigurationDTO) {
17471747 Map <String , Object > additionalProperties = keyManagerConfigurationDTO .getAdditionalProperties ();
17481748 List <ConfigurationDto > connectionConfigurations =
17491749 keyManagerConnectorConfiguration .getConnectionConfigurations ();
1750- for (ConfigurationDto connectionConfiguration : connectionConfigurations ) {
1751- if (connectionConfiguration .isMask ()) {
1752- additionalProperties .replace (connectionConfiguration .getName (),
1753- APIConstants .DEFAULT_MODIFIED_ENDPOINT_PASSWORD );
1750+ if (connectionConfigurations != null && !connectionConfigurations .isEmpty ()) {
1751+ for (ConfigurationDto connectionConfiguration : connectionConfigurations ) {
1752+ if (connectionConfiguration .isMask ()) {
1753+ additionalProperties .replace (connectionConfiguration .getName (),
1754+ APIConstants .DEFAULT_MODIFIED_ENDPOINT_PASSWORD );
1755+ }
17541756 }
17551757 }
17561758
17571759 // if authConfiguration array is not empty, check for maskable values there as well
17581760 if (keyManagerConnectorConfiguration .getAuthConfigurations () != null
17591761 && !(keyManagerConnectorConfiguration .getAuthConfigurations ().isEmpty ())) {
17601762 List <ConfigurationDto > authConfigurations = keyManagerConnectorConfiguration .getAuthConfigurations ();
1761- // Recursively check nested objects in authConfigurations and apply masking
1762- for (ConfigurationDto authConfiguration : authConfigurations ) {
1763- applyMaskToNestedFields (authConfiguration .getValues (), additionalProperties );
1763+ if (authConfigurations != null && !authConfigurations .isEmpty ()) {
1764+ // Recursively check nested objects in authConfigurations and apply masking
1765+ for (ConfigurationDto authConfiguration : authConfigurations ) {
1766+ applyMaskToNestedFields (authConfiguration .getValues (), additionalProperties );
1767+ }
17641768 }
17651769 }
17661770 }
0 commit comments