Skip to content

If invalid value is set for a property in settings.properties, defaul… #1464

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
Vassiliy-Kudryashov merged 4 commits into from
Dec 6, 2022
Merged

If invalid value is set for a property in settings.properties, defaul… #1464

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a47bc27
If invalid value is set for a property in settings.properties, defaul…
Vassiliy-Kudryashov Dec 6, 2022
509ae72
If invalid value is set for a property in settings.properties, defaul…
Vassiliy-Kudryashov Dec 6, 2022
92562c5
Merge branch 'main' into Vassiliy-Kudryashov/1437-if-invalid-value-is…
Vassiliy-Kudryashov Dec 6, 2022
b5ec6b3
Merge branch 'main' into Vassiliy-Kudryashov/1437-if-invalid-value-is…
Vassiliy-Kudryashov Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
If invalid value is set for a property in settings.properties, defaul… 
…t value should be applied #1437
  • Loading branch information
@Vassiliy-Kudryashov
Vassiliy-Kudryashov committed Dec 6, 2022
commit a47bc27d10d6d1b52cb3d1fef3db12836df0a39b
7 changes: 6 additions & 1 deletion utbot-core/src/main/kotlin/org/utbot/common/AbstractSettings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,12 @@ abstract class AbstractSettings(
return container.settingFor(defaultValue, null, converter)
}

protected fun getBooleanProperty(defaultValue: Boolean) = getProperty(defaultValue, converter = String::toBoolean)
protected fun getBooleanProperty(defaultValue: Boolean) = getProperty(defaultValue, converter = {
//Invalid values shouldn't be parsed as "false"
if (it.equals("true", true)) true
else if (it.equals("false", true)) false
else defaultValue
})
protected fun getIntProperty(defaultValue: Int) = getProperty(defaultValue, converter = String::toInt)
protected fun getIntProperty(defaultValue: Int, minValue: Int, maxValue: Int) = getProperty(defaultValue, Triple(minValue, maxValue, Comparator(Integer::compare)), String::toInt)
protected fun getLongProperty(defaultValue: Long) = getProperty(defaultValue, converter = String::toLong)
Expand Down