This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new aecf6da Allow subclasses of AbstractConfiguration to use fluent style
aecf6da is described below
commit aecf6da41f8978ad82b1f0cf65fc914f242e1d16
Author: Ivan Kelly <[email protected]>
AuthorDate: Wed Dec 13 13:46:15 2017 -0800
Allow subclasses of AbstractConfiguration to use fluent style
And in doing so, get rid of ugly casts.
Author: Ivan Kelly <[email protected]>
Reviewers: Enrico Olivelli <[email protected]>, Jia Zhai <None>, Sijie
Guo <[email protected]>
This closes #835 from ivankelly/abstract-conf-generic
---
.../org/apache/bookkeeper/client/BookKeeper.java | 2 +-
.../apache/bookkeeper/client/BookKeeperAdmin.java | 2 +-
.../bookkeeper/conf/AbstractConfiguration.java | 45 +++++++++++++---------
.../bookkeeper/conf/ClientConfiguration.java | 7 +++-
.../bookkeeper/conf/ServerConfiguration.java | 6 ++-
.../bookkeeper/meta/LedgerManagerFactory.java | 4 +-
6 files changed, 41 insertions(+), 25 deletions(-)
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java
index 69e1139..d0f8a64 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java
@@ -314,7 +314,7 @@ public class BookKeeper implements
org.apache.bookkeeper.client.api.BookKeeper {
*/
public BookKeeper(String servers) throws IOException, InterruptedException,
BKException {
- this((ClientConfiguration) (new
ClientConfiguration().setZkServers(servers)));
+ this(new ClientConfiguration().setZkServers(servers));
}
/**
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeperAdmin.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeperAdmin.java
index 09fda48..0d6321f 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeperAdmin.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeperAdmin.java
@@ -136,7 +136,7 @@ public class BookKeeperAdmin implements AutoCloseable {
* BookKeeper client.
*/
public BookKeeperAdmin(String zkServers) throws IOException,
InterruptedException, BKException {
- this((ClientConfiguration) (new
ClientConfiguration().setZkServers(zkServers)));
+ this(new ClientConfiguration().setZkServers(zkServers));
}
/**
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/AbstractConfiguration.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/AbstractConfiguration.java
index 9f8c503..b197b1e 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/AbstractConfiguration.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/AbstractConfiguration.java
@@ -35,7 +35,8 @@ import org.apache.commons.lang.StringUtils;
/**
* Abstract configuration.
*/
-public abstract class AbstractConfiguration extends CompositeConfiguration {
+public abstract class AbstractConfiguration<T extends AbstractConfiguration>
+ extends CompositeConfiguration {
public static final String READ_SYSTEM_PROPERTIES_PROPERTY =
"org.apache.bookkeeper.conf.readsystemproperties";
@@ -158,9 +159,9 @@ public abstract class AbstractConfiguration extends
CompositeConfiguration {
* @param zkServers
* ZooKeeper servers to connect
*/
- public AbstractConfiguration setZkServers(String zkServers) {
+ public T setZkServers(String zkServers) {
setProperty(ZK_SERVERS, zkServers);
- return this;
+ return getThis();
}
/**
@@ -179,9 +180,9 @@ public abstract class AbstractConfiguration extends
CompositeConfiguration {
* ZooKeeper server timeout
* @return server configuration
*/
- public AbstractConfiguration setZkTimeout(int zkTimeout) {
+ public T setZkTimeout(int zkTimeout) {
setProperty(ZK_TIMEOUT, Integer.toString(zkTimeout));
- return this;
+ return getThis();
}
/**
@@ -380,10 +381,10 @@ public abstract class AbstractConfiguration extends
CompositeConfiguration {
* the client authentication provider factory class name
* @return client configuration
*/
- public AbstractConfiguration setClientAuthProviderFactoryClass(
+ public T setClientAuthProviderFactoryClass(
String factoryClass) {
setProperty(CLIENT_AUTH_PROVIDER_FACTORY_CLASS, factoryClass);
- return this;
+ return getThis();
}
/**
@@ -414,9 +415,9 @@ public abstract class AbstractConfiguration extends
CompositeConfiguration {
* the max size in bytes
* @return server configuration
*/
- public AbstractConfiguration setNettyMaxFrameSizeBytes(int maxSize) {
+ public T setNettyMaxFrameSizeBytes(int maxSize) {
setProperty(NETTY_MAX_FRAME_SIZE, String.valueOf(maxSize));
- return this;
+ return getThis();
}
/**
@@ -435,9 +436,9 @@ public abstract class AbstractConfiguration extends
CompositeConfiguration {
* the client security provider factory class name
* @return client configuration
*/
- public AbstractConfiguration setTLSProviderFactoryClass(String
factoryClass) {
+ public T setTLSProviderFactoryClass(String factoryClass) {
setProperty(TLS_PROVIDER_FACTORY_CLASS, factoryClass);
- return this;
+ return getThis();
}
/**
@@ -456,9 +457,9 @@ public abstract class AbstractConfiguration extends
CompositeConfiguration {
* TLS Provider type
* @return Client Configuration
*/
- public AbstractConfiguration setTLSProvider(String provider) {
+ public T setTLSProvider(String provider) {
setProperty(TLS_PROVIDER, provider);
- return this;
+ return getThis();
}
/**
@@ -478,9 +479,9 @@ public abstract class AbstractConfiguration extends
CompositeConfiguration {
* Whether to send a certificate or not
* @return client configuration
*/
- public AbstractConfiguration setTLSClientAuthentication(boolean enabled) {
+ public T setTLSClientAuthentication(boolean enabled) {
setProperty(TLS_CLIENT_AUTHENTICATION, enabled);
- return this;
+ return getThis();
}
/**
@@ -491,10 +492,10 @@ public abstract class AbstractConfiguration extends
CompositeConfiguration {
* comma separated list of enabled TLS cipher suites
* @return current configuration
*/
- public AbstractConfiguration setTLSEnabledCipherSuites(
+ public T setTLSEnabledCipherSuites(
String list) {
setProperty(TLS_ENABLED_CIPHER_SUITES, list);
- return this;
+ return getThis();
}
/**
@@ -516,10 +517,10 @@ public abstract class AbstractConfiguration extends
CompositeConfiguration {
* comma separated list of enabled TLS cipher suites
* @return current configuration
*/
- public AbstractConfiguration setTLSEnabledProtocols(
+ public T setTLSEnabledProtocols(
String list) {
setProperty(TLS_ENABLED_PROTOCOLS, list);
- return this;
+ return getThis();
}
/**
@@ -532,4 +533,10 @@ public abstract class AbstractConfiguration extends
CompositeConfiguration {
public String getTLSEnabledProtocols() {
return getString(TLS_ENABLED_PROTOCOLS, null);
}
+
+
+ /**
+ * Trickery to allow inheritance with fluent style.
+ */
+ protected abstract T getThis();
}
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java
index 93adc1f..257c367 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java
@@ -39,7 +39,7 @@ import
org.apache.commons.configuration.ConfigurationException;
/**
* Configuration settings for client side.
*/
-public class ClientConfiguration extends AbstractConfiguration {
+public class ClientConfiguration extends
AbstractConfiguration<ClientConfiguration> {
// Throttle value
protected static final String THROTTLE = "throttle";
@@ -1669,4 +1669,9 @@ public class ClientConfiguration extends
AbstractConfiguration {
public boolean getStoreSystemtimeAsLedgerCreationTime() {
return getBoolean(STORE_SYSTEMTIME_AS_LEDGER_CREATION_TIME, false);
}
+
+ @Override
+ protected ClientConfiguration getThis() {
+ return this;
+ }
}
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java
index 19d5df1..38eccba 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java
@@ -34,7 +34,7 @@ import
org.apache.commons.configuration.ConfigurationException;
/**
* Configuration manages server-side settings.
*/
-public class ServerConfiguration extends AbstractConfiguration {
+public class ServerConfiguration extends
AbstractConfiguration<ServerConfiguration> {
// Entry Log Parameters
protected static final String ENTRY_LOG_SIZE_LIMIT = "logSizeLimit";
protected static final String ENTRY_LOG_FILE_PREALLOCATION_ENABLED =
"entryLogFilePreallocationEnabled";
@@ -2497,4 +2497,8 @@ public class ServerConfiguration extends
AbstractConfiguration {
DEFAULT_LOADER);
}
+ @Override
+ protected ServerConfiguration getThis() {
+ return this;
+ }
}
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerManagerFactory.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerManagerFactory.java
index 91d83e7..651076f 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerManagerFactory.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerManagerFactory.java
@@ -109,7 +109,7 @@ public abstract class LedgerManagerFactory {
* @throws IOException
*/
public static LedgerManagerFactory newLedgerManagerFactory(
- final AbstractConfiguration conf, final ZooKeeper zk)
+ final AbstractConfiguration<?> conf, final ZooKeeper zk)
throws IOException, KeeperException, InterruptedException {
Class<? extends LedgerManagerFactory> factoryClass;
try {
@@ -252,7 +252,7 @@ public abstract class LedgerManagerFactory {
* @param zk
* Zookeeper instance
*/
- public void format(final AbstractConfiguration conf, final ZooKeeper zk)
+ public void format(final AbstractConfiguration<?> conf, final ZooKeeper zk)
throws InterruptedException, KeeperException, IOException {
Class<? extends LedgerManagerFactory> factoryClass;
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
