Formatting code w.r.t Google Java Style Guide #269 · magic-coder/java-client@0e8e2e2 · GitHub
Skip to content

Commit 0e8e2e2

Browse files
SrinivasanTargetSrinivasanTarget
committed
Formatting code w.r.t Google Java Style Guide appium#269 
1 parent 46bd45b commit 0e8e2e2

177 files changed

Lines changed: 18978 additions & 9439 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/main/java/io/appium/java_client/AppiumDriver.java‎

Lines changed: 288 additions & 346 deletions
Large diffs are not rendered by default.

‎src/main/java/io/appium/java_client/AppiumExecutionMethod.java‎

Lines changed: 13 additions & 13 deletions

‎src/main/java/io/appium/java_client/AppiumSetting.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,18 @@
1818

1919
/**
2020
* Enums defining constants for Appium Settings which can be set and toggled during a test session.
21-
*
2221
*/
2322
public enum AppiumSetting {
2423

25-
IGNORE_UNIMPORTANT_VIEWS("ignoreUnimportantViews");
26-
private String name;
24+
IGNORE_UNIMPORTANT_VIEWS("ignoreUnimportantViews");
25+
private String name;
2726

28-
private AppiumSetting(String name) {
29-
this.name = name;
30-
}
27+
private AppiumSetting(String name) {
28+
this.name = name;
29+
}
3130

32-
public String toString() {
33-
return this.name;
34-
}
31+
public String toString() {
32+
return this.name;
33+
}
3534

3635
}

‎src/main/java/io/appium/java_client/DefaultGenericMobileDriver.java‎

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616

1717
package io.appium.java_client;
1818

19-
import io.appium.java_client.MobileDriver;
2019
import io.appium.java_client.generic.searchcontext.*;
21-
22-
import org.openqa.selenium.*;
20+
import org.openqa.selenium.By;
21+
import org.openqa.selenium.Capabilities;
22+
import org.openqa.selenium.WebDriverException;
23+
import org.openqa.selenium.WebElement;
2324
import org.openqa.selenium.interactions.Mouse;
2425
import org.openqa.selenium.remote.CommandExecutor;
2526
import org.openqa.selenium.remote.RemoteWebDriver;
@@ -28,51 +29,47 @@
2829
import java.util.List;
2930
import java.util.Map;
3031

31-
@SuppressWarnings({ "unchecked", "rawtypes" })
32-
abstract class DefaultGenericMobileDriver<T extends WebElement> extends RemoteWebDriver implements MobileDriver,
33-
GenericSearchContext<T>, GenericFindsById<T>, GenericFindsByXPath<T>, GenericFindsByLinkText<T>, GenericFindsByTagName<T>,
34-
GenericFindsByClassName<T>, GenericFindsByCssSelector<T>, GenericFindsByName<T>{
32+
@SuppressWarnings({"unchecked", "rawtypes"})
33+
abstract class DefaultGenericMobileDriver<T extends WebElement> extends RemoteWebDriver
34+
implements MobileDriver, GenericSearchContext<T>, GenericFindsById<T>, GenericFindsByXPath<T>,
35+
GenericFindsByLinkText<T>, GenericFindsByTagName<T>, GenericFindsByClassName<T>,
36+
GenericFindsByCssSelector<T>, GenericFindsByName<T> {
3537

36-
public DefaultGenericMobileDriver(CommandExecutor executor, Capabilities desiredCapabilities){
37-
super(executor, desiredCapabilities);
38+
public DefaultGenericMobileDriver(CommandExecutor executor, Capabilities desiredCapabilities) {
39+
super(executor, desiredCapabilities);
3840
}
3941

40-
@Override
41-
public Response execute(String driverCommand, Map<String, ?> parameters) {
42+
@Override public Response execute(String driverCommand, Map<String, ?> parameters) {
4243
return super.execute(driverCommand, parameters);
4344
}
4445

45-
@Override
46-
public List findElements(By by){
46+
@Override public List findElements(By by) {
4747
return super.findElements(by);
4848
}
4949

50-
@Override
51-
public T findElement(By by){
50+
@Override public T findElement(By by) {
5251
return (T) super.findElement(by);
5352
}
5453

55-
@Override
56-
public List findElementsById(String id){
54+
@Override public List findElementsById(String id) {
5755
return super.findElementsById(id);
5856
}
5957

60-
@Override
61-
public T findElementById(String id){
58+
@Override public T findElementById(String id) {
6259
return (T) super.findElementById(id);
6360
}
6461

6562
/**
6663
* @throws WebDriverException his method doesn't work against native app UI.
6764
*/
68-
public T findElementByLinkText(String using) throws WebDriverException{
65+
public T findElementByLinkText(String using) throws WebDriverException {
6966
return (T) super.findElementByLinkText(using);
7067
}
7168

7269
/**
7370
* @throws WebDriverException This method doesn't work against native app UI.
7471
*/
75-
public List findElementsByLinkText(String using) throws WebDriverException{
72+
public List findElementsByLinkText(String using) throws WebDriverException {
7673
return super.findElementsByLinkText(using);
7774
}
7875

@@ -117,14 +114,14 @@ public List findElementsByClassName(String using) {
117114
/**
118115
* @throws WebDriverException his method doesn't work against native app UI.
119116
*/
120-
public T findElementByCssSelector(String using) throws WebDriverException{
117+
public T findElementByCssSelector(String using) throws WebDriverException {
121118
return (T) super.findElementByCssSelector(using);
122119
}
123120

124121
/**
125122
* @throws WebDriverException This method doesn't work against native app UI.
126123
*/
127-
public List findElementsByCssSelector(String using) throws WebDriverException{
124+
public List findElementsByCssSelector(String using) throws WebDriverException {
128125
return super.findElementsByCssSelector(using);
129126
}
130127

@@ -139,24 +136,21 @@ public List findElementsByXPath(String using) {
139136
@Override
140137
/**
141138
* @throws WebDriverException This method is not applicable with browser/webview UI.
142-
*/
143-
public T findElementByAccessibilityId(String using) throws WebDriverException {
139+
*/ public T findElementByAccessibilityId(String using) throws WebDriverException {
144140
return (T) findElement("accessibility id", using);
145141
}
146142

147143
@Override
148144
/**
149145
* @throws WebDriverException This method is not applicable with browser/webview UI.
150-
*/
151-
public List findElementsByAccessibilityId(String using) throws WebDriverException{
146+
*/ public List findElementsByAccessibilityId(String using) throws WebDriverException {
152147
return (List<T>) findElements("accessibility id", using);
153148
}
154149

155150
/**
156151
* Mouse doesn't work on mobile devices and emulators
157152
*/
158-
@Deprecated
159-
public Mouse getMouse(){
153+
@Deprecated public Mouse getMouse() {
160154
return super.getMouse();
161155
}
162156
}

‎src/main/java/io/appium/java_client/DefaultGenericMobileElement.java‎

Lines changed: 22 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -16,51 +16,40 @@
1616

1717
package io.appium.java_client;
1818

19-
import io.appium.java_client.generic.searchcontext.GenericFindsByClassName;
20-
import io.appium.java_client.generic.searchcontext.GenericFindsByCssSelector;
21-
import io.appium.java_client.generic.searchcontext.GenericFindsById;
22-
import io.appium.java_client.generic.searchcontext.GenericFindsByLinkText;
23-
import io.appium.java_client.generic.searchcontext.GenericFindsByName;
24-
import io.appium.java_client.generic.searchcontext.GenericFindsByTagName;
25-
import io.appium.java_client.generic.searchcontext.GenericFindsByXPath;
26-
import io.appium.java_client.generic.searchcontext.GenericSearchContext;
27-
28-
import java.util.List;
29-
import java.util.Map;
30-
19+
import io.appium.java_client.generic.searchcontext.*;
3120
import org.openqa.selenium.By;
3221
import org.openqa.selenium.WebDriverException;
3322
import org.openqa.selenium.WebElement;
3423
import org.openqa.selenium.remote.RemoteWebElement;
3524
import org.openqa.selenium.remote.Response;
3625

37-
@SuppressWarnings({ "unchecked", "rawtypes" })
38-
abstract class DefaultGenericMobileElement<T extends WebElement> extends RemoteWebElement implements
39-
GenericSearchContext<T>, GenericFindsById<T>, GenericFindsByXPath<T>, GenericFindsByLinkText<T>, GenericFindsByTagName<T>,
40-
GenericFindsByClassName<T>, GenericFindsByCssSelector<T>, GenericFindsByName<T>, FindsByAccessibilityId<T>, TouchableElement{
26+
import java.util.List;
27+
import java.util.Map;
28+
29+
@SuppressWarnings({"unchecked", "rawtypes"})
30+
abstract class DefaultGenericMobileElement<T extends WebElement> extends RemoteWebElement
31+
implements GenericSearchContext<T>, GenericFindsById<T>, GenericFindsByXPath<T>,
32+
GenericFindsByLinkText<T>, GenericFindsByTagName<T>, GenericFindsByClassName<T>,
33+
GenericFindsByCssSelector<T>, GenericFindsByName<T>, FindsByAccessibilityId<T>,
34+
TouchableElement {
4135

42-
@Override
43-
public Response execute(String driverCommand, Map<String, ?> parameters) {
36+
@Override public Response execute(String driverCommand, Map<String, ?> parameters) {
4437
return super.execute(driverCommand, parameters);
4538
}
4639

47-
@Override
48-
public List findElements(By by){
40+
@Override public List findElements(By by) {
4941
return super.findElements(by);
5042
}
5143

52-
@Override
53-
public T findElement(By by){
44+
@Override public T findElement(By by) {
5445
return (T) super.findElement(by);
5546
}
5647

57-
@Override
58-
public List findElementsById(String id){
48+
@Override public List findElementsById(String id) {
5949
return super.findElementsById(id);
6050
}
6151

62-
@Override
63-
public T findElementById(String id){
52+
@Override public T findElementById(String id) {
6453
return (T) super.findElementById(id);
6554
}
6655

@@ -74,7 +63,7 @@ public T findElementByLinkText(String using) throws WebDriverException {
7463
/**
7564
* @throws WebDriverException This method doesn't work against native app UI.
7665
*/
77-
public List findElementsByLinkText(String using) throws WebDriverException{
66+
public List findElementsByLinkText(String using) throws WebDriverException {
7867
return super.findElementsByLinkText(using);
7968
}
8069

@@ -119,14 +108,14 @@ public List findElementsByClassName(String using) {
119108
/**
120109
* @throws WebDriverException his method doesn't work against native app UI.
121110
*/
122-
public T findElementByCssSelector(String using) throws WebDriverException{
111+
public T findElementByCssSelector(String using) throws WebDriverException {
123112
return (T) super.findElementByCssSelector(using);
124113
}
125114

126115
/**
127116
* @throws WebDriverException This method doesn't work against native app UI.
128117
*/
129-
public List findElementsByCssSelector(String using) throws WebDriverException{
118+
public List findElementsByCssSelector(String using) throws WebDriverException {
130119
return super.findElementsByCssSelector(using);
131120
}
132121

@@ -138,27 +127,25 @@ public List findElementsByXPath(String using) {
138127
return super.findElementsByXPath(using);
139128
}
140129

141-
@Override
142-
public T findElementByAccessibilityId(String using) {
130+
@Override public T findElementByAccessibilityId(String using) {
143131
return (T) findElement("accessibility id", using);
144132
}
145133

146-
@Override
147-
public List findElementsByAccessibilityId(String using) {
134+
@Override public List findElementsByAccessibilityId(String using) {
148135
return (List<T>) findElements("accessibility id", using);
149136
}
150137

151138
/**
152139
* @throws WebDriverException because it may not work against native app UI.
153140
*/
154-
public void submit() throws WebDriverException{
141+
public void submit() throws WebDriverException {
155142
super.submit();
156143
}
157144

158145
/**
159146
* @throws WebDriverException because it may not work against native app UI.
160147
*/
161-
public String getCssValue(String propertyName) throws WebDriverException{
148+
public String getCssValue(String propertyName) throws WebDriverException {
162149
return super.getCssValue(propertyName);
163150
}
164151
}

‎src/main/java/io/appium/java_client/DeviceActionShortcuts.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
public interface DeviceActionShortcuts {
2121

2222
/**
23-
* Hides the keyboard if it is showing.
24-
* On iOS, there are multiple strategies for hiding the keyboard. Defaults to the "tapOutside" strategy (taps outside the keyboard).
25-
* Switch to using hideKeyboard(HideKeyboardStrategy.PRESS_KEY, "Done") if this doesn't work.
26-
*/
27-
void hideKeyboard();
23+
* Hides the keyboard if it is showing.
24+
* On iOS, there are multiple strategies for hiding the keyboard. Defaults to the "tapOutside" strategy (taps outside the keyboard).
25+
* Switch to using hideKeyboard(HideKeyboardStrategy.PRESS_KEY, "Done") if this doesn't work.
26+
*/
27+
void hideKeyboard();
2828

2929
/*
3030
Gets device date and time for both iOS(Supports only real device) and Android devices

‎src/main/java/io/appium/java_client/DriverMobileCommand.java‎

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)