-
-
Notifications
You must be signed in to change notification settings - Fork 8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[grid]: Integrate protocol conversion into the new grid
We expose more of the internals this way, but it'll be for the best in the end.
- Loading branch information
Showing
32 changed files
with
749 additions
and
530 deletions.
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
40 changes: 40 additions & 0 deletions
40
java/server/src/org/openqa/selenium/grid/node/ActiveSession.java
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 @@ | ||
| // Licensed to the Software Freedom Conservancy (SFC) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The SFC licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package org.openqa.selenium.grid.node; | ||
|
|
||
| import org.openqa.selenium.Capabilities; | ||
| import org.openqa.selenium.grid.web.CommandHandler; | ||
| import org.openqa.selenium.remote.Dialect; | ||
| import org.openqa.selenium.remote.SessionId; | ||
|
|
||
| import java.net.URI; | ||
|
|
||
| public interface ActiveSession extends CommandHandler { | ||
|
|
||
| SessionId getId(); | ||
|
|
||
| Capabilities getCapabilities(); | ||
|
|
||
| URI getUri(); | ||
|
|
||
| Dialect getUpstreamDialect(); | ||
|
|
||
| Dialect getDownstreamDialect(); | ||
|
|
||
| void stop(); | ||
| } |
88 changes: 88 additions & 0 deletions
88
java/server/src/org/openqa/selenium/grid/node/BaseActiveSession.java
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,88 @@ | ||
| // Licensed to the Software Freedom Conservancy (SFC) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The SFC licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package org.openqa.selenium.grid.node; | ||
|
|
||
| import org.openqa.selenium.Capabilities; | ||
| import org.openqa.selenium.ImmutableCapabilities; | ||
| import org.openqa.selenium.grid.data.Session; | ||
| import org.openqa.selenium.remote.Dialect; | ||
| import org.openqa.selenium.remote.SessionId; | ||
| import org.openqa.selenium.remote.http.HttpClient; | ||
|
|
||
| import java.net.URI; | ||
| import java.net.URISyntaxException; | ||
| import java.net.URL; | ||
| import java.util.Objects; | ||
|
|
||
| public abstract class BaseActiveSession implements ActiveSession { | ||
|
|
||
| private final Session session; | ||
| private final Dialect downstream; | ||
| private final Dialect upstream; | ||
|
|
||
| protected BaseActiveSession( | ||
| SessionId id, | ||
| URL url, | ||
| Dialect downstream, | ||
| Dialect upstream, | ||
| Capabilities capabilities) { | ||
| URI uri = null; | ||
| try { | ||
| uri = Objects.requireNonNull(url).toURI(); | ||
| } catch (URISyntaxException e) { | ||
| throw new IllegalArgumentException(e); | ||
| } | ||
|
|
||
| this.session = new Session( | ||
| Objects.requireNonNull(id), | ||
| uri, | ||
| ImmutableCapabilities.copyOf(Objects.requireNonNull(capabilities))); | ||
|
|
||
| this.downstream = Objects.requireNonNull(downstream); | ||
| this.upstream = Objects.requireNonNull(upstream); | ||
| } | ||
|
|
||
| @Override | ||
| public SessionId getId() { | ||
| return session.getId(); | ||
| } | ||
|
|
||
| @Override | ||
| public Capabilities getCapabilities() { | ||
| return session.getCapabilities(); | ||
| } | ||
|
|
||
| @Override | ||
| public URI getUri() { | ||
| return session.getUri(); | ||
| } | ||
|
|
||
| @Override | ||
| public Dialect getUpstreamDialect() { | ||
| return upstream; | ||
| } | ||
|
|
||
| @Override | ||
| public Dialect getDownstreamDialect() { | ||
| return downstream; | ||
| } | ||
|
|
||
| public Session asSession() { | ||
| return session; | ||
| } | ||
| } |
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
Oops, something went wrong.