-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
Address comments for PR 6440 #6481
Merged
Merged
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
ab81ee9
Changed var to val
grzesiek2010 a1b0cb8
Revert "Keep ChangeLock inteface and its only implementation in one f…
grzesiek2010 94ed012
Revert "Removed redundant BooleanChangeLock"
grzesiek2010 f7b5c3e
Removed redundant casts
grzesiek2010 00108f9
Add #lock method for easier testing
grzesiek2010 86620b9
Improved ThreadSafeBooleanChangeLockTest
grzesiek2010 d7300a3
Test both implementations of ChangeLock
grzesiek2010 6856223
Use synchronized in #lock
grzesiek2010 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
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
40 changes: 40 additions & 0 deletions
40
shared/src/main/java/org/odk/collect/shared/locks/BooleanChangeLock.kt
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| package org.odk.collect.shared.locks | ||
|
|
||
| import java.util.function.Function | ||
|
|
||
| class BooleanChangeLock : ChangeLock { | ||
| private var locked = false | ||
|
|
||
| override fun <T> withLock(function: Function<Boolean, T>): T { | ||
| val acquired = tryLock() | ||
|
|
||
| return try { | ||
| function.apply(acquired) | ||
| } finally { | ||
| if (acquired) { | ||
| unlock() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| override fun tryLock(): Boolean { | ||
| if (locked) { | ||
| return false | ||
| } else { | ||
| locked = true | ||
| return true | ||
| } | ||
| } | ||
|
|
||
| override fun lock() { | ||
| if (locked) { | ||
| throw IllegalStateException() | ||
| } else { | ||
| locked = true | ||
| } | ||
| } | ||
|
|
||
| override fun unlock() { | ||
| locked = false | ||
| } | ||
| } |
This file contains 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
44 changes: 44 additions & 0 deletions
44
shared/src/main/java/org/odk/collect/shared/locks/ThreadSafeBooleanChangeLock.kt
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| package org.odk.collect.shared.locks | ||
|
|
||
| import java.util.function.Function | ||
|
|
||
| class ThreadSafeBooleanChangeLock : ChangeLock { | ||
| private var locked = false | ||
|
|
||
| override fun <T> withLock(function: Function<Boolean, T>): T { | ||
| val acquired = tryLock() | ||
|
|
||
| return try { | ||
| function.apply(acquired) | ||
| } finally { | ||
| if (acquired) { | ||
| unlock() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| override fun tryLock(): Boolean { | ||
| return synchronized(this) { | ||
| if (locked) { | ||
| false | ||
| } else { | ||
| locked = true | ||
| true | ||
| } | ||
| } | ||
| } | ||
|
|
||
| override fun lock() { | ||
| if (locked) { | ||
| throw IllegalStateException() | ||
| } else { | ||
| locked = true | ||
| } | ||
| } | ||
|
|
||
| override fun unlock() { | ||
| synchronized(this) { | ||
| locked = false | ||
| } | ||
| } | ||
| } | ||
7 changes: 7 additions & 0 deletions
7
shared/src/test/java/org/odk/collect/shared/locks/BooleanChangeLockTest.kt
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package org.odk.collect.shared.locks | ||
|
|
||
| class BooleanChangeLockTest : ChangeLockTest() { | ||
| override fun buildSubject(): ChangeLock { | ||
| return BooleanChangeLock() | ||
| } | ||
| } |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be wrapped in a
synchronizedto make sure that the lock can't be acquired between theifcheck and the assignment.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.