Fixed test and improved style

community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ResourceInjectionTest.java

@@ -100,7 +100,6 @@ public void shouldFailNicelyWhenUnknownAPI() throws Throwable
 
         // Then
         compiler.compileProcedure( ProcedureWithUnknownAPI.class, Optional.empty(), true );
-
     }
 
     @Test
@@ -142,7 +141,6 @@ public void shouldFailNicelyWhenUnsafeAPISafeMode() throws Throwable
                     "org.neo4j.kernel.impl.proc.listCoolPeople is not " +
                             "available due to not having unrestricted access rights, check configuration." ) );
         }
-
     }
 
     @Test
@@ -170,7 +168,6 @@ public void shouldFailNicelyWhenFunctionUsesUnknownAPI() throws Throwable
 
         // Then
         compiler.compileFunction( FunctionWithUnknownAPI.class );
-
     }
 
     @Test
@@ -195,7 +192,6 @@ public void shouldFailNicelyWhenUnsafeAPISafeModeFunction() throws Throwable
                     "org.neo4j.kernel.impl.proc.listCoolPeople is not " +
                             "available due to not having unrestricted access rights, check configuration." ) );
         }
-
     }
 
     @Test
@@ -224,7 +220,6 @@ public void shouldFailNicelyWhenAggregationFunctionUsesUnknownAPI() throws Throw
 
         // Then
         compiler.compileAggregationFunction( AggregationFunctionWithUnknownAPI.class );
-
     }
 
     @Test
@@ -250,7 +245,6 @@ public void shouldFailNicelyWhenUnsafeAPISafeModeAggregationFunction() throws Th
                     "org.neo4j.kernel.impl.proc.listCoolPeople is not " +
                             "available due to not having unrestricted access rights, check configuration." ) );
         }
-
     }
 
     @Test
@@ -266,7 +260,7 @@ public void shouldFailNicelyWhenAllUsesUnsafeAPI() throws Throwable
                 .warn( "org.neo4j.kernel.impl.proc.listCoolPeople is not " +
                         "available due to not having unrestricted access rights, check configuration." );
         verify( log )
-                .warn( "org.neo4j.kernel.impl.proc.safeUserFunctionInUnknownAPIClass is not " +
+                .warn( "org.neo4j.kernel.impl.proc.safeUserFunctionInUnsafeAPIClass is not " +
                         "available due to not having unrestricted access rights, check configuration." );
         verify( log )
                 .warn( "org.neo4j.kernel.impl.proc.listCoolPeopleProcedure is not " +
@@ -510,10 +504,9 @@ public Stream<MyOutputRecord> listCoolPeopleProcedure()
         }
 
         @UserFunction
-        public String safeUserFunctionInUnknownAPIClass()
+        public String safeUserFunctionInUnsafeAPIClass()
         {
             return "a safe function";
         }
     }
-
 }

integrationtests/src/test/java/org/neo4j/procedure/ProcedureIT.java

@@ -1148,7 +1148,6 @@ public void setUp() throws IOException
         db = new TestGraphDatabaseFactory()
                 .newImpermanentDatabaseBuilder()
                 .setConfig( plugin_dir, plugins.getRoot().getAbsolutePath() )
-                .setConfig( GraphDatabaseSettings.procedure_unrestricted, "*" )
                 .newGraphDatabase();
     }
 
@@ -1290,9 +1289,6 @@ public static class ClassWithProcedures
         @Context
         public ProcedureTransaction procedureTransaction;
 
-        @Context
-        public GraphDatabaseAPI graphDatabaseAPI;
-
         @Procedure
         public Stream<Output> guardMe()
         {
@@ -1648,11 +1644,8 @@ public void schemaTryingToWrite()
 
     public static class ClassWithFunctions
     {
-        @Context
-        public GraphDatabaseAPI graphDatabaseAPI;
-
         @UserFunction()
-        public String getNodeName( @Name( value = "node", defaultValue = "null") Node node )
+        public String getNodeName( @Name( value = "node", defaultValue = "null" ) Node node )
         {
             return "nodeName";
         }