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.

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

Jump to bottom

fix: usage of Optional.orElseThrow after Map.put #2145

Merged
merged 6 commits into from
Mar 28, 2024
Merged

fix: usage of Optional.orElseThrow after Map.put #2145

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7806c7d
Fix KeyEvent
artlomako Mar 28, 2024
dfdd24f
Fix optional usage in AndroidGeoLocation builder
artlomako Mar 28, 2024
31a9279
Remove redundant import
artlomako Mar 28, 2024
5ecd06a
Merge branch 'master' into fix-key-event
valfirst Mar 28, 2024
9a19742
Revert noisy change
valfirst Mar 28, 2024
c55d0a8
Fix checkstyle vioation and unify approach
valfirst Mar 28, 2024
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
5 changes: 3 additions & 2 deletions src/main/java/io/appium/java_client/android/nativekey/KeyEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
Copy link
Contributor

Choose a reason for hiding this comment

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

there is no need for this import

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed


import static java.util.Optional.ofNullable;

Expand Down Expand Up @@ -83,8 +84,8 @@ public KeyEvent withFlag(KeyEventFlag keyEventFlag) {
*/
public Map<String, Object> build() {
var map = new HashMap<String, Object>();
ofNullable(this.keyCode).map(x -> map.put("keycode", x)).orElseThrow(() -> new IllegalStateException(
Copy link
Contributor

Choose a reason for hiding this comment

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

@valfirst Could there be other places in the source like this one? I assume the issue may have been added during the recent refactoring

Copy link
Collaborator

Choose a reason for hiding this comment

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

yes, this is a regression issue, I've found 2 more similar occurrences, I'll open PR soon

Copy link
Contributor

Choose a reason for hiding this comment

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

thanks. Lets address them all and publish a patch asap

Copy link
Contributor Author

@artlomako artlomako Mar 28, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

@mykola-mokhnach I believe I fixed them in my last commit

Copy link
Collaborator

Choose a reason for hiding this comment

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

I've already addressed AndroidGeoLocation issues here: #2146

"The key code must be set"));
Integer keyCode = ofNullable(this.keyCode).orElseThrow(() -> new IllegalStateException("The key code must be set"));
map.put("keycode", keyCode);
ofNullable(this.metaState).ifPresent(x -> map.put("metastate", x));
ofNullable(this.flags).ifPresent(x -> map.put("flags", x));
return Collections.unmodifiableMap(map);
Expand Down
Loading