Skip to content

refactor: Switch the time getter to use mobile extensions #1884

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
Apr 14, 2023
Merged

refactor: Switch the time getter to use mobile extensions #1884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions src/main/java/io/appium/java_client/CommandExecutionHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,8 @@ public static <T> T execute(ExecutesMethod executesMethod, String command) {
}

private static <T> T handleResponse(Response response) {
if (response != null) {
return (T) response.getValue();
}
return null;
//noinspection unchecked
return response == null ? null : (T) response.getValue();
}

public static <T> T executeScript(ExecutesMethod executesMethod, String scriptName) {
Expand Down
17 changes: 3 additions & 14 deletions src/main/java/io/appium/java_client/HasDeviceTime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,7 @@

package io.appium.java_client;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import org.openqa.selenium.remote.DriverCommand;
import org.openqa.selenium.remote.Response;

import java.util.Map;

import static io.appium.java_client.MobileCommand.GET_DEVICE_TIME;

public interface HasDeviceTime extends ExecutesMethod {

Expand All @@ -38,12 +31,9 @@ public interface HasDeviceTime extends ExecutesMethod {
* @return Device time string
*/
default String getDeviceTime(String format) {
Map<String, ?> params = ImmutableMap.of(
"script", "mobile: getDeviceTime",
"args", ImmutableList.of(ImmutableMap.of("format", format))
return CommandExecutionHelper.executeScript(
this, "mobile: getDeviceTime", ImmutableMap.of("format", format)
);
Response response = execute(DriverCommand.EXECUTE_SCRIPT, params);
return response.getValue().toString();
}

/**
Expand All @@ -53,7 +43,6 @@ default String getDeviceTime(String format) {
* @return Device time string
*/
default String getDeviceTime() {
Response response = execute(GET_DEVICE_TIME);
return response.getValue().toString();
return CommandExecutionHelper.executeScript(this, "mobile: getDeviceTime");
}
}