Skip to content

KNIME-1938: Improving node settings management #155

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Nov 4, 2024
Merged

KNIME-1938: Improving node settings management #155

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions org.rdkit.knime.nodes/src/org/rdkit/knime/nodes/AbstractRDKitGenericNodeModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1449,7 +1449,7 @@ protected void loadValidatedSettingsFrom(final NodeSettingsRO settings)
if (iErrorCounter == arrDeprecatedKeys.length - 1) {
LOGGER.debug("Deprecated keys did not work either. - Giving up.");

if (bIgnoreNonExistingSetting) {
if (bIgnoreNonExistingSetting && isNonExistingSettingException(excOrig)) {
LOGGER.warn("The new setting '" + newKey + "' was not known when the node" +
(nodeName == null ? "" : " '" + nodeName + "'") + " was saved. " +
"Please save the workflow again to include it for the future.");
Expand All @@ -1465,7 +1465,7 @@ protected void loadValidatedSettingsFrom(final NodeSettingsRO settings)
setting.loadSettingsFrom(settings);
}
catch (final InvalidSettingsException excOrig) {
if (bIgnoreNonExistingSetting) {
if (bIgnoreNonExistingSetting && isNonExistingSettingException(excOrig)) {
LOGGER.debug("A new setting was not known when the node" +
(nodeName == null ? "" : " '" + nodeName + "'") + " was saved.");
}
Expand Down Expand Up @@ -1547,7 +1547,7 @@ protected void validateSettings(final NodeSettingsRO settings)
if (iErrorCounter == arrDeprecatedKeys.length - 1) {
LOGGER.debug("Deprecated keys did not work either. - Giving up.");

if (!bIgnoreNonExistingSetting) {
if (!bIgnoreNonExistingSetting || !isNonExistingSettingException(excOrig)) {
throw excOrig;
}
}
Expand All @@ -1558,7 +1558,7 @@ protected void validateSettings(final NodeSettingsRO settings)
setting.validateSettings(settings);
}
catch (final InvalidSettingsException excOrig) {
if (!bIgnoreNonExistingSetting) {
if (!bIgnoreNonExistingSetting || !isNonExistingSettingException(excOrig)) {
throw excOrig;
}
}
Expand Down Expand Up @@ -2907,5 +2907,22 @@ protected static PortObject[] tablesToObjects(BufferedDataTable[] inTables) {
.toArray(PortObject[]::new);
}

//
// Private static methods
//

/**
* Checks and returns True if the supplied {@code InvalidSettingsException} instance
* is about a non-existing settings entry, otherwise False.
*
* @param e The {@code InvalidSettingsException} instance to check.
* Can be null.
* @return True if the supplied {@code InvalidSettingsException} instance is about a non-existing settings entry, otherwise False.
*/
private static boolean isNonExistingSettingException(InvalidSettingsException e) {
return e != null && e.getMessage() != null
&& e.getMessage().matches(".*? for key \".*?\" not found.");
}

}