From 89740708fbf8e1574732fb8f6ddee39b6a16a54f Mon Sep 17 00:00:00 2001
From: Mikhaylo Demianenko <mikhaylo.demianenko@neotechnology.com>
Date: Thu, 21 Jan 2016 14:23:33 +0100
Subject: [PATCH] Restore helper method, fix new tests, switch helper method in
 Iterables to use Iterable

---
 .../neo4j/helpers/collection/Iterables.java   |  2 +-
 .../java/org/neo4j/helpers/Exceptions.java    | 19 +++++++++++++++++++
 .../neo4j/graphdb/LuceneLabelScanStoreIT.java | 10 ++++++++--
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/community/collections/src/main/java/org/neo4j/helpers/collection/Iterables.java b/community/collections/src/main/java/org/neo4j/helpers/collection/Iterables.java
index 3cb61a166bc66..abea6db58ce97 100644
--- a/community/collections/src/main/java/org/neo4j/helpers/collection/Iterables.java
+++ b/community/collections/src/main/java/org/neo4j/helpers/collection/Iterables.java
@@ -414,7 +414,7 @@ public static <T> Iterator<T> concat( Iterator<? extends T>... iterables )
         return concat( Arrays.asList( (Iterator<T>[]) iterables ).iterator() );
     }
 
-    public static <T> ResourceIterator<T> concatResourceIterators( List<ResourceIterator<T>> iteratorList )
+    public static <T> ResourceIterator<T> concatResourceIterators( Iterable<ResourceIterator<T>> iteratorList )
     {
         return concatResourceIterators( iteratorList.iterator() );
     }
diff --git a/community/kernel/src/main/java/org/neo4j/helpers/Exceptions.java b/community/kernel/src/main/java/org/neo4j/helpers/Exceptions.java
index edbb121f40bdf..23991f56dd5b0 100644
--- a/community/kernel/src/main/java/org/neo4j/helpers/Exceptions.java
+++ b/community/kernel/src/main/java/org/neo4j/helpers/Exceptions.java
@@ -290,4 +290,23 @@ public static Predicate<StackTraceElement> forMethod( final String name )
     {
         return item -> item.getMethodName().equals( name );
     }
+
+    public static String briefOneLineStackTraceInformation( Predicate<StackTraceElement> toInclude )
+    {
+        StringBuilder builder = new StringBuilder();
+        for ( StackTraceElement element : Thread.currentThread().getStackTrace() )
+        {
+            if ( toInclude.test( element ) )
+            {
+                builder.append( builder.length() > 0 ? "," : "" )
+                        .append( simpleClassName( element.getClassName() ) + "#" + element.getMethodName() );
+            }
+        }
+        return builder.toString();
+    }
+
+    private static String simpleClassName( String className )
+    {
+        return className.substring( className.lastIndexOf( '.' ) );
+    }
 }
diff --git a/community/lucene-index/src/test/java/org/neo4j/graphdb/LuceneLabelScanStoreIT.java b/community/lucene-index/src/test/java/org/neo4j/graphdb/LuceneLabelScanStoreIT.java
index 9c0e7a0601a70..32782720526aa 100644
--- a/community/lucene-index/src/test/java/org/neo4j/graphdb/LuceneLabelScanStoreIT.java
+++ b/community/lucene-index/src/test/java/org/neo4j/graphdb/LuceneLabelScanStoreIT.java
@@ -50,7 +50,7 @@ public class LuceneLabelScanStoreIT extends LabelScanStoreIT
     public void scanStoreStartWithoutExistentIndex() throws IOException
     {
         NeoStoreDataSource dataSource = getDataSource();
-        LabelScanStore labelScanStore = dataSource.getLabelScanStore();
+        LabelScanStore labelScanStore = getLabelScanStore();
         labelScanStore.shutdown();
 
         File labelScanStoreDirectory = getLabelScanStoreDirectory( dataSource );
@@ -66,7 +66,7 @@ public void scanStoreStartWithoutExistentIndex() throws IOException
     public void scanStoreRecreateCorruptedIndexOnStartup() throws IOException
     {
         NeoStoreDataSource dataSource = getDataSource();
-        LabelScanStore labelScanStore = dataSource.getLabelScanStore();
+        LabelScanStore labelScanStore = getLabelScanStore();
 
         Node node = createTestNode();
         List<Long> labels = readNodeLabels( labelScanStore, node );
@@ -128,6 +128,12 @@ private NeoStoreDataSource getDataSource()
         return dataSourceManager.getDataSource();
     }
 
+    private LabelScanStore getLabelScanStore()
+    {
+        DependencyResolver dependencyResolver = dbRule.getDependencyResolver();
+        return dependencyResolver.resolveDependency( LabelScanStore.class );
+    }
+
     private void checkLabelScanStoreAccessible( LabelScanStore labelScanStore ) throws IOException
     {
         try ( LabelScanWriter labelScanWriter = labelScanStore.newWriter() )