-
-
Notifications
You must be signed in to change notification settings - Fork 767
feat: Proxy commands issues via RemoteWebElement #2311
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 5 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
a79df4b
fix: Proxy commands issues via RemoteWebElement
pujagani 5f657cc
Address comments
pujagani 7aa6bfe
Modularize into RemoteWebElementListener
pujagani c2feeff
Remove unused imports
pujagani 68cfbaa
Address comments
pujagani 2b93de8
Address comments
pujagani 458259f
Address comments
pujagani 5e6fabe
Rename the new listener
pujagani b33ebae
Address comments
pujagani f379757
Add comments describing public methods
pujagani c262974
Update the docs - The-event_firing.md
pujagani 08000fd
Update src/main/java/io/appium/java_client/proxy/Helpers.java
pujagani fdbdadb
Optimize method
pujagani 31cd9e1
Merge branch 'proxy-remotewebelement' of https://github.com/pujagani/…
pujagani File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
22 changes: 22 additions & 0 deletions
22
src/main/java/io/appium/java_client/proxy/ProxyAwareListener.java
This file contains hidden or 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,22 @@ | ||
/* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* See the NOTICE file distributed with this work for additional | ||
* information regarding copyright ownership. | ||
* 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 io.appium.java_client.proxy; | ||
|
||
public interface ProxyAwareListener extends MethodCallListener { | ||
void attachProxyInstance(Object proxy); | ||
pujagani marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
|
106 changes: 106 additions & 0 deletions
106
src/main/java/io/appium/java_client/proxy/RemoteWebElementListener.java
This file contains hidden or 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,106 @@ | ||
/* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* See the NOTICE file distributed with this work for additional | ||
* information regarding copyright ownership. | ||
* 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 io.appium.java_client.proxy; | ||
|
||
import com.google.common.base.Preconditions; | ||
import net.bytebuddy.matcher.ElementMatchers; | ||
import org.openqa.selenium.WebDriver; | ||
import org.openqa.selenium.remote.RemoteWebDriver; | ||
import org.openqa.selenium.remote.RemoteWebElement; | ||
|
||
import java.lang.reflect.Method; | ||
import java.util.Collection; | ||
import java.util.Collections; | ||
import java.util.List; | ||
import java.util.concurrent.Callable; | ||
import java.util.stream.Collectors; | ||
|
||
import static io.appium.java_client.proxy.Helpers.OBJECT_METHOD_NAMES; | ||
import static io.appium.java_client.proxy.Helpers.createProxy; | ||
import static net.bytebuddy.matcher.ElementMatchers.namedOneOf; | ||
|
||
public class RemoteWebElementListener implements MethodCallListener, ProxyAwareListener { | ||
private WebDriver parent; | ||
private final Collection<MethodCallListener> listeners; | ||
|
||
public RemoteWebElementListener(MethodCallListener listener) { | ||
this.listeners = Collections.singletonList(listener); | ||
} | ||
|
||
public RemoteWebElementListener(Collection<MethodCallListener> listeners) { | ||
this.listeners = listeners; | ||
} | ||
|
||
@Override | ||
public void attachProxyInstance(Object proxy) { | ||
Preconditions.checkArgument(proxy instanceof WebDriver); | ||
this.parent = (WebDriver) proxy; | ||
} | ||
|
||
@Override | ||
public Object call(Object obj, Method method, Object[] args, Callable<?> original) throws Throwable { | ||
Object result = original.call(); | ||
|
||
if (result instanceof RemoteWebElement) { | ||
return wrapElement( | ||
(RemoteWebElement) result, | ||
parent, | ||
listeners); | ||
} | ||
|
||
if (result instanceof List) { | ||
return ((List<?>) result).stream() | ||
.map(item -> { | ||
if (item instanceof RemoteWebElement) { | ||
pujagani marked this conversation as resolved.
Show resolved
Hide resolved
|
||
return wrapElement( | ||
(RemoteWebElement) item, | ||
parent, | ||
listeners); | ||
} | ||
return item; | ||
}) | ||
.collect(Collectors.toList()); | ||
} | ||
|
||
return result; | ||
} | ||
|
||
private RemoteWebElement wrapElement( | ||
RemoteWebElement original, | ||
WebDriver parent, | ||
Collection<MethodCallListener> listeners | ||
) { | ||
RemoteWebElement proxy = createProxy( | ||
RemoteWebElement.class, | ||
new Object[]{}, | ||
new Class[]{}, | ||
listeners, | ||
ElementMatchers.not( | ||
namedOneOf( | ||
OBJECT_METHOD_NAMES.toArray(new String[0])) | ||
.or(ElementMatchers.named("setId").or(ElementMatchers.named("setParent"))) | ||
) | ||
); | ||
|
||
proxy.setId(original.getId()); | ||
|
||
proxy.setParent((RemoteWebDriver) parent); | ||
|
||
return proxy; | ||
} | ||
|
||
} |
This file contains hidden or 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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.