Remove optionAsOptional

Author: misolt

dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/ConnectorArguments.java

@@ -18,7 +18,6 @@
 
 import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.edwmigration.dumper.application.dumper.utils.OptionalUtils.optionallyWhen;
 import static java.time.temporal.ChronoUnit.DAYS;
 import static java.time.temporal.ChronoUnit.HOURS;
 import static java.util.Arrays.stream;
@@ -27,7 +26,6 @@
 import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects.ToStringHelper;
 import com.google.common.base.Predicates;
-import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 import com.google.edwmigration.dumper.application.dumper.ZonedParser.DayOffset;
 import com.google.edwmigration.dumper.application.dumper.connector.Connector;
@@ -759,10 +757,6 @@ public boolean isAssessment() {
     return getOptions().has(optionAssessment);
   }
 
-  private <T> Optional<T> optionAsOptional(OptionSpec<T> spec) {
-    return optionallyWhen(getOptions().has(spec), () -> getOptions().valueOf(spec));
-  }
-
   @Nonnull
   public Predicate<String> getSchemaPredicate() {
     return toPredicate(getSchemata());
@@ -793,7 +787,11 @@ public String getUserOrFail() {
    */
   @Nonnull
   public Optional<String> getPasswordIfFlagProvided() {
-    return optionallyWhen(getOptions().has(optionPass), this::getPasswordOrPrompt);
+    if (getOptions().has(optionPass)) {
+      return Optional.of(getPasswordOrPrompt());
+    } else {
+      return Optional.empty();
+    }
   }
 
   @Nonnull
@@ -840,7 +838,15 @@ public List<String> getConfiguration() {
   }
 
   public Optional<String> getOutputFile() {
-    return optionAsOptional(optionOutput).filter(file -> !Strings.isNullOrEmpty(file));
+    if (!getOptions().has(optionOutput)) {
+      return Optional.empty();
+    }
+    String file = getOptions().valueOf(optionOutput);
+    if (file == null || file.isEmpty()) {
+      return Optional.empty();
+    } else {
+      return Optional.of(file);
+    }
   }
 
   public boolean isOutputContinue() {