Make discovery_type and discovery_implementation case insensitive.

Make case sensitivity of options settings explicit.

community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseSettings.java

@@ -75,8 +75,8 @@
 import static org.neo4j.kernel.configuration.Settings.listenAddress;
 import static org.neo4j.kernel.configuration.Settings.matches;
 import static org.neo4j.kernel.configuration.Settings.min;
-import static org.neo4j.kernel.configuration.Settings.options;
 import static org.neo4j.kernel.configuration.Settings.optionsIgnoreCase;
+import static org.neo4j.kernel.configuration.Settings.optionsObeyCase;
 import static org.neo4j.kernel.configuration.Settings.pathSetting;
 import static org.neo4j.kernel.configuration.Settings.range;
 import static org.neo4j.kernel.configuration.Settings.setting;
@@ -189,12 +189,12 @@ public class GraphDatabaseSettings implements LoadableConfig
     @Description( "Set this to specify the default parser (language version)." )
     public static final Setting<String> cypher_parser_version = setting(
             "cypher.default_language_version",
-            options( "2.3", "3.1", "3.3","3.5", DEFAULT ), DEFAULT );
+            optionsObeyCase( "2.3", "3.1", "3.3","3.5", DEFAULT ), DEFAULT );
 
     @Description( "Set this to specify the default planner for the default language version." )
     public static final Setting<String> cypher_planner = setting(
             "cypher.planner",
-            options( "COST", "RULE", DEFAULT ), DEFAULT );
+            optionsObeyCase( "COST", "RULE", DEFAULT ), DEFAULT );
 
     @Description( "Set this to specify the behavior when Cypher planner or runtime hints cannot be fulfilled. "
             + "If true, then non-conformance will result in an error, otherwise only a warning is generated." )
@@ -333,7 +333,7 @@ public class GraphDatabaseSettings implements LoadableConfig
                   "Setting the algorithm to 'none' will cause the threshold to not decay over time." )
     @Internal
     public static final Setting<String> cypher_replan_algorithm = setting( "unsupported.cypher.replan_algorithm",
-            options( "inverse", "exponential", "none", DEFAULT ), DEFAULT );
+            optionsObeyCase( "inverse", "exponential", "none", DEFAULT ), DEFAULT );
 
     @Description( "Enable using minimum cardinality estimates in the Cypher cost planner, so that cardinality " +
                   "estimates for logical plan operators are not allowed to go below certain thresholds even when " +
@@ -456,17 +456,17 @@ public class GraphDatabaseSettings implements LoadableConfig
 
     @Description( "Debug log level threshold." )
     public static final Setting<Level> store_internal_log_level = setting( "dbms.logs.debug.level",
-            options( Level.class ), "INFO" );
+            optionsObeyCase( Level.class ), "INFO" );
 
     @Description( "Database timezone. Among other things, this setting influences which timezone the logs and monitoring procedures use." )
     public static final Setting<LogTimeZone> db_timezone =
-            setting( "dbms.db.timezone", options( LogTimeZone.class ), LogTimeZone.UTC.name() );
+            setting( "dbms.db.timezone", optionsObeyCase( LogTimeZone.class ), LogTimeZone.UTC.name() );
 
     @Description( "Database logs timezone." )
     @Deprecated
     @ReplacedBy( "dbms.db.timezone" )
     public static final Setting<LogTimeZone> log_timezone =
-            setting( "dbms.logs.timezone", options( LogTimeZone.class ), LogTimeZone.UTC.name() );
+            setting( "dbms.logs.timezone", optionsObeyCase( LogTimeZone.class ), LogTimeZone.UTC.name() );
 
     @Description( "Database timezone for temporal functions. All Time and DateTime values that are created without " +
             "an explicit timezone will use this configured default timezone." )
@@ -1053,7 +1053,7 @@ public enum TransactionStateMemoryAllocation
     @Description( "Defines whether memory for transaction state should be allocated on- or off-heap." )
     public static final Setting<TransactionStateMemoryAllocation> tx_state_memory_allocation = buildSetting(
             "dbms.tx_state.memory_allocation",
-            options( TransactionStateMemoryAllocation.class, true ),
+            optionsIgnoreCase( TransactionStateMemoryAllocation.class ),
             TransactionStateMemoryAllocation.OFF_HEAP.name() ).build();
 
     @Description( "The maximum amount of off-heap memory that can be used to store transaction state data; it's a total amount of memory " +
@@ -1123,7 +1123,7 @@ public Connector( String key, @SuppressWarnings( "UnusedParameters" ) String typ
         {
             group = new GroupSettingSupport( Connector.class, key );
             enabled = group.scope( setting( "enabled", BOOLEAN, FALSE ) );
-            type = group.scope( setting( "type", options( ConnectorType.class ), NO_DEFAULT ) );
+            type = group.scope( setting( "type", optionsObeyCase( ConnectorType.class ), NO_DEFAULT ) );
         }
 
         public enum ConnectorType
@@ -1169,7 +1169,7 @@ public BoltConnector( String key )
         {
             super( key, null );
             encryption_level = group.scope(
-                    setting( "tls_level", options( EncryptionLevel.class ), EncryptionLevel.OPTIONAL.name() ) );
+                    setting( "tls_level", optionsObeyCase( EncryptionLevel.class ), EncryptionLevel.OPTIONAL.name() ) );
             Setting<ListenSocketAddress> legacyAddressSetting = listenAddress( "address", 7687 );
             Setting<ListenSocketAddress> listenAddressSetting = legacyFallback( legacyAddressSetting,
                     listenAddress( "listen_address", 7687 ) );

community/kernel/src/main/java/org/neo4j/kernel/configuration/BoltConnector.java

@@ -34,7 +34,7 @@
 import static org.neo4j.kernel.configuration.Settings.advertisedAddress;
 import static org.neo4j.kernel.configuration.Settings.legacyFallback;
 import static org.neo4j.kernel.configuration.Settings.listenAddress;
-import static org.neo4j.kernel.configuration.Settings.options;
+import static org.neo4j.kernel.configuration.Settings.optionsObeyCase;
 import static org.neo4j.kernel.configuration.Settings.setting;
 
 @Description( "Configuration options for Bolt connectors. " +
@@ -80,7 +80,7 @@ public BoltConnector( String key )
     {
         super( key );
         encryption_level = group.scope(
-                Settings.setting( "tls_level", options( EncryptionLevel.class ), OPTIONAL.name() ) );
+                Settings.setting( "tls_level", optionsObeyCase( EncryptionLevel.class ), OPTIONAL.name() ) );
         Setting<ListenSocketAddress> legacyAddressSetting = listenAddress( "address", 7687 );
         Setting<ListenSocketAddress> listenAddressSetting = legacyFallback( legacyAddressSetting,
                 listenAddress( "listen_address", 7687 ) );

community/kernel/src/main/java/org/neo4j/kernel/configuration/BoltConnectorValidator.java

@@ -35,7 +35,7 @@
 import static org.neo4j.kernel.configuration.Settings.NO_DEFAULT;
 import static org.neo4j.kernel.configuration.Settings.advertisedAddress;
 import static org.neo4j.kernel.configuration.Settings.listenAddress;
-import static org.neo4j.kernel.configuration.Settings.options;
+import static org.neo4j.kernel.configuration.Settings.optionsObeyCase;
 import static org.neo4j.kernel.configuration.Settings.setting;
 
 public class BoltConnectorValidator extends ConnectorValidator
@@ -64,13 +64,13 @@ protected Optional<Setting<Object>> getSettingFor( @Nonnull String settingName,
             break;
         case "type":
             setting =
-                    (BaseSetting) setting( settingName, options( Connector.ConnectorType.class ), NO_DEFAULT );
+                    (BaseSetting) setting( settingName, optionsObeyCase( Connector.ConnectorType.class ), NO_DEFAULT );
             setting.setDeprecated( true );
             setting.setDescription( "Connector type. This setting is deprecated and its value will instead be " +
                     "inferred from the name of the connector." );
             break;
         case "tls_level":
-            setting = (BaseSetting) setting( settingName, options( BoltConnector.EncryptionLevel.class ),
+            setting = (BaseSetting) setting( settingName, optionsObeyCase( BoltConnector.EncryptionLevel.class ),
                     OPTIONAL.name() );
             setting.setDescription( "Encryption level to require this connector to use." );
             break;

community/kernel/src/main/java/org/neo4j/kernel/configuration/Connector.java

@@ -24,7 +24,7 @@
 
 import static org.neo4j.kernel.configuration.Settings.BOOLEAN;
 import static org.neo4j.kernel.configuration.Settings.NO_DEFAULT;
-import static org.neo4j.kernel.configuration.Settings.options;
+import static org.neo4j.kernel.configuration.Settings.optionsObeyCase;
 import static org.neo4j.kernel.configuration.Settings.setting;
 
 @Group( "dbms.connector" )
@@ -58,7 +58,7 @@ public Connector( String key )
     {
         group = new GroupSettingSupport( Connector.class, key );
         enabled = group.scope( setting( "enabled", BOOLEAN, "false" ) );
-        type = group.scope( setting( "type", options( ConnectorType.class ), NO_DEFAULT ) );
+        type = group.scope( setting( "type", optionsObeyCase( ConnectorType.class ), NO_DEFAULT ) );
     }
 
     public enum ConnectorType

community/kernel/src/main/java/org/neo4j/kernel/configuration/HttpConnector.java

@@ -29,7 +29,7 @@
 import static org.neo4j.kernel.configuration.Settings.advertisedAddress;
 import static org.neo4j.kernel.configuration.Settings.legacyFallback;
 import static org.neo4j.kernel.configuration.Settings.listenAddress;
-import static org.neo4j.kernel.configuration.Settings.options;
+import static org.neo4j.kernel.configuration.Settings.optionsObeyCase;
 import static org.neo4j.kernel.configuration.Settings.setting;
 
 @Description( "Configuration options for HTTP connectors. " +
@@ -73,7 +73,7 @@ public HttpConnector( String key, Encryption encryptionLevel )
     {
         super( key );
         this.encryptionLevel = encryptionLevel;
-        encryption = group.scope( setting( "encryption", options( HttpConnector.Encryption.class ), NO_DEFAULT ) );
+        encryption = group.scope( setting( "encryption", optionsObeyCase( HttpConnector.Encryption.class ), NO_DEFAULT ) );
         Setting<ListenSocketAddress> legacyAddressSetting = listenAddress( "address", encryptionLevel.defaultPort );
         Setting<ListenSocketAddress> listenAddressSetting = legacyFallback( legacyAddressSetting,
                 listenAddress( "listen_address", encryptionLevel.defaultPort ) );

community/kernel/src/main/java/org/neo4j/kernel/configuration/HttpConnectorValidator.java

@@ -41,7 +41,7 @@
 import static org.neo4j.kernel.configuration.Settings.advertisedAddress;
 import static org.neo4j.kernel.configuration.Settings.describeOneOf;
 import static org.neo4j.kernel.configuration.Settings.listenAddress;
-import static org.neo4j.kernel.configuration.Settings.options;
+import static org.neo4j.kernel.configuration.Settings.optionsObeyCase;
 import static org.neo4j.kernel.configuration.Settings.setting;
 
 public class HttpConnectorValidator extends ConnectorValidator
@@ -76,7 +76,7 @@ protected Optional<Setting<Object>> getSettingFor( @Nonnull String settingName,
         break;
         case "type":
             setting =
-                    (BaseSetting) setting( settingName, options( Connector.ConnectorType.class ), NO_DEFAULT );
+                    (BaseSetting) setting( settingName, optionsObeyCase( Connector.ConnectorType.class ), NO_DEFAULT );
             setting.setDeprecated( true );
             setting.setDescription( "Connector type. This setting is deprecated and its value will instead be " +
                     "inferred from the name of the connector." );
@@ -177,7 +177,7 @@ public static BaseSetting<HttpConnector.Encryption> encryptionSetting( @Nonnull
             defaultValue )
     {
         Setting<Encryption> s = setting( "dbms.connector." + name + ".encryption",
-                options( Encryption.class ), defaultValue.name() );
+                optionsObeyCase( Encryption.class ), defaultValue.name() );
 
         return new BaseSetting<Encryption>()
         {

community/kernel/src/main/java/org/neo4j/kernel/configuration/Settings.java

@@ -775,17 +775,17 @@ public String toString()
         }
     };
 
-    public static <T extends Enum<T>> Function<String, T> options( final Class<T> enumClass )
+    public static <T extends Enum<T>> Function<String, T> optionsObeyCase( final Class<T> enumClass )
     {
         return options( EnumSet.allOf( enumClass ), false );
     }
 
-    public static <T extends Enum<T>> Function<String, T> options( final Class<T> enumClass, boolean ignoreCase )
+    public static <T extends Enum<T>> Function<String, T> optionsIgnoreCase( final Class<T> enumClass )
     {
-        return options( EnumSet.allOf( enumClass ), ignoreCase );
+        return options( EnumSet.allOf( enumClass ), true );
     }
 
-    public static <T> Function<String, T> options( T... optionValues )
+    public static <T> Function<String, T> optionsObeyCase( T... optionValues )
     {
         return options( Iterables.iterable( optionValues ), false );
     }

community/kernel/src/main/java/org/neo4j/kernel/configuration/ssl/SslPolicyConfig.java

@@ -39,7 +39,7 @@
 import static org.neo4j.kernel.configuration.Settings.STRING;
 import static org.neo4j.kernel.configuration.Settings.STRING_LIST;
 import static org.neo4j.kernel.configuration.Settings.derivedSetting;
-import static org.neo4j.kernel.configuration.Settings.options;
+import static org.neo4j.kernel.configuration.Settings.optionsIgnoreCase;
 import static org.neo4j.kernel.configuration.Settings.pathSetting;
 import static org.neo4j.kernel.configuration.Settings.setting;
 
@@ -109,7 +109,7 @@ public SslPolicyConfig( String policyName )
         this.revoked_dir = group.scope( derivedDefault( "revoked_dir", base_directory, "revoked" ) );
 
         this.private_key_password = group.scope( setting( "private_key_password", STRING, NO_DEFAULT ) );
-        this.client_auth = group.scope( setting( "client_auth", options( ClientAuth.class, true ), ClientAuth.REQUIRE.name() ) );
+        this.client_auth = group.scope( setting( "client_auth", optionsIgnoreCase( ClientAuth.class ), ClientAuth.REQUIRE.name() ) );
         this.tls_versions = group.scope( setting( "tls_versions", STRING_LIST, joinList( TLS_VERSION_DEFAULTS ) ) );
         this.ciphers = group.scope( setting( "ciphers", STRING_LIST, joinList( CIPHER_SUITES_DEFAULTS ) ) );
         this.verify_hostname = group.scope( setting( "verify_hostname", BOOLEAN, FALSE ) );

community/kernel/src/main/java/org/neo4j/kernel/configuration/ssl/SslSystemSettings.java

@@ -25,7 +25,7 @@
 import org.neo4j.configuration.LoadableConfig;
 import org.neo4j.graphdb.config.Setting;
 
-import static org.neo4j.kernel.configuration.Settings.options;
+import static org.neo4j.kernel.configuration.Settings.optionsObeyCase;
 import static org.neo4j.kernel.configuration.Settings.setting;
 
 /**
@@ -35,5 +35,6 @@
 public class SslSystemSettings implements LoadableConfig
 {
     @Description( "Netty SSL provider" )
-    public static final Setting<SslProvider> netty_ssl_provider = setting( "dbms.netty.ssl.provider", options( SslProvider.class ), SslProvider.JDK.name() );
+    public static final Setting<SslProvider> netty_ssl_provider =
+            setting( "dbms.netty.ssl.provider", optionsObeyCase( SslProvider.class ), SslProvider.JDK.name() );
 }

enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/CausalClusteringSettings.java

@@ -72,7 +72,7 @@
 import static org.neo4j.kernel.configuration.Settings.list;
 import static org.neo4j.kernel.configuration.Settings.listenAddress;
 import static org.neo4j.kernel.configuration.Settings.min;
-import static org.neo4j.kernel.configuration.Settings.options;
+import static org.neo4j.kernel.configuration.Settings.optionsIgnoreCase;
 import static org.neo4j.kernel.configuration.Settings.prefixSetting;
 import static org.neo4j.kernel.configuration.Settings.setting;
 
@@ -197,7 +197,7 @@ public class CausalClusteringSettings implements LoadableConfig
 
     @Description( "Type of in-flight cache." )
     public static final Setting<InFlightCacheFactory.Type> in_flight_cache_type =
-            setting( "causal_clustering.in_flight_cache.type", options( InFlightCacheFactory.Type.class, true ),
+            setting( "causal_clustering.in_flight_cache.type", optionsIgnoreCase( InFlightCacheFactory.Type.class ),
                     InFlightCacheFactory.Type.CONSECUTIVE.name() );
 
     @Description( "The maximum number of entries in the in-flight cache." )
@@ -241,11 +241,11 @@ public HostnameResolver getHostnameResolver( LogProvider logProvider, LogProvide
 
     @Description( "Configure the discovery type used for cluster name resolution" )
     public static final Setting<DiscoveryType> discovery_type =
-            setting( "causal_clustering.discovery_type", options( DiscoveryType.class ), DiscoveryType.LIST.name() );
+            setting( "causal_clustering.discovery_type", optionsIgnoreCase( DiscoveryType.class ), DiscoveryType.LIST.name() );
 
     @Description( "Select the middleware used for cluster topology discovery" )
     public static final Setting<DiscoveryServiceFactorySelector.DiscoveryImplementation> discovery_implementation =
-            setting( "causal_clustering.discovery_implementation", options( DiscoveryServiceFactorySelector.DiscoveryImplementation.class ),
+            setting( "causal_clustering.discovery_implementation", optionsIgnoreCase( DiscoveryServiceFactorySelector.DiscoveryImplementation.class ),
                     DiscoveryServiceFactorySelector.DEFAULT.name() );
 
     @Description( "Prevents the network middleware from dumping its own logs. Defaults to true." )

enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/DiscoveryServiceFactorySelector.java

@@ -27,7 +27,7 @@
 
 public abstract class DiscoveryServiceFactorySelector<T extends DiscoveryServiceFactory>
 {
-    public static DiscoveryImplementation DEFAULT = DiscoveryImplementation.hazelcast;
+    public static DiscoveryImplementation DEFAULT = DiscoveryImplementation.HAZELCAST;
 
     public T select( Config config )
     {
@@ -39,6 +39,7 @@ public T select( Config config )
 
     public enum DiscoveryImplementation
     {
-        hazelcast, akka
+        HAZELCAST,
+        AKKA
     }
 }

enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/EnterpriseDiscoveryServiceFactorySelector.java

@@ -29,8 +29,8 @@ protected DiscoveryServiceFactory select( DiscoveryImplementation middleware )
     {
         switch ( middleware )
         {
-        case hazelcast: return new HazelcastDiscoveryServiceFactory();
-        case akka: throw new UnsupportedOperationException( "Akka based discovery is Commercial release only" );
+        case HAZELCAST: return new HazelcastDiscoveryServiceFactory();
+        case AKKA: throw new UnsupportedOperationException( "Akka based discovery is Commercial release only" );
         default: throw new IllegalArgumentException( "Should have matched a discovery service factory to " + middleware );
         }
     }