From fd7ca16d124a8ba5b5837e317efb322ad4de4aa3 Mon Sep 17 00:00:00 2001
From: Craig Taverner <craig@amanzi.com>
Date: Thu, 5 Apr 2018 11:21:20 +0200
Subject: [PATCH] Removed additional HashSet since existing HashMap is good
 enough

---
 .../org/neo4j/graphdb/config/BaseSetting.java  |  6 +++---
 .../org/neo4j/kernel/configuration/Config.java | 18 ++++++++----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/community/graphdb-api/src/main/java/org/neo4j/graphdb/config/BaseSetting.java b/community/graphdb-api/src/main/java/org/neo4j/graphdb/config/BaseSetting.java
index b0f02a5997cb7..00ba65b57b7f9 100644
--- a/community/graphdb-api/src/main/java/org/neo4j/graphdb/config/BaseSetting.java
+++ b/community/graphdb-api/src/main/java/org/neo4j/graphdb/config/BaseSetting.java
@@ -31,7 +31,7 @@ public abstract class BaseSetting<T> implements Setting<T>
     private boolean deprecated;
     private String replacement;
     private boolean internal;
-    private boolean isSecret;
+    private boolean secret;
     private boolean dynamic;
     private String documentedDefaultValue;
     private String description;
@@ -72,12 +72,12 @@ public void setInternal( final boolean val )
     @Override
     public boolean secret()
     {
-        return this.isSecret;
+        return this.secret;
     }
 
     public void setSecret( final boolean val )
     {
-        this.isSecret = val;
+        this.secret = val;
     }
 
     @Override
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/configuration/Config.java b/community/kernel/src/main/java/org/neo4j/kernel/configuration/Config.java
index 9676ed87529a5..c4dc910e4780b 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/configuration/Config.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/configuration/Config.java
@@ -85,7 +85,6 @@ public class Config implements DiagnosticsProvider, Configuration
     private final List<ConfigOptions> configOptions;
 
     private final Map<String,String> params = new CopyOnWriteHashMap<>(); // Read heavy workload
-    private final Set<String> secrets = new HashSet<>();
     private final Map<String, Collection<BiConsumer<String,String>>> updateListeners = new ConcurrentHashMap<>();
     private final ConfigurationMigrator migrator;
     private final List<ConfigurationValidator> validators = new ArrayList<>();
@@ -394,14 +393,6 @@ private Config( File configFile,
                 .map( BaseSetting.class::cast )
                 .forEach( setting -> settingsMap.put( setting.name(), setting ) );
 
-        // Find secret settings
-        configOptions.stream()
-                .map( ConfigOptions::settingGroup )
-                .filter( SettingGroup::secret )
-                .filter( BaseSetting.class::isInstance )
-                .map( BaseSetting.class::cast )
-                .forEach( setting -> secrets.add( setting.name() ) );
-
         validators.addAll( additionalValidators );
         migrator = new AnnotationBasedConfigurationMigrator( settingsClasses );
         this.overriddenDefaults.putAll( overriddenDefaults );
@@ -767,7 +758,14 @@ private String obsfucateIfSecret( Map.Entry<String,String> param )
 
     private String obsfucateIfSecret( String key, String value )
     {
-        return secrets.contains( key ) ? Secret.OBSFUCATED : value;
+        if ( settingsMap.containsKey( key ) && settingsMap.get( key ).secret() )
+        {
+            return Secret.OBSFUCATED;
+        }
+        else
+        {
+            return value;
+        }
     }
 
     /**