Skip to content

Commit 7ddd002

Browse files
asolntsevdiemol
asolntsev
and
diemol
authored
Code cleanup (#12934)
* fix IDEA warning "Non-final field in 'enum'" * fix IDEA warning "Field can be final" * Format files --------- Co-authored-by: Diego Molina <diemol@gmail.com> Co-authored-by: Diego Molina <diemol@users.noreply.github.com>
1 parent f7fd6d3 commit 7ddd002

33 files changed

Lines changed: 70 additions & 67 deletions

‎java/src/org/openqa/selenium/PageLoadStrategy.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public enum PageLoadStrategy {
2222
EAGER("eager"),
2323
NORMAL("normal");
2424

25-
private String text;
25+
private final String text;
2626

2727
PageLoadStrategy(String text) {
2828
this.text = text;

‎java/src/org/openqa/selenium/UnexpectedAlertBehaviour.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public enum UnexpectedAlertBehaviour {
2424
DISMISS_AND_NOTIFY("dismiss and notify"),
2525
IGNORE("ignore");
2626

27-
private String text;
27+
private final String text;
2828

2929
UnexpectedAlertBehaviour(String text) {
3030
this.text = text;

‎java/src/org/openqa/selenium/devtools/CdpClientGenerator.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
112112
}
113113

114114
private static class Model {
115-
private List<Domain> domains = new ArrayList<>();
116-
private String basePackage;
115+
private final List<Domain> domains = new ArrayList<>();
116+
private final String basePackage;
117117

118118
public Model(String basePackage) {
119119
this.basePackage = basePackage;
@@ -149,7 +149,7 @@ public void dumpTo(Path target) {
149149
}
150150

151151
private static class Parser<T extends BaseSpec> {
152-
private Map<String, BiConsumer<T, Object>> processors;
152+
private final Map<String, BiConsumer<T, Object>> processors;
153153

154154
public Parser(Map<String, BiConsumer<T, Object>> processors) {
155155
this.processors = processors;
@@ -247,11 +247,11 @@ public TypedSpecParser(boolean inline, Map<String, BiConsumer<T, Object>> extraP
247247
}
248248

249249
private static class Domain extends BaseSpec {
250-
private Model model;
250+
private final Model model;
251251

252-
private List<TypeSpec> types = new ArrayList<>();
253-
private List<CommandSpec> commands = new ArrayList<>();
254-
private List<EventSpec> events = new ArrayList<>();
252+
private final List<TypeSpec> types = new ArrayList<>();
253+
private final List<CommandSpec> commands = new ArrayList<>();
254+
private final List<EventSpec> events = new ArrayList<>();
255255

256256
public Domain(Model model) {
257257
this.model = model;
@@ -794,8 +794,8 @@ public String getMapper() {
794794
}
795795

796796
private static class SimpleType implements IType {
797-
private String name;
798-
private String type;
797+
private final String name;
798+
private final String type;
799799

800800
public SimpleType(String name, String type) {
801801
this.name = name;
@@ -1075,9 +1075,9 @@ public String getJavaType() {
10751075

10761076
private static class ObjectType implements IType {
10771077

1078-
private TypedSpec parent;
1079-
private String name;
1080-
private List<VariableSpec> properties;
1078+
private final TypedSpec parent;
1079+
private final String name;
1080+
private final List<VariableSpec> properties;
10811081

10821082
public ObjectType(TypedSpec parent, String name, List<VariableSpec> properties) {
10831083
this.parent = parent;
@@ -1225,7 +1225,7 @@ public String getMapper() {
12251225

12261226
private static class ArrayType implements IType {
12271227
private IType itemType;
1228-
private String name;
1228+
private final String name;
12291229

12301230
public ArrayType(String name) {
12311231
this.name = name;
@@ -1310,9 +1310,9 @@ public void parse(Domain domain, Map<String, Object> json) {
13101310
}
13111311

13121312
private static class RefType implements IType {
1313-
private String name;
1314-
private Domain domain;
1315-
private String type;
1313+
private final String name;
1314+
private final Domain domain;
1315+
private final String type;
13161316

13171317
public RefType(String name, Domain domain, String type) {
13181318
this.name = name;

‎java/src/org/openqa/selenium/devtools/noop/NoOpDomains.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
public class NoOpDomains implements Domains {
3030

31-
private static BuildInfo INFO = new BuildInfo();
31+
private static final BuildInfo INFO = new BuildInfo();
3232

3333
private static final String WARNING =
3434
String.format(

‎java/src/org/openqa/selenium/events/zeromq/UnboundZmqEventBus.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class UnboundZmqEventBus implements EventBus {
6868
private final Map<EventName, List<Consumer<Event>>> listeners = new ConcurrentHashMap<>();
6969
private final Queue<UUID> recentMessages = EvictingQueue.create(128);
7070
private final String encodedSecret;
71-
private ZMQ.Poller poller;
71+
private final ZMQ.Poller poller;
7272

7373
private ZMQ.Socket pub;
7474
private ZMQ.Socket sub;

‎java/src/org/openqa/selenium/firefox/FirefoxBinary.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public enum Channel {
5454
DEV("dev"),
5555
NIGHTLY("nightly");
5656

57-
private String name;
57+
private final String name;
5858

5959
Channel(String name) {
6060
this.name = name;

‎java/src/org/openqa/selenium/firefox/FirefoxCommandContext.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public enum FirefoxCommandContext {
2424
CONTENT("content"),
2525
CHROME("chrome");
2626

27-
private String text;
27+
private final String text;
2828

2929
FirefoxCommandContext(String text) {
3030
this.text = text;

‎java/src/org/openqa/selenium/firefox/FirefoxDriver.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public class FirefoxDriver extends RemoteWebDriver
9191
private final Optional<URI> biDiUri;
9292
private Connection connection;
9393
private DevTools devTools;
94-
private Optional<BiDi> biDi;
94+
private final Optional<BiDi> biDi;
9595

9696
/**
9797
* Creates a new FirefoxDriver using the {@link GeckoDriverService#createDefaultService)} server

‎java/src/org/openqa/selenium/firefox/Preferences.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ class Preferences {
5656
private static final Pattern PREFERENCE_PATTERN =
5757
Pattern.compile("user_pref\\(\"([^\"]+)\", (\"?.+?\"?)\\);");
5858

59-
private Map<String, Object> immutablePrefs = new HashMap<>();
60-
private Map<String, Object> allPrefs = new HashMap<>();
59+
private final Map<String, Object> immutablePrefs = new HashMap<>();
60+
private final Map<String, Object> allPrefs = new HashMap<>();
6161

6262
public Preferences() {}
6363

‎java/src/org/openqa/selenium/firefox/ProfilesIni.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.openqa.selenium.io.TemporaryFilesystem;
3535

3636
public class ProfilesIni {
37-
private Map<String, File> profiles;
37+
private final Map<String, File> profiles;
3838

3939
public ProfilesIni() {
4040
File appData = locateAppDataDirectory(Platform.getCurrent());

0 commit comments

Comments
 (0)