Address issues found by Codacy

Author: Mykola Mokhnach

src/main/java/io/appium/java_client/android/AndroidStartScreenRecordingOptions.java

@@ -28,7 +28,9 @@ public class AndroidStartScreenRecordingOptions
         extends BaseStartScreenRecordingOptions<AndroidStartScreenRecordingOptions> {
     private Integer bitRate;
 
-    public AndroidStartScreenRecordingOptions() {}
+    public static AndroidStartScreenRecordingOptions startScreenRecordingOptions() {
+        return new AndroidStartScreenRecordingOptions();
+    }
 
     /**
      * The video bit rate for the video, in megabits per second.

src/main/java/io/appium/java_client/android/AndroidStopScreenRecordingOptions.java

@@ -20,5 +20,9 @@
 
 public class AndroidStopScreenRecordingOptions extends
         BaseStopScreenRecordingOptions<AndroidStopScreenRecordingOptions> {
-    public AndroidStopScreenRecordingOptions() {}
+
+    public static AndroidStopScreenRecordingOptions stopScreenRecordingOptions() {
+        return new AndroidStopScreenRecordingOptions();
+    }
+
 }

src/main/java/io/appium/java_client/ios/IOSStartScreenRecordingOptions.java

@@ -30,7 +30,9 @@ public class IOSStartScreenRecordingOptions
     private String videoType;
     private String videoQuality;
 
-    public IOSStartScreenRecordingOptions() {}
+    public static IOSStartScreenRecordingOptions startScreenRecordingOptions() {
+        return new IOSStartScreenRecordingOptions();
+    }
 
     public enum VideoType {
         H264, MP4, FMP4

src/main/java/io/appium/java_client/ios/IOSStopScreenRecordingOptions.java

@@ -20,5 +20,9 @@
 
 public class IOSStopScreenRecordingOptions extends
         BaseStopScreenRecordingOptions<IOSStopScreenRecordingOptions> {
-    public IOSStopScreenRecordingOptions() {}
+
+    public static IOSStopScreenRecordingOptions stopScreenRecordingOptions() {
+        return new IOSStopScreenRecordingOptions();
+    }
+
 }

src/main/java/io/appium/java_client/screenrecording/BaseScreenRecordingOptions.java

@@ -24,61 +24,25 @@
 import static java.util.Optional.ofNullable;
 
 public abstract class BaseScreenRecordingOptions<T extends BaseScreenRecordingOptions<T>> {
-    private String remotePath;
-    private String user;
-    private String pass;
-    private String method;
+    private ScreenRecordingUploadOptions uploadOptions;
 
     /**
-     * The path to the remote location, where the resulting video should be uploaded.
+     * Upload options set for the recorded screen capture.
      *
-     * @param remotePath The path to a writable remote location.
+     * @param uploadOptions see the documentation on {@link ScreenRecordingUploadOptions}
+     *                      for more details.
      * @return self instance for chaining.
      */
-    public T withRemotePath(String remotePath) {
-        this.remotePath = checkNotNull(remotePath);
-        //noinspection unchecked
-        return (T) this;
-    }
-
-    /**
-     * Sets the credentials for remote ftp/http authentication (if needed).
-     * This option only has an effect if remotePath is provided.
-     *
-     * @param user The name of the user for the remote authentication.
-     * @param pass The password for the remote authentication.
-     * @return self instance for chaining.
-     */
-    public T withAuthCredentials(String user, String pass) {
-        this.user = checkNotNull(user);
-        this.pass = checkNotNull(pass);
-        //noinspection unchecked
-        return (T) this;
-    }
-
-    public enum RequestMethod {
-        POST, PUT
-    }
-
-    /**
-     * Sets the method name for http(s) upload. PUT is used by default.
-     * This option only has an effect if remotePath is provided.
-     *
-     * @param method The HTTP method name.
-     * @return self instance for chaining.
-     */
-    public T withHttpMethod(RequestMethod method) {
-        this.method = checkNotNull(method).name();
+    public T withUploadOptions(ScreenRecordingUploadOptions uploadOptions) {
+        this.uploadOptions = checkNotNull(uploadOptions);
         //noinspection unchecked
         return (T) this;
     }
 
     public Map<String, Object> build() {
         final ImmutableMap.Builder<String, Object> builder = ImmutableMap.builder();
-        ofNullable(remotePath).map(x -> builder.put("remotePath", x));
-        ofNullable(user).map(x -> builder.put("user", x));
-        ofNullable(pass).map(x -> builder.put("pass", x));
-        ofNullable(method).map(x -> builder.put("method", x));
+        //noinspection unchecked
+        ofNullable(uploadOptions).map(x -> builder.putAll(x.build()));
         return builder.build();
     }
 }

src/main/java/io/appium/java_client/screenrecording/BaseStartScreenRecordingOptions.java

@@ -30,7 +30,8 @@ public abstract class BaseStartScreenRecordingOptions<T extends BaseStartScreenR
     private Duration timeLimit;
 
     /**
-     * The path to the remote location, where the resulting video should be uploaded.
+     * The remotePath upload option is the path to the remote location,
+     * where the resulting video should be uploaded.
      * The following protocols are supported: http/https (multipart), ftp.
      * Missing value (the default setting) means the content of the resulting
      * file should be encoded as Base64 and passed as the endpoint response value, but
@@ -39,13 +40,14 @@ public abstract class BaseStartScreenRecordingOptions<T extends BaseStartScreenR
      * This option only has an effect if there is a screen recording session in progress
      * and forced restart is not enabled (the default setting).
      *
-     * @param remotePath The path to a writable remote location (ftp or http(s)).
+     * @param uploadOptions see the documentation on {@link ScreenRecordingUploadOptions}
+     *                      for more details.
      * @return self instance for chaining.
      */
     @Override
-    public T withRemotePath(String remotePath) {
+    public T withUploadOptions(ScreenRecordingUploadOptions uploadOptions) {
         //noinspection unchecked
-        return (T) super.withRemotePath(remotePath);
+        return (T) super.withUploadOptions(uploadOptions);
     }
 
     /**

src/main/java/io/appium/java_client/screenrecording/BaseStopScreenRecordingOptions.java

@@ -20,18 +20,21 @@ public abstract class BaseStopScreenRecordingOptions<T extends BaseStopScreenRec
         extends BaseScreenRecordingOptions<BaseStopScreenRecordingOptions<T>> {
 
     /**
-     * The path to the remote location, where the resulting video should be uploaded.
+     * The remotePath upload option is the path to the remote location,
+     * where the resulting video should be uploaded.
      * The following protocols are supported: http/https (multipart), ftp.
      * Missing value (the default setting) means the content of resulting
      * file should be encoded as Base64 and passed as the endpoint response value, but
      * an exception will be thrown if the generated media file is too big to
      * fit into the available process memory.
      *
-     * @param remotePath The path to a writable remote location (ftp or http(s)).
+     * @param uploadOptions see the documentation on {@link ScreenRecordingUploadOptions}
+     *                      for more details.
      * @return self instance for chaining.
      */
-    public T withRemotePath(String remotePath) {
+    @Override
+    public T withUploadOptions(ScreenRecordingUploadOptions uploadOptions) {
         //noinspection unchecked
-        return (T) super.withRemotePath(remotePath);
+        return (T) super.withUploadOptions(uploadOptions);
     }
 }

src/main/java/io/appium/java_client/screenrecording/ScreenRecordingUploadOptions.java

@@ -0,0 +1,85 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "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.
+ */
+
+package io.appium.java_client.screenrecording;
+
+import com.google.common.collect.ImmutableMap;
+
+import java.util.Map;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Optional.ofNullable;
+
+public class ScreenRecordingUploadOptions {
+    private String remotePath;
+    private String user;
+    private String pass;
+    private String method;
+
+    public static ScreenRecordingUploadOptions uploadOptions() {
+        return new ScreenRecordingUploadOptions();
+    }
+
+    /**
+     * The path to the remote location, where the resulting video should be uploaded.
+     *
+     * @param remotePath The path to a writable remote location.
+     * @return self instance for chaining.
+     */
+    public ScreenRecordingUploadOptions withRemotePath(String remotePath) {
+        this.remotePath = checkNotNull(remotePath);
+        return this;
+    }
+
+    /**
+     * Sets the credentials for remote ftp/http authentication (if needed).
+     * This option only has an effect if remotePath is provided.
+     *
+     * @param user The name of the user for the remote authentication.
+     * @param pass The password for the remote authentication.
+     * @return self instance for chaining.
+     */
+    public ScreenRecordingUploadOptions withAuthCredentials(String user, String pass) {
+        this.user = checkNotNull(user);
+        this.pass = checkNotNull(pass);
+        return this;
+    }
+
+    public enum RequestMethod {
+        POST, PUT
+    }
+
+    /**
+     * Sets the method name for http(s) upload. PUT is used by default.
+     * This option only has an effect if remotePath is provided.
+     *
+     * @param method The HTTP method name.
+     * @return self instance for chaining.
+     */
+    public ScreenRecordingUploadOptions withHttpMethod(RequestMethod method) {
+        this.method = checkNotNull(method).name();
+        return this;
+    }
+
+    public Map<String, Object> build() {
+        final ImmutableMap.Builder<String, Object> builder = ImmutableMap.builder();
+        ofNullable(remotePath).map(x -> builder.put("remotePath", x));
+        ofNullable(user).map(x -> builder.put("user", x));
+        ofNullable(pass).map(x -> builder.put("pass", x));
+        ofNullable(method).map(x -> builder.put("method", x));
+        return builder.build();
+    }
+}