Skip to content

feat: Add idempotency key to session creation requests #1327

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 2 commits into from
Apr 1, 2020
Merged

feat: Add idempotency key to session creation requests #1327

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7e1843
feat: Add idempotency key to session creation requests
mykola-mokhnach Mar 31, 2020
e3ca704
Try with patched beta
mykola-mokhnach Apr 1, 2020
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
20 changes: 14 additions & 6 deletions src/main/java/io/appium/java_client/remote/AppiumCommandExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,11 @@
import java.net.URL;
import java.util.Map;
import java.util.Optional;
import java.util.UUID;

public class AppiumCommandExecutor extends HttpCommandExecutor {
// https://github.com/appium/appium-base-driver/pull/400
private static final String IDEMPOTENCY_KEY_HEADER = "X-Idempotency-Key";

private final Optional<DriverService> serviceOptional;

Expand Down Expand Up @@ -150,18 +153,23 @@ protected void setResponseCodec(ResponseCodec<HttpResponse> codec) {
}

protected HttpClient getClient() {
//noinspection unchecked
return getPrivateFieldValue("client", HttpClient.class);
}

protected HttpClient withRequestsPatchedByIdempotencyKey(HttpClient httpClient) {
return (request) -> {
request.setHeader(IDEMPOTENCY_KEY_HEADER, UUID.randomUUID().toString().toLowerCase());
return httpClient.execute(request);
};
}

private Response createSession(Command command) throws IOException {
if (getCommandCodec() != null) {
throw new SessionNotCreatedException("Session already exists");
}
ProtocolHandshake handshake = new ProtocolHandshake() {
@SuppressWarnings("unchecked")
public Result createSession(HttpClient client, Command command)
throws IOException {
@SuppressWarnings({"unchecked", "UnstableApiUsage"})
public Result createSession(HttpClient client, Command command) throws IOException {
Capabilities desiredCapabilities = (Capabilities) command.getParameters().get("desiredCapabilities");
Capabilities desired = desiredCapabilities == null ? new ImmutableCapabilities() : desiredCapabilities;

Expand All @@ -182,8 +190,8 @@ public Result createSession(HttpClient client, Command command)
.getDeclaredMethod("createSession", HttpClient.class, InputStream.class, long.class);
createSessionMethod.setAccessible(true);

Optional<Result> result = (Optional<Result>) createSessionMethod
.invoke(this, client, contentStream, counter.getCount());
Optional<Result> result = (Optional<Result>) createSessionMethod.invoke(this,
withRequestsPatchedByIdempotencyKey(client), contentStream, counter.getCount());

return result.map(result1 -> {
Result toReturn = result.get();
Expand Down