InstanceSelector#flatMap -> #transform

neo4j · Jun 11, 2018 · b798a60 · b798a60
1 parent 5e8afa0
commit b798a60
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/...y/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexAccessor.java b/...y/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexAccessor.java
@@ -96,7 +96,7 @@ public IndexReader newReader()
     @Override
     public BoundedIterable<Long> newAllEntriesReader()
     {
-        Iterable<BoundedIterable<Long>> entries = instanceSelector.flatMap( IndexAccessor::newAllEntriesReader );
+        Iterable<BoundedIterable<Long>> entries = instanceSelector.transform( IndexAccessor::newAllEntriesReader );
         return new BoundedIterable<Long>()
         {
             @Override
@@ -133,7 +133,7 @@ public Iterator<Long> iterator()
     @Override
     public ResourceIterator<File> snapshotFiles() throws IOException
     {
-        return concatResourceIterators( instanceSelector.flatMap( IndexAccessor::snapshotFiles ).iterator() );
+        return concatResourceIterators( instanceSelector.transform( IndexAccessor::snapshotFiles ).iterator() );
     }
 
     @Override
@@ -149,7 +149,7 @@ public void verifyDeferredConstraints( PropertyAccessor propertyAccessor )
     @Override
     public boolean isDirty()
     {
-        return Iterables.stream( instanceSelector.flatMap( IndexAccessor::isDirty ) ).anyMatch( Boolean::booleanValue );
+        return Iterables.stream( instanceSelector.transform( IndexAccessor::isDirty ) ).anyMatch( Boolean::booleanValue );
     }
 
     @Override

diff --git a/.../kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexPopulator.java b/.../kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexPopulator.java
@@ -122,6 +122,6 @@ public void includeSample( IndexEntryUpdate<?> update )
     @Override
     public IndexSample sampleResult()
     {
-        return combineSamples( instanceSelector.flatMap( IndexPopulator::sampleResult ) );
+        return combineSamples( instanceSelector.transform( IndexPopulator::sampleResult ) );
     }
 }
diff --git a/...y/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexProvider.java b/...y/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexProvider.java
@@ -142,7 +142,7 @@ private void writeFailure( String indexName, StringBuilder builder, IndexProvide
     @Override
     public InternalIndexState getInitialState( StoreIndexDescriptor descriptor )
     {
-        Iterable<InternalIndexState> statesIterable = providers.flatMap( p -> p.getInitialState( descriptor ) );
+        Iterable<InternalIndexState> statesIterable = providers.transform( p -> p.getInitialState( descriptor ) );
         List<InternalIndexState> states = Iterables.asList( statesIterable );
         if ( states.contains( FAILED ) )
         {
@@ -161,7 +161,7 @@ public InternalIndexState getInitialState( StoreIndexDescriptor descriptor )
     @Override
     public IndexCapability getCapability()
     {
-        Iterable<IndexCapability> capabilities = providers.flatMap( IndexProvider::getCapability );
+        Iterable<IndexCapability> capabilities = providers.transform( IndexProvider::getCapability );
         return new UnionIndexCapability( capabilities )
         {
             @Override

diff --git a/...ity/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexReader.java b/...ity/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexReader.java
@@ -62,7 +62,7 @@ public long countIndexedNodes( long nodeId, Value... propertyValues )
     @Override
     public IndexSampler createSampler()
     {
-        return new FusionIndexSampler( instanceSelector.flatMap( IndexReader::createSampler ) );
+        return new FusionIndexSampler( instanceSelector.transform( IndexReader::createSampler ) );
     }
 
     @Override
@@ -71,7 +71,7 @@ public PrimitiveLongResourceIterator query( IndexQuery... predicates ) throws In
         IndexSlot slot = slotSelector.selectSlot( predicates, IndexQuery::valueGroup );
         return slot != null
                ? instanceSelector.select( slot ).query( predicates )
-               : concat( instanceSelector.flatMap( reader -> reader.query( predicates ) ) );
+               : concat( instanceSelector.transform( reader -> reader.query( predicates ) ) );
     }
 
     @Override

diff --git a/...nity/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/InstanceSelector.java b/...nity/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/InstanceSelector.java
@@ -110,7 +110,7 @@ <R,E extends Exception> EnumMap<IndexSlot,R> map( ThrowingFunction<T,R,E> conver
      * @throws E exception from converter.
      */
     @SuppressWarnings( "unchecked" )
-    <R,E extends Exception> Iterable<R> flatMap( ThrowingFunction<T,R,E> converter ) throws E
+    <R,E extends Exception> Iterable<R> transform( ThrowingFunction<T,R,E> converter ) throws E
     {
         List<R> result = new ArrayList<>();
         for ( IndexSlot slot : IndexSlot.values() )

diff --git a/.../kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/InstanceSelectorTest.java b/.../kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/InstanceSelectorTest.java
@@ -84,7 +84,7 @@ public void shouldThrowOnNonInstantiatedFlatMap()
         // when
         try
         {
-            selector.flatMap( Integer::parseInt );
+            selector.transform( Integer::parseInt );
             fail( "Should have failed" );
         }
         catch ( IllegalStateException e )
@@ -120,7 +120,7 @@ public void shouldFlatMap()
         InstanceSelector<String> selector = selectorFilledWithOrdinal();
 
         // when
-        List<Integer> actual = Iterables.asList( selector.flatMap( Integer::parseInt ) );
+        List<Integer> actual = Iterables.asList( selector.transform( Integer::parseInt ) );
         List<Integer> expected = Arrays.stream( IndexSlot.values() ).map( Enum::ordinal ).collect( Collectors.toList() );
 
         // then