@@ -96,10 +96,11 @@ private Map<String, Object> mergeChromiumOptions(Map<String, Object> stereotypeO
96
96
Map <String , Object > capsOptions ) {
97
97
Map <String , Object > toReturn = new HashMap <>(stereotypeOptions );
98
98
99
- for (String name : capsOptions .keySet ()) {
99
+ for (Map .Entry <String , Object > entry : capsOptions .entrySet ()) {
100
+ String name = entry .getKey ();
101
+ Object value = entry .getValue ();
100
102
if (name .equals ("args" )) {
101
- List <String > arguments =
102
- (List <String >) (capsOptions .getOrDefault (("args" ), new ArrayList <>()));
103
+ List <String > arguments = (List <String >) value ;
103
104
104
105
List <String > stereotypeArguments =
105
106
(List <String >) (stereotypeOptions .getOrDefault (("args" ), new ArrayList <>()));
@@ -113,7 +114,7 @@ private Map<String, Object> mergeChromiumOptions(Map<String, Object> stereotypeO
113
114
}
114
115
115
116
if (name .equals ("extensions" )) {
116
- List <String > extensionList = (List <String >) ( capsOptions . get (( "extensions" ))) ;
117
+ List <String > extensionList = (List <String >) value ;
117
118
118
119
List <String > stereotypeExtensions =
119
120
(List <String >) (stereotypeOptions .getOrDefault (("extensions" ), new ArrayList <>()));
@@ -128,7 +129,7 @@ private Map<String, Object> mergeChromiumOptions(Map<String, Object> stereotypeO
128
129
}
129
130
130
131
if (!name .equals ("binary" ) && !name .equals ("extensions" ) && !name .equals ("args" )) {
131
- toReturn .put (name , capsOptions . get ( name ) );
132
+ toReturn .put (name , value );
132
133
}
133
134
}
134
135
@@ -139,11 +140,11 @@ private Map<String, Object> mergeFirefoxOptions(Map<String, Object> stereotypeOp
139
140
Map <String , Object > capsOptions ) {
140
141
Map <String , Object > toReturn = new HashMap <>(stereotypeOptions );
141
142
142
- for (String name : capsOptions .keySet ()) {
143
+ for (Map .Entry <String , Object > entry : capsOptions .entrySet ()) {
144
+ String name = entry .getKey ();
145
+ Object value = entry .getValue ();
143
146
if (name .equals ("args" )) {
144
- List <String >
145
- arguments =
146
- (List <String >) (capsOptions .getOrDefault (("args" ), new ArrayList <>()));
147
+ List <String > arguments = (List <String >) value ;
147
148
List <String > stereotypeArguments =
148
149
(List <String >) (stereotypeOptions .getOrDefault (("args" ), new ArrayList <>()));
149
150
arguments .forEach (arg -> {
@@ -155,8 +156,7 @@ private Map<String, Object> mergeFirefoxOptions(Map<String, Object> stereotypeOp
155
156
}
156
157
157
158
if (name .equals ("prefs" )) {
158
- Map <String , Object > prefs =
159
- (Map <String , Object >) (capsOptions .getOrDefault (("prefs" ), new HashMap <>()));
159
+ Map <String , Object > prefs = (Map <String , Object >) value ;
160
160
161
161
Map <String , Object > stereotypePrefs =
162
162
(Map <String , Object >) (stereotypeOptions .getOrDefault (("prefs" ), new HashMap <>()));
@@ -166,15 +166,12 @@ private Map<String, Object> mergeFirefoxOptions(Map<String, Object> stereotypeOp
166
166
}
167
167
168
168
if (name .equals ("profile" )) {
169
- String rawProfile =
170
- (String ) capsOptions .get ("profile" );
171
-
169
+ String rawProfile = (String ) value ;
172
170
toReturn .put ("profile" , rawProfile );
173
171
}
174
172
175
173
if (name .equals ("log" )) {
176
- Map <String , Object > logLevelMap =
177
- (Map <String , Object >) capsOptions .get ("log" );
174
+ Map <String , Object > logLevelMap = (Map <String , Object >) value ;
178
175
toReturn .put ("log" , logLevelMap );
179
176
}
180
177
}
0 commit comments