Clean up.

neo4j · Oct 26, 2016 · 6326953 · 6326953
1 parent 477c0dc
commit 6326953
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 19 deletions.
diff --git a/community/command-line/src/main/java/org/neo4j/commandline/admin/AdminCommand.java b/community/command-line/src/main/java/org/neo4j/commandline/admin/AdminCommand.java
@@ -20,8 +20,8 @@
 package org.neo4j.commandline.admin;
 
 import java.nio.file.Path;
-import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 
 import org.neo4j.helpers.Service;
 import org.neo4j.helpers.collection.Iterables;
@@ -95,7 +95,7 @@ protected Blocker( String key, String... altKeys )
         /**
          * @return              a list of the commands this blocker applies to.
          */
-        public abstract List<String> commands();
+        public abstract Set<String> commands();
 
         /**
          * @return explanation of why a command was blocked. This will be shown to the user.

diff --git a/community/dbms/src/test/java/org/neo4j/commandline/dbms/DumpCommandTest.java b/community/dbms/src/test/java/org/neo4j/commandline/dbms/DumpCommandTest.java
@@ -33,8 +33,7 @@
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.ArrayList;
+import java.util.Arrays;
-import java.util.List;
 import java.util.function.Predicate;
 
 import org.neo4j.commandline.admin.AdminCommand;
@@ -43,7 +42,6 @@
 import org.neo4j.commandline.admin.IncorrectUsage;
 import org.neo4j.dbms.archive.Dumper;
 import org.neo4j.io.fs.DefaultFileSystemAbstraction;
-import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.internal.StoreLocker;
 import org.neo4j.test.rule.TestDirectory;
 
@@ -324,13 +322,8 @@ public void shouldBlockDumpIfABlockerSaysSo() throws IncorrectUsage
         when( blocker.doesBlock( any(), any() ) ).thenReturn( true );
         when( blocker.explanation() ).thenReturn( "blocked" );
 
-        List<AdminCommand.Blocker> blockers = new ArrayList<AdminCommand.Blocker>()
-        {{
-            add( blocker );
-        }};
-
         BlockerLocator blockerLocator = mock( BlockerLocator.class );
-        when(blockerLocator.findBlockersForCommand( "dump" )).thenReturn( blockers );
+        when( blockerLocator.findBlockersForCommand( "dump" ) ).thenReturn( Arrays.asList( blocker ) );
 
         try
         {
@@ -355,15 +348,9 @@ public void shouldBlockDumpIfOneBlockerOutOfManySaysSo() throws IncorrectUsage
         when( falseBlocker.doesBlock( any(), any() ) ).thenReturn( false );
         when( falseBlocker.explanation() ).thenReturn( "falseBlocker explanation" );
 
-        List<AdminCommand.Blocker> blockers = new ArrayList<AdminCommand.Blocker>()
-        {{
-            add( trueBlocker );
-            add( falseBlocker );
-            add( falseBlocker );
-        }};
-
         BlockerLocator blockerLocator = mock( BlockerLocator.class );
-        when(blockerLocator.findBlockersForCommand( "dump" )).thenReturn( blockers );
+        when( blockerLocator.findBlockersForCommand( "dump" ) ).thenReturn(
+                Arrays.asList( trueBlocker, falseBlocker, falseBlocker ) );
 
         try
         {