fixing out:

TikhomirovSergey · TikhomirovSergey · commit a79c6248ca52 · 2018-02-12T00:55:21.000+03:00
- removal of redundant code from the original NewSessionPayload
diff --git a/src/main/java/io/appium/java_client/remote/MobileCapabilityType.java b/src/main/java/io/appium/java_client/remote/MobileCapabilityType.java
@@ -118,7 +118,7 @@ public interface MobileCapabilityType extends CapabilityType {
 
     /**
      * This is the flag which forces server to switch to the mobile WSONWP.
-     * If {@code false} when it is switched to W3C mode.
+     * If {@code false} then it is switched to W3C mode.
      */
     String FORCE_MJSONWP = "forceMjsonwp";
 }
diff --git a/src/main/java/org/openqa/selenium/remote/NewSessionPayload.java b/src/main/java/org/openqa/selenium/remote/NewSessionPayload.java
@@ -13,13 +13,13 @@
 // "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.
+// under the License.writeTo
 
 package org.openqa.selenium.remote;
 
+import static com.google.common.collect.ImmutableMap.of;
 import static io.appium.java_client.remote.MobileCapabilityType.FORCE_MJSONWP;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.Arrays.asList;
 import static java.util.Optional.ofNullable;
 import static java.util.stream.Collectors.toList;
 import static org.openqa.selenium.json.Json.LIST_OF_MAPS_TYPE;
@@ -67,15 +67,13 @@
 import java.util.*;
 import java.util.function.Function;
 import java.util.function.Predicate;
-import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 
 public class NewSessionPayload implements Closeable {
 
-    private static final Logger LOG = Logger.getLogger(NewSessionPayload.class.getName());
     private static final List<String> APPIUM_CAPABILITIES = ImmutableList.<String>builder()
             .addAll(getAppiumCapabilities(MobileCapabilityType.class))
             .addAll(getAppiumCapabilities(AndroidMobileCapabilityType.class))
@@ -86,7 +84,6 @@ public class NewSessionPayload implements Closeable {
     private final Set<CapabilityTransform> transforms;
     private final boolean forceMobileJSONWP;
 
-    private static final Dialect DEFAULT_DIALECT = Dialect.OSS;
     private final static Predicate<String> ACCEPTED_W3C_PATTERNS = Stream.of(
             "^[\\w-]+:.*$",
             "^acceptInsecureCerts$",
@@ -104,7 +101,6 @@ public class NewSessionPayload implements Closeable {
 
     private final Json json = new Json();
     private final FileBackedOutputStream backingStore;
-    private final ImmutableSet<Dialect> dialects;
 
     private static List<String> getAppiumCapabilities(Class<?> capabilityList) {
         return Arrays.stream(capabilityList.getDeclaredFields()).map(field -> {
@@ -118,31 +114,21 @@ private static List<String> getAppiumCapabilities(Class<?> capabilityList) {
     }
 
     public static NewSessionPayload create(Capabilities caps) throws IOException {
-        // We need to convert the capabilities into a new session payload. At this point we're dealing
-        // with references, so I'm Just Sure This Will Be Fine.
         boolean forceMobileJSONWP = ofNullable(caps.getCapability(FORCE_MJSONWP))
                 .map(o -> {
                     if (Boolean.class.isAssignableFrom(o.getClass())) {
                         return Boolean.class.cast(o);
                     }
                     return false;
                 }).orElse(false);
+
         HashMap<String, ?> capabilityMap = new HashMap<>(caps.asMap());
         capabilityMap.remove(FORCE_MJSONWP);
-        return create(ImmutableMap.of("desiredCapabilities", capabilityMap), forceMobileJSONWP);
-    }
-
-    public static NewSessionPayload create(Map<String, ?> source, boolean forceMobileJSONWP) throws IOException {
-        Objects.requireNonNull(source, "Payload must be set");
-
+        Map<String, ?> source = of("desiredCapabilities", capabilityMap);
         String json = new Json().toJson(source);
         return new NewSessionPayload(new StringReader(json), forceMobileJSONWP);
     }
 
-    public static NewSessionPayload create(Reader source, boolean forceMobileJSONWP) throws IOException {
-        return new NewSessionPayload(source, forceMobileJSONWP);
-    }
-
     private NewSessionPayload(Reader source, boolean forceMobileJSONWP) throws IOException {
         this.forceMobileJSONWP = forceMobileJSONWP;
         // Dedicate up to 10% of all RAM or 20% of available RAM (whichever is smaller) to storing this
@@ -184,7 +170,6 @@ private NewSessionPayload(Reader source, boolean forceMobileJSONWP) throws IOExc
         if (getAlwaysMatch() != null || getFirstMatches() != null) {
             dialects.add(Dialect.W3C);
         }
-        this.dialects = dialects.build();
 
         validate();
     }
@@ -304,28 +289,6 @@ private void writeMetaData(JsonOutput out) throws IOException {
         }
     }
 
-    private void streamW3CProtocolParameters(JsonOutput out, Map<String, Object> des) {
-        // Technically we should be building up a combination of "alwaysMatch" and "firstMatch" options.
-        // We're going to do a little processing to figure out what we might be able to do, and assume
-        // that people don't really understand the difference between required and desired (which is
-        // commonly the case). Wish us luck. Looking at the current implementations, people may have
-        // set options for multiple browsers, in which case a compliant W3C remote end won't start
-        // a session. If we find this, then we create multiple firstMatch capabilities. Furrfu.
-        // The table of options are:
-        //
-        // Chrome: chromeOptions
-        // Firefox: moz:.*, firefox_binary, firefox_profile, marionette
-        // Edge: none given
-        // IEDriver: ignoreZoomSetting, initialBrowserUrl, enableElementCacheCleanup,
-        //   browserAttachTimeout, enablePersistentHover, requireWindowFocus, logFile, logLevel, host,
-        //   extractPath, silent, ie.*
-        // Opera: operaOptions
-        // SafariDriver: safari.options
-        //
-        // We can't use the constants defined in the classes because it would introduce circular
-        // dependencies between the remote library and the implementations. Yay!
-    }
-
     /**
      * Stream the {@link Capabilities} encoded in the payload used to create this instance. The
      * {@link Stream} will start with a {@link Capabilities} object matching the OSS capabilities, and
@@ -351,10 +314,6 @@ public Stream<Capabilities> stream() throws IOException {
                 .map(ImmutableCapabilities::new);
     }
 
-    public ImmutableSet<Dialect> getDownstreamDialects() {
-        return dialects.isEmpty() ? ImmutableSet.of(DEFAULT_DIALECT) : dialects;
-    }
-
     @Override
     public void close() throws IOException {
         backingStore.reset();
@@ -417,14 +376,7 @@ private Stream<Map<String, Object>> getW3C() throws IOException {
                     .map(first -> ImmutableMap.<String, Object>builder().putAll(always).putAll(first).build())
                     .map(this::applyTransforms)
                     .map(map -> map.entrySet().stream()
-                            .filter(entry -> {
-                                if (forceMobileJSONWP) {
-                                    return ACCEPTED_W3C_PATTERNS.test(entry.getKey());
-                                }
-                                else {
-                                    return true;
-                                }
-                            })
+                            .filter(entry -> !forceMobileJSONWP || ACCEPTED_W3C_PATTERNS.test(entry.getKey()))
                             .map((Function<Map.Entry<String, Object>, Map.Entry<String, Object>>) stringObjectEntry ->
                                     new Map.Entry<String, Object>() {
                                 @Override
@@ -451,7 +403,7 @@ public Object setValue(Object value) {
             fromOss = Stream.of();
         }
 
-        Stream<Map<String, Object>> fromW3c = null;
+        Stream<Map<String, Object>> fromW3c;
         Map<String, Object> alwaysMatch = getAlwaysMatch();
         Collection<Map<String, Object>> firsts = getFirstMatches();
 

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public interface MobileCapabilityType extends CapabilityType {`
`118`	`118`
`119`	`119`	`/**`
`120`	`120`	`* This is the flag which forces server to switch to the mobile WSONWP.`
`121`		`- * If {@code false} when it is switched to W3C mode.`
	`121`	`+ * If {@code false} then it is switched to W3C mode.`
`122`	`122`	`*/`
`123`	`123`	`String FORCE_MJSONWP = "forceMjsonwp";`
`124`	`124`	`}`