servlets = getHubServlets();
// merge with hub template servlets
@@ -249,13 +247,18 @@ public Path createHubConfig() throws IOException {
// strip extension to get template base path
String configPathBase = hubConfigPath.substring(0, hubConfigPath.length() - 5);
- // get hash code of servlets as 8-digit hexadecimal string
- String hashCode = String.format("%08X", servlets.hashCode());
+ // get hash code of slot matcher and servlets as 8-digit hexadecimal string
+ String hashCode = String.format("%08X", Objects.hash(slotMatcher, servlets));
// assemble hub configuration file path with servlets hash code
Path filePath = Paths.get(configPathBase + "-" + hashCode + ".json");
// if assembled path does not exist
if (filePath.toFile().createNewFile()) {
+ try {
+ hubConfig.capabilityMatcher = (CapabilityMatcher) Class.forName(slotMatcher).newInstance();
+ } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
+ throw new ConfigException("Failed instantiating capability matcher: " + slotMatcher, e);
+ }
hubConfig.servlets = Arrays.asList(servlets.toArray(new String[0]));
try(OutputStream fos = new FileOutputStream(filePath.toFile());
OutputStream out = new BufferedOutputStream(fos)) {
diff --git a/src/selenium3/java/com/nordstrom/automation/selenium/core/FoundationSlotMatcher.java b/src/selenium3/java/com/nordstrom/automation/selenium/core/FoundationSlotMatcher.java
new file mode 100644
index 00000000..4744c737
--- /dev/null
+++ b/src/selenium3/java/com/nordstrom/automation/selenium/core/FoundationSlotMatcher.java
@@ -0,0 +1,198 @@
+// 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 com.nordstrom.automation.selenium.core;
+
+import static org.openqa.selenium.remote.BrowserType.SAFARI;
+import static org.openqa.selenium.remote.CapabilityType.BROWSER_NAME;
+
+import com.google.common.collect.ImmutableSet;
+
+import org.openqa.grid.internal.utils.CapabilityMatcher;
+import org.openqa.selenium.Platform;
+import org.openqa.selenium.WebDriverException;
+import org.openqa.selenium.remote.CapabilityType;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.BiFunction;
+import java.util.stream.Stream;
+
+/**
+ * Default (naive) implementation of the capability matcher.
+ *
+ * The default capability matcher will look at all the key from the request do not start with _ and
+ * will try to find a node that has at least those capabilities.
+ */
+public class FoundationSlotMatcher implements CapabilityMatcher {
+
+ private static final String GRID_TOKEN = "_";
+
+ interface Validator extends BiFunction, Map, Boolean> {
+ }
+
+ private boolean anything(Object requested) {
+ return requested == null || ImmutableSet.of("any", "", "*").contains(requested.toString().toLowerCase());
+ }
+
+ class PlatformValidator implements Validator {
+ @Override
+ @SuppressWarnings("deprecation")
+ public Boolean apply(Map providedCapabilities, Map requestedCapabilities) {
+ Object requested = Optional.ofNullable(requestedCapabilities.get(CapabilityType.PLATFORM))
+ .orElse(requestedCapabilities.get(CapabilityType.PLATFORM_NAME));
+ if (anything(requested)) {
+ return true;
+ }
+ Object provided = Optional.ofNullable(providedCapabilities.get(CapabilityType.PLATFORM))
+ .orElse(providedCapabilities.get(CapabilityType.PLATFORM_NAME));
+ Platform requestedPlatform = extractPlatform(requested);
+ if (requestedPlatform != null) {
+ Platform providedPlatform = extractPlatform(provided);
+ return providedPlatform != null && providedPlatform.is(requestedPlatform);
+ }
+
+ return provided != null && Objects.equals(requested.toString(), provided.toString());
+ }
+ }
+
+ class AliasedPropertyValidator implements Validator {
+ private String[] propertyAliases;
+
+ AliasedPropertyValidator(String... propertyAliases) {
+ this.propertyAliases = propertyAliases;
+ }
+
+ @Override
+ public Boolean apply(Map providedCapabilities, Map requestedCapabilities) {
+ Object requested = Stream.of(propertyAliases).map(requestedCapabilities::get).filter(Objects::nonNull)
+ .findFirst().orElse(null);
+
+ if (anything(requested)) {
+ return true;
+ }
+
+ Object provided = Stream.of(propertyAliases).map(providedCapabilities::get).filter(Objects::nonNull)
+ .findFirst().orElse(null);
+ return Objects.equals(requested, provided);
+ }
+ }
+
+ class SimplePropertyValidator implements Validator {
+ private List toConsider;
+
+ SimplePropertyValidator(String... toConsider) {
+ this.toConsider = Arrays.asList(toConsider);
+ }
+
+ @Override
+ public Boolean apply(Map providedCapabilities, Map requestedCapabilities) {
+ return requestedCapabilities.entrySet().stream().filter(entry -> !entry.getKey().startsWith(GRID_TOKEN))
+ .filter(entry -> toConsider.contains(entry.getKey())).filter(entry -> !anything(entry.getValue()))
+ .allMatch(entry -> entry.getValue().equals(providedCapabilities.get(entry.getKey())));
+ }
+ }
+
+ class FirefoxSpecificValidator implements Validator {
+ @Override
+ public Boolean apply(Map providedCapabilities, Map requestedCapabilities) {
+ if (!"firefox".equals(requestedCapabilities.get(BROWSER_NAME))) {
+ return true;
+ }
+
+ if (requestedCapabilities.get("marionette") != null
+ && !Boolean.valueOf(requestedCapabilities.get("marionette").toString())) {
+ return providedCapabilities.get("marionette") != null
+ && !Boolean.valueOf(providedCapabilities.get("marionette").toString());
+ } else {
+ return providedCapabilities.get("marionette") == null
+ || Boolean.valueOf(providedCapabilities.get("marionette").toString());
+ }
+ }
+ }
+
+ class SafariSpecificValidator implements Validator {
+ static final String SAFARI_TECH_PREVIEW = "Safari Technology Preview";
+ static final String AUTOMATIC_INSPECTION = "safari:automaticInspection";
+ static final String AUTOMATIC_PROFILING = "safari:automaticProfiling";
+ static final String TECHNOLOGY_PREVIEW = "technologyPreview";
+
+ @Override
+ public Boolean apply(Map providedCapabilities, Map requestedCapabilities) {
+ if (!SAFARI.equals(getBrowserName(requestedCapabilities))
+ && !SAFARI_TECH_PREVIEW.equals(getBrowserName(requestedCapabilities))) {
+ return true;
+ }
+
+ return getAutomaticInspection(requestedCapabilities) == getAutomaticInspection(providedCapabilities)
+ && getAutomaticProfiling(requestedCapabilities) == getAutomaticProfiling(providedCapabilities)
+ && getUseTechnologyPreview(requestedCapabilities) == getUseTechnologyPreview(providedCapabilities);
+ }
+
+ private String getBrowserName(Map capabilities) {
+ return (String) capabilities.get(BROWSER_NAME);
+ }
+
+ private boolean getAutomaticInspection(Map capabilities) {
+ return Boolean.TRUE.equals(capabilities.get(AUTOMATIC_INSPECTION));
+ }
+
+ private boolean getAutomaticProfiling(Map capabilities) {
+ return Boolean.TRUE.equals(capabilities.get(AUTOMATIC_PROFILING));
+ }
+
+ private boolean getUseTechnologyPreview(Map capabilities) {
+ return SAFARI_TECH_PREVIEW.equals(getBrowserName(capabilities))
+ || Boolean.TRUE.equals(capabilities.get(TECHNOLOGY_PREVIEW));
+ }
+ }
+
+ private final List validators = new ArrayList<>();
+ {
+ validators.addAll(Arrays.asList(new PlatformValidator(), new AliasedPropertyValidator(BROWSER_NAME, "browser"),
+ new AliasedPropertyValidator(CapabilityType.BROWSER_VERSION, CapabilityType.VERSION),
+ new SimplePropertyValidator(CapabilityType.APPLICATION_NAME), new FirefoxSpecificValidator(),
+ new SafariSpecificValidator()));
+ }
+
+ public void addToConsider(String capabilityName) {
+ validators.add(new SimplePropertyValidator(capabilityName));
+ }
+
+ public boolean matches(Map providedCapabilities, Map requestedCapabilities) {
+ return providedCapabilities != null && requestedCapabilities != null
+ && validators.stream().allMatch(v -> v.apply(providedCapabilities, requestedCapabilities));
+ }
+
+ private Platform extractPlatform(Object o) {
+ if (o == null) {
+ return null;
+ }
+ if (o instanceof Platform) {
+ return (Platform) o;
+ }
+ try {
+ return Platform.fromString(o.toString());
+ } catch (WebDriverException ex) {
+ return null;
+ }
+ }
+}
diff --git a/src/selenium3/java/com/nordstrom/automation/selenium/core/GridServer.java b/src/selenium3/java/com/nordstrom/automation/selenium/core/GridServer.java
index b61b62e9..2763504a 100644
--- a/src/selenium3/java/com/nordstrom/automation/selenium/core/GridServer.java
+++ b/src/selenium3/java/com/nordstrom/automation/selenium/core/GridServer.java
@@ -29,7 +29,7 @@ public class GridServer {
private boolean isHub;
private URL serverUrl;
protected String statusRequest;
- protected String shutdownRequest;
+ protected String[] shutdownRequest;
public static final String GRID_CONSOLE = "/grid/console";
public static final String HUB_BASE = "/wd/hub";
@@ -37,8 +37,8 @@ public class GridServer {
public static final String HUB_CONFIG = "/grid/api/hub/";
public static final String NODE_CONFIG = "/grid/api/proxy";
- private static final String HUB_SHUTDOWN = "/lifecycle-manager?action=shutdown";
- private static final String NODE_SHUTDOWN = "/extra/LifecycleServlet?action=shutdown";
+ private static final String[] HUB_SHUTDOWN = { "/lifecycle-manager", "action=shutdown" };
+ private static final String[] NODE_SHUTDOWN = { "/extra/LifecycleServlet", "action=shutdown" };
private static final long SHUTDOWN_DELAY = 15;
public GridServer(URL url, boolean isHub) {
@@ -180,7 +180,7 @@ public static List getNodeCapabilities(SeleniumConfig config, URL
private static String getStatusOfNode(SeleniumConfig config, URL hubUrl, URL nodeUrl) throws IOException {
String nodeEndpoint = nodeUrl.getProtocol() + "://" + nodeUrl.getAuthority();
String url = hubUrl.getProtocol() + "://" + hubUrl.getAuthority() + NODE_CONFIG + "?id=" + nodeEndpoint;
- try (InputStream is = new URL(url).openStream()) {
+ try (InputStream is = URI.create(url).toURL().openStream()) {
return GridUtility.readAvailable(is);
}
}
diff --git a/src/selenium3/java/com/nordstrom/automation/selenium/core/LocalSeleniumGrid.java b/src/selenium3/java/com/nordstrom/automation/selenium/core/LocalSeleniumGrid.java
index 3e9f9fd6..fb9a2417 100644
--- a/src/selenium3/java/com/nordstrom/automation/selenium/core/LocalSeleniumGrid.java
+++ b/src/selenium3/java/com/nordstrom/automation/selenium/core/LocalSeleniumGrid.java
@@ -25,6 +25,7 @@
import com.nordstrom.common.base.UncheckedThrow;
import com.nordstrom.common.file.PathUtils;
import com.nordstrom.common.jar.JarUtils;
+import com.nordstrom.common.uri.UriUtils;
/**
* This class launches Selenium Grid server instances, each in its own system process. Clients of this class specify
@@ -351,7 +352,7 @@ public boolean shutdown(final boolean localOnly) throws InterruptedException {
*/
public static URL getServerUrl(String host, Integer port) {
try {
- return new URL("http://" + host + ":" + port.toString() + GridServer.HUB_BASE);
+ return UriUtils.makeBasicURI("http", host, port, GridServer.HUB_BASE).toURL();
} catch (MalformedURLException e) {
throw UncheckedThrow.throwUnchecked(e);
}
diff --git a/src/selenium3/java/com/nordstrom/automation/selenium/utility/RevisedCapabilityMatcher.java b/src/selenium3/java/com/nordstrom/automation/selenium/utility/RevisedCapabilityMatcher.java
deleted file mode 100644
index 53bb2260..00000000
--- a/src/selenium3/java/com/nordstrom/automation/selenium/utility/RevisedCapabilityMatcher.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.nordstrom.automation.selenium.utility;
-
-import static net.bytebuddy.matcher.ElementMatchers.*;
-import static org.openqa.selenium.remote.BrowserType.SAFARI;
-import static org.openqa.selenium.remote.CapabilityType.BROWSER_NAME;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.openqa.grid.internal.utils.DefaultCapabilityMatcher;
-
-import com.nordstrom.automation.selenium.model.Enhanceable;
-
-import net.bytebuddy.ByteBuddy;
-import net.bytebuddy.implementation.MethodDelegation;
-
-/**
- * This capability matcher is functionally equivalent to {@link DefaultCapabilityMatcher}, implemented to avoid direct
- * references to the {@code SafariOptions} class. This avoids the need to include the path to the safari-driver
- * JAR on the class path provided to the Selenium Grid hub process.
- */
-public class RevisedCapabilityMatcher extends DefaultCapabilityMatcher {
-
- private static final String SAFARI_SPECIFIC_VALIDATOR = "org.openqa.grid.internal.utils.DefaultCapabilityMatcher$SafariSpecificValidator";
- private static final String REVISED_SAFARI_VALIDATOR = "org.openqa.grid.internal.utils.DefaultCapabilityMatcher$RevisedSafariValidator";
-
- private static Class safariValidator;
-
- /**
- * This constructor replaces the {@code SafariSpecificValidator} instance in the validators list of the
- * {@link DefaultCapabilityMatcher} with an instance of a dynamically-generated {@code RevisedSafariValidator}
- * class. This dynamic validator is functionally equivalent, but is implemented without explicit references to
- * the {@code SafariOptions} class.
- */
- @SuppressWarnings("unchecked")
- public RevisedCapabilityMatcher() {
- super();
- Field field = FieldUtils.getField(DefaultCapabilityMatcher.class, "validators", true);
- if (field != null) {
- field.setAccessible(true);
- try {
- List