Workaround for javac, added missing headers.

akarnokd · akarnokd · commit 43e5299a956f · 2015-09-08T13:21:21.000+02:00
diff --git a/src/main/java/io/reactivex/Observable.java b/src/main/java/io/reactivex/Observable.java
@@ -2212,11 +2212,16 @@ public final <K, V> Observable<Map<K, V>> toMap(Function<? super T, ? extends K>
     }
 
     public final <K> Observable<Map<K, Collection<T>>> toMultimap(Function<? super T, ? extends K> keySelector) {
-        return toMultimap(keySelector, v -> v, HashMap::new, k -> new ArrayList<>());
+        Function<? super T, ? extends T> valueSelector = v -> v;
+        Supplier<Map<K, Collection<T>>> mapSupplier = HashMap::new;
+        Function<K, Collection<T>> collectionFactory = k -> new ArrayList<>();
+        return toMultimap(keySelector, valueSelector, mapSupplier, collectionFactory);
     }
     
     public final <K, V> Observable<Map<K, Collection<V>>> toMultimap(Function<? super T, ? extends K> keySelector, Function<? super T, ? extends V> valueSelector) {
-        return toMultimap(keySelector, valueSelector, HashMap::new, k -> new ArrayList<>());
+        Supplier<Map<K, Collection<V>>> mapSupplier = HashMap::new;
+        Function<K, Collection<V>> collectionFactory = k -> new ArrayList<>();
+        return toMultimap(keySelector, valueSelector, mapSupplier, collectionFactory);
     }
     
     public final <K, V> Observable<Map<K, Collection<V>>> toMultimap(
diff --git a/src/test/java/io/reactivex/internal/operators/OperatorSkipTimedTest.java b/src/test/java/io/reactivex/internal/operators/OperatorSkipTimedTest.java
@@ -1,3 +1,16 @@
+/**
+ * Copyright 2015 Netflix, Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. 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.reactivex.internal.operators;
 
 import static org.mockito.Matchers.any;
diff --git a/src/test/java/io/reactivex/internal/operators/OperatorSkipUntilTest.java b/src/test/java/io/reactivex/internal/operators/OperatorSkipUntilTest.java
@@ -1,3 +1,16 @@
+/**
+ * Copyright 2015 Netflix, Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. 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.reactivex.internal.operators;
 
 import static org.mockito.Matchers.any;
diff --git a/src/test/java/io/reactivex/internal/operators/OperatorSkipWhileTest.java b/src/test/java/io/reactivex/internal/operators/OperatorSkipWhileTest.java
@@ -1,3 +1,16 @@
+/**
+ * Copyright 2015 Netflix, Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. 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.reactivex.internal.operators;
 
 import static org.mockito.Matchers.*;
diff --git a/src/test/java/io/reactivex/internal/operators/OperatorToMultimapTest.java b/src/test/java/io/reactivex/internal/operators/OperatorToMultimapTest.java
@@ -227,9 +227,10 @@ public void testToMultimapWithThrowingCollectionFactory() {
         };
 
         Function<String, String> identity = v -> v;
+        Supplier<Map<Integer, Collection<String>>> mapSupplier = HashMap::new;
         
         Observable<Map<Integer, Collection<String>>> mapped = source.toMultimap(lengthFunc, 
-                identity, HashMap::new, collectionFactory);
+                identity, mapSupplier, collectionFactory);
 
         Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(2, Arrays.asList("cc", "dd"));

Original file line number	Diff line number	Diff line change
`@@ -2212,11 +2212,16 @@ public final <K, V> Observable<Map<K, V>> toMap(Function<? super T, ? extends K>`
`2212`	`2212`	`}`
`2213`	`2213`
`2214`	`2214`	`public final <K> Observable<Map<K, Collection<T>>> toMultimap(Function<? super T, ? extends K> keySelector) {`
`2215`		`- return toMultimap(keySelector, v -> v, HashMap::new, k -> new ArrayList<>());`
	`2215`	`+ Function<? super T, ? extends T> valueSelector = v -> v;`
	`2216`	`+ Supplier<Map<K, Collection<T>>> mapSupplier = HashMap::new;`
	`2217`	`+ Function<K, Collection<T>> collectionFactory = k -> new ArrayList<>();`
	`2218`	`+ return toMultimap(keySelector, valueSelector, mapSupplier, collectionFactory);`
`2216`	`2219`	`}`
`2217`	`2220`
`2218`	`2221`	`public final <K, V> Observable<Map<K, Collection<V>>> toMultimap(Function<? super T, ? extends K> keySelector, Function<? super T, ? extends V> valueSelector) {`
`2219`		`- return toMultimap(keySelector, valueSelector, HashMap::new, k -> new ArrayList<>());`
	`2222`	`+ Supplier<Map<K, Collection<V>>> mapSupplier = HashMap::new;`
	`2223`	`+ Function<K, Collection<V>> collectionFactory = k -> new ArrayList<>();`
	`2224`	`+ return toMultimap(keySelector, valueSelector, mapSupplier, collectionFactory);`
`2220`	`2225`	`}`
`2221`	`2226`
`2222`	`2227`	`public final <K, V> Observable<Map<K, Collection<V>>> toMultimap(`