Optionals.toStream -> RichStream.from

Summary: As suggested in D15194495, split into separate diffs.

Reviewed By: styurin

fbshipit-source-id: 9376858981

Author: mykola-semko

src/com/facebook/buck/android/RobolectricTest.java

@@ -36,7 +36,7 @@
 import com.facebook.buck.rules.args.Arg;
 import com.facebook.buck.step.Step;
 import com.facebook.buck.step.fs.WriteFileStep;
-import com.facebook.buck.util.Optionals;
+import com.facebook.buck.util.RichStream;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
@@ -308,9 +308,9 @@ public Stream<BuildTarget> getRuntimeDeps(BuildRuleResolver buildRuleResolver) {
                 // {@link DummyRDotJava} and any of its resource deps is available locally (if it
                 // exists)
                 // to run this test.
-                Optionals.toStream(optionalDummyRDotJava),
+                RichStream.from(optionalDummyRDotJava),
                 buildRuleResolver.filterBuildRuleInputs(
-                    Optionals.toStream(optionalDummyRDotJava)
+                    RichStream.from(optionalDummyRDotJava)
                         .flatMap(input -> input.getAndroidResourceDeps().stream())
                         .flatMap(input -> Stream.of(input.getRes(), input.getAssets()))
                         .filter(Objects::nonNull)),

src/com/facebook/buck/apple/AppleDescriptions.java

@@ -65,7 +65,6 @@
 import com.facebook.buck.rules.coercer.SourceSortedSet;
 import com.facebook.buck.rules.macros.StringWithMacros;
 import com.facebook.buck.shell.AbstractGenruleDescription;
-import com.facebook.buck.util.Optionals;
 import com.facebook.buck.util.RichStream;
 import com.facebook.buck.util.types.Either;
 import com.google.common.annotations.VisibleForTesting;
@@ -814,9 +813,9 @@ static AppleBundle createAppleBundle(
             binaryTarget,
             ImmutableSet.<BuildRule>builder()
                 .add(targetDebuggableBinaryRule)
-                .addAll(Optionals.toStream(assetCatalog).iterator())
-                .addAll(Optionals.toStream(coreDataModel).iterator())
-                .addAll(Optionals.toStream(sceneKitAssets).iterator())
+                .addAll(RichStream.from(assetCatalog).iterator())
+                .addAll(RichStream.from(coreDataModel).iterator())
+                .addAll(RichStream.from(sceneKitAssets).iterator())
                 .addAll(
                     BuildRules.toBuildRulesFor(
                         buildTarget,
@@ -826,7 +825,7 @@ static AppleBundle createAppleBundle(
                             .filter(BuildTargetSourcePath.class)
                             .map(BuildTargetSourcePath::getTarget)
                             .collect(ImmutableSet.toImmutableSet())))
-                .addAll(Optionals.toStream(appleDsym).iterator())
+                .addAll(RichStream.from(appleDsym).iterator())
                 .addAll(extraBinaries)
                 .build());
 

src/com/facebook/buck/apple/AppleTest.java

@@ -43,7 +43,7 @@
 import com.facebook.buck.test.TestCaseSummary;
 import com.facebook.buck.test.TestResults;
 import com.facebook.buck.test.TestRunningOptions;
-import com.facebook.buck.util.Optionals;
+import com.facebook.buck.util.RichStream;
 import com.facebook.buck.util.types.Either;
 import com.facebook.buck.util.types.Pair;
 import com.google.common.annotations.VisibleForTesting;
@@ -493,9 +493,9 @@ public Stream<BuildTarget> getRuntimeDeps(BuildRuleResolver buildRuleResolver) {
     return Stream.concat(
         Stream.concat(
                 Stream.of(testBundle),
-                Stream.concat(Optionals.toStream(testHostApp), Optionals.toStream(uiTestTargetApp)))
+                Stream.concat(RichStream.from(testHostApp), RichStream.from(uiTestTargetApp)))
             .map(BuildRule::getBuildTarget),
-        Optionals.toStream(xctool)
+        RichStream.from(xctool)
             .map(buildRuleResolver::filterBuildRuleInputs)
             .flatMap(ImmutableSet::stream)
             .map(BuildRule::getBuildTarget));

src/com/facebook/buck/apple/AppleTestDescription.java

@@ -75,7 +75,7 @@
 import com.facebook.buck.swift.SwiftRuntimeNativeLinkable;
 import com.facebook.buck.test.config.TestBuckConfig;
 import com.facebook.buck.unarchive.UnzipStep;
-import com.facebook.buck.util.Optionals;
+import com.facebook.buck.util.RichStream;
 import com.facebook.buck.util.types.Either;
 import com.facebook.buck.versions.Version;
 import com.google.common.annotations.VisibleForTesting;
@@ -286,7 +286,7 @@ public BuildRule createBuildRule(
             testHostWithTargetApp.flatMap(TestHostInfo::getTestHostAppBinarySourcePath),
             testHostWithTargetApp.map(TestHostInfo::getBlacklist).orElse(ImmutableSet.of()),
             libraryTarget,
-            Optionals.toStream(args.getTestHostApp()).toImmutableSortedSet(Ordering.natural()));
+            RichStream.from(args.getTestHostApp()).toImmutableSortedSet(Ordering.natural()));
     if (!createBundle || SwiftLibraryDescription.isSwiftTarget(libraryTarget)) {
       return library;
     }

src/com/facebook/buck/apple/toolchain/impl/AppleCxxPlatforms.java

@@ -58,7 +58,7 @@
 import com.facebook.buck.io.filesystem.ProjectFilesystem;
 import com.facebook.buck.swift.toolchain.SwiftPlatform;
 import com.facebook.buck.swift.toolchain.impl.SwiftPlatformFactory;
-import com.facebook.buck.util.Optionals;
+import com.facebook.buck.util.RichStream;
 import com.facebook.buck.util.environment.Platform;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
@@ -229,7 +229,7 @@ public static AppleCxxPlatform buildWithXcodeToolFinder(
     ImmutableList<String> toolchainVersions =
         targetSdk.getToolchains().stream()
             .map(AppleToolchain::getVersion)
-            .flatMap(Optionals::toStream)
+            .flatMap(RichStream::from)
             .collect(ImmutableList.toImmutableList());
     if (toolchainVersions.isEmpty()) {
       if (!xcodeBuildVersion.isPresent()) {

src/com/facebook/buck/core/rules/DefaultSourcePathRuleFinder.java

@@ -18,7 +18,6 @@
 
 import com.facebook.buck.core.sourcepath.BuildTargetSourcePath;
 import com.facebook.buck.core.sourcepath.SourcePath;
-import com.facebook.buck.util.Optionals;
 import com.facebook.buck.util.RichStream;
 import com.google.common.collect.ImmutableSet;
 import java.util.Arrays;
@@ -54,7 +53,7 @@ public Stream<BuildRule> filterBuildRuleInputs(Stream<SourcePath> sources) {
 
   @Override
   public Stream<BuildRule> filterBuildRuleInputs(Optional<SourcePath> sourcePath) {
-    return filterBuildRuleInputs(Optionals.toStream(sourcePath));
+    return filterBuildRuleInputs(RichStream.from(sourcePath));
   }
 
   /**

src/com/facebook/buck/counters/CounterRegistryImpl.java

@@ -18,7 +18,7 @@
 
 import com.facebook.buck.core.util.log.Logger;
 import com.facebook.buck.event.BuckEventBus;
-import com.facebook.buck.util.Optionals;
+import com.facebook.buck.util.RichStream;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -121,7 +121,7 @@ private void flushCounters() {
     }
 
     ImmutableList<CounterSnapshot> presentSnapshots =
-        snapshots.stream().flatMap(Optionals::toStream).collect(ImmutableList.toImmutableList());
+        snapshots.stream().flatMap(RichStream::from).collect(ImmutableList.toImmutableList());
     if (!presentSnapshots.isEmpty()) {
       CountersSnapshotEvent event = new CountersSnapshotEvent(presentSnapshots);
       eventBus.post(event);

src/com/facebook/buck/doctor/AbstractReport.java

@@ -165,7 +165,7 @@ public final Optional<DefectSubmitResult> collectAndSubmitResult()
             .setHighlightedBuildIds(
                 RichStream.from(selectedBuilds)
                     .map(BuildLogEntry::getBuildId)
-                    .flatMap(Optionals::toStream)
+                    .flatMap(RichStream::from)
                     .toOnceIterable())
             .setBuildEnvironmentDescription(buildEnvironmentDescription)
             .setSourceControlInfo(sourceControlInfo)

src/com/facebook/buck/features/apple/project/WorkspaceAndProjectGenerator.java

@@ -49,7 +49,7 @@
 import com.facebook.buck.features.halide.HalideBuckConfig;
 import com.facebook.buck.rules.keys.config.RuleKeyConfiguration;
 import com.facebook.buck.swift.SwiftBuckConfig;
-import com.facebook.buck.util.Optionals;
+import com.facebook.buck.util.RichStream;
 import com.facebook.buck.util.json.ObjectMappers;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
@@ -253,7 +253,7 @@ public Path generateWorkspaceAndDependentProjects(
 
     ImmutableSet<BuildTarget> targetsInRequiredProjects =
         Stream.concat(
-                schemeNameToSrcTargetNode.values().stream().flatMap(Optionals::toStream),
+                schemeNameToSrcTargetNode.values().stream().flatMap(RichStream::from),
                 buildForTestNodes.values().stream())
             .map(TargetNode::getBuildTarget)
             .collect(ImmutableSet.toImmutableSet());
@@ -1069,7 +1069,7 @@ private void buildWorkspaceSchemeTests(
     for (String schemeName : schemeNameToSrcTargetNode.keySet()) {
       ImmutableSet<TargetNode<?>> targetNodes =
           schemeNameToSrcTargetNode.get(schemeName).stream()
-              .flatMap(Optionals::toStream)
+              .flatMap(RichStream::from)
               .collect(ImmutableSet.toImmutableSet());
       ImmutableSet<TargetNode<AppleTestDescriptionArg>> testNodes =
           getOrderedTestNodes(
@@ -1187,7 +1187,7 @@ private void writeWorkspaceSchemes(
       ImmutableSet<PBXTarget> orderedBuildTargets =
           schemeNameToSrcTargetNode.get(schemeName).stream()
               .distinct()
-              .flatMap(Optionals::toStream)
+              .flatMap(RichStream::from)
               .map(TargetNode::getBuildTarget)
               .map(buildTargetToPBXTarget::get)
               .filter(Objects::nonNull)

src/com/facebook/buck/features/haskell/HaskellCompileRule.java

@@ -49,7 +49,6 @@
 import com.facebook.buck.util.Escaper;
 import com.facebook.buck.util.MoreIterables;
 import com.facebook.buck.util.MoreSuppliers;
-import com.facebook.buck.util.Optionals;
 import com.facebook.buck.util.RichStream;
 import com.facebook.buck.util.Verbosity;
 import com.google.common.annotations.VisibleForTesting;
@@ -308,7 +307,7 @@ private Iterable<String> getCompilerArguments(SourcePathResolver resolver) {
     builder
         .addAll(
             MoreIterables.zipAndConcat(
-                Iterables.cycle("-main-is"), Optionals.toStream(main).toOnceIterable()))
+                Iterables.cycle("-main-is"), RichStream.from(main).toOnceIterable()))
         .addAll(getPackageNameArgs())
         .addAll(getPreprocessorFlags(resolver))
         .add("-odir", getProjectFilesystem().resolve(getObjectDir()).toString())

src/com/facebook/buck/features/lua/LuaBinaryDescription.java

@@ -66,7 +66,7 @@
 import com.facebook.buck.rules.args.SourcePathArg;
 import com.facebook.buck.rules.coercer.PatternMatchedCollection;
 import com.facebook.buck.util.MoreMaps;
-import com.facebook.buck.util.Optionals;
+import com.facebook.buck.util.RichStream;
 import com.facebook.buck.versions.VersionRoot;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
@@ -148,7 +148,7 @@ private Iterable<BuildTarget> getNativeStarterDepTargets(LuaPlatform luaPlatform
     Optional<BuildTarget> nativeStarterLibrary = luaPlatform.getNativeStarterLibrary();
     return nativeStarterLibrary.isPresent()
         ? ImmutableSet.of(nativeStarterLibrary.get())
-        : Optionals.toStream(luaPlatform.getLuaCxxLibraryTarget())
+        : RichStream.from(luaPlatform.getLuaCxxLibraryTarget())
             .collect(ImmutableSet.toImmutableSet());
   }
 

src/com/facebook/buck/features/project/intellij/DefaultIjModuleFactoryResolver.java

@@ -32,7 +32,7 @@
 import com.facebook.buck.jvm.java.CompilerOutputPaths;
 import com.facebook.buck.jvm.java.JavacPluginParams;
 import com.facebook.buck.jvm.java.JvmLibraryArg;
-import com.facebook.buck.util.Optionals;
+import com.facebook.buck.util.RichStream;
 import java.nio.file.Path;
 import java.util.Optional;
 import java.util.Set;
@@ -134,7 +134,7 @@ public Optional<Path> getCompilerOutputPath(TargetNode<? extends JvmLibraryArg>
 
   private Path getRelativePathAndRecordRule(SourcePath sourcePath) {
     requiredBuildTargets.addAll(
-        Optionals.toStream(graphBuilder.getRule(sourcePath).map(BuildRule::getBuildTarget))
+        RichStream.from(graphBuilder.getRule(sourcePath).map(BuildRule::getBuildTarget))
             .collect(Collectors.toList()));
     return sourcePathResolver.getRelativePath(sourcePath);
   }

src/com/facebook/buck/shell/AbstractGenruleDescription.java

@@ -52,7 +52,6 @@
 import com.facebook.buck.rules.macros.WorkerMacroArg;
 import com.facebook.buck.rules.macros.WorkerMacroExpander;
 import com.facebook.buck.sandbox.SandboxExecutionStrategy;
-import com.facebook.buck.util.Optionals;
 import com.facebook.buck.util.RichStream;
 import com.facebook.infer.annotation.SuppressFieldNotInitialized;
 import com.google.common.collect.ImmutableList;
@@ -184,7 +183,7 @@ public BuildRule createBuildRule(
               Stream.concat(
                       graphBuilder.filterBuildRuleInputs(args.getSrcs().getPaths()).stream(),
                       Stream.of(cmd, bash, cmdExe)
-                          .flatMap(Optionals::toStream)
+                          .flatMap(RichStream::from)
                           .flatMap(input -> BuildableSupport.getDeps(input, graphBuilder)))
                   .collect(ImmutableSortedSet.toImmutableSortedSet(Comparator.naturalOrder()))),
           graphBuilder,

src/com/facebook/buck/shell/ShTestDescription.java

@@ -40,7 +40,7 @@
 import com.facebook.buck.rules.macros.StringWithMacros;
 import com.facebook.buck.rules.macros.StringWithMacrosConverter;
 import com.facebook.buck.test.config.TestBuckConfig;
-import com.facebook.buck.util.Optionals;
+import com.facebook.buck.util.RichStream;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -82,7 +82,7 @@ public ShTest createBuildRule(
         StringWithMacrosConverter.of(buildTarget, context.getCellPathResolver(), MACRO_EXPANDERS);
     ImmutableList<Arg> testArgs =
         Stream.concat(
-                Optionals.toStream(args.getTest()).map(SourcePathArg::of),
+                RichStream.from(args.getTest()).map(SourcePathArg::of),
                 args.getArgs().stream().map(x -> macrosConverter.convert(x, graphBuilder)))
             .collect(ImmutableList.toImmutableList());
     ImmutableMap<String, Arg> testEnv =

src/com/facebook/buck/util/Optionals.java

@@ -66,27 +66,6 @@ public static <T> T require(Optional<T> optional) {
     return optional.get();
   }
 
-  /**
-   * Returns a singleton stream of an {@code Optional}'s value if present, otherwise an empty
-   * stream.
-   *
-   * <p>Useful for filtering present instances in a stream pipeline:
-   *
-   * <pre>{@code
-   * Stream.of(Optional.empty(), Optional.of(1), Optional.of(2))
-   *   .flatMap(Optionals::toStream)
-   *
-   * // Yields a stream of 2 elements, [1, 2]
-   * }</pre>
-   */
-  public static <T> RichStream<T> toStream(Optional<T> optional) {
-    if (optional.isPresent()) {
-      return RichStream.of(optional.get());
-    } else {
-      return RichStream.empty();
-    }
-  }
-
   private static final Optional<Boolean> OPTIONAL_TRUE = Optional.of(true);
   private static final Optional<Boolean> OPTIONAL_FALSE = Optional.of(false);
 

test/com/facebook/buck/cxx/CxxGenruleDescriptionTest.java

@@ -54,7 +54,6 @@
 import com.facebook.buck.rules.macros.StringWithMacrosUtils;
 import com.facebook.buck.shell.Genrule;
 import com.facebook.buck.testutil.OptionalMatchers;
-import com.facebook.buck.util.Optionals;
 import com.facebook.buck.util.RichStream;
 import com.facebook.buck.versions.NaiveVersionSelector;
 import com.facebook.buck.versions.ParallelVersionedTargetGraphBuilder;
@@ -282,7 +281,7 @@ public void cxxGenruleInLocationMacro() {
                 .getRule(rule.getGenrule(CxxPlatformUtils.DEFAULT_PLATFORM, graphBuilder))
                 .orElseThrow(AssertionError::new);
     assertThat(
-        Arg.stringify(Optionals.toStream(genrule.getCmd()).toOnceIterable(), pathResolver),
+        Arg.stringify(RichStream.from(genrule.getCmd()).toOnceIterable(), pathResolver),
         Matchers.contains(
             pathResolver
                 .getAbsolutePath(dep.getGenrule(CxxPlatformUtils.DEFAULT_PLATFORM, graphBuilder))