Rename SYSTEM_DB_NAME to SYSTEM_DATABASE_NAME.

Remove RESTRICTED_STRING field that was introduced by mistake.
neo4j · Sep 13, 2018 · c6ac5ee · c6ac5ee
1 parent d1cade2
commit c6ac5ee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseSettings.java b/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseSettings.java
@@ -100,7 +100,7 @@ public class GraphDatabaseSettings implements LoadableConfig
     // default unspecified transaction timeout
     public static final long UNSPECIFIED_TIMEOUT = 0L;
 
-    public static final String SYSTEM_DB_NAME = "system.db";
+    public static final String SYSTEM_DATABASE_NAME = "system.db";
     public static final String DEFAULT_DATABASE_NAME = "graph.db";
 
     @SuppressWarnings( "unused" ) // accessed by reflection
@@ -115,7 +115,7 @@ public class GraphDatabaseSettings implements LoadableConfig
 
     @Description( "Name of the database to load" )
     public static final Setting<String> active_database =
-            buildSetting( "dbms.active_database", STRING, DEFAULT_DATABASE_NAME ).constraint( except( SYSTEM_DB_NAME ) ).build();
+            buildSetting( "dbms.active_database", STRING, DEFAULT_DATABASE_NAME ).constraint( except( SYSTEM_DATABASE_NAME ) ).build();
 
     @Description( "Path of the data directory. You must not configure more than one Neo4j installation to use the " +
             "same data directory." )

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/configuration/Settings.java b/community/kernel/src/main/java/org/neo4j/kernel/configuration/Settings.java
@@ -503,21 +503,6 @@ public String toString()
         }
     };
 
-    public static final Function<String, String> RESTRICTED_STRING = new Function<String, String>()
-    {
-        @Override
-        public String apply( String value )
-        {
-            return value.trim();
-        }
-
-        @Override
-        public String toString()
-        {
-            return "a string";
-        }
-    };
-
     public static final Function<String,List<String>> STRING_LIST = list( SEPARATOR, STRING );
 
     public static final Function<String,HostnamePort> HOSTNAME_PORT = new Function<String, HostnamePort>()