Revert changes to AssertableLogProvider from 7b267c6d905 "IndexingSer…

…vice log when deprecated IndexProviders are used"

And simply use Matchers.allOf instead where needed.

community/community-it/kernel-it/src/test/java/recovery/RecoveryCleanupIT.java

@@ -188,7 +188,7 @@ private void nativeIndexMustLogCrashPointerCleanupDuringRecovery( GraphDatabaseS
             matchers.add( indexRecoveryFinishedLogMatcher( subType ) );
             matchers.add( indexRecoveryLogMatcher( "Schema index cleanup job closed", subType ) );
         }
-        matchers.forEach( logProvider::assertContainsExactlyOneMessageMatchingInAnyOrder );
+        matchers.forEach( logProvider::assertContainsExactlyOneMessageMatching );
     }
 
     private Matcher<String> indexRecoveryLogMatcher( String logMessage, String subIndexProviderKey )

community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java

@@ -574,11 +574,13 @@ public void shouldLogDeprecatedIndexesOnInit() throws IOException
         indexingService.init();
 
         // then
-        userLogProvider.assertContainsExactlyOneMessageMatchingInAnyOrder(
-                Matchers.containsString( "IndexingService.init: Deprecated index providers in use:" ),
-                Matchers.containsString( lucene10Descriptor.name() + " (1 index)" ),
-                Matchers.containsString( native10Descriptor.name() + " (1 index)" ),
-                Matchers.containsString( native20Descriptor.name() + " (2 indexes)" )
+        userLogProvider.assertContainsExactlyOneMessageMatching(
+                Matchers.allOf(
+                        Matchers.containsString( "IndexingService.init: Deprecated index providers in use:" ),
+                        Matchers.containsString( lucene10Descriptor.name() + " (1 index)" ),
+                        Matchers.containsString( native10Descriptor.name() + " (1 index)" ),
+                        Matchers.containsString( native20Descriptor.name() + " (2 indexes)" )
+                )
         );
         onBothLogProviders( logProvider -> internalLogProvider.assertNoMessagesContaining( nativeBtree10Descriptor.name() ) );
         onBothLogProviders( logProvider -> internalLogProvider.assertNoMessagesContaining( fulltextDescriptor.name() ) );
@@ -625,11 +627,13 @@ public void shouldLogDeprecatedIndexesOnStart() throws IOException
         indexingService.start();
 
         // then
-        userLogProvider.assertContainsExactlyOneMessageMatchingInAnyOrder(
-                Matchers.containsString( "IndexingService.start: Deprecated index providers in use:" ),
-                Matchers.containsString( lucene10Descriptor.name() + " (1 index)" ),
-                Matchers.containsString( native10Descriptor.name() + " (1 index)" ),
-                Matchers.containsString( native20Descriptor.name() + " (2 indexes)" )
+        userLogProvider.assertContainsExactlyOneMessageMatching(
+                Matchers.allOf(
+                        Matchers.containsString( "IndexingService.start: Deprecated index providers in use:" ),
+                        Matchers.containsString( lucene10Descriptor.name() + " (1 index)" ),
+                        Matchers.containsString( native10Descriptor.name() + " (1 index)" ),
+                        Matchers.containsString( native20Descriptor.name() + " (2 indexes)" )
+                )
         );
         onBothLogProviders( logProvider -> internalLogProvider.assertNoMessagesContaining( nativeBtree10Descriptor.name() ) );
         onBothLogProviders( logProvider -> internalLogProvider.assertNoMessagesContaining( fulltextDescriptor.name() ) );

community/logging/src/test/java/org/neo4j/logging/AssertableLogProvider.java

@@ -764,24 +764,14 @@ public void assertContainsMessageMatching( Matcher<String> messageMatcher )
         }
     }
 
-    @SafeVarargs
-    public final void assertContainsExactlyOneMessageMatchingInAnyOrder( Matcher<? extends String>... messageMatchers )
+    public final void assertContainsExactlyOneMessageMatching( Matcher<String> messageMatcher )
     {
         boolean found = false;
         synchronized ( logCalls )
         {
             for ( LogCall logCall : logCalls )
             {
-                boolean match = true;
-                for ( Matcher<? extends String> messageMatcher : messageMatchers )
-                {
-                    if ( !messageMatcher.matches( logCall.message ) )
-                    {
-                        match = false;
-                        break;
-                    }
-                }
-                if ( match )
+                if ( messageMatcher.matches( logCall.message ) )
                 {
                     if ( !found )
                     {
@@ -790,10 +780,7 @@ public final void assertContainsExactlyOneMessageMatchingInAnyOrder( Matcher<? e
                     else
                     {
                         StringDescription description = new StringDescription();
-                        for ( Matcher<? extends String> messageMatcher : messageMatchers )
-                        {
-                            description.appendDescriptionOf( messageMatcher );
-                        }
+                        description.appendDescriptionOf( messageMatcher );
                         fail( format( "Expected exactly one log statement with message as %s, but multiple found. Actual log calls were:%n%s",
                                 description.toString(), serialize( logCalls.iterator() ) ) );
                     }
@@ -802,10 +789,7 @@ public final void assertContainsExactlyOneMessageMatchingInAnyOrder( Matcher<? e
             if ( !found )
             {
                 StringDescription description = new StringDescription();
-                for ( Matcher<? extends String> messageMatcher : messageMatchers )
-                {
-                    description.appendDescriptionOf( messageMatcher );
-                }
+                description.appendDescriptionOf( messageMatcher );
                 fail( format(
                         "Expected at least one log statement with message as %s, but none found. Actual log calls were:\n%s",
                         description.toString(), serialize( logCalls.iterator() ) ) );

enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/StoreCopyClientIT.java

@@ -326,7 +326,7 @@ public AdvertisedSocketAddress secondary()
         }
         catch ( StoreCopyFailedException e )
         {
-            assertableLogProvider.assertContainsExactlyOneMessageMatchingInAnyOrder(
+            assertableLogProvider.assertContainsExactlyOneMessageMatching(
                     both( containsString( "Connection refused:" ) ).and( containsString( "localhost/127.0.0.1:" + port ) ) );
         }
     }
@@ -356,7 +356,7 @@ public AdvertisedSocketAddress secondary() throws CatchupAddressResolutionExcept
         }
         catch ( StoreCopyFailedException e )
         {
-            assertableLogProvider.assertContainsExactlyOneMessageMatchingInAnyOrder( startsWith( "Unable to resolve address for" ) );
+            assertableLogProvider.assertContainsExactlyOneMessageMatching( startsWith( "Unable to resolve address for" ) );
             assertableLogProvider.assertLogStringContains(catchupAddressResolutionException.getMessage() );
         }
     }

enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/diagnostics/CoreMonitorTest.java

@@ -52,7 +52,7 @@ public void shouldNotDuplicateToAnyLog()
         ClusterId clusterId = new ClusterId( UUID.randomUUID() );
         monitor.boundToCluster( clusterId );
 
-        user.assertContainsExactlyOneMessageMatchingInAnyOrder( Matchers.equalToIgnoringCase( "Bound to cluster with id " + clusterId.uuid() ) );
-        debug.assertContainsExactlyOneMessageMatchingInAnyOrder( Matchers.equalToIgnoringCase( "Bound to cluster with id " + clusterId.uuid() ) );
+        user.assertContainsExactlyOneMessageMatching( Matchers.equalToIgnoringCase( "Bound to cluster with id " + clusterId.uuid() ) );
+        debug.assertContainsExactlyOneMessageMatching( Matchers.equalToIgnoringCase( "Bound to cluster with id " + clusterId.uuid() ) );
     }
 }