diff --git a/community/configuration/src/main/java/org/neo4j/configuration/ConfigValue.java b/community/configuration/src/main/java/org/neo4j/configuration/ConfigValue.java index 254d3ddacdd9b..3493a2105f860 100644 --- a/community/configuration/src/main/java/org/neo4j/configuration/ConfigValue.java +++ b/community/configuration/src/main/java/org/neo4j/configuration/ConfigValue.java @@ -34,7 +34,7 @@ public class ConfigValue private final Optional value; private final String valueDescription; private final boolean internal; - private final boolean isSecret; + private final boolean secret; private final boolean dynamic; private final boolean deprecated; private final Optional replacement; @@ -42,7 +42,7 @@ public class ConfigValue public ConfigValue( @Nonnull String name, @Nonnull Optional description, @Nonnull Optional documentedDefaultValue, @Nonnull Optional value, @Nonnull String valueDescription, boolean internal, boolean dynamic, boolean deprecated, - @Nonnull Optional replacement, boolean isSecret ) + @Nonnull Optional replacement, boolean secret ) { this.name = name; this.description = description; @@ -50,7 +50,7 @@ public ConfigValue( @Nonnull String name, @Nonnull Optional description, this.value = value; this.valueDescription = valueDescription; this.internal = internal; - this.isSecret = isSecret; + this.secret = secret; this.dynamic = dynamic; this.deprecated = deprecated; this.replacement = replacement; @@ -77,7 +77,7 @@ public Optional value() @Nonnull public Optional valueAsString() { - return this.isSecret() ? Optional.of( Secret.OBSFUCATED ) : value.map( ConfigValue::valueToString ); + return this.secret() ? Optional.of( Secret.OBSFUCATED ) : value.map( ConfigValue::valueToString ); } @Override @@ -102,9 +102,9 @@ public boolean internal() return internal; } - public boolean isSecret() + public boolean secret() { - return isSecret; + return secret; } public boolean dynamic() diff --git a/community/configuration/src/test/java/org/neo4j/configuration/ConfigValueTest.java b/community/configuration/src/test/java/org/neo4j/configuration/ConfigValueTest.java index dc77430c6695f..0ec07bb54af0e 100644 --- a/community/configuration/src/test/java/org/neo4j/configuration/ConfigValueTest.java +++ b/community/configuration/src/test/java/org/neo4j/configuration/ConfigValueTest.java @@ -42,7 +42,7 @@ public void handlesEmptyValue() throws Exception assertFalse( value.deprecated() ); assertEquals( Optional.empty(), value.replacement() ); assertFalse( value.internal() ); - assertFalse( value.isSecret() ); + assertFalse( value.secret() ); } @Test @@ -52,7 +52,7 @@ public void handlesInternal() throws Exception "description", true, false, false, Optional.empty(), false ); assertTrue( value.internal() ); - assertFalse( value.isSecret() ); + assertFalse( value.secret() ); } @Test @@ -66,7 +66,7 @@ public void handlesNonEmptyValue() throws Exception assertFalse( value.deprecated() ); assertEquals( Optional.empty(), value.replacement() ); assertFalse( value.internal() ); - assertFalse( value.isSecret() ); + assertFalse( value.secret() ); } @Test @@ -80,7 +80,7 @@ public void handlesDeprecationAndReplacement() throws Exception assertTrue( value.deprecated() ); assertEquals( "new_name", value.replacement().get() ); assertFalse( value.internal() ); - assertFalse( value.isSecret() ); + assertFalse( value.secret() ); } @Test @@ -94,7 +94,7 @@ public void handlesValueDescription() throws Exception assertTrue( value.deprecated() ); assertEquals( "new_name", value.replacement().get() ); assertFalse( value.internal() ); - assertFalse( value.isSecret() ); + assertFalse( value.secret() ); assertEquals( "a simple integer", value.valueDescription() ); } @@ -109,7 +109,7 @@ public void handlesSecretValue() throws Exception assertFalse( value.deprecated() ); assertEquals( Optional.empty(), value.replacement() ); assertFalse( value.internal() ); - assertTrue( value.isSecret() ); + assertTrue( value.secret() ); } @Test diff --git a/community/kernel/src/test/java/org/neo4j/kernel/configuration/ConfigTest.java b/community/kernel/src/test/java/org/neo4j/kernel/configuration/ConfigTest.java index a7038dc79f2ec..f7ebbe18e1526 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/configuration/ConfigTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/configuration/ConfigTest.java @@ -276,8 +276,8 @@ public void shouldSetSecretParameter() .build(); // Then - assertTrue( config.getConfigValues().get( MySettingsWithDefaults.password.name() ).isSecret() ); - assertFalse( config.getConfigValues().get( MySettingsWithDefaults.hello.name() ).isSecret() ); + assertTrue( config.getConfigValues().get( MySettingsWithDefaults.password.name() ).secret() ); + assertFalse( config.getConfigValues().get( MySettingsWithDefaults.hello.name() ).secret() ); String configText = config.toString(); assertTrue( configText.contains( Secret.OBSFUCATED ) ); assertFalse( configText.contains( "this should not be visible" ) );