Skip to content

Commit 842b9f6

Browse files
pujaganipujagani
authored
Merge 0e38d2f into 7384157 
2 parents 7384157 + 0e38d2f commit 842b9f6

16 files changed

Lines changed: 1043 additions & 4 deletions

‎java/src/org/openqa/selenium/bidi/BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ java_library(
2828
"browsingcontext/*.java",
2929
"network/*.java",
3030
"script/*.java",
31+
"storage/*.java",
3132
],
3233
exclude = AUGMENTER_SRCS,
3334
),

‎java/src/org/openqa/selenium/bidi/Storage.java‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
// Licensed to the Software Freedom Conservancy (SFC) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The SFC licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
18+
package org.openqa.selenium.bidi;
19+
20+
import java.io.StringReader;
21+
import java.util.Map;
22+
import java.util.function.Function;
23+
import org.openqa.selenium.WebDriver;
24+
import org.openqa.selenium.bidi.storage.DeleteCookiesParameters;
25+
import org.openqa.selenium.bidi.storage.GetCookiesParameters;
26+
import org.openqa.selenium.bidi.storage.GetCookiesResult;
27+
import org.openqa.selenium.bidi.storage.PartitionKey;
28+
import org.openqa.selenium.bidi.storage.SetCookieParameters;
29+
import org.openqa.selenium.internal.Require;
30+
import org.openqa.selenium.json.Json;
31+
import org.openqa.selenium.json.JsonInput;
32+
33+
public class Storage {
34+
private static final Json JSON = new Json();
35+
36+
private final BiDi bidi;
37+
38+
private final Function<JsonInput, GetCookiesResult> getCookiesResultMapper =
39+
jsonInput -> jsonInput.read(GetCookiesResult.class);
40+
41+
private final Function<JsonInput, PartitionKey> partitionKeyResultMapper =
42+
jsonInput -> {
43+
Map<String, Object> response = jsonInput.read(Map.class);
44+
try (StringReader reader = new StringReader(JSON.toJson(response.get("partitionKey")));
45+
JsonInput input = JSON.newInput(reader)) {
46+
return input.read(PartitionKey.class);
47+
}
48+
};
49+
50+
public Storage(WebDriver driver) {
51+
Require.nonNull("WebDriver", driver);
52+
53+
if (!(driver instanceof HasBiDi)) {
54+
throw new IllegalArgumentException("WebDriver instance must support BiDi protocol");
55+
}
56+
57+
this.bidi = ((HasBiDi) driver).getBiDi();
58+
}
59+
60+
public GetCookiesResult getCookies(GetCookiesParameters params) {
61+
return this.bidi.send(
62+
new Command<>("storage.getCookies", params.toMap(), getCookiesResultMapper));
63+
}
64+
65+
public PartitionKey setCookie(SetCookieParameters params) {
66+
return this.bidi.send(
67+
new Command<>("storage.setCookie", params.toMap(), partitionKeyResultMapper));
68+
}
69+
70+
public PartitionKey deleteCookies(DeleteCookiesParameters params) {
71+
return this.bidi.send(
72+
new Command<>("storage.deleteCookies", params.toMap(), partitionKeyResultMapper));
73+
}
74+
}

‎java/src/org/openqa/selenium/bidi/network/BytesValue.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
public class BytesValue {
2323

24-
enum Type {
24+
public enum Type {
2525
STRING("string"),
2626
BASE64("base64");
2727

@@ -41,7 +41,7 @@ public String toString() {
4141

4242
private final String value;
4343

44-
private BytesValue(Type type, String value) {
44+
public BytesValue(Type type, String value) {
4545
this.type = type;
4646
this.value = value;
4747
}

‎java/src/org/openqa/selenium/bidi/network/Cookie.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,15 @@ public static Cookie fromJson(JsonInput input) {
111111
case "secure":
112112
isSecure = input.read(Boolean.class);
113113
break;
114-
case "isHttpOnly":
114+
case "httpOnly":
115115
isHttpOnly = input.read(Boolean.class);
116116
break;
117117
case "sameSite":
118118
String sameSiteValue = input.read(String.class);
119119
sameSite = SameSite.findByName(sameSiteValue);
120120
break;
121121
case "expiry":
122-
expiry = input.read(Long.class);
122+
expiry = Optional.of(input.read(Long.class));
123123
break;
124124
default:
125125
input.skipValue();

‎java/src/org/openqa/selenium/bidi/storage/BrowsingContextPartitionDescriptor.java‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
// Licensed to the Software Freedom Conservancy (SFC) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The SFC licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
18+
package org.openqa.selenium.bidi.storage;
19+
20+
import java.util.HashMap;
21+
import java.util.Map;
22+
23+
public class BrowsingContextPartitionDescriptor extends PartitionDescriptor {
24+
private final String context;
25+
26+
public BrowsingContextPartitionDescriptor(String context) {
27+
super(Type.CONTEXT);
28+
this.context = context;
29+
}
30+
31+
public Map<String, Object> toMap() {
32+
Map<String, Object> map = new HashMap<>();
33+
map.put("type", super.type.toString());
34+
map.put("context", this.context);
35+
36+
return map;
37+
}
38+
}

‎java/src/org/openqa/selenium/bidi/storage/CookieFilter.java‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
// Licensed to the Software Freedom Conservancy (SFC) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The SFC licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
18+
package org.openqa.selenium.bidi.storage;
19+
20+
import java.util.HashMap;
21+
import java.util.Map;
22+
import org.openqa.selenium.bidi.network.BytesValue;
23+
import org.openqa.selenium.bidi.network.Cookie;
24+
25+
public class CookieFilter {
26+
private final Map<String, Object> map = new HashMap<>();
27+
28+
public CookieFilter name(String name) {
29+
map.put("name", name);
30+
return this;
31+
}
32+
33+
public CookieFilter value(BytesValue value) {
34+
map.put("value", value);
35+
return this;
36+
}
37+
38+
public CookieFilter domain(String domain) {
39+
map.put("domain", domain);
40+
return this;
41+
}
42+
43+
public CookieFilter path(String path) {
44+
map.put("path", path);
45+
return this;
46+
}
47+
48+
public CookieFilter size(long size) {
49+
map.put("size", size);
50+
return this;
51+
}
52+
53+
public CookieFilter httpOnly(boolean httpOnly) {
54+
map.put("httpOnly", httpOnly);
55+
return this;
56+
}
57+
58+
public CookieFilter secure(boolean secure) {
59+
map.put("secure", secure);
60+
return this;
61+
}
62+
63+
public CookieFilter sameSite(Cookie.SameSite sameSite) {
64+
map.put("sameSite", sameSite.toString());
65+
return this;
66+
}
67+
68+
public CookieFilter expiry(long expiry) {
69+
map.put("expiry", expiry);
70+
return this;
71+
}
72+
73+
public Map<String, Object> toMap() {
74+
return map;
75+
}
76+
}

‎java/src/org/openqa/selenium/bidi/storage/DeleteCookiesParameters.java‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
// Licensed to the Software Freedom Conservancy (SFC) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The SFC licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
package org.openqa.selenium.bidi.storage;
18+
19+
import java.util.HashMap;
20+
import java.util.Map;
21+
import java.util.Optional;
22+
23+
public class DeleteCookiesParameters {
24+
private Optional<CookieFilter> cookieFilter = Optional.empty();
25+
private Optional<PartitionDescriptor> partitionDescriptor = Optional.empty();
26+
27+
public DeleteCookiesParameters(
28+
CookieFilter cookieFilter, PartitionDescriptor partitionDescriptor) {
29+
this.cookieFilter = Optional.of(cookieFilter);
30+
this.partitionDescriptor = Optional.of(partitionDescriptor);
31+
}
32+
33+
public DeleteCookiesParameters(CookieFilter cookieFilter) {
34+
this.cookieFilter = Optional.of(cookieFilter);
35+
}
36+
37+
public DeleteCookiesParameters(PartitionDescriptor partitionDescriptor) {
38+
this.partitionDescriptor = Optional.of(partitionDescriptor);
39+
}
40+
41+
public Map<String, Object> toMap() {
42+
Map<String, Object> map = new HashMap<>();
43+
cookieFilter.ifPresent(filter -> map.put("filter", cookieFilter));
44+
partitionDescriptor.ifPresent(descriptor -> map.put("partition", partitionDescriptor));
45+
46+
return map;
47+
}
48+
}

‎java/src/org/openqa/selenium/bidi/storage/GetCookiesParameters.java‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
// Licensed to the Software Freedom Conservancy (SFC) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The SFC licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
package org.openqa.selenium.bidi.storage;
18+
19+
import java.util.HashMap;
20+
import java.util.Map;
21+
import java.util.Optional;
22+
23+
public class GetCookiesParameters {
24+
private Optional<CookieFilter> cookieFilter = Optional.empty();
25+
private Optional<PartitionDescriptor> partitionDescriptor = Optional.empty();
26+
27+
public GetCookiesParameters(CookieFilter cookieFilter, PartitionDescriptor partitionDescriptor) {
28+
this.cookieFilter = Optional.of(cookieFilter);
29+
this.partitionDescriptor = Optional.of(partitionDescriptor);
30+
}
31+
32+
public GetCookiesParameters(CookieFilter cookieFilter) {
33+
this.cookieFilter = Optional.of(cookieFilter);
34+
}
35+
36+
public GetCookiesParameters(PartitionDescriptor partitionDescriptor) {
37+
this.partitionDescriptor = Optional.of(partitionDescriptor);
38+
}
39+
40+
public Map<String, Object> toMap() {
41+
Map<String, Object> map = new HashMap<>();
42+
cookieFilter.ifPresent(filter -> map.put("filter", filter));
43+
partitionDescriptor.ifPresent(descriptor -> map.put("partition", descriptor));
44+
45+
return map;
46+
}
47+
}

0 commit comments

Comments
 (0)