You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2016/07/22 00:19:59 UTC
[12/26] incubator-geode git commit: GEODE-420: Added tests to cover
the ssl-enabled-components. cleaned up code using
AbstractDistributionConfig.checkAttributes to not require the method to
return a value. Added a validation step at the end of the initia
GEODE-420: Added tests to cover the ssl-enabled-components.
cleaned up code using AbstractDistributionConfig.checkAttributes to not require the method to return a value.
Added a validation step at the end of the initialization to validate the properties once all properties are set.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/851e02bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/851e02bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/851e02bf
Branch: refs/heads/feature/GEODE-420
Commit: 851e02bf18178bf97ef9427904bae2b39893bbb3
Parents: 1b11b67
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Fri Jun 17 07:38:12 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Thu Jul 21 16:13:38 2016 -0700
----------------------------------------------------------------------
.../internal/AbstractDistributionConfig.java | 22 +-
.../internal/DistributionConfig.java | 130 +++++++++
.../internal/DistributionConfigImpl.java | 274 ++++++++++---------
.../internal/RuntimeDistributionConfigImpl.java | 14 +-
.../gemfire/internal/i18n/LocalizedStrings.java | 20 +-
.../internal/DistributionConfigJUnitTest.java | 11 +-
.../InternalDistributedSystemJUnitTest.java | 210 +++++++++-----
7 files changed, 448 insertions(+), 233 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/851e02bf/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
index b7a3843..8a4082b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
@@ -21,6 +21,7 @@ import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import java.lang.reflect.Method;
import java.net.InetAddress;
import java.net.UnknownHostException;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
@@ -55,7 +56,7 @@ import com.gemstone.gemfire.memcached.GemFireMemcachedServer;
@SuppressWarnings("deprecation")
public abstract class AbstractDistributionConfig extends AbstractConfig implements DistributionConfig {
- protected Object checkAttribute(String attName, Object value) {
+ protected void checkAttribute(String attName, Object value) {
// first check to see if this attribute is modifiable, this also checks if the attribute is a valid one.
if (!isAttributeModifiable(attName)) {
throw new UnmodifiableException(_getUnmodifiableMsg(attName));
@@ -65,7 +66,7 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
if (attribute == null) {
// isAttributeModifiable already checks the validity of the attName, if reached here, then they
// must be those special attributes that starts with ssl_system_props or sys_props, no further checking needed
- return value;
+ return;
}
// for integer attribute, do the range check.
if (attribute.type().equals(Integer.class)) {
@@ -75,12 +76,12 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
Method checker = checkers.get(attName);
if (checker == null) {
- return value;
+ return;
}
// if specific checker exists for this attribute, call that with the value
try {
- return checker.invoke(this, value);
+ checker.invoke(this, value);
} catch (Exception e) {
if (e instanceof RuntimeException) {
throw (RuntimeException) e;
@@ -499,10 +500,8 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
}));
}
}
- if(getJmxManagerSSLEnabled() || getHttpServiceSSLEnabled() || getServerSSLEnabled() || getGatewaySSLEnabled())
- {
- throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_SSL_ENABLED_COMPONENTS_SET_INVALID_DEPRECATED_SSL_SET
- .toLocalizedString());
+ if (getJmxManagerSSLEnabled() || getHttpServiceSSLEnabled() || getServerSSLEnabled() || getGatewaySSLEnabled()) {
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_SSL_ENABLED_COMPONENTS_SET_INVALID_DEPRECATED_SSL_SET.toLocalizedString());
}
}
return value;
@@ -655,12 +654,9 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
* @return an empty list
*/
public List<String> getUnModifiableAttributes() {
- String[] list = {};
- return Arrays.asList(list);
+ return new ArrayList<>();
}
- ;
-
public Class getAttributeType(String attName) {
checkAttributeName(attName);
return _getAttributeType(attName);
@@ -965,7 +961,7 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
m.put(SECURITY_MANAGER, "User defined fully qualified class name implementing SecurityManager interface for integrated security. Defaults to \"{0}\". Legal values can be any \"class name\" implementing SecurityManager that is present in the classpath.");
m.put(SECURITY_POST_PROCESSOR, "User defined fully qualified class name implementing PostProcessor interface for integrated security. Defaults to \"{0}\". Legal values can be any \"class name\" implementing PostProcessor that is present in the classpath.");
- m.put(SSL_ENABLED_COMPONENTS,"A comma delimited list of components that require SSL communications");
+ m.put(SSL_ENABLED_COMPONENTS, "A comma delimited list of components that require SSL communications");
dcAttDescriptions = Collections.unmodifiableMap(m);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/851e02bf/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
index 0494b50..b076af9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
@@ -3064,6 +3064,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #getClusterSSLEnabled()}
*/
+ @Deprecated
@ConfigAttributeGetter(name = HTTP_SERVICE_SSL_ENABLED)
boolean getHttpServiceSSLEnabled();
@@ -3072,6 +3073,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #setClusterSSLEnabled(boolean)}
*/
+ @Deprecated
@ConfigAttributeSetter(name = HTTP_SERVICE_SSL_ENABLED)
void setHttpServiceSSLEnabled(boolean httpServiceSSLEnabled);
@@ -3080,6 +3082,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p> Actual value of this constant is <code>false</code>.
* @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_ENABLED}
*/
+ @Deprecated
boolean DEFAULT_HTTP_SERVICE_SSL_ENABLED = false;
/**
@@ -3087,6 +3090,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_ENABLED} property
* @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_ENABLED}
*/
+ @Deprecated
@ConfigAttribute(type = Boolean.class)
String HTTP_SERVICE_SSL_ENABLED_NAME = HTTP_SERVICE_SSL_ENABLED;
@@ -3095,6 +3099,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #getClusterSSLRequireAuthentication()}
*/
+ @Deprecated
@ConfigAttributeGetter(name = HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION)
boolean getHttpServiceSSLRequireAuthentication();
@@ -3103,6 +3108,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #setClusterSSLRequireAuthentication(boolean)}
*/
+ @Deprecated
@ConfigAttributeSetter(name = HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION)
void setHttpServiceSSLRequireAuthentication(boolean httpServiceSSLRequireAuthentication);
@@ -3111,6 +3117,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p> Actual value of this constant is <code>true</code>.
* @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION}
*/
+ @Deprecated
boolean DEFAULT_HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION = false;
/**
@@ -3118,6 +3125,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION} property
* @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION}
*/
+ @Deprecated
@ConfigAttribute(type = Boolean.class)
String HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION_NAME = HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION;
@@ -3126,6 +3134,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #getClusterSSLProtocols()}
*/
+ @Deprecated
@ConfigAttributeGetter(name = HTTP_SERVICE_SSL_PROTOCOLS)
String getHttpServiceSSLProtocols();
@@ -3134,6 +3143,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #setClusterSSLProtocols(String)}
*/
+ @Deprecated
@ConfigAttributeSetter(name = HTTP_SERVICE_SSL_PROTOCOLS)
void setHttpServiceSSLProtocols(String protocols);
@@ -3142,6 +3152,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p> Actual value of this constant is <code>any</code>.
* @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_PROTOCOLS}
*/
+ @Deprecated
String DEFAULT_HTTP_SERVICE_SSL_PROTOCOLS = "any";
/**
@@ -3149,6 +3160,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_PROTOCOLS} property
* @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_PROTOCOLS}
*/
+ @Deprecated
@ConfigAttribute(type = String.class)
String HTTP_SERVICE_SSL_PROTOCOLS_NAME = HTTP_SERVICE_SSL_PROTOCOLS;
@@ -3157,6 +3169,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #getClusterSSLCiphers()}
*/
+ @Deprecated
@ConfigAttributeGetter(name = HTTP_SERVICE_SSL_CIPHERS)
String getHttpServiceSSLCiphers();
@@ -3165,6 +3178,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #setClusterSSLCiphers(String)}
*/
+ @Deprecated
@ConfigAttributeSetter(name = HTTP_SERVICE_SSL_CIPHERS)
void setHttpServiceSSLCiphers(String ciphers);
@@ -3173,6 +3187,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p> Actual value of this constant is <code>any</code>.
* @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_CIPHERS}
*/
+ @Deprecated
String DEFAULT_HTTP_SERVICE_SSL_CIPHERS = "any";
/**
@@ -3180,6 +3195,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_CIPHERS} property
* @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_CIPHERS}
*/
+ @Deprecated
@ConfigAttribute(type = String.class)
String HTTP_SERVICE_SSL_CIPHERS_NAME = HTTP_SERVICE_SSL_CIPHERS;
@@ -3188,6 +3204,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #getClusterSSLKeyStore()}
*/
+ @Deprecated
@ConfigAttributeGetter(name = HTTP_SERVICE_SSL_KEYSTORE)
String getHttpServiceSSLKeyStore();
@@ -3196,6 +3213,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #setClusterSSLKeyStore(String)}
*/
+ @Deprecated
@ConfigAttributeSetter(name = HTTP_SERVICE_SSL_KEYSTORE)
void setHttpServiceSSLKeyStore(String keyStore);
@@ -3204,6 +3222,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p> Actual value of this constant is "".
* @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE}
*/
+ @Deprecated
String DEFAULT_HTTP_SERVICE_SSL_KEYSTORE = "";
/**
@@ -3211,6 +3230,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE} property
* @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE}
*/
+ @Deprecated
@ConfigAttribute(type = String.class)
String HTTP_SERVICE_SSL_KEYSTORE_NAME = HTTP_SERVICE_SSL_KEYSTORE;
@@ -3219,6 +3239,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #getClusterSSLKeyStorePassword()}
*/
+ @Deprecated
@ConfigAttributeGetter(name = HTTP_SERVICE_SSL_KEYSTORE_PASSWORD)
String getHttpServiceSSLKeyStorePassword();
@@ -3227,6 +3248,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #setClusterSSLKeyStorePassword(String)}
*/
+ @Deprecated
@ConfigAttributeSetter(name = HTTP_SERVICE_SSL_KEYSTORE_PASSWORD)
void setHttpServiceSSLKeyStorePassword(String keyStorePassword);
@@ -3235,6 +3257,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p> Actual value of this constant is "".
* @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_PASSWORD}
*/
+ @Deprecated
String DEFAULT_HTTP_SERVICE_SSL_KEYSTORE_PASSWORD = "";
/**
@@ -3242,6 +3265,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_PASSWORD} property
* @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE_PASSWORD}
*/
+ @Deprecated
@ConfigAttribute(type = String.class)
String HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME = HTTP_SERVICE_SSL_KEYSTORE_PASSWORD;
@@ -3250,6 +3274,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #getClusterSSLKeyStoreType()}
*/
+ @Deprecated
@ConfigAttributeGetter(name = HTTP_SERVICE_SSL_KEYSTORE_TYPE)
String getHttpServiceSSLKeyStoreType();
@@ -3266,6 +3291,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p> Actual value of this constant is "".
* @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_TYPE}
*/
+ @Deprecated
String DEFAULT_HTTP_SERVICE_SSL_KEYSTORE_TYPE = "";
/**
@@ -3281,6 +3307,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #getClusterSSLTrustStore()}
*/
+ @Deprecated
@ConfigAttributeGetter(name = HTTP_SERVICE_SSL_TRUSTSTORE)
String getHttpServiceSSLTrustStore();
@@ -3289,6 +3316,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #setClusterSSLTrustStore(String)}
*/
+ @Deprecated
@ConfigAttributeSetter(name = HTTP_SERVICE_SSL_TRUSTSTORE)
void setHttpServiceSSLTrustStore(String trustStore);
@@ -3304,6 +3332,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE} property
* @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE}
*/
+ @Deprecated
@ConfigAttribute(type = String.class)
String HTTP_SERVICE_SSL_TRUSTSTORE_NAME = HTTP_SERVICE_SSL_TRUSTSTORE;
@@ -3312,6 +3341,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #getClusterSSLTrustStorePassword()}
*/
+ @Deprecated
@ConfigAttributeGetter(name = HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD)
String getHttpServiceSSLTrustStorePassword();
@@ -3320,6 +3350,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #setClusterSSLTrustStorePassword(String)}
*/
+ @Deprecated
@ConfigAttributeSetter(name = HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD)
void setHttpServiceSSLTrustStorePassword(String trustStorePassword);
@@ -3328,6 +3359,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p> Actual value of this constant is "".
* @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_TRUSTSTORE_PASSWORD}
*/
+ @Deprecated
String DEFAULT_HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD = "";
/**
@@ -3335,12 +3367,14 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD} property
* @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD}
*/
+ @Deprecated
@ConfigAttribute(type = String.class)
String HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD_NAME = HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD;
/**
* @deprecated Geode 1.0 use {@link #getClusterSSLProperties()}
*/
+ @Deprecated
Properties getHttpServiceSSLProperties();
//Added for API REST
@@ -3352,6 +3386,7 @@ public interface DistributionConfig extends Config, LogConfig {
* @return the value of the property
* @since GemFire 8.0
*/
+
@ConfigAttributeGetter(name = START_DEV_REST_API)
boolean getStartDevRestApi();
@@ -3411,6 +3446,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* @deprecated Geode 1.0 use {@link #getClusterSSLProperties()}
*/
+ @Deprecated
Properties getServerSSLProperties();
/**
@@ -3418,6 +3454,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #getClusterSSLEnabled()}
*/
+ @Deprecated
@ConfigAttributeGetter(name = SERVER_SSL_ENABLED)
boolean getServerSSLEnabled();
@@ -3426,12 +3463,14 @@ public interface DistributionConfig extends Config, LogConfig {
* <p> Actual value of this constant is <code>false</code>.
* @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_ENABLED}
*/
+ @Deprecated
boolean DEFAULT_SERVER_SSL_ENABLED = false;
/**
* The name of the {@link ConfigurationProperties#SERVER_SSL_ENABLED} property
* The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_ENABLED} property
* @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_ENABLED}
*/
+ @Deprecated
@ConfigAttribute(type = Boolean.class)
String SERVER_SSL_ENABLED_NAME = SERVER_SSL_ENABLED;
@@ -3440,6 +3479,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #setClusterSSLEnabled(boolean)}
*/
+ @Deprecated
@ConfigAttributeSetter(name = SERVER_SSL_ENABLED)
void setServerSSLEnabled(boolean enabled);
@@ -3448,6 +3488,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #getClusterSSLProtocols()}
*/
+ @Deprecated
@ConfigAttributeGetter(name = SERVER_SSL_PROTOCOLS)
String getServerSSLProtocols();
@@ -3469,6 +3510,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_PROTOCOLS} property
* @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_PROTOCOLS}
*/
+ @Deprecated
@ConfigAttribute(type = String.class)
String SERVER_SSL_PROTOCOLS_NAME = SERVER_SSL_PROTOCOLS;
@@ -3477,6 +3519,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #getClusterSSLCiphers()}�
*/
+ @Deprecated
@ConfigAttributeGetter(name = SERVER_SSL_CIPHERS)
String getServerSSLCiphers();
@@ -3485,6 +3528,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #setClusterSSLCiphers(String)}�
*/
+ @Deprecated
@ConfigAttributeSetter(name = SERVER_SSL_CIPHERS)
void setServerSSLCiphers(String ciphers);
@@ -3499,6 +3543,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_CIPHERS} property
* @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_CIPHERS}�
*/
+ @Deprecated
@ConfigAttribute(type = String.class)
String SERVER_SSL_CIPHERS_NAME = SERVER_SSL_CIPHERS;
@@ -3507,6 +3552,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #getClusterSSLRequireAuthentication()}�
*/
+ @Deprecated
@ConfigAttributeGetter(name = SERVER_SSL_REQUIRE_AUTHENTICATION)
boolean getServerSSLRequireAuthentication();
@@ -3515,6 +3561,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #setClusterSSLRequireAuthentication(boolean)}�
*/
+ @Deprecated
@ConfigAttributeSetter(name = SERVER_SSL_REQUIRE_AUTHENTICATION)
void setServerSSLRequireAuthentication(boolean enabled);
@@ -3523,12 +3570,14 @@ public interface DistributionConfig extends Config, LogConfig {
* <p> Actual value of this constant is <code>true</code>.
* @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION}
*/
+ @Deprecated
boolean DEFAULT_SERVER_SSL_REQUIRE_AUTHENTICATION = true;
/**
* The name of the {@link ConfigurationProperties#SERVER_SSL_REQUIRE_AUTHENTICATION} property
* The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_REQUIRE_AUTHENTICATION} property
* @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION}
*/
+ @Deprecated
@ConfigAttribute(type = Boolean.class)
String SERVER_SSL_REQUIRE_AUTHENTICATION_NAME = SERVER_SSL_REQUIRE_AUTHENTICATION;
@@ -3537,6 +3586,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #getClusterSSLKeyStore()}
*/
+ @Deprecated
@ConfigAttributeGetter(name = SERVER_SSL_KEYSTORE)
String getServerSSLKeyStore();
@@ -3545,6 +3595,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #setClusterSSLKeyStore(String)}
*/
+ @Deprecated
@ConfigAttributeSetter(name = SERVER_SSL_KEYSTORE)
void setServerSSLKeyStore(String keyStore);
@@ -3553,6 +3604,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p> Actual value of this constant is "".
* @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE}
*/
+ @Deprecated
String DEFAULT_SERVER_SSL_KEYSTORE = "";
/**
@@ -3560,6 +3612,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_KEYSTORE} property
* @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE}
*/
+ @Deprecated
@ConfigAttribute(type = String.class)
String SERVER_SSL_KEYSTORE_NAME = SERVER_SSL_KEYSTORE;
@@ -3568,13 +3621,16 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #getClusterSSLKeyStoreType()}
*/
+ @Deprecated
@ConfigAttributeGetter(name = SERVER_SSL_KEYSTORE_TYPE)
String getServerSSLKeyStoreType();
/**
* Sets the value of the {@link ConfigurationProperties#SERVER_SSL_KEYSTORE_TYPE}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLKeyStoreType(String)}
*/
+ @Deprecated
@ConfigAttributeSetter(name = SERVER_SSL_KEYSTORE_TYPE)
void setServerSSLKeyStoreType(String keyStoreType);
@@ -3583,6 +3639,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p> Actual value of this constant is "".
* @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_TYPE}
*/
+ @Deprecated
String DEFAULT_SERVER_SSL_KEYSTORE_TYPE = "";
/**
@@ -3590,6 +3647,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_KEYSTORE_TYPE} property
* @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE_TYPE}
*/
+ @Deprecated
@ConfigAttribute(type = String.class)
String SERVER_SSL_KEYSTORE_TYPE_NAME = SERVER_SSL_KEYSTORE_TYPE;
@@ -3598,13 +3656,16 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #getClusterSSLKeyStorePassword()}
*/
+ @Deprecated
@ConfigAttributeGetter(name = SERVER_SSL_KEYSTORE_PASSWORD)
String getServerSSLKeyStorePassword();
/**
* Sets the value of the {@link ConfigurationProperties#SERVER_SSL_KEYSTORE_PASSWORD}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLKeyStorePassword(String)}
*/
+ @Deprecated
@ConfigAttributeSetter(name = SERVER_SSL_KEYSTORE_PASSWORD)
void setServerSSLKeyStorePassword(String keyStorePassword);
@@ -3613,6 +3674,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p> Actual value of this constant is "".
* @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_PASSWORD}
*/
+ @Deprecated
String DEFAULT_SERVER_SSL_KEYSTORE_PASSWORD = "";
/**
@@ -3620,6 +3682,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_KEYSTORE_PASSWORD} property
* @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE_PASSWORD}
*/
+ @Deprecated
@ConfigAttribute(type = String.class)
String SERVER_SSL_KEYSTORE_PASSWORD_NAME = SERVER_SSL_KEYSTORE_PASSWORD;
@@ -3628,6 +3691,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #getClusterSSLTrustStore()}
*/
+ @Deprecated
@ConfigAttributeGetter(name = SERVER_SSL_TRUSTSTORE)
String getServerSSLTrustStore();
@@ -3636,6 +3700,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #setServerSSLTrustStore(String)}
*/
+ @Deprecated
@ConfigAttributeSetter(name = SERVER_SSL_TRUSTSTORE)
void setServerSSLTrustStore(String trustStore);
@@ -3651,6 +3716,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_TRUSTSTORE} property
* @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE}
*/
+ @Deprecated
@ConfigAttribute(type = String.class)
String SERVER_SSL_TRUSTSTORE_NAME = SERVER_SSL_TRUSTSTORE;
@@ -3659,6 +3725,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #getClusterSSLTrustStorePassword()}
*/
+ @Deprecated
@ConfigAttributeGetter(name = SERVER_SSL_TRUSTSTORE_PASSWORD)
String getServerSSLTrustStorePassword();
@@ -3667,6 +3734,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #setClusterSSLTrustStorePassword(String)}
*/
+ @Deprecated
@ConfigAttributeSetter(name = SERVER_SSL_TRUSTSTORE_PASSWORD)
void setServerSSLTrustStorePassword(String trusStorePassword);
@@ -3675,6 +3743,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p> Actual value of this constant is "".
* @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_TRUSTSTORE_PASSWORD}
*/
+ @Deprecated
String DEFAULT_SERVER_SSL_TRUSTSTORE_PASSWORD = "";
/**
@@ -3682,6 +3751,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_TRUSTSTORE_PASSWORD} property
* @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD}
*/
+ @Deprecated
@ConfigAttribute(type = String.class)
String SERVER_SSL_TRUSTSTORE_PASSWORD_NAME = SERVER_SSL_TRUSTSTORE_PASSWORD;
@@ -3690,6 +3760,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #getClusterSSLEnabled()}
*/
+ @Deprecated
@ConfigAttributeGetter(name = GATEWAY_SSL_ENABLED)
boolean getGatewaySSLEnabled();
@@ -3698,12 +3769,14 @@ public interface DistributionConfig extends Config, LogConfig {
* <p> Actual value of this constant is <code>false</code>.
* @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_ENABLED}
*/
+ @Deprecated
boolean DEFAULT_GATEWAY_SSL_ENABLED = false;
/**
* The name of the {@link ConfigurationProperties#GATEWAY_SSL_ENABLED} property
* The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#GATEWAY_SSL_ENABLED} property
* @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_ENABLED}
*/
+ @Deprecated
@ConfigAttribute(type = Boolean.class)
String GATEWAY_SSL_ENABLED_NAME = GATEWAY_SSL_ENABLED;
@@ -3712,6 +3785,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #getClusterSSLEnabled()}
*/
+ @Deprecated
@ConfigAttributeSetter(name = GATEWAY_SSL_ENABLED)
void setGatewaySSLEnabled(boolean enabled);
@@ -3720,6 +3794,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #getClusterSSLProtocols()}
*/
+ @Deprecated
@ConfigAttributeGetter(name = GATEWAY_SSL_PROTOCOLS)
String getGatewaySSLProtocols();
@@ -3728,6 +3803,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #setClusterSSLTrustStorePassword(String)}
*/
+ @Deprecated
@ConfigAttributeSetter(name = GATEWAY_SSL_PROTOCOLS)
void setGatewaySSLProtocols(String protocols);
@@ -3742,6 +3818,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#GATEWAY_SSL_PROTOCOLS} property
* @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_PROTOCOLS}
*/
+ @Deprecated
@ConfigAttribute(type = String.class)
String GATEWAY_SSL_PROTOCOLS_NAME = GATEWAY_SSL_PROTOCOLS;
@@ -3750,6 +3827,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #getClusterSSLCiphers()}�
*/
+ @Deprecated
@ConfigAttributeGetter(name = GATEWAY_SSL_CIPHERS)
String getGatewaySSLCiphers();
@@ -3758,6 +3836,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #setClusterSSLCiphers(String)}�
*/
+ @Deprecated
@ConfigAttributeSetter(name = GATEWAY_SSL_CIPHERS)
void setGatewaySSLCiphers(String ciphers);
@@ -3772,6 +3851,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#GATEWAY_SSL_CIPHERS} property
* @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_CIPHERS}�
*/
+ @Deprecated
@ConfigAttribute(type = String.class)
String GATEWAY_SSL_CIPHERS_NAME = GATEWAY_SSL_CIPHERS;
@@ -3780,6 +3860,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #getClusterSSLRequireAuthentication()}
*/
+ @Deprecated
@ConfigAttributeGetter(name = GATEWAY_SSL_REQUIRE_AUTHENTICATION)
boolean getGatewaySSLRequireAuthentication();
@@ -3788,6 +3869,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #setGatewaySSLRequireAuthentication(boolean)}
*/
+ @Deprecated
@ConfigAttributeSetter(name = GATEWAY_SSL_REQUIRE_AUTHENTICATION)
void setGatewaySSLRequireAuthentication(boolean enabled);
@@ -3802,6 +3884,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#GATEWAY_SSL_REQUIRE_AUTHENTICATION} property
* @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION}
*/
+ @Deprecated
@ConfigAttribute(type = Boolean.class)
String GATEWAY_SSL_REQUIRE_AUTHENTICATION_NAME = GATEWAY_SSL_REQUIRE_AUTHENTICATION;
@@ -3810,6 +3893,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #getClusterSSLKeyStore()}
*/
+ @Deprecated
@ConfigAttributeGetter(name = GATEWAY_SSL_KEYSTORE)
String getGatewaySSLKeyStore();
@@ -3818,6 +3902,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #setClusterSSLKeyStore(String)}
*/
+ @Deprecated
@ConfigAttributeSetter(name = GATEWAY_SSL_KEYSTORE)
void setGatewaySSLKeyStore(String keyStore);
@@ -3826,6 +3911,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p> Actual value of this constant is "".
* @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE}
*/
+ @Deprecated
String DEFAULT_GATEWAY_SSL_KEYSTORE = "";
/**
@@ -3833,13 +3919,16 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#GATEWAY_SSL_KEYSTORE} property
* @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE}
*/
+ @Deprecated
@ConfigAttribute(type = String.class)
String GATEWAY_SSL_KEYSTORE_NAME = GATEWAY_SSL_KEYSTORE;
/**
* Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE_TYPE}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLKeyStoreType()}
*/
+ @Deprecated
@ConfigAttributeGetter(name = GATEWAY_SSL_KEYSTORE_TYPE)
String getGatewaySSLKeyStoreType();
@@ -3848,6 +3937,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #setClusterSSLKeyStoreType(String)}
*/
+ @Deprecated
@ConfigAttributeSetter(name = GATEWAY_SSL_KEYSTORE_TYPE)
void setGatewaySSLKeyStoreType(String keyStoreType);
@@ -3856,6 +3946,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p> Actual value of this constant is "".
* @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_TYPE}
*/
+ @Deprecated
String DEFAULT_GATEWAY_SSL_KEYSTORE_TYPE = "";
/**
@@ -3863,6 +3954,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#GATEWAY_SSL_KEYSTORE_TYPE} property
* @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE_TYPE}
*/
+ @Deprecated
@ConfigAttribute(type = String.class)
String GATEWAY_SSL_KEYSTORE_TYPE_NAME = GATEWAY_SSL_KEYSTORE_TYPE;
@@ -3871,6 +3963,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #getClusterSSLKeyStorePassword()}
*/
+ @Deprecated
@ConfigAttributeGetter(name = GATEWAY_SSL_KEYSTORE_PASSWORD)
String getGatewaySSLKeyStorePassword();
@@ -3879,6 +3972,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #setClusterSSLKeyStorePassword(String)}
*/
+ @Deprecated
@ConfigAttributeSetter(name = GATEWAY_SSL_KEYSTORE_PASSWORD)
void setGatewaySSLKeyStorePassword(String keyStorePassword);
@@ -3887,6 +3981,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p> Actual value of this constant is "".
* @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_PASSWORD}
*/
+ @Deprecated
String DEFAULT_GATEWAY_SSL_KEYSTORE_PASSWORD = "";
/**
@@ -3894,6 +3989,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#GATEWAY_SSL_KEYSTORE_PASSWORD} property
* @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE_PASSWORD}
*/
+ @Deprecated
@ConfigAttribute(type = String.class)
String GATEWAY_SSL_KEYSTORE_PASSWORD_NAME = GATEWAY_SSL_KEYSTORE_PASSWORD;
@@ -3902,6 +3998,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #getClusterSSLTrustStore()}
*/
+ @Deprecated
@ConfigAttributeGetter(name = GATEWAY_SSL_TRUSTSTORE)
String getGatewaySSLTrustStore();
@@ -3910,6 +4007,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #setClusterSSLTrustStore(String)}
*/
+ @Deprecated
@ConfigAttributeSetter(name = GATEWAY_SSL_TRUSTSTORE)
void setGatewaySSLTrustStore(String trustStore);
@@ -3918,6 +4016,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p> Actual value of this constant is "".
* @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_TRUSTSTORE}
*/
+ @Deprecated
String DEFAULT_GATEWAY_SSL_TRUSTSTORE = "";
/**
@@ -3925,6 +4024,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE} property
* @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE}
*/
+ @Deprecated
@ConfigAttribute(type = String.class)
String GATEWAY_SSL_TRUSTSTORE_NAME = GATEWAY_SSL_TRUSTSTORE;
@@ -3933,6 +4033,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #getClusterSSLTrustStorePassword()}
*/
+ @Deprecated
@ConfigAttributeGetter(name = GATEWAY_SSL_TRUSTSTORE_PASSWORD)
String getGatewaySSLTrustStorePassword();
@@ -3941,6 +4042,7 @@ public interface DistributionConfig extends Config, LogConfig {
* property.
* @deprecated Geode 1.0 use {@link #setClusterSSLKeyStorePassword(String)}
*/
+ @Deprecated
@ConfigAttributeSetter(name = GATEWAY_SSL_TRUSTSTORE_PASSWORD)
void setGatewaySSLTrustStorePassword(String trusStorePassword);
@@ -3949,6 +4051,7 @@ public interface DistributionConfig extends Config, LogConfig {
* <p> Actual value of this constant is "".
* @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_TRUSTSTORE_PASSWORD}
*/
+ @Deprecated
String DEFAULT_GATEWAY_SSL_TRUSTSTORE_PASSWORD = "";
/**
@@ -3962,6 +4065,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* @deprecated Geode 1.0 use {@link #getClusterSSLProperties()}
*/
+ @Deprecated
Properties getGatewaySSLProperties();
ConfigSource getConfigSource(String attName);
@@ -4007,6 +4111,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#CLUSTER_SSL_ALIAS}
* property.
+ * @since Geode 1.0
*/
@ConfigAttributeGetter(name = CLUSTER_SSL_ALIAS)
String getClusterSSLAlias();
@@ -4014,14 +4119,20 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#CLUSTER_SSL_ALIAS}
* property.
+ * @since Geode 1.0
*/
@ConfigAttributeSetter(name = CLUSTER_SSL_ALIAS)
void setClusterSSLAlias(String alias);
+ /**
+ * The Default Cluster SSL alias
+ * @since Geode 1.0
+ */
String DEFAULT_CLUSTER_SSL_ALIAS = "";
/**
* The name of the {@link ConfigurationProperties#CLUSTER_SSL_ALIAS} property
+ * @since Geode 1.0
*/
@ConfigAttribute(type = String.class)
String CLUSTER_SSL_ALIAS_NAME = CLUSTER_SSL_ALIAS;
@@ -4029,6 +4140,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_ALIAS}
* property.
+ * @since Geode 1.0
*/
@ConfigAttributeGetter(name = GATEWAY_SSL_ALIAS)
String getGatewaySSLAlias();
@@ -4036,12 +4148,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_ALIAS}
* property.
+ * @since Geode 1.0
*/
@ConfigAttributeSetter(name = GATEWAY_SSL_ALIAS)
void setGatewaySSLAlias(String alias);
/**
* The name of the {@link ConfigurationProperties#GATEWAY_SSL_ALIAS} property
+ * @since Geode 1.0
*/
@ConfigAttribute(type = String.class)
String GATEWAY_SSL_ALIAS_NAME = GATEWAY_SSL_ALIAS;
@@ -4049,6 +4163,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#CLUSTER_SSL_ALIAS}
* property.
+ * @since Geode 1.0
*/
@ConfigAttributeGetter(name = HTTP_SERVICE_SSL_ALIAS)
String getHTTPServiceSSLAlias();
@@ -4056,12 +4171,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_ALIAS}
* property.
+ * @since Geode 1.0
*/
@ConfigAttributeSetter(name = HTTP_SERVICE_SSL_ALIAS)
void setHTTPServiceSSLAlias(String alias);
/**
* The name of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_ALIAS} property
+ * @since Geode 1.0
*/
@ConfigAttribute(type = String.class)
String HTTP_SERVICE_SSL_ALIAS_NAME = HTTP_SERVICE_SSL_ALIAS;
@@ -4069,6 +4186,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_ALIAS}
* property.
+ * @since Geode 1.0
*/
@ConfigAttributeGetter(name = JMX_MANAGER_SSL_ALIAS)
String getJMXManagerSSLAlias();
@@ -4076,12 +4194,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_ALIAS}
* property.
+ * @since Geode 1.0
*/
@ConfigAttributeSetter(name = JMX_MANAGER_SSL_ALIAS)
void setJMXManagerSSLAlias(String alias);
/**
* The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_ALIAS} property
+ * @since Geode 1.0
*/
@ConfigAttribute(type = String.class)
String JMX_MANAGER_SSL_ALIAS_NAME = JMX_MANAGER_SSL_ALIAS;
@@ -4089,6 +4209,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#SERVER_SSL_ALIAS}
* property.
+ * @since Geode 1.0
*/
@ConfigAttributeGetter(name = SERVER_SSL_ALIAS)
String getServerSSLAlias();
@@ -4096,12 +4217,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#SERVER_SSL_ALIAS}
* property.
+ * @since Geode 1.0
*/
@ConfigAttributeSetter(name = SERVER_SSL_ALIAS)
void setServerSSLAlias(String alias);
/**
* The name of the {@link ConfigurationProperties#SERVER_SSL_ALIAS} property
+ * @since Geode 1.0
*/
@ConfigAttribute(type = String.class)
String SERVER_SSL_ALIAS_NAME = SERVER_SSL_ALIAS;
@@ -4109,6 +4232,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#SSL_ENABLED_COMPONENTS}
* property.
+ * @since Geode 1.0
*/
@ConfigAttributeGetter(name = SSL_ENABLED_COMPONENTS)
String getSSLEnabledComponents();
@@ -4116,16 +4240,22 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#SSL_ENABLED_COMPONENTS}
* property.
+ * @since Geode 1.0
*/
@ConfigAttributeSetter(name = SSL_ENABLED_COMPONENTS)
void setSSLEnabledComponents(String sslEnabledComponents);
/**
* The name of the {@link ConfigurationProperties#SSL_ENABLED_COMPONENTS} property
+ * @since Geode 1.0
*/
@ConfigAttribute(type = String.class)
String SSL_ENABLED_COMPONENTS_NAME = SSL_ENABLED_COMPONENTS;
+ /**
+ * The default ssl enabled components
+ * @since Geode 1.0
+ */
String DEFAULT_SSL_ENABLED_COMPONENTS = "";
//*************** Initializers to gather all the annotations in this class ************************
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/851e02bf/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
index bbf46e7..e4025e2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
@@ -22,6 +22,8 @@ import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import java.io.File;
import java.io.IOException;
import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.net.InetAddress;
import java.net.URL;
import java.net.UnknownHostException;
@@ -38,6 +40,7 @@ import org.apache.geode.redis.GeodeRedisServer;
import com.gemstone.gemfire.GemFireConfigException;
import com.gemstone.gemfire.GemFireIOException;
+import com.gemstone.gemfire.InternalGemFireException;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.ConfigSource;
import com.gemstone.gemfire.internal.SocketCreator;
@@ -827,13 +830,46 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
Map.Entry entry = (Map.Entry) iter.next();
System.setProperty(SECURITY_SYSTEM_PREFIX + (String) entry.getKey(), (String) entry.getValue());
}
- computeMcastPortDefault();
if (!isConnected) {
copySSLPropsToServerSSLProps();
copySSLPropsToJMXSSLProps();
copyClusterSSLPropsToGatewaySSLProps();
copySSLPropsToHTTPSSLProps();
}
+
+ // Make attributes read only
+ this.modifiable = true;
+ validateConfigurationProperties(props);
+ // Make attributes read only
+ this.modifiable = false;
+
+ }
+
+ /**
+ * Here we will validate the correctness of the set properties as per the CheckAttributeChecker annotations defined in #AbstractDistributionConfig
+ * @param props
+ */
+ private void validateConfigurationProperties(final HashMap props) {
+ for (Object o : props.keySet()) {
+ String propertyName = (String) o;
+ Object value = null;
+ try {
+ Method method = getters.get(propertyName);
+ if (method != null) {
+ value = method.invoke(this, new Object[] {});
+ }
+ } catch (Exception e) {
+ if (e instanceof RuntimeException) {
+ throw (RuntimeException) e;
+ }
+ if (e.getCause() instanceof RuntimeException) {
+ throw (RuntimeException) e.getCause();
+ } else {
+ throw new InternalGemFireException("error invoking getter for property" + propertyName );
+ }
+ }
+ checkAttribute(propertyName,value);
+ }
}
/*
@@ -844,8 +880,9 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
private void copySSLPropsToJMXSSLProps() {
boolean jmxSSLEnabledOverriden = this.sourceMap.get(JMX_MANAGER_SSL_ENABLED) != null;
boolean clusterSSLOverRidden = this.sourceMap.get(CLUSTER_SSL_ENABLED) != null;
+ boolean hasSSLComponents = this.sourceMap.get(SSL_ENABLED_COMPONENTS) != null;
- if (clusterSSLOverRidden && !jmxSSLEnabledOverriden) {
+ if (clusterSSLOverRidden && !jmxSSLEnabledOverriden && !hasSSLComponents) {
this.jmxManagerSSLEnabled = this.clusterSSLEnabled;
this.sourceMap.put(JMX_MANAGER_SSL_ENABLED, this.sourceMap.get(CLUSTER_SSL_ENABLED));
if (this.sourceMap.get(CLUSTER_SSL_CIPHERS) != null) {
@@ -916,10 +953,10 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
*/
private void copySSLPropsToHTTPSSLProps() {
boolean httpServiceSSLEnabledOverriden = this.sourceMap.get(HTTP_SERVICE_SSL_ENABLED) != null;
-
boolean clusterSSLOverRidden = this.sourceMap.get(CLUSTER_SSL_ENABLED) != null;
+ boolean hasSSLComponents = this.sourceMap.get(SSL_ENABLED_COMPONENTS) != null;
- if (clusterSSLOverRidden && !httpServiceSSLEnabledOverriden) {
+ if (clusterSSLOverRidden && !httpServiceSSLEnabledOverriden && !hasSSLComponents) {
this.httpServiceSSLEnabled = this.clusterSSLEnabled;
this.sourceMap.put(HTTP_SERVICE_SSL_ENABLED, this.sourceMap.get(CLUSTER_SSL_ENABLED));
@@ -993,8 +1030,9 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
private void copySSLPropsToServerSSLProps() {
boolean cacheServerSSLOverriden = this.sourceMap.get(SERVER_SSL_ENABLED) != null;
boolean clusterSSLOverRidden = this.sourceMap.get(CLUSTER_SSL_ENABLED) != null;
+ boolean hasSSLComponents = this.sourceMap.get(SSL_ENABLED_COMPONENTS) != null;
- if (clusterSSLOverRidden && !cacheServerSSLOverriden) {
+ if (clusterSSLOverRidden && !cacheServerSSLOverriden && !hasSSLComponents) {
this.serverSSLEnabled = this.clusterSSLEnabled;
this.sourceMap.put(SERVER_SSL_ENABLED, this.sourceMap.get(CLUSTER_SSL_ENABLED));
if (this.sourceMap.get(CLUSTER_SSL_CIPHERS) != null) {
@@ -1066,8 +1104,9 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
private void copyClusterSSLPropsToGatewaySSLProps() {
boolean gatewaySSLOverriden = this.sourceMap.get(GATEWAY_SSL_ENABLED) != null;
boolean clusterSSLOverRidden = this.sourceMap.get(CLUSTER_SSL_ENABLED) != null;
+ boolean hasSSLComponents = this.sourceMap.get(SSL_ENABLED_COMPONENTS) != null;
- if (clusterSSLOverRidden && !gatewaySSLOverriden) {
+ if (clusterSSLOverRidden && !gatewaySSLOverriden && !hasSSLComponents) {
this.gatewaySSLEnabled = this.clusterSSLEnabled;
this.sourceMap.put(GATEWAY_SSL_ENABLED, this.sourceMap.get(CLUSTER_SSL_ENABLED));
if (this.sourceMap.get(CLUSTER_SSL_CIPHERS) != null) {
@@ -1133,19 +1172,6 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
- private void computeMcastPortDefault() {
- // a no-op since multicast discovery has been removed
- // and the default mcast port is now zero
-
- // ConfigSource cs = getAttSourceMap().get(ConfigurationProperties.MCAST_PORT);
- // if (cs == null) {
- // String locators = getLocators();
- // if (locators != null && !locators.isEmpty()) {
- // this.mcastPort = 0; // fixes 46308
- // }
- // }
- }
-
/**
* Produce a DistributionConfigImpl for the given properties and return it.
*/
@@ -1189,7 +1215,6 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
this.setAttribute(propName, propVal.trim(), this.sourceMap.get(propName));
}
}
- computeMcastPortDefault();
// Make attributes read only
this.modifiable = false;
}
@@ -1508,7 +1533,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setHttpServicePort(int value) {
- this.httpServicePort = (Integer) checkAttribute(HTTP_SERVICE_PORT, value);
+ this.httpServicePort = value;
}
public String getHttpServiceBindAddress() {
@@ -1516,7 +1541,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setHttpServiceBindAddress(String value) {
- this.httpServiceBindAddress = (String) checkAttribute(HTTP_SERVICE_BIND_ADDRESS, value);
+ this.httpServiceBindAddress = value;
}
public boolean getStartDevRestApi() {
@@ -1528,7 +1553,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setUserCommandPackages(String value) {
- this.userCommandPackages = (String) checkAttribute(USER_COMMAND_PACKAGES, value);
+ this.userCommandPackages = value;
}
public boolean getDeltaPropagation() {
@@ -1536,42 +1561,42 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setDeltaPropagation(boolean value) {
- this.deltaPropagation = (Boolean) checkAttribute(DELTA_PROPAGATION, value);
+ this.deltaPropagation = (Boolean) value;
}
public void setName(String value) {
if (value == null) {
value = DEFAULT_NAME;
}
- this.name = (String) checkAttribute(NAME, value);
+ this.name = (String) value;
}
public void setTcpPort(int value) {
- this.tcpPort = (Integer) checkAttribute(TCP_PORT, value);
+ this.tcpPort = (Integer) value;
}
public void setMcastPort(int value) {
- this.mcastPort = (Integer) checkAttribute(MCAST_PORT, value);
+ this.mcastPort = (Integer) value;
}
public void setMcastTtl(int value) {
- this.mcastTtl = (Integer) checkAttribute(MCAST_TTL, value);
+ this.mcastTtl = (Integer) value;
}
public void setSocketLeaseTime(int value) {
- this.socketLeaseTime = (Integer) checkAttribute(SOCKET_LEASE_TIME, value);
+ this.socketLeaseTime = (Integer) value;
}
public void setSocketBufferSize(int value) {
- this.socketBufferSize = (Integer) checkAttribute(SOCKET_BUFFER_SIZE, value);
+ this.socketBufferSize = (Integer) value;
}
public void setConserveSockets(boolean value) {
- this.conserveSockets = (Boolean) checkAttribute(CONSERVE_SOCKETS, value);
+ this.conserveSockets = (Boolean) value;
}
public void setRoles(String value) {
- this.roles = (String) checkAttribute(ROLES, value);
+ this.roles = (String) value;
}
public void setMaxWaitTimeForReconnect(int value) {
@@ -1583,22 +1608,22 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setMcastAddress(InetAddress value) {
- this.mcastAddress = (InetAddress) checkAttribute(MCAST_ADDRESS, value);
+ this.mcastAddress = (InetAddress) value;
}
public void setBindAddress(String value) {
- this.bindAddress = (String) checkAttribute(BIND_ADDRESS, value);
+ this.bindAddress = (String) value;
}
public void setServerBindAddress(String value) {
- this.serverBindAddress = (String) checkAttribute(SERVER_BIND_ADDRESS, value);
+ this.serverBindAddress = (String) value;
}
public void setLocators(String value) {
if (value == null) {
value = DEFAULT_LOCATORS;
}
- this.locators = (String) checkAttribute(LOCATORS, value);
+ this.locators = (String) value;
}
public void setLocatorWaitTime(int value) {
@@ -1610,15 +1635,15 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setDeployWorkingDir(File value) {
- this.deployWorkingDir = (File) checkAttribute(DEPLOY_WORKING_DIR, value);
+ this.deployWorkingDir = (File) value;
}
public void setLogFile(File value) {
- this.logFile = (File) checkAttribute(LOG_FILE, value);
+ this.logFile = (File) value;
}
public void setLogLevel(int value) {
- this.logLevel = (Integer) checkAttribute(LOG_LEVEL, value);
+ this.logLevel = (Integer) value;
}
/**
@@ -1656,18 +1681,18 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
throw new GemFireConfigException("Illegal port specified for start-locator", e);
}
} else {
- value = (String) checkAttribute(START_LOCATOR, value);
+
}
}
this.startLocator = value;
}
public void setStatisticSamplingEnabled(boolean value) {
- this.statisticSamplingEnabled = (Boolean) checkAttribute(STATISTIC_SAMPLING_ENABLED, value);
+ this.statisticSamplingEnabled = (Boolean) value;
}
public void setStatisticSampleRate(int value) {
- value = (Integer) checkAttribute(STATISTIC_SAMPLE_RATE, value);
+ value = (Integer) value;
if (value < DEFAULT_STATISTIC_SAMPLE_RATE) {
// fix 48228
InternalDistributedSystem ids = InternalDistributedSystem.getConnectedInstance();
@@ -1684,19 +1709,19 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
if (value == null) {
value = new File("");
}
- this.statisticArchiveFile = (File) checkAttribute(STATISTIC_ARCHIVE_FILE, value);
+ this.statisticArchiveFile = (File) value;
}
public void setCacheXmlFile(File value) {
- this.cacheXmlFile = (File) checkAttribute(CACHE_XML_FILE, value);
+ this.cacheXmlFile = (File) value;
}
public void setAckWaitThreshold(int value) {
- this.ackWaitThreshold = (Integer) checkAttribute(ACK_WAIT_THRESHOLD, value);
+ this.ackWaitThreshold = (Integer) value;
}
public void setAckSevereAlertThreshold(int value) {
- this.ackForceDisconnectThreshold = (Integer) checkAttribute(ACK_SEVERE_ALERT_THRESHOLD, value);
+ this.ackForceDisconnectThreshold = (Integer) value;
}
public int getArchiveDiskSpaceLimit() {
@@ -1704,7 +1729,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setArchiveDiskSpaceLimit(int value) {
- this.archiveDiskSpaceLimit = (Integer) checkAttribute(ARCHIVE_DISK_SPACE_LIMIT, value);
+ this.archiveDiskSpaceLimit = (Integer) value;
}
public int getArchiveFileSizeLimit() {
@@ -1712,7 +1737,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setArchiveFileSizeLimit(int value) {
- this.archiveFileSizeLimit = (Integer) checkAttribute(ARCHIVE_FILE_SIZE_LIMIT, value);
+ this.archiveFileSizeLimit = (Integer) value;
}
public int getLogDiskSpaceLimit() {
@@ -1720,7 +1745,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setLogDiskSpaceLimit(int value) {
- this.logDiskSpaceLimit = (Integer) checkAttribute(LOG_DISK_SPACE_LIMIT, value);
+ this.logDiskSpaceLimit = (Integer) value;
}
public int getLogFileSizeLimit() {
@@ -1728,51 +1753,51 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setLogFileSizeLimit(int value) {
- this.logFileSizeLimit = (Integer) checkAttribute(LOG_FILE_SIZE_LIMIT, value);
+ this.logFileSizeLimit = (Integer) value;
}
public void setClusterSSLEnabled(boolean value) {
- this.clusterSSLEnabled = (Boolean) checkAttribute(CLUSTER_SSL_ENABLED, value);
+ this.clusterSSLEnabled = (Boolean) value;
}
public void setClusterSSLProtocols(String value) {
- this.clusterSSLProtocols = (String) checkAttribute(CLUSTER_SSL_PROTOCOLS, value);
+ this.clusterSSLProtocols = (String) value;
}
public void setClusterSSLCiphers(String value) {
- this.clusterSSLCiphers = (String) checkAttribute(CLUSTER_SSL_CIPHERS, value);
+ this.clusterSSLCiphers = (String) value;
}
public void setClusterSSLRequireAuthentication(boolean value) {
- this.clusterSSLRequireAuthentication = (Boolean) checkAttribute(CLUSTER_SSL_REQUIRE_AUTHENTICATION, value);
+ this.clusterSSLRequireAuthentication = (Boolean) value;
}
public void setClusterSSLKeyStore(String value) {
- value = (String) checkAttribute(CLUSTER_SSL_KEYSTORE, value);
+
this.getClusterSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + KEY_STORE_NAME, value);
this.clusterSSLKeyStore = value;
}
public void setClusterSSLKeyStoreType(String value) {
- value = (String) checkAttribute(CLUSTER_SSL_KEYSTORE_TYPE, value);
+
this.getClusterSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + KEY_STORE_TYPE_NAME, value);
this.clusterSSLKeyStoreType = value;
}
public void setClusterSSLKeyStorePassword(String value) {
- value = (String) checkAttribute(CLUSTER_SSL_KEYSTORE_PASSWORD, value);
+
this.getClusterSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + KEY_STORE_PASSWORD_NAME, value);
this.clusterSSLKeyStorePassword = value;
}
public void setClusterSSLTrustStore(String value) {
- value = (String) checkAttribute(CLUSTER_SSL_TRUSTSTORE, value);
+
this.getClusterSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + TRUST_STORE_NAME, value);
this.clusterSSLTrustStore = value;
}
public void setClusterSSLTrustStorePassword(String value) {
- value = (String) checkAttribute(CLUSTER_SSL_TRUSTSTORE_PASSWORD, value);
+
this.getClusterSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + TRUST_STORE_PASSWORD_NAME, value);
this.clusterSSLTrustStorePassword = value;
}
@@ -1782,7 +1807,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setMcastSendBufferSize(int value) {
- mcastSendBufferSize = (Integer) checkAttribute(MCAST_SEND_BUFFER_SIZE, value);
+ mcastSendBufferSize = (Integer) value;
}
public int getMcastRecvBufferSize() {
@@ -1790,19 +1815,19 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setMcastRecvBufferSize(int value) {
- mcastRecvBufferSize = (Integer) checkAttribute(MCAST_RECV_BUFFER_SIZE, value);
+ mcastRecvBufferSize = (Integer) value;
}
public void setAsyncDistributionTimeout(int value) {
- this.asyncDistributionTimeout = (Integer) checkAttribute(ASYNC_DISTRIBUTION_TIMEOUT, value);
+ this.asyncDistributionTimeout = (Integer) value;
}
public void setAsyncQueueTimeout(int value) {
- this.asyncQueueTimeout = (Integer) checkAttribute(ASYNC_QUEUE_TIMEOUT, value);
+ this.asyncQueueTimeout = (Integer) value;
}
public void setAsyncMaxQueueSize(int value) {
- this.asyncMaxQueueSize = (Integer) checkAttribute(ASYNC_MAX_QUEUE_SIZE, value);
+ this.asyncMaxQueueSize = (Integer) value;
}
public FlowControlParams getMcastFlowControl() {
@@ -1810,7 +1835,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setMcastFlowControl(FlowControlParams values) {
- mcastFlowControl = (FlowControlParams) checkAttribute(MCAST_FLOW_CONTROL, values);
+ mcastFlowControl = (FlowControlParams) values;
}
public int getUdpFragmentSize() {
@@ -1818,7 +1843,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setUdpFragmentSize(int value) {
- udpFragmentSize = (Integer) checkAttribute(UDP_FRAGMENT_SIZE, value);
+ udpFragmentSize = (Integer) value;
}
public int getUdpSendBufferSize() {
@@ -1826,7 +1851,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setUdpSendBufferSize(int value) {
- udpSendBufferSize = (Integer) checkAttribute(UDP_SEND_BUFFER_SIZE, value);
+ udpSendBufferSize = (Integer) value;
}
public int getUdpRecvBufferSize() {
@@ -1834,7 +1859,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setUdpRecvBufferSize(int value) {
- udpRecvBufferSize = (Integer) checkAttribute(UDP_RECV_BUFFER_SIZE, value);
+ udpRecvBufferSize = (Integer) value;
}
public boolean getDisableTcp() {
@@ -1858,7 +1883,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setMemberTimeout(int value) {
- memberTimeout = (Integer) checkAttribute(MEMBER_TIMEOUT, value);
+ memberTimeout = (Integer) value;
}
/**
@@ -1872,7 +1897,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
* @since GemFire 5.7
*/
public void setClientConflation(String value) {
- this.clientConflation = (String) checkAttribute(CONFLATE_EVENTS, value);
+ this.clientConflation = (String) value;
}
public String getDurableClientId() {
@@ -1880,7 +1905,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setDurableClientId(String value) {
- durableClientId = (String) checkAttribute(DURABLE_CLIENT_ID, value);
+ durableClientId = (String) value;
}
public int getDurableClientTimeout() {
@@ -1888,7 +1913,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setDurableClientTimeout(int value) {
- durableClientTimeout = (Integer) checkAttribute(DURABLE_CLIENT_TIMEOUT, value);
+ durableClientTimeout = (Integer) value;
}
public String getSecurityClientAuthInit() {
@@ -1896,7 +1921,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setSecurityClientAuthInit(String value) {
- securityClientAuthInit = (String) checkAttribute(SECURITY_CLIENT_AUTH_INIT, value);
+ securityClientAuthInit = (String) value;
}
public String getSecurityClientAuthenticator() {
@@ -1928,7 +1953,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setSecurityClientAuthenticator(String value) {
- securityClientAuthenticator = (String) checkAttribute(SECURITY_CLIENT_AUTHENTICATOR, value);
+ securityClientAuthenticator = (String) value;
}
public void setSecurityManager(String value){
@@ -1944,7 +1969,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setSecurityClientDHAlgo(String value) {
- securityClientDHAlgo = (String) checkAttribute(SECURITY_CLIENT_DHALGO, value);
+ securityClientDHAlgo = (String) value;
}
public String getSecurityPeerAuthInit() {
@@ -1952,7 +1977,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setSecurityPeerAuthInit(String value) {
- securityPeerAuthInit = (String) checkAttribute(SECURITY_PEER_AUTH_INIT, value);
+ securityPeerAuthInit = (String) value;
}
public String getSecurityPeerAuthenticator() {
@@ -1960,7 +1985,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setSecurityPeerAuthenticator(String value) {
- securityPeerAuthenticator = (String) checkAttribute(SECURITY_PEER_AUTHENTICATOR, value);
+ securityPeerAuthenticator = (String) value;
}
public String getSecurityClientAccessor() {
@@ -1968,7 +1993,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setSecurityClientAccessor(String value) {
- securityClientAccessor = (String) checkAttribute(SECURITY_CLIENT_ACCESSOR, value);
+ securityClientAccessor = (String) value;
}
public String getSecurityClientAccessorPP() {
@@ -1976,7 +2001,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setSecurityClientAccessorPP(String value) {
- securityClientAccessorPP = (String) checkAttribute(SECURITY_CLIENT_ACCESSOR_PP, value);
+ securityClientAccessorPP = (String) value;
}
public int getSecurityLogLevel() {
@@ -1984,7 +2009,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setSecurityLogLevel(int value) {
- securityLogLevel = (Integer) checkAttribute(SECURITY_LOG_LEVEL, value);
+ securityLogLevel = (Integer) value;
}
public File getSecurityLogFile() {
@@ -1992,7 +2017,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setSecurityLogFile(File value) {
- securityLogFile = (File) checkAttribute(SECURITY_LOG_FILE, value);
+ securityLogFile = (File) value;
}
public int getSecurityPeerMembershipTimeout() {
@@ -2000,7 +2025,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setSecurityPeerMembershipTimeout(int value) {
- securityPeerMembershipTimeout = (Integer) checkAttribute(SECURITY_PEER_VERIFY_MEMBER_TIMEOUT, value);
+ securityPeerMembershipTimeout = (Integer) value;
}
public Properties getSecurityProps() {
@@ -2030,7 +2055,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setDistributedSystemId(int distributedSystemId) {
- this.distributedSystemId = (Integer) checkAttribute(DISTRIBUTED_SYSTEM_ID, distributedSystemId);
+ this.distributedSystemId = (Integer) distributedSystemId;
}
@@ -2044,12 +2069,12 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setEnforceUniqueHost(boolean enforceUniqueHost) {
- this.enforceUniqueHost = (Boolean) checkAttribute(ENFORCE_UNIQUE_HOST, enforceUniqueHost);
+ this.enforceUniqueHost = (Boolean) enforceUniqueHost;
}
public void setRedundancyZone(String redundancyZone) {
- this.redundancyZone = (String) checkAttribute(REDUNDANCY_ZONE, redundancyZone);
+ this.redundancyZone = (String) redundancyZone;
}
@@ -2098,7 +2123,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
if (value == null) {
value = DEFAULT_GROUPS;
}
- this.groups = (String) checkAttribute(GROUPS, value);
+ this.groups = (String) value;
}
@Override
@@ -2162,31 +2187,31 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
public void setJmxManagerSSLKeyStore(String value) {
- value = (String) checkAttribute(JMX_MANAGER_SSL_KEYSTORE, value);
+
this.getJmxSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + KEY_STORE_NAME, value);
this.jmxManagerSSLKeyStore = value;
}
public void setJmxManagerSSLKeyStoreType(String value) {
- value = (String) checkAttribute(JMX_MANAGER_SSL_KEYSTORE_TYPE, value);
+
this.getJmxSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + KEY_STORE_TYPE_NAME, value);
this.jmxManagerSSLKeyStoreType = value;
}
public void setJmxManagerSSLKeyStorePassword(String value) {
- value = (String) checkAttribute(JMX_MANAGER_SSL_KEYSTORE_PASSWORD, value);
+
this.getJmxSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + KEY_STORE_PASSWORD_NAME, value);
this.jmxManagerSSLKeyStorePassword = value;
}
public void setJmxManagerSSLTrustStore(String value) {
- value = (String) checkAttribute(JMX_MANAGER_SSL_TRUSTSTORE, value);
+
this.getJmxSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + TRUST_STORE_NAME, value);
this.jmxManagerSSLTrustStore = value;
}
public void setJmxManagerSSLTrustStorePassword(String value) {
- value = (String) checkAttribute(JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD, value);
+
this.getJmxSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + TRUST_STORE_PASSWORD_NAME, value);
this.jmxManagerSSLTrustStorePassword = value;
}
@@ -2218,7 +2243,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
@Override
public void setJmxManagerPort(int value) {
- this.jmxManagerPort = (Integer) checkAttribute(JMX_MANAGER_PORT, value);
+ this.jmxManagerPort = (Integer) value;
}
@Override
@@ -2231,7 +2256,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
if (value == null) {
value = "";
}
- this.jmxManagerBindAddress = (String) checkAttribute(JMX_MANAGER_BIND_ADDRESS, value);
+ this.jmxManagerBindAddress = (String) value;
}
@Override
@@ -2244,7 +2269,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
if (value == null) {
value = "";
}
- this.jmxManagerHostnameForClients = (String) checkAttribute(JMX_MANAGER_HOSTNAME_FOR_CLIENTS, value);
+ this.jmxManagerHostnameForClients = (String) value;
}
@Override
@@ -2257,7 +2282,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
if (value == null) {
value = "";
}
- this.jmxManagerPasswordFile = (String) checkAttribute(JMX_MANAGER_PASSWORD_FILE, value);
+ this.jmxManagerPasswordFile = (String) value;
}
@Override
@@ -2270,7 +2295,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
if (value == null) {
value = "";
}
- this.jmxManagerAccessFile = (String) checkAttribute(JMX_MANAGER_ACCESS_FILE, value);
+ this.jmxManagerAccessFile = (String) value;
}
@Override
@@ -2290,7 +2315,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
@Override
public void setJmxManagerUpdateRate(int value) {
- this.jmxManagerUpdateRate = (Integer) checkAttribute(JMX_MANAGER_UPDATE_RATE, value);
+ this.jmxManagerUpdateRate = (Integer) value;
}
@Override
@@ -3310,14 +3335,14 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
* @see com.gemstone.gemfire.distributed.internal.DistributionConfig#setMembershipPortRange(int[])
*/
public void setMembershipPortRange(int[] range) {
- membershipPortRange = (int[]) checkAttribute(MEMBERSHIP_PORT_RANGE, range);
+ membershipPortRange = (int[]) range;
}
/**
* Set the host-port information of remote site locator
*/
public void setRemoteLocators(String value) {
- this.remoteLocators = (String) checkAttribute(REMOTE_LOCATORS, value);
+ this.remoteLocators = (String) value;
}
/**
@@ -3338,7 +3363,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
@Override
public void setMemcachedPort(int value) {
- this.memcachedPort = (Integer) checkAttribute(MEMCACHED_PORT, value);
+ this.memcachedPort = (Integer) value;
}
@Override
@@ -3348,7 +3373,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
@Override
public void setMemcachedProtocol(String protocol) {
- this.memcachedProtocol = (String) checkAttribute(MEMCACHED_PROTOCOL, protocol);
+ this.memcachedProtocol = (String) protocol;
}
@Override
@@ -3358,7 +3383,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
@Override
public void setRedisPort(int value) {
- this.redisPort = (Integer) checkAttribute(REDIS_PORT, value);
+ this.redisPort = (Integer) value;
}
@Override
@@ -3368,7 +3393,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
@Override
public void setRedisBindAddress(String bindAddress) {
- this.redisBindAddress = (String) checkAttribute(REDIS_BIND_ADDRESS, bindAddress);
+ this.redisBindAddress = (String) bindAddress;
}
@Override
@@ -3388,7 +3413,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
@Override
public void setOffHeapMemorySize(String value) {
- this.offHeapMemorySize = (String) checkAttribute(OFF_HEAP_MEMORY_SIZE, value);
+ this.offHeapMemorySize = (String) value;
}
@Override
@@ -3398,12 +3423,12 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
@Override
public void setMemcachedBindAddress(String bindAddress) {
- this.memcachedBindAddress = (String) checkAttribute(MEMCACHED_BIND_ADDRESS, bindAddress);
+ this.memcachedBindAddress = (String) bindAddress;
}
@Override
public void setEnableClusterConfiguration(boolean value) {
- this.enableSharedConfiguration = (Boolean) checkAttribute(ENABLE_CLUSTER_CONFIGURATION, value);
+ this.enableSharedConfiguration = (Boolean) value;
}
@Override
@@ -3414,7 +3439,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
@Override
public void setUseSharedConfiguration(boolean newValue) {
- this.useSharedConfiguration = (Boolean) checkAttribute(USE_CLUSTER_CONFIGURATION, newValue);
+ this.useSharedConfiguration = (Boolean) newValue;
}
@Override
@@ -3424,7 +3449,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
@Override
public void setLoadClusterConfigFromDir(boolean newValue) {
- this.loadSharedConfigurationFromDir = (Boolean) checkAttribute(LOAD_CLUSTER_CONFIGURATION_FROM_DIR, newValue);
+ this.loadSharedConfigurationFromDir = (Boolean) newValue;
}
@Override
@@ -3434,7 +3459,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
@Override
public void setClusterConfigDir(String clusterConfigDir) {
- this.clusterConfigDir = (String) checkAttribute(CLUSTER_CONFIGURATION_DIR, clusterConfigDir);
+ this.clusterConfigDir = (String) clusterConfigDir;
}
@Override
@@ -3449,7 +3474,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
@Override
public void setServerSSLEnabled(boolean value) {
- this.serverSSLEnabled = (Boolean) checkAttribute(SERVER_SSL_ENABLED, value);
+ this.serverSSLEnabled = (Boolean) value;
}
@@ -3460,7 +3485,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
@Override
public void setServerSSLRequireAuthentication(boolean value) {
- this.serverSslRequireAuthentication = (Boolean) checkAttribute(SERVER_SSL_REQUIRE_AUTHENTICATION, value);
+ this.serverSslRequireAuthentication = (Boolean) value;
}
@Override
@@ -3470,7 +3495,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
@Override
public void setServerSSLProtocols(String protocols) {
- this.serverSslProtocols = (String) checkAttribute(SERVER_SSL_PROTOCOLS, protocols);
+ this.serverSslProtocols = (String) protocols;
}
@Override
@@ -3480,35 +3505,30 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
@Override
public void setServerSSLCiphers(String ciphers) {
- this.serverSslCiphers = (String) checkAttribute(SERVER_SSL_CIPHERS, ciphers);
+ this.serverSslCiphers = (String) ciphers;
}
public void setServerSSLKeyStore(String value) {
- value = (String) checkAttribute(SERVER_SSL_KEYSTORE, value);
this.getServerSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + KEY_STORE_NAME, value);
this.serverSSLKeyStore = value;
}
public void setServerSSLKeyStoreType(String value) {
- value = (String) checkAttribute(SERVER_SSL_KEYSTORE_TYPE, value);
this.getServerSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + KEY_STORE_TYPE_NAME, value);
this.serverSSLKeyStoreType = value;
}
public void setServerSSLKeyStorePassword(String value) {
- value = (String) checkAttribute(SERVER_SSL_KEYSTORE_PASSWORD, value);
this.getServerSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + KEY_STORE_PASSWORD_NAME, value);
this.serverSSLKeyStorePassword = value;
}
public void setServerSSLTrustStore(String value) {
- value = (String) checkAttribute(SERVER_SSL_TRUSTSTORE, value);
this.getServerSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + TRUST_STORE_NAME, value);
this.serverSSLTrustStore = value;
}
public void setServerSSLTrustStorePassword(String value) {
- value = (String) checkAttribute(SERVER_SSL_TRUSTSTORE_PASSWORD, value);
this.getServerSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + TRUST_STORE_PASSWORD_NAME, value);
this.serverSSLTrustStorePassword = value;
}
@@ -3545,7 +3565,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
@Override
public void setGatewaySSLEnabled(boolean value) {
- this.gatewaySSLEnabled = (Boolean) checkAttribute(SERVER_SSL_ENABLED, value);
+ this.gatewaySSLEnabled = (Boolean) value;
}
@@ -3556,7 +3576,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
@Override
public void setGatewaySSLRequireAuthentication(boolean value) {
- this.gatewaySslRequireAuthentication = (Boolean) checkAttribute(GATEWAY_SSL_REQUIRE_AUTHENTICATION, value);
+ this.gatewaySslRequireAuthentication = (Boolean) value;
}
@Override
@@ -3566,7 +3586,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
@Override
public void setGatewaySSLProtocols(String protocols) {
- this.gatewaySslProtocols = (String) checkAttribute(SERVER_SSL_PROTOCOLS, protocols);
+ this.gatewaySslProtocols = (String) protocols;
}
@Override
@@ -3576,35 +3596,30 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
@Override
public void setGatewaySSLCiphers(String ciphers) {
- this.gatewaySslCiphers = (String) checkAttribute(GATEWAY_SSL_CIPHERS, ciphers);
+ this.gatewaySslCiphers = (String) ciphers;
}
public void setGatewaySSLKeyStore(String value) {
- checkAttribute(GATEWAY_SSL_KEYSTORE, value);
this.getGatewaySSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + KEY_STORE_NAME, value);
this.gatewaySSLKeyStore = value;
}
public void setGatewaySSLKeyStoreType(String value) {
- checkAttribute(GATEWAY_SSL_KEYSTORE_TYPE, value);
this.getGatewaySSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + KEY_STORE_TYPE_NAME, value);
this.gatewaySSLKeyStoreType = value;
}
public void setGatewaySSLKeyStorePassword(String value) {
- checkAttribute(GATEWAY_SSL_KEYSTORE_PASSWORD, value);
this.getGatewaySSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + KEY_STORE_PASSWORD_NAME, value);
this.gatewaySSLKeyStorePassword = value;
}
public void setGatewaySSLTrustStore(String value) {
- checkAttribute(GATEWAY_SSL_TRUSTSTORE, value);
this.getGatewaySSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + TRUST_STORE_NAME, value);
this.gatewaySSLTrustStore = value;
}
public void setGatewaySSLTrustStorePassword(String value) {
- checkAttribute(GATEWAY_SSL_TRUSTSTORE_PASSWORD, value);
this.getGatewaySSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + TRUST_STORE_PASSWORD_NAME, value);
this.gatewaySSLTrustStorePassword = value;
}
@@ -3683,7 +3698,6 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
@Override
public void setHttpServiceSSLKeyStore(String httpServiceSSLKeyStore) {
- checkAttribute(HTTP_SERVICE_SSL_KEYSTORE, httpServiceSSLKeyStore);
this.getHttpServiceSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + KEY_STORE_NAME, httpServiceSSLKeyStore);
this.httpServiceSSLKeyStore = httpServiceSSLKeyStore;
}
@@ -3695,7 +3709,6 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
@Override
public void setHttpServiceSSLKeyStoreType(String httpServiceSSLKeyStoreType) {
- checkAttribute(HTTP_SERVICE_SSL_KEYSTORE_TYPE, httpServiceSSLKeyStoreType);
this.getHttpServiceSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + KEY_STORE_TYPE_NAME, httpServiceSSLKeyStoreType);
this.httpServiceSSLKeyStoreType = httpServiceSSLKeyStoreType;
}
@@ -3707,7 +3720,6 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
@Override
public void setHttpServiceSSLKeyStorePassword(String httpServiceSSLKeyStorePassword) {
- checkAttribute(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, httpServiceSSLKeyStorePassword);
this.getHttpServiceSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + KEY_STORE_PASSWORD_NAME, httpServiceSSLKeyStorePassword);
this.httpServiceSSLKeyStorePassword = httpServiceSSLKeyStorePassword;
}
@@ -3719,7 +3731,6 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
@Override
public void setHttpServiceSSLTrustStore(String httpServiceSSLTrustStore) {
- checkAttribute(HTTP_SERVICE_SSL_TRUSTSTORE, httpServiceSSLTrustStore);
this.getHttpServiceSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + TRUST_STORE_NAME, httpServiceSSLTrustStore);
this.httpServiceSSLTrustStore = httpServiceSSLTrustStore;
}
@@ -3731,7 +3742,6 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
@Override
public void setHttpServiceSSLTrustStorePassword(String httpServiceSSLTrustStorePassword) {
- checkAttribute(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD, httpServiceSSLTrustStorePassword);
this.getHttpServiceSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + TRUST_STORE_PASSWORD_NAME, httpServiceSSLTrustStorePassword);
this.httpServiceSSLTrustStorePassword = httpServiceSSLTrustStorePassword;
}