Skip to content

Commit

Permalink
[java][cdp] Simplify Augmentation for Dom Mutation
Browse files Browse the repository at this point in the history
  • Loading branch information
pujagani committed Feb 2, 2023
1 parent e3e77e7 commit cbd263f
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 0 deletions.
62 changes: 62 additions & 0 deletions java/src/org/openqa/selenium/remote/AddHasLogEvents.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
// 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 static org.openqa.selenium.remote.Browser.CHROME;
import static org.openqa.selenium.remote.Browser.EDGE;
import static org.openqa.selenium.remote.Browser.OPERA;

import org.openqa.selenium.Capabilities;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.devtools.HasDevTools;
import org.openqa.selenium.logging.EventType;
import org.openqa.selenium.logging.HasLogEvents;

import java.util.function.Predicate;

public class AddHasLogEvents
implements AugmenterProvider<HasLogEvents> {

private static final Predicate<String> IS_CHROMIUM_BROWSER = name ->
CHROME.is(name) ||
EDGE.is(name) ||
OPERA.is(name);

@Override
public Predicate<Capabilities> isApplicable() {
return caps -> IS_CHROMIUM_BROWSER.test(caps.getBrowserName());
}

@Override
public Class<HasLogEvents> getDescribedInterface() {
return HasLogEvents.class;
}

@Override
public HasLogEvents getImplementation(Capabilities capabilities, ExecuteMethod executeMethod) {
return new HasLogEvents() {
@Override
public <X> void onLogEvent(EventType<X> kind) {
if (((RemoteExecuteMethod) executeMethod).getWrappedDriver() instanceof HasDevTools) {
WebDriver driver = ((RemoteExecuteMethod) executeMethod).getWrappedDriver();
kind.initializeListener(driver);
}
}
};
}
}
5 changes: 5 additions & 0 deletions java/src/org/openqa/selenium/remote/Augmenter.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.openqa.selenium.WebDriverException;
import org.openqa.selenium.WrapsDriver;
import org.openqa.selenium.internal.Require;
import org.openqa.selenium.logging.HasLogEvents;
import org.openqa.selenium.remote.html5.AddWebStorage;

import java.lang.reflect.Field;
Expand Down Expand Up @@ -219,6 +220,10 @@ private WebDriver addDependentAugmentations(WebDriver driver) {
augmentationList.add(createAugmentation(new AddHasAuthentication()));
}

if (!(driver instanceof HasLogEvents)) {
augmentationList.add(createAugmentation(new AddHasLogEvents()));
}

if (!augmentationList.isEmpty()) {
Capabilities caps = ImmutableCapabilities.copyOf(((HasCapabilities) driver).getCapabilities());

Expand Down

0 comments on commit cbd263f

Please sign in to comment.