safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-464: use enable-environment-properties as the property name

Browse Source
This commit is contained in:
Carl Harris
2018-01-16 11:49:15 -05:00
parent cc99584802
commit 718663d2c5
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
guacamole-ext/src/main/java/org/apache/guacamole/environment/LocalEnvironment.java
View File

@@ -78,11 +78,11 @@ public class LocalEnvironment implements Environment {
* A property that determines whether environment variables are evaluated * A property that determines whether environment variables are evaluated
* to override properties specified in guacamole.properties. * to override properties specified in guacamole.properties.
*/ */
private static final BooleanGuacamoleProperty ENVIRONMENT_PROPERTY_OVERRIDE = private static final BooleanGuacamoleProperty ENABLE_ENVIRONMENT_PROPERTIES =
new BooleanGuacamoleProperty() { new BooleanGuacamoleProperty() {
@Override @Override
public String getName() { public String getName() {
return "enable-environment-overrides"; return "enable-environment-properties";
} }
}; };
@@ -104,7 +104,7 @@ public class LocalEnvironment implements Environment {
/** /**
* Flag indicating whether environment variables can override properties. * Flag indicating whether environment variables can override properties.
*/ */
private final boolean environmentPropertyOverride; private final boolean environmentPropertiesEnabled;
/** /**
* The Jackson parser for parsing JSON files. * The Jackson parser for parsing JSON files.
@@ -161,7 +161,7 @@ public class LocalEnvironment implements Environment {
availableProtocols = readProtocols(); availableProtocols = readProtocols();
// Should environment variables override configuration properties? // Should environment variables override configuration properties?
environmentPropertyOverride = propertyOverrideEnabled(properties); environmentPropertiesEnabled = environmentPropertiesEnabled(properties);
} }
/** /**
@@ -321,7 +321,7 @@ public class LocalEnvironment implements Environment {
} }
/** /**
* Checks for the presence of the {@link #ENVIRONMENT_PROPERTY_OVERRIDE} * Checks for the presence of the {@link #ENABLE_ENVIRONMENT_PROPERTIES}
* property in the given properties collection. * property in the given properties collection.
* *
* @param properties * @param properties
@@ -335,13 +335,13 @@ public class LocalEnvironment implements Environment {
* cannot be successfully parsed as a Boolean * cannot be successfully parsed as a Boolean
* *
*/ */
private static boolean propertyOverrideEnabled(Properties properties) private static boolean environmentPropertiesEnabled(Properties properties)
throws GuacamoleException { throws GuacamoleException {
final Boolean enableOverrides = ENVIRONMENT_PROPERTY_OVERRIDE.parseValue( final Boolean enabled = ENABLE_ENVIRONMENT_PROPERTIES.parseValue(
properties.getProperty(ENVIRONMENT_PROPERTY_OVERRIDE.getName())); properties.getProperty(ENABLE_ENVIRONMENT_PROPERTIES.getName()));
return enableOverrides != null && enableOverrides; return enabled != null && enabled;
} }
@Override @Override
@@ -371,7 +371,7 @@ public class LocalEnvironment implements Environment {
private String getPropertyValue(String name) { private String getPropertyValue(String name) {
// Check for corresponding environment variable if overrides enabled // Check for corresponding environment variable if overrides enabled
if (environmentPropertyOverride) { if (environmentPropertiesEnabled) {
// Transform the name according to common convention // Transform the name according to common convention
final String envName = name.replace('-', '_').toUpperCase(); final String envName = name.replace('-', '_').toUpperCase();