Minor clean-ups from PR review

neo4j · Oct 21, 2016 · 0164c04 · 0164c04
1 parent df67896
commit 0164c04
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 48 deletions.
diff --git a/...ty/src/main/java/org/neo4j/server/security/enterprise/configuration/SecuritySettings.java b/...ty/src/main/java/org/neo4j/server/security/enterprise/configuration/SecuritySettings.java
@@ -231,28 +231,28 @@ public class SecuritySettings
     //=========================================================================
 
     @Internal
-    public static final Setting<File> security_log_filename = derivedSetting("dbms.security.log_path",
+    public static final Setting<File> security_log_filename = derivedSetting( "dbms.security.log_path",
             GraphDatabaseSettings.logs_directory,
             ( logs ) -> new File( logs, "security.log" ),
             PATH );
 
-    @Description("Security log level threshold.")
+    @Description( "Security log level threshold." )
     public static final Setting<Level> security_log_level = setting( "dbms.logs.security.level",
             options( Level.class ), "INFO" );
 
     @Description( "Set to log successful authentication events." )
     public static final Setting<Boolean> security_log_successful_authentication =
-            setting("dbms.security.log_successful_authentication", BOOLEAN, "true" );
+            setting( "dbms.security.log_successful_authentication", BOOLEAN, "true" );
 
     @Description( "Threshold for rotation of the security log." )
     public static final Setting<Long> store_security_log_rotation_threshold =
-            setting("dbms.logs.security.rotation.size", BYTES, "20m", min(0L), max( Long.MAX_VALUE ) );
+            setting( "dbms.logs.security.rotation.size", BYTES, "20m", min(0L), max( Long.MAX_VALUE ) );
 
     @Description( "Minimum time interval after last rotation of the security log before it may be rotated again." )
     public static final Setting<Long> store_security_log_rotation_delay =
-            setting("dbms.logs.security.rotation.delay", DURATION, "300s" );
+            setting( "dbms.logs.security.rotation.delay", DURATION, "300s" );
 
     @Description( "Maximum number of history files for the security log." )
     public static final Setting<Integer> store_security_log_max_archives =
-            setting("dbms.logs.security.rotation.keep_number", INTEGER, "7", min(1) );
+            setting( "dbms.logs.security.rotation.keep_number", INTEGER, "7", min(1) );
 }
diff --git a/...urity/src/test/java/org/neo4j/server/security/enterprise/auth/plugin/PluginRealmTest.java b/...urity/src/test/java/org/neo4j/server/security/enterprise/auth/plugin/PluginRealmTest.java
@@ -91,64 +91,42 @@ private void assertLogged( String name )
             );
     }
 
-    private class LoggingAuthPlugin extends LoggingAdapter implements AuthPlugin
+    private class LoggingAuthPlugin extends TestAuthPlugin
     {
         @Override
-        public String name()
+        public void initialize( RealmOperations realmOperations ) throws Throwable
-        {
-            return "LoggingAuthPlugin";
-        }
-
-        @Override
-        public AuthInfo authenticateAndAuthorize( AuthToken authToken ) throws AuthenticationException
         {
-            return null;
+            logLines( realmOperations );
         }
     }
 
-    private class LoggingAuthenticationPlugin extends LoggingAdapter implements AuthenticationPlugin
+    private class LoggingAuthenticationPlugin extends TestAuthenticationPlugin
     {
         @Override
-        public String name()
+        public void initialize( RealmOperations realmOperations ) throws Throwable
-        {
-            return "LoggingAuthenticationPlugin";
-        }
-
-        @Override
-        public AuthenticationInfo authenticate( AuthToken authToken ) throws AuthenticationException
         {
-            return null;
+            logLines( realmOperations );
         }
     }
 
-    private class LoggingAuthorizationPlugin extends LoggingAdapter implements AuthorizationPlugin
+    private class LoggingAuthorizationPlugin extends TestAuthorizationPlugin
     {
         @Override
-        public String name()
+        public void initialize( RealmOperations realmOperations ) throws Throwable
-        {
-            return "LoggingAuthorizationPlugin";
-        }
-
-        @Override
-        public AuthorizationInfo authorize( Collection<PrincipalAndRealm> principals )
         {
-            return null;
+            logLines( realmOperations );
         }
     }
 
-    abstract class LoggingAdapter extends RealmLifecycle.Adapter
+    private static void logLines( RealmOperations realmOperations ) throws Throwable
     {
-        @Override
+        RealmOperations.Log log = realmOperations.log();
-        public void initialize( RealmOperations realmOperations ) throws Throwable
+        if ( log.isDebugEnabled() )
         {
-            RealmOperations.Log log = realmOperations.log();
+            log.debug( "debug line" );
-            if ( log.isDebugEnabled() )
-            {
-                log.debug( "debug line" );
-            }
-            log.info( "info line" );
-            log.warn( "warn line" );
-            log.error( "error line" );
         }
+        log.info( "info line" );
+        log.warn( "warn line" );
+        log.error( "error line" );
     }
 }
diff --git a/...rise/security/src/test/java/org/neo4j/server/security/enterprise/log/SecurityLogTest.java b/...rise/security/src/test/java/org/neo4j/server/security/enterprise/log/SecurityLogTest.java
@@ -19,7 +19,6 @@
  */
 package org.neo4j.server.security.enterprise.log;
 
-import org.hamcrest.Matchers;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -37,6 +36,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.array;
 import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
 import static org.neo4j.helpers.collection.MapUtil.stringMap;
 
 public class SecurityLogTest
@@ -58,9 +58,9 @@ public void shouldRotateLog() throws IOException
         FileSystemAbstraction fs = fileSystemRule.get();
 
         File activeLogFile = config.get( SecuritySettings.security_log_filename );
-        assertThat( fs.fileExists( activeLogFile ), Matchers.equalTo( true ) );
+        assertThat( fs.fileExists( activeLogFile ), equalTo( true ) );
-        assertThat( fs.fileExists( archive( 1 ) ), Matchers.equalTo( true ) );
+        assertThat( fs.fileExists( archive( 1 ) ), equalTo( true ) );
-        assertThat( fs.fileExists( archive( 2 ) ), Matchers.equalTo( false ) );
+        assertThat( fs.fileExists( archive( 2 ) ), equalTo( false ) );
 
         String[] activeLines = readLogFile( fs, activeLogFile );
         assertThat( activeLines, array( containsString( "line 2" ) ) );