Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for handling SML and directory related configuration keys #267

Merged
merged 3 commits into from
Jul 30, 2024

Conversation

anakinj
Copy link
Contributor

@anakinj anakinj commented Jan 4, 2024

While configuring a new instance of the latest (7.1.0) SQL version I noticed that some properties from the configuration files were not taken into account and always needed to be changed via the settings UI.

Looking closer into the issue I noticed a few problems:

  • When reading the SML/Directory related configuration values from the DB the fallback will be the hardcoded values, not the ones from the config file
  • The application.properties resource shipped within the app had the new keys define that prevented the old keys from being read

This PR fixes these by:

  • Fallback to set config values instead of constants when reading settings from DB
  • Use the new config keys when reading the SML/Directory related values
  • Disable the SML/Directory related values from the default application.properties

@@ -100,7 +105,7 @@ public SMPSettingsManagerMongoDB ()
}

@Nonnull
@ReturnsMutableObject
@aTargeturnsMutableObject
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo to fix

ret.setSMLRequired (StringParser.parseBool (aValues.get (SML_REQUIRED), SMPSettings.DEFAULT_SML_REQUIRED));
ret.isDirectoryIntegrationAutoUpdate ()));
String sDirectoryHostName = aValues.get (DIRECTORY_HOSTNAME);
if (sDirectoryHostName == null)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use hasNoText

aTarget.setSMLEnabled (aDoc.getBoolean (BSON_SML_ENABLED, SMPSettings.DEFAULT_SML_ENABLED));
aTarget.isDirectoryIntegrationAutoUpdate ()));
String sDirectoryHostName = aDoc.getString (BSON_DIRECTORY_HOSTNAME);
if (sDirectoryHostName == null)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use hasNoText

@phax phax merged commit c4c034b into phax:master Jul 30, 2024
phax added a commit that referenced this pull request Jul 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants