-
-
Notifications
You must be signed in to change notification settings - Fork 8.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Provide actual working information for the Java Module System
Because we need to make this stuff work with the Java Platform Module System, and currently, we don't. The changes here break into a few types: * We weren't declaring that we were building multi-release jars properly in our manifests. This is now fixed. * Automated tools for figuring out packages were screwing up with our shaded Jetty, so we built a custom module-info just for that. * Our server classes didn't really have module definitions, and we'd set things up so that the same class could appear in two different JARs. This was suboptimal as it cause a split package, which causes modularised java to barf. * Some of our internal classes were being used in modules other than the one that they were declared in. This is a big no-no, and is also considered suboptimal. I'm pretty sure this isn't the end of the matter, but I think that this will get us a lot further. The ideal goal will be to use jlink to build Grid TNG and have that work from an image. We'll see if we can get there. Wish us luck.
- Loading branch information
Showing
32 changed files
with
316 additions
and
131 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
96 changes: 96 additions & 0 deletions
96
java/client/src/org/openqa/selenium/remote/JsonToWebElementConverter.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,96 @@ | ||
| // 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.remote; | ||
|
|
||
| import com.google.common.base.Function; | ||
| import com.google.common.collect.Iterables; | ||
| import com.google.common.collect.Lists; | ||
| import com.google.common.collect.Maps; | ||
|
|
||
| import org.openqa.selenium.WebElement; | ||
|
|
||
| import java.util.Collection; | ||
| import java.util.Map; | ||
| import java.util.Objects; | ||
|
|
||
| /** | ||
| * Reconstitutes {@link WebElement}s from their JSON representation. Will recursively convert Lists | ||
| * and Maps to catch nested references. All other values pass through the converter unchanged. | ||
| */ | ||
| public class JsonToWebElementConverter implements Function<Object, Object> { | ||
|
|
||
| private final RemoteWebDriver driver; | ||
|
|
||
| public JsonToWebElementConverter(RemoteWebDriver driver) { | ||
| this.driver = driver; | ||
| } | ||
|
|
||
| @Override | ||
| public Object apply(Object result) { | ||
| if (result instanceof Collection<?>) { | ||
| Collection<?> results = (Collection<?>) result; | ||
| return Lists.newArrayList(Iterables.transform(results, this)); | ||
| } | ||
|
|
||
| if (result instanceof Map<?, ?>) { | ||
| Map<?, ?> resultAsMap = (Map<?, ?>) result; | ||
| String elementKey = getElementKey(resultAsMap); | ||
| if (null != elementKey) { | ||
| RemoteWebElement element = newRemoteWebElement(); | ||
| element.setId(String.valueOf(resultAsMap.get(elementKey))); | ||
| return element; | ||
| } else { | ||
| return Maps.transformValues(resultAsMap, this); | ||
| } | ||
| } | ||
|
|
||
| if (result instanceof RemoteWebElement) { | ||
| return setOwner((RemoteWebElement) result); | ||
| } | ||
|
|
||
| if (result instanceof Number) { | ||
| if (result instanceof Float || result instanceof Double) { | ||
| return ((Number) result).doubleValue(); | ||
| } | ||
| return ((Number) result).longValue(); | ||
| } | ||
|
|
||
| return result; | ||
| } | ||
|
|
||
| protected RemoteWebElement newRemoteWebElement() { | ||
| return setOwner(new RemoteWebElement()); | ||
| } | ||
|
|
||
| private RemoteWebElement setOwner(RemoteWebElement element) { | ||
| if (driver != null) { | ||
| element.setParent(driver); | ||
| element.setFileDetector(driver.getFileDetector()); | ||
| } | ||
| return element; | ||
| } | ||
| private String getElementKey(Map<?, ?> resultAsMap) { | ||
| for (Dialect d : Dialect.values()) { | ||
| String elementKeyForDialect = d.getEncodedElementKey(); | ||
| if (resultAsMap.containsKey(elementKeyForDialect)) { | ||
| return elementKeyForDialect; | ||
| } | ||
| } | ||
| return null; | ||
| } | ||
| } |
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
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
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.