@@ -96,10 +96,11 @@ private Map<String, Object> mergeChromiumOptions(Map<String, Object> stereotypeO
9696 Map <String , Object > capsOptions ) {
9797 Map <String , Object > toReturn = new HashMap <>(stereotypeOptions );
9898
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 ();
100102 if (name .equals ("args" )) {
101- List <String > arguments =
102- (List <String >) (capsOptions .getOrDefault (("args" ), new ArrayList <>()));
103+ List <String > arguments = (List <String >) value ;
103104
104105 List <String > stereotypeArguments =
105106 (List <String >) (stereotypeOptions .getOrDefault (("args" ), new ArrayList <>()));
@@ -113,7 +114,7 @@ private Map<String, Object> mergeChromiumOptions(Map<String, Object> stereotypeO
113114 }
114115
115116 if (name .equals ("extensions" )) {
116- List <String > extensionList = (List <String >) ( capsOptions . get (( "extensions" ))) ;
117+ List <String > extensionList = (List <String >) value ;
117118
118119 List <String > stereotypeExtensions =
119120 (List <String >) (stereotypeOptions .getOrDefault (("extensions" ), new ArrayList <>()));
@@ -128,7 +129,7 @@ private Map<String, Object> mergeChromiumOptions(Map<String, Object> stereotypeO
128129 }
129130
130131 if (!name .equals ("binary" ) && !name .equals ("extensions" ) && !name .equals ("args" )) {
131- toReturn .put (name , capsOptions . get ( name ) );
132+ toReturn .put (name , value );
132133 }
133134 }
134135
@@ -139,11 +140,11 @@ private Map<String, Object> mergeFirefoxOptions(Map<String, Object> stereotypeOp
139140 Map <String , Object > capsOptions ) {
140141 Map <String , Object > toReturn = new HashMap <>(stereotypeOptions );
141142
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 ();
143146 if (name .equals ("args" )) {
144- List <String >
145- arguments =
146- (List <String >) (capsOptions .getOrDefault (("args" ), new ArrayList <>()));
147+ List <String > arguments = (List <String >) value ;
147148 List <String > stereotypeArguments =
148149 (List <String >) (stereotypeOptions .getOrDefault (("args" ), new ArrayList <>()));
149150 arguments .forEach (arg -> {
@@ -155,8 +156,7 @@ private Map<String, Object> mergeFirefoxOptions(Map<String, Object> stereotypeOp
155156 }
156157
157158 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 ;
160160
161161 Map <String , Object > stereotypePrefs =
162162 (Map <String , Object >) (stereotypeOptions .getOrDefault (("prefs" ), new HashMap <>()));
@@ -166,15 +166,12 @@ private Map<String, Object> mergeFirefoxOptions(Map<String, Object> stereotypeOp
166166 }
167167
168168 if (name .equals ("profile" )) {
169- String rawProfile =
170- (String ) capsOptions .get ("profile" );
171-
169+ String rawProfile = (String ) value ;
172170 toReturn .put ("profile" , rawProfile );
173171 }
174172
175173 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 ;
178175 toReturn .put ("log" , logLevelMap );
179176 }
180177 }
0 commit comments