Property support: Use static unmodifiable Maps for common defaults - #2041
Draft
matthiaso wants to merge 1 commit into
Draft
Conversation
matthiaso
force-pushed
the
features/matthiaso/26.2/449281_improveProperySupportWithDefaultValues
branch
7 times, most recently
from
February 24, 2026 12:01
0828d57 to
4d8d0f1
Compare
Goal: Decrease memory usage when lots of property supports are in use. 449281
paolobazzi
force-pushed
the
features/matthiaso/26.2/449281_improveProperySupportWithDefaultValues
branch
from
June 25, 2026 14:42
4d8d0f1 to
7a101bf
Compare
paolobazzi
reviewed
Jun 25, 2026
paolobazzi
left a comment
paolobazzi
left a comment
Member
There was a problem hiding this comment.
See inputs for minor improvements
| public class DefaultValueMapTest { | ||
|
|
||
| @Test | ||
| public void testIsEmptyAndSize() { |
Member
There was a problem hiding this comment.
Add test methods for non-covered parts:
- Constructor using startEmpty=true
- containsKey
- containsValue
- size
- isEmpty
Member
Author
There was a problem hiding this comment.
size/isEmpty is tested by testIsEmptyAndSize - additional tests necessary?
Some other tests have been added, see https://github.com/eclipse-scout/scout.rt/compare/0d91af9a3b0a0f3a3c9a0b783d3882ca68295a28..3f51b964e32eeb523113d121e626d9125254ea83
| boolean additionalValuesContainsKey = m_additionalValues.containsKey(key); | ||
| if (m_defaultValues.containsKey(key)) { | ||
| if (isDefaultValue(key, value)) { // must be same, equals would not be sufficient | ||
| return additionalValuesContainsKey |
Member
There was a problem hiding this comment.
code is hard to read -> split into several methods or use if then else on separate lines and prepending a javadoc indicating which case is handled
e.g.:
@Override
public Object put(String key, Object value) {
boolean additionalValuesContainsKey = m_additionalValues.containsKey(key);
if (m_defaultValues.containsKey(key)) {
if (isDefaultValue(key, value)) { // must be same, equals would not be sufficient
if (additionalValuesContainsKey) {
Object removedValue = m_additionalValues.remove(key);
return removedValue != REMOVED_MARKER ? removedValue : null;
} else {
return m_defaultValues.get(key);
}
}
else if (!additionalValuesContainsKey) {
m_additionalValues.put(key, value);
return m_defaultValues.get(key); // load previous value from default values (if any)
}
}
//....
Member
Author
There was a problem hiding this comment.
Simplified a bit (and added more tests because of simplification): https://github.com/eclipse-scout/scout.rt/compare/cb6eef71e529068cee3809ea3d1d7f0c2066bd51..df77bd946c25172c1065f279cfeda8023496bbfb
|
|
||
| import org.junit.Test; | ||
|
|
||
| public class DefaultValueMapTest { |
Member
There was a problem hiding this comment.
check for missing coverage in DefaultValueMap:
- Iterator/EntrySet.next()
- Iterator/EntrySet.remove()
- Iterator/EntrySet.size
- Iterator/EntrySet.isEmpty
Member
Author
There was a problem hiding this comment.
matthiaso
marked this pull request as draft
August 31, 2026 04:02
Member
Author
|
Added cherry-pick for 27/1, see #2322
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Goal: Decrease memory usage when lots of property supports are in use.
449281