This is an automated email from the ASF dual-hosted git repository.
zhaijia 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 502c6b1 ISSUE #675: Enable checkstyle in a few packages
502c6b1 is described below
commit 502c6b1e4b9d65a7ebd373eb6177e925648880f8
Author: Sijie Guo <[email protected]>
AuthorDate: Sun Oct 29 10:28:10 2017 +0800
ISSUE #675: Enable checkstyle in a few packages
These packages include:
- feature
- processor
- shims
- stats
- streaming
- versioning
- zookeeper
not fully enabled in conf package.
Author: Sijie Guo <[email protected]>
Reviewers: Jia Zhai <None>
This closes #676 from sijie/fix_checkstyles, closes #675
---
.../bookkeeper/conf/AbstractConfiguration.java | 5 +-
.../bookkeeper/conf/ClientConfiguration.java | 5 +-
.../org/apache/bookkeeper/conf/Configurable.java | 11 ++--
.../bookkeeper/conf/ServerConfiguration.java | 4 +-
.../package-info.java} | 20 ++----
.../feature/CacheableFeatureProvider.java | 8 +--
.../org/apache/bookkeeper/feature/Feature.java | 3 +-
.../apache/bookkeeper/feature/FeatureProvider.java | 3 +-
.../bookkeeper/feature/FixedValueFeature.java | 6 +-
.../apache/bookkeeper/feature/SettableFeature.java | 6 +-
.../feature/SettableFeatureProvider.java | 5 +-
.../feature/{Feature.java => package-info.java} | 42 ++++--------
.../bookkeeper/processor/RequestProcessor.java | 7 +-
.../package-info.java} | 20 ++----
.../shims/zk/ZooKeeperServerShimFactory.java | 3 +
.../shims/zk/ZooKeeperServerShimImpl.java | 5 +-
...perServerShimFactory.java => package-info.java} | 20 ++----
.../apache/bookkeeper/stats/AlertStatsLogger.java | 4 +-
.../package-info.java} | 20 ++----
.../bookkeeper/streaming/LedgerInputStream.java | 20 +++---
.../bookkeeper/streaming/LedgerOutputStream.java | 9 +--
.../package-info.java} | 20 ++----
.../apache/bookkeeper/versioning/LongVersion.java | 2 +-
.../org/apache/bookkeeper/versioning/Version.java | 20 +++---
.../apache/bookkeeper/versioning/Versioned.java | 31 +++------
.../package-info.java} | 20 ++----
.../zookeeper/ExponentialBackoffRetryPolicy.java | 3 +
.../apache/bookkeeper/zookeeper/RetryPolicy.java | 8 +--
.../bookkeeper/zookeeper/ZooKeeperClient.java | 77 ++++++++++++----------
.../bookkeeper/zookeeper/ZooKeeperWatcherBase.java | 8 +--
.../org/apache/bookkeeper/zookeeper/ZooWorker.java | 21 +++---
.../package-info.java} | 20 ++----
.../resources/bookkeeper/server-suppressions.xml | 8 ---
33 files changed, 180 insertions(+), 284 deletions(-)
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 1858c67..594973d 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
@@ -29,15 +29,12 @@ import
org.apache.commons.configuration.CompositeConfiguration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.commons.configuration.SystemConfiguration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
- * Abstract configuration
+ * Abstract configuration.
*/
public abstract class AbstractConfiguration extends CompositeConfiguration {
- static final Logger LOG =
LoggerFactory.getLogger(AbstractConfiguration.class);
public static final String READ_SYSTEM_PROPERTIES_PROPERTY
=
"org.apache.bookkeeper.conf.readsystemproperties";
/**
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 6e11f94..5a21753 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
@@ -18,14 +18,13 @@
package org.apache.bookkeeper.conf;
import static com.google.common.base.Charsets.UTF_8;
-import io.netty.buffer.ByteBuf;
import static
org.apache.bookkeeper.util.BookKeeperConstants.FEATURE_DISABLE_ENSEMBLE_CHANGE;
+import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
-
import org.apache.bookkeeper.client.BookKeeper.DigestType;
import org.apache.bookkeeper.client.EnsemblePlacementPolicy;
import org.apache.bookkeeper.client.LedgerHandle;
@@ -37,7 +36,7 @@ import org.apache.commons.lang.StringUtils;
/**
- * Configuration settings for client side
+ * Configuration settings for client side.
*/
public class ClientConfiguration extends AbstractConfiguration {
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/Configurable.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/Configurable.java
index 3616690..6b4adb3 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/Configurable.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/Configurable.java
@@ -20,14 +20,15 @@
*/
package org.apache.bookkeeper.conf;
+import org.apache.bookkeeper.common.annotation.InterfaceAudience.Public;
+import org.apache.bookkeeper.common.annotation.InterfaceStability.Stable;
import org.apache.commons.configuration.Configuration;
-import com.google.common.annotations.Beta;
-
/**
* Class that may be configured with a {@link Configuration}.
*/
-@Beta
+@Public
+@Stable
public interface Configurable {
/**
@@ -36,12 +37,12 @@ public interface Configurable {
* @param conf
* Configuration object to use
*/
- public void setConf(Configuration conf);
+ void setConf(Configuration conf);
/**
* Return the configuration used by this object.
*
* @return configuration used by this object.
*/
- public Configuration getConf();
+ Configuration getConf();
}
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 cbf88ad..fea051c 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
@@ -22,13 +22,11 @@ import java.util.List;
import java.util.concurrent.TimeUnit;
import com.google.common.annotations.Beta;
-
import org.apache.bookkeeper.bookie.InterleavedLedgerStorage;
import org.apache.bookkeeper.bookie.LedgerStorage;
import org.apache.bookkeeper.bookie.SortedLedgerStorage;
import org.apache.bookkeeper.discover.RegistrationManager;
import org.apache.bookkeeper.discover.ZKRegistrationManager;
-import org.apache.bookkeeper.server.component.ServerLifecycleComponent;
import org.apache.bookkeeper.stats.NullStatsProvider;
import org.apache.bookkeeper.stats.StatsProvider;
import org.apache.bookkeeper.util.BookKeeperConstants;
@@ -37,7 +35,7 @@ import
org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.lang.StringUtils;
/**
- * Configuration manages server-side settings
+ * Configuration manages server-side settings.
*/
public class ServerConfiguration extends AbstractConfiguration {
// Entry Log Parameters
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimFactory.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/package-info.java
similarity index 65%
copy from
bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimFactory.java
copy to
bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/package-info.java
index 59ff88a..bf4aaa5 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimFactory.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/package-info.java
@@ -1,5 +1,4 @@
/*
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -16,20 +15,9 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
-package org.apache.bookkeeper.shims.zk;
-
-import java.io.File;
-import java.io.IOException;
-public class ZooKeeperServerShimFactory {
-
- public static ZooKeeperServerShim createServer(File snapDir, File logDir,
int zkPort, int maxCC)
- throws IOException {
- ZooKeeperServerShim server = new ZooKeeperServerShimImpl();
- server.initialize(snapDir, logDir, zkPort, maxCC);
- return server;
- }
-
-}
+/**
+ * Configurations used by bookkeeper.
+ */
+package org.apache.bookkeeper.conf;
\ No newline at end of file
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/CacheableFeatureProvider.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/CacheableFeatureProvider.java
index 95c9981..b80ea51 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/CacheableFeatureProvider.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/CacheableFeatureProvider.java
@@ -1,5 +1,3 @@
-package org.apache.bookkeeper.feature;
-
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,14 +18,14 @@ package org.apache.bookkeeper.feature;
* under the License.
*
*/
-
-import org.apache.commons.lang.StringUtils;
+package org.apache.bookkeeper.feature;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import org.apache.commons.lang.StringUtils;
/**
- * Cacheable Feature Provider
+ * Cacheable Feature Provider.
*/
public abstract class CacheableFeatureProvider<T extends Feature> implements
FeatureProvider {
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/Feature.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/Feature.java
index ab9fae9..4578e7f 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/Feature.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/Feature.java
@@ -25,7 +25,8 @@ package org.apache.bookkeeper.feature;
* This interface represents a feature.
*/
public interface Feature {
- public static int FEATURE_AVAILABILITY_MAX_VALUE = 100;
+
+ int FEATURE_AVAILABILITY_MAX_VALUE = 100;
/**
* Returns a textual representation of the feature.
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/FeatureProvider.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/FeatureProvider.java
index 04686b7..0710cea 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/FeatureProvider.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/FeatureProvider.java
@@ -1,5 +1,3 @@
-package org.apache.bookkeeper.feature;
-
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +18,7 @@ package org.apache.bookkeeper.feature;
* under the License.
*
*/
+package org.apache.bookkeeper.feature;
/**
* Provider to provide features.
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/FixedValueFeature.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/FixedValueFeature.java
index 825276b..729ac6b 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/FixedValueFeature.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/FixedValueFeature.java
@@ -1,5 +1,3 @@
-package org.apache.bookkeeper.feature;
-
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +18,11 @@ package org.apache.bookkeeper.feature;
* under the License.
*
*/
+package org.apache.bookkeeper.feature;
+/**
+ * A feature implementation that has a fixed value of availability.
+ */
public class FixedValueFeature implements Feature {
protected final String name;
protected int availability;
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/SettableFeature.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/SettableFeature.java
index f175bf0..bb6d1db 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/SettableFeature.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/SettableFeature.java
@@ -1,5 +1,3 @@
-package org.apache.bookkeeper.feature;
-
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +18,11 @@ package org.apache.bookkeeper.feature;
* under the License.
*
*/
+package org.apache.bookkeeper.feature;
+/**
+ * A feature implementation that allow changing availability programmatically.
+ */
public class SettableFeature extends FixedValueFeature {
public SettableFeature(String name, int initialAvailability) {
super(name, initialAvailability);
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/SettableFeatureProvider.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/SettableFeatureProvider.java
index e21ad9d..9a6cc84 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/SettableFeatureProvider.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/SettableFeatureProvider.java
@@ -1,5 +1,3 @@
-package org.apache.bookkeeper.feature;
-
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,13 +18,14 @@ package org.apache.bookkeeper.feature;
* under the License.
*
*/
+package org.apache.bookkeeper.feature;
/**
* A provider will provide settable features.
*/
public class SettableFeatureProvider extends
CacheableFeatureProvider<SettableFeature> {
- public final static FeatureProvider DISABLE_ALL = new
SettableFeatureProvider("", 0);
+ public static final FeatureProvider DISABLE_ALL = new
SettableFeatureProvider("", 0);
protected final int availability;
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/Feature.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/package-info.java
similarity index 53%
copy from
bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/Feature.java
copy to
bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/package-info.java
index ab9fae9..cd911cc 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/Feature.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/feature/package-info.java
@@ -1,7 +1,4 @@
-package org.apache.bookkeeper.feature;
-
/*
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -18,34 +15,19 @@ package org.apache.bookkeeper.feature;
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
/**
- * This interface represents a feature.
+ * A <a href="https://en.wikipedia.org/wiki/Feature_toggle";>feature-flag</a>
system
+ * that is used to proportionally control what features are enabled for the
system.
+ *
+ * <p>In other words, it is a way of altering the control in a system without
restarting it.
+ * It can be used during all stages of developement, its most visible use case
is on production.
+ * For instance, during a production release, you can enable or disable
individual features,
+ * control the data flow through the system, thereby minimizing risk of system
failures
+ * in real time.
+ *
+ * <p>The <i>feature provider</i> interface is pluggable and easy to integrate
with
+ * any configuration management system.
*/
-public interface Feature {
- public static int FEATURE_AVAILABILITY_MAX_VALUE = 100;
-
- /**
- * Returns a textual representation of the feature.
- *
- * @return name of the feature.
- */
- String name();
-
- /**
- * Returns the availability of this feature, an integer between 0 and 100.
- *
- * @return the availability of this feature.
- */
- int availability();
-
- /**
- * Whether this feature is available or not.
- *
- * @return true if this feature is available, otherwise false.
- */
- boolean isAvailable();
-}
-
+package org.apache.bookkeeper.feature;
\ No newline at end of file
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/processor/RequestProcessor.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/processor/RequestProcessor.java
index 658753c..19f095c 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/processor/RequestProcessor.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/processor/RequestProcessor.java
@@ -22,12 +22,15 @@ package org.apache.bookkeeper.processor;
import io.netty.channel.Channel;
+/**
+ * A request processor that is used for processing requests at bookie side.
+ */
public interface RequestProcessor {
/**
* Close the request processor.
*/
- public void close();
+ void close();
/**
* Process request.
@@ -37,6 +40,6 @@ public interface RequestProcessor {
* @param channel
* channel received the given request <i>r</i>
*/
- public void processRequest(Object r, Channel channel);
+ void processRequest(Object r, Channel channel);
}
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimFactory.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/processor/package-info.java
similarity index 65%
copy from
bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimFactory.java
copy to
bookkeeper-server/src/main/java/org/apache/bookkeeper/processor/package-info.java
index 59ff88a..bba0c7b 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimFactory.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/processor/package-info.java
@@ -1,5 +1,4 @@
/*
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -16,20 +15,9 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
-package org.apache.bookkeeper.shims.zk;
-
-import java.io.File;
-import java.io.IOException;
-public class ZooKeeperServerShimFactory {
-
- public static ZooKeeperServerShim createServer(File snapDir, File logDir,
int zkPort, int maxCC)
- throws IOException {
- ZooKeeperServerShim server = new ZooKeeperServerShimImpl();
- server.initialize(snapDir, logDir, zkPort, maxCC);
- return server;
- }
-
-}
+/**
+ * Define the processors used by bookie from processing requests.
+ */
+package org.apache.bookkeeper.processor;
\ No newline at end of file
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimFactory.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimFactory.java
index 59ff88a..6f82e46 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimFactory.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimFactory.java
@@ -23,6 +23,9 @@ package org.apache.bookkeeper.shims.zk;
import java.io.File;
import java.io.IOException;
+/**
+ * A factory to create zookeeper server.
+ */
public class ZooKeeperServerShimFactory {
public static ZooKeeperServerShim createServer(File snapDir, File logDir,
int zkPort, int maxCC)
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimImpl.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimImpl.java
index b74df4b..cc6e2e2 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimImpl.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimImpl.java
@@ -20,12 +20,11 @@
*/
package org.apache.bookkeeper.shims.zk;
-import org.apache.zookeeper.server.NIOServerCnxnFactory;
-import org.apache.zookeeper.server.ZooKeeperServer;
-
import java.io.File;
import java.io.IOException;
import java.net.InetSocketAddress;
+import org.apache.zookeeper.server.NIOServerCnxnFactory;
+import org.apache.zookeeper.server.ZooKeeperServer;
class ZooKeeperServerShimImpl implements ZooKeeperServerShim {
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimFactory.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/package-info.java
similarity index 65%
copy from
bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimFactory.java
copy to
bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/package-info.java
index 59ff88a..5f94461 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimFactory.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/package-info.java
@@ -1,5 +1,4 @@
/*
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -16,20 +15,9 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
-package org.apache.bookkeeper.shims.zk;
-
-import java.io.File;
-import java.io.IOException;
-public class ZooKeeperServerShimFactory {
-
- public static ZooKeeperServerShim createServer(File snapDir, File logDir,
int zkPort, int maxCC)
- throws IOException {
- ZooKeeperServerShim server = new ZooKeeperServerShimImpl();
- server.initialize(snapDir, logDir, zkPort, maxCC);
- return server;
- }
-
-}
+/**
+ * A shim layer to adopt different zookeeper versions.
+ */
+package org.apache.bookkeeper.shims.zk;
\ No newline at end of file
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/stats/AlertStatsLogger.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/stats/AlertStatsLogger.java
index 63ba3b5..f9ffe35 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/stats/AlertStatsLogger.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/stats/AlertStatsLogger.java
@@ -20,7 +20,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * This class is used to raise alert when we detect an event that should never
happen in production
+ * This class is used to raise alert when we detect an event that should never
happen in production.
*/
public class AlertStatsLogger {
private static final Logger logger =
LoggerFactory.getLogger(AlertStatsLogger.class);
@@ -49,7 +49,7 @@ public class AlertStatsLogger {
private String format(String msg) {
return msg.startsWith("ALERT!: ") ? msg :
- ("ALERT!: " + (scope != null ? "(" + scope + "):" : "" ) +
msg);
+ ("ALERT!: " + (scope != null ? "(" + scope + "):" : "") + msg);
}
private void initializeCountersIfNeeded() {
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimFactory.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/stats/package-info.java
similarity index 65%
copy from
bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimFactory.java
copy to
bookkeeper-server/src/main/java/org/apache/bookkeeper/stats/package-info.java
index 59ff88a..df77c58 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimFactory.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/stats/package-info.java
@@ -1,5 +1,4 @@
/*
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -16,20 +15,9 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
-package org.apache.bookkeeper.shims.zk;
-
-import java.io.File;
-import java.io.IOException;
-public class ZooKeeperServerShimFactory {
-
- public static ZooKeeperServerShim createServer(File snapDir, File logDir,
int zkPort, int maxCC)
- throws IOException {
- ZooKeeperServerShim server = new ZooKeeperServerShimImpl();
- server.initialize(snapDir, logDir, zkPort, maxCC);
- return server;
- }
-
-}
+/**
+ * The bookkeeper stats related classes.
+ */
+package org.apache.bookkeeper.stats;
\ No newline at end of file
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerInputStream.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerInputStream.java
index a56003a..20f26dc 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerInputStream.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerInputStream.java
@@ -24,15 +24,15 @@ import java.io.IOException;
import java.io.InputStream;
import java.nio.ByteBuffer;
import java.util.Enumeration;
-
import org.apache.bookkeeper.client.BKException;
import org.apache.bookkeeper.client.LedgerEntry;
import org.apache.bookkeeper.client.LedgerHandle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+/**
+ * An input stream on reading data from a ledger.
+ */
public class LedgerInputStream extends InputStream {
- private final static Logger LOG =
LoggerFactory.getLogger(LedgerInputStream.class);
+
private final LedgerHandle lh;
private ByteBuffer bytebuff;
byte[] bbytes;
@@ -42,11 +42,12 @@ public class LedgerInputStream extends InputStream {
Enumeration<LedgerEntry> ledgerSeq = null;
/**
- * construct a outputstream from a ledger handle
+ * construct a outputstream from a ledger handle.
*
* @param lh
* ledger handle
- * @throws {@link BKException}, {@link InterruptedException}
+ * @throws BKException when encountered bookkeeper exceptions
+ * @throws InterruptedException when opening a ledger input stream is
interrupted.
*/
public LedgerInputStream(LedgerHandle lh) throws BKException,
InterruptedException {
this.lh = lh;
@@ -58,13 +59,14 @@ public class LedgerInputStream extends InputStream {
}
/**
- * construct a outputstream from a ledger handle
+ * construct a outputstream from a ledger handle.
*
* @param lh
* the ledger handle
* @param size
* the size of the buffer
- * @throws {@link BKException}, {@link InterruptedException}
+ * @throws BKException when encountered bookkeeper exceptions
+ * @throws InterruptedException when opening a ledger input stream is
interrupted.
*/
public LedgerInputStream(LedgerHandle lh, int size) throws BKException,
InterruptedException {
this.lh = lh;
@@ -88,7 +90,7 @@ public class LedgerInputStream extends InputStream {
}
/**
- * refill the buffer, we need to read more bytes
+ * refill the buffer, we need to read more bytes.
*
* @return if we can refill or not
*/
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerOutputStream.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerOutputStream.java
index ac7e04f..0d27204 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerOutputStream.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerOutputStream.java
@@ -23,7 +23,6 @@ package org.apache.bookkeeper.streaming;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.ByteBuffer;
-
import org.apache.bookkeeper.client.BKException;
import org.apache.bookkeeper.client.LedgerHandle;
import org.slf4j.Logger;
@@ -36,14 +35,16 @@ import org.slf4j.LoggerFactory;
* out the entry to the ledger.
*/
public class LedgerOutputStream extends OutputStream {
- private final static Logger LOG =
LoggerFactory.getLogger(LedgerOutputStream.class);
+
+ private static final Logger LOG =
LoggerFactory.getLogger(LedgerOutputStream.class);
+
private final LedgerHandle lh;
private ByteBuffer bytebuff;
byte[] bbytes;
int defaultSize = 1024 * 1024; // 1MB default size
/**
- * construct a outputstream from a ledger handle
+ * construct a outputstream from a ledger handle.
*
* @param lh
* ledger handle
@@ -55,7 +56,7 @@ public class LedgerOutputStream extends OutputStream {
}
/**
- * construct a outputstream from a ledger handle
+ * construct a outputstream from a ledger handle.
*
* @param lh
* the ledger handle
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimFactory.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/package-info.java
similarity index 65%
copy from
bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimFactory.java
copy to
bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/package-info.java
index 59ff88a..9da615f 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimFactory.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/package-info.java
@@ -1,5 +1,4 @@
/*
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -16,20 +15,9 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
-package org.apache.bookkeeper.shims.zk;
-
-import java.io.File;
-import java.io.IOException;
-public class ZooKeeperServerShimFactory {
-
- public static ZooKeeperServerShim createServer(File snapDir, File logDir,
int zkPort, int maxCC)
- throws IOException {
- ZooKeeperServerShim server = new ZooKeeperServerShimImpl();
- server.initialize(snapDir, logDir, zkPort, maxCC);
- return server;
- }
-
-}
+/**
+ * A java io stream wrapper over bookkeeper ledgers.
+ */
+package org.apache.bookkeeper.streaming;
\ No newline at end of file
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/versioning/LongVersion.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/versioning/LongVersion.java
index 11f9b19..4ec4388 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/versioning/LongVersion.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/versioning/LongVersion.java
@@ -39,7 +39,7 @@ public class LongVersion implements Version {
} else if (!(v instanceof LongVersion)) {
throw new IllegalArgumentException("Invalid version type");
}
- LongVersion zv = (LongVersion)v;
+ LongVersion zv = (LongVersion) v;
int res = Long.compare(version, zv.version);
if (res == 0) {
return Occurred.CONCURRENTLY;
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/versioning/Version.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/versioning/Version.java
index 39ad3e5..10f4415 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/versioning/Version.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/versioning/Version.java
@@ -28,7 +28,7 @@ public interface Version {
/**
* Initial version.
*/
- public static final Version NEW = new Version() {
+ Version NEW = new Version() {
@Override
public Occurred compare(Version v) {
if (null == v) {
@@ -44,19 +44,19 @@ public interface Version {
/**
* Match any version.
*/
- public static final Version ANY = new Version() {
- @Override
- public Occurred compare(Version v) {
- if (null == v) {
- throw new NullPointerException("Version is not allowed to be
null.");
- }
- return Occurred.CONCURRENTLY;
+ Version ANY = v -> {
+ if (null == v) {
+ throw new NullPointerException("Version is not allowed to be
null.");
}
+ return Occurred.CONCURRENTLY;
};
- public static enum Occurred {
+ /**
+ * Define the sequence of versions.
+ */
+ enum Occurred {
BEFORE, AFTER, CONCURRENTLY
}
- public Occurred compare(Version v);
+ Occurred compare(Version v);
}
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/versioning/Versioned.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/versioning/Versioned.java
index 7e8f1c9..f692624 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/versioning/Versioned.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/versioning/Versioned.java
@@ -18,28 +18,17 @@
package org.apache.bookkeeper.versioning;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/**
+ * A <code>Versioned</code> value represents a value associated with a version.
+ *
+ * @param <T> value type.
+ */
+@Data
+@AllArgsConstructor
public class Versioned<T> {
T value;
Version version;
-
- public Versioned(T value, Version version) {
- this.value = value;
- this.version = version;
- }
-
- public void setValue(T value) {
- this.value = value;
- }
-
- public T getValue() {
- return value;
- }
-
- public void setVersion(Version version) {
- this.version = version;
- }
-
- public Version getVersion() {
- return version;
- }
}
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimFactory.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/versioning/package-info.java
similarity index 65%
copy from
bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimFactory.java
copy to
bookkeeper-server/src/main/java/org/apache/bookkeeper/versioning/package-info.java
index 59ff88a..86fb4b5 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimFactory.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/versioning/package-info.java
@@ -1,5 +1,4 @@
/*
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -16,20 +15,9 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
-package org.apache.bookkeeper.shims.zk;
-
-import java.io.File;
-import java.io.IOException;
-public class ZooKeeperServerShimFactory {
-
- public static ZooKeeperServerShim createServer(File snapDir, File logDir,
int zkPort, int maxCC)
- throws IOException {
- ZooKeeperServerShim server = new ZooKeeperServerShimImpl();
- server.initialize(snapDir, logDir, zkPort, maxCC);
- return server;
- }
-
-}
+/**
+ * a versioning library provides an abstraction over versioned data.
+ */
+package org.apache.bookkeeper.versioning;
\ No newline at end of file
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/ExponentialBackoffRetryPolicy.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/ExponentialBackoffRetryPolicy.java
index 23d86f4..bb66ee9 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/ExponentialBackoffRetryPolicy.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/ExponentialBackoffRetryPolicy.java
@@ -22,6 +22,9 @@ package org.apache.bookkeeper.zookeeper;
import java.util.Random;
+/**
+ * A retry policy implementation that backoff retries exponentially.
+ */
public class ExponentialBackoffRetryPolicy implements RetryPolicy {
private final Random random;
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/RetryPolicy.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/RetryPolicy.java
index a4269fb..fba8b1a 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/RetryPolicy.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/RetryPolicy.java
@@ -28,7 +28,7 @@ public interface RetryPolicy {
/**
* Called when retrying an operation failed for some reason. Return true if
* another attempt is allowed to make.
- *
+ *
* @param retryCount
* The number of times retried so far (1 for the first time).
* @param elapsedRetryTime
@@ -36,12 +36,12 @@ public interface RetryPolicy {
* milliseconds)
* @return true if anther attempt is allowed to make. otherwise, false.
*/
- public boolean allowRetry(int retryCount, long elapsedRetryTime);
+ boolean allowRetry(int retryCount, long elapsedRetryTime);
/**
* Called before making an attempt to retry a failed operation. Return 0 if
* an attempt needs to be made immediately.
- *
+ *
* @param retryCount
* The number of times retried so far (0 for the first time).
* @param elapsedRetryTime
@@ -50,6 +50,6 @@ public interface RetryPolicy {
* @return the elapsed time that the attempt needs to wait before retrying.
* (in milliseconds)
*/
- public long nextRetryWaitTime(int retryCount, long elapsedRetryTime);
+ long nextRetryWaitTime(int retryCount, long elapsedRetryTime);
}
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/ZooKeeperClient.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/ZooKeeperClient.java
index 94df8da..0c143da 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/ZooKeeperClient.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/ZooKeeperClient.java
@@ -20,6 +20,12 @@
*/
package org.apache.bookkeeper.zookeeper;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.util.concurrent.RateLimiter;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
import java.io.IOException;
import java.util.List;
import java.util.Set;
@@ -31,20 +37,14 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.RateLimiter;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-
import org.apache.bookkeeper.stats.NullStatsLogger;
import org.apache.bookkeeper.stats.OpStatsLogger;
import org.apache.bookkeeper.stats.StatsLogger;
import org.apache.bookkeeper.zookeeper.ZooWorker.ZooCallable;
import org.apache.zookeeper.AsyncCallback.ACLCallback;
-import org.apache.zookeeper.AsyncCallback.Create2Callback;
import org.apache.zookeeper.AsyncCallback.Children2Callback;
import org.apache.zookeeper.AsyncCallback.ChildrenCallback;
+import org.apache.zookeeper.AsyncCallback.Create2Callback;
import org.apache.zookeeper.AsyncCallback.DataCallback;
import org.apache.zookeeper.AsyncCallback.MultiCallback;
import org.apache.zookeeper.AsyncCallback.StatCallback;
@@ -66,11 +66,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Provide a zookeeper client to handle session expire
+ * Provide a zookeeper client to handle session expire.
*/
public class ZooKeeperClient extends ZooKeeper implements Watcher {
- final static Logger logger =
LoggerFactory.getLogger(ZooKeeperClient.class);
+ private static final Logger logger =
LoggerFactory.getLogger(ZooKeeperClient.class);
private static final int DEFAULT_RETRY_EXECUTOR_THREAD_COUNT = 1;
@@ -160,6 +160,9 @@ public class ZooKeeperClient extends ZooKeeper implements
Watcher {
.build();
}
+ /**
+ * A builder to build retryable zookeeper client.
+ */
public static class Builder {
String connectString = null;
int sessionTimeoutMs = 10000;
@@ -213,10 +216,10 @@ public class ZooKeeperClient extends ZooKeeper implements
Watcher {
}
public ZooKeeperClient build() throws IOException, KeeperException,
InterruptedException {
- Preconditions.checkNotNull(connectString);
- Preconditions.checkArgument(sessionTimeoutMs > 0);
- Preconditions.checkNotNull(statsLogger);
- Preconditions.checkArgument(retryExecThreadCount > 0);
+ checkNotNull(connectString);
+ checkArgument(sessionTimeoutMs > 0);
+ checkNotNull(statsLogger);
+ checkArgument(retryExecThreadCount > 0);
if (null == connectRetryPolicy) {
connectRetryPolicy =
@@ -326,8 +329,8 @@ public class ZooKeeperClient extends ZooKeeper implements
Watcher {
@Override
public void process(WatchedEvent event) {
- if (event.getType() == EventType.None &&
- event.getState() == KeeperState.Expired) {
+ if (event.getType() == EventType.None
+ && event.getState() == KeeperState.Expired) {
onExpired();
}
}
@@ -351,7 +354,10 @@ public class ZooKeeperClient extends ZooKeeper implements
Watcher {
}
}
- static abstract class ZkRetryRunnable implements Runnable {
+ /**
+ * A runnable that retries zookeeper operations.
+ */
+ abstract static class ZkRetryRunnable implements Runnable {
final ZooWorker worker;
final RateLimiter rateLimiter;
@@ -465,7 +471,7 @@ public class ZooKeeperClient extends ZooKeeper implements
Watcher {
@Override
public void processResult(int rc, String path, Object ctx,
List<OpResult> results) {
- ZooWorker worker = (ZooWorker)ctx;
+ ZooWorker worker = (ZooWorker) ctx;
if (allowRetry(worker, rc)) {
backOffAndRetry(that, worker.nextRetryWaitTime());
} else {
@@ -536,7 +542,7 @@ public class ZooKeeperClient extends ZooKeeper implements
Watcher {
@Override
public void processResult(int rc, String path, Object ctx,
List<ACL> acl, Stat stat) {
- ZooWorker worker = (ZooWorker)ctx;
+ ZooWorker worker = (ZooWorker) ctx;
if (allowRetry(worker, rc)) {
backOffAndRetry(that, worker.nextRetryWaitTime());
} else {
@@ -596,7 +602,7 @@ public class ZooKeeperClient extends ZooKeeper implements
Watcher {
@Override
public void processResult(int rc, String path, Object ctx,
Stat stat) {
- ZooWorker worker = (ZooWorker)ctx;
+ ZooWorker worker = (ZooWorker) ctx;
if (allowRetry(worker, rc)) {
backOffAndRetry(that, worker.nextRetryWaitTime());
} else {
@@ -633,7 +639,7 @@ public class ZooKeeperClient extends ZooKeeper implements
Watcher {
@Override
public void processResult(int rc, String path, Object ctx) {
- ZooWorker worker = (ZooWorker)ctx;
+ ZooWorker worker = (ZooWorker) ctx;
if (allowRetry(worker, rc)) {
backOffAndRetry(that, worker.nextRetryWaitTime());
} else {
@@ -714,7 +720,7 @@ public class ZooKeeperClient extends ZooKeeper implements
Watcher {
@Override
public void processResult(int rc, String path, Object ctx,
String name) {
- ZooWorker worker = (ZooWorker)ctx;
+ ZooWorker worker = (ZooWorker) ctx;
if (allowRetry(worker, rc)) {
backOffAndRetry(that, worker.nextRetryWaitTime());
} else {
@@ -782,7 +788,7 @@ public class ZooKeeperClient extends ZooKeeper implements
Watcher {
@Override
public void processResult(int rc, String path, Object ctx,
String name, Stat stat) {
- ZooWorker worker = (ZooWorker)ctx;
+ ZooWorker worker = (ZooWorker) ctx;
if (allowRetry(worker, rc)) {
backOffAndRetry(that, worker.nextRetryWaitTime());
} else {
@@ -842,7 +848,7 @@ public class ZooKeeperClient extends ZooKeeper implements
Watcher {
@Override
public void processResult(int rc, String path, Object ctx) {
- ZooWorker worker = (ZooWorker)ctx;
+ ZooWorker worker = (ZooWorker) ctx;
if (allowRetry(worker, rc)) {
backOffAndRetry(that, worker.nextRetryWaitTime());
} else {
@@ -921,7 +927,7 @@ public class ZooKeeperClient extends ZooKeeper implements
Watcher {
@Override
public void processResult(int rc, String path, Object ctx,
Stat stat) {
- ZooWorker worker = (ZooWorker)ctx;
+ ZooWorker worker = (ZooWorker) ctx;
if (allowRetry(worker, rc)) {
backOffAndRetry(that, worker.nextRetryWaitTime());
} else {
@@ -958,7 +964,7 @@ public class ZooKeeperClient extends ZooKeeper implements
Watcher {
@Override
public void processResult(int rc, String path, Object ctx,
Stat stat) {
- ZooWorker worker = (ZooWorker)ctx;
+ ZooWorker worker = (ZooWorker) ctx;
if (allowRetry(worker, rc)) {
backOffAndRetry(that, worker.nextRetryWaitTime());
} else {
@@ -1039,7 +1045,7 @@ public class ZooKeeperClient extends ZooKeeper implements
Watcher {
@Override
public void processResult(int rc, String path, Object ctx,
byte[] data, Stat stat) {
- ZooWorker worker = (ZooWorker)ctx;
+ ZooWorker worker = (ZooWorker) ctx;
if (allowRetry(worker, rc)) {
backOffAndRetry(that, worker.nextRetryWaitTime());
} else {
@@ -1076,7 +1082,7 @@ public class ZooKeeperClient extends ZooKeeper implements
Watcher {
@Override
public void processResult(int rc, String path, Object ctx,
byte[] data, Stat stat) {
- ZooWorker worker = (ZooWorker)ctx;
+ ZooWorker worker = (ZooWorker) ctx;
if (allowRetry(worker, rc)) {
backOffAndRetry(that, worker.nextRetryWaitTime());
} else {
@@ -1136,7 +1142,7 @@ public class ZooKeeperClient extends ZooKeeper implements
Watcher {
@Override
public void processResult(int rc, String path, Object ctx,
Stat stat) {
- ZooWorker worker = (ZooWorker)ctx;
+ ZooWorker worker = (ZooWorker) ctx;
if (allowRetry(worker, rc)) {
backOffAndRetry(that, worker.nextRetryWaitTime());
} else {
@@ -1219,7 +1225,7 @@ public class ZooKeeperClient extends ZooKeeper implements
Watcher {
@Override
public void processResult(int rc, String path, Object ctx,
List<String> children, Stat stat) {
- ZooWorker worker = (ZooWorker)ctx;
+ ZooWorker worker = (ZooWorker) ctx;
if (allowRetry(worker, rc)) {
backOffAndRetry(that, worker.nextRetryWaitTime());
} else {
@@ -1258,7 +1264,7 @@ public class ZooKeeperClient extends ZooKeeper implements
Watcher {
@Override
public void processResult(int rc, String path, Object ctx,
List<String> children, Stat stat) {
- ZooWorker worker = (ZooWorker)ctx;
+ ZooWorker worker = (ZooWorker) ctx;
if (allowRetry(worker, rc)) {
backOffAndRetry(that, worker.nextRetryWaitTime());
} else {
@@ -1342,7 +1348,7 @@ public class ZooKeeperClient extends ZooKeeper implements
Watcher {
@Override
public void processResult(int rc, String path, Object ctx,
List<String> children) {
- ZooWorker worker = (ZooWorker)ctx;
+ ZooWorker worker = (ZooWorker) ctx;
if (allowRetry(worker, rc)) {
backOffAndRetry(that, worker.nextRetryWaitTime());
} else {
@@ -1381,7 +1387,7 @@ public class ZooKeeperClient extends ZooKeeper implements
Watcher {
@Override
public void processResult(int rc, String path, Object ctx,
List<String> children) {
- ZooWorker worker = (ZooWorker)ctx;
+ ZooWorker worker = (ZooWorker) ctx;
if (allowRetry(worker, rc)) {
backOffAndRetry(that, worker.nextRetryWaitTime());
} else {
@@ -1422,7 +1428,12 @@ public class ZooKeeperClient extends ZooKeeper
implements Watcher {
}
@Override
- public void removeWatches(String path, Watcher watcher, WatcherType
watcherType, boolean local, VoidCallback cb, Object ctx) {
+ public void removeWatches(String path,
+ Watcher watcher,
+ WatcherType watcherType,
+ boolean local,
+ VoidCallback cb,
+ Object ctx) {
ZooKeeper zkHandle = zk.get();
if (null == zkHandle) {
ZooKeeperClient.super.removeWatches(path, watcher, watcherType,
local, cb, ctx);
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/ZooKeeperWatcherBase.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/ZooKeeperWatcherBase.java
index 7a98668..f5816b0 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/ZooKeeperWatcherBase.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/ZooKeeperWatcherBase.java
@@ -26,7 +26,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-
import org.apache.bookkeeper.stats.Counter;
import org.apache.bookkeeper.stats.NullStatsLogger;
import org.apache.bookkeeper.stats.StatsLogger;
@@ -132,7 +131,8 @@ public class ZooKeeperWatcherBase implements Watcher {
clientConnectLatch.countDown();
break;
case Disconnected:
- LOG.info("ZooKeeper client is disconnected from zookeeper now, but
it is OK unless we received EXPIRED event.");
+ LOG.info("ZooKeeper client is disconnected from zookeeper now,"
+ + " but it is OK unless we received EXPIRED event.");
break;
case Expired:
clientConnectLatch = new CountDownLatch(1);
@@ -147,7 +147,7 @@ public class ZooKeeperWatcherBase implements Watcher {
}
/**
- * Waiting for the SyncConnected event from the ZooKeeper server
+ * Waiting for the SyncConnected event from the ZooKeeper server.
*
* @throws KeeperException
* when there is no connection
@@ -161,7 +161,7 @@ public class ZooKeeperWatcherBase implements Watcher {
}
/**
- * Return zookeeper session time out
+ * Return zookeeper session time out.
*/
public int getZkSessionTimeOut() {
return zkSessionTimeOut;
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/ZooWorker.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/ZooWorker.java
index 117ba8e..c2ca019 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/ZooWorker.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/ZooWorker.java
@@ -20,10 +20,9 @@
*/
package org.apache.bookkeeper.zookeeper;
+import com.google.common.util.concurrent.RateLimiter;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
-
-import com.google.common.util.concurrent.RateLimiter;
import org.apache.bookkeeper.stats.OpStatsLogger;
import org.apache.bookkeeper.util.MathUtils;
import org.apache.zookeeper.KeeperException;
@@ -36,7 +35,7 @@ import org.slf4j.LoggerFactory;
*/
class ZooWorker {
- static final Logger logger = LoggerFactory.getLogger(ZooWorker.class);
+ private static final Logger logger =
LoggerFactory.getLogger(ZooWorker.class);
int attempts = 0;
long startTimeNanos;
@@ -75,10 +74,10 @@ class ZooWorker {
* @return true if given result code is recoverable.
*/
public static boolean isRecoverableException(int rc) {
- return KeeperException.Code.CONNECTIONLOSS.intValue() == rc ||
- KeeperException.Code.OPERATIONTIMEOUT.intValue() == rc ||
- KeeperException.Code.SESSIONMOVED.intValue() == rc ||
- KeeperException.Code.SESSIONEXPIRED.intValue() == rc;
+ return KeeperException.Code.CONNECTIONLOSS.intValue() == rc
+ || KeeperException.Code.OPERATIONTIMEOUT.intValue() == rc
+ || KeeperException.Code.SESSIONMOVED.intValue() == rc
+ || KeeperException.Code.SESSIONEXPIRED.intValue() == rc;
}
/**
@@ -91,7 +90,7 @@ class ZooWorker {
return isRecoverableException(exception.code().intValue());
}
- static interface ZooCallable<T> {
+ interface ZooCallable<T> {
/**
* Be compatible with ZooKeeper interface.
*
@@ -99,7 +98,7 @@ class ZooWorker {
* @throws InterruptedException
* @throws KeeperException
*/
- public T call() throws InterruptedException, KeeperException;
+ T call() throws InterruptedException, KeeperException;
}
/**
@@ -145,8 +144,8 @@ class ZooWorker {
++attempts;
boolean rethrow = true;
long elapsedTime = MathUtils.elapsedMSec(startTimeNanos);
- if (((null != client && isRecoverableException(e)) || null ==
client) &&
- retryPolicy.allowRetry(attempts, elapsedTime)) {
+ if (((null != client && isRecoverableException(e)) || null ==
client)
+ && retryPolicy.allowRetry(attempts, elapsedTime)) {
rethrow = false;
}
if (rethrow) {
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimFactory.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/package-info.java
similarity index 65%
copy from
bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimFactory.java
copy to
bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/package-info.java
index 59ff88a..aace95b 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/shims/zk/ZooKeeperServerShimFactory.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/zookeeper/package-info.java
@@ -1,5 +1,4 @@
/*
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -16,20 +15,9 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
-package org.apache.bookkeeper.shims.zk;
-
-import java.io.File;
-import java.io.IOException;
-public class ZooKeeperServerShimFactory {
-
- public static ZooKeeperServerShim createServer(File snapDir, File logDir,
int zkPort, int maxCC)
- throws IOException {
- ZooKeeperServerShim server = new ZooKeeperServerShimImpl();
- server.initialize(snapDir, logDir, zkPort, maxCC);
- return server;
- }
-
-}
+/**
+ * A simple retryable zookeeper wrapper provided in bookkeeper.
+ */
+package org.apache.bookkeeper.zookeeper;
\ No newline at end of file
diff --git a/buildtools/src/main/resources/bookkeeper/server-suppressions.xml
b/buildtools/src/main/resources/bookkeeper/server-suppressions.xml
index d5c14b2..0d4f896 100644
--- a/buildtools/src/main/resources/bookkeeper/server-suppressions.xml
+++ b/buildtools/src/main/resources/bookkeeper/server-suppressions.xml
@@ -24,24 +24,16 @@
<suppress checks=".*" files=".*[\\/]bookie[\\/].*"/>
<suppress checks=".*"
files=".*[\\/]client[\\/](?:[^\\/]+$|(?!api)|(?!impl)[^\\/]+[\\/])"/>
<suppress checks=".*" files=".*[\\/]conf[\\/].*"/>
- <suppress checks=".*" files=".*[\\/]feature[\\/].*"/>
<suppress checks=".*" files=".*[\\/]http[\\/].*"/>
<suppress checks=".*" files=".*[\\/]meta[\\/].*"/>
<suppress checks=".*" files=".*[\\/]metastore[\\/].*"/>
<suppress checks=".*" files=".*[\\/]net[\\/].*"/>
- <suppress checks=".*" files=".*[\\/]processor[\\/].*"/>
<suppress checks=".*" files=".*[\\/]proto[\\/].*"/>
<suppress checks=".*" files=".*[\\/]replication[\\/].*"/>
<suppress checks=".*" files=".*[\\/]sasl[\\/].*"/>
- <suppress checks=".*" files=".*[\\/]shims[\\/].*"/>
- <suppress checks=".*" files=".*[\\/]stats[\\/].*"/>
- <suppress checks=".*" files=".*[\\/]streaming[\\/].*"/>
<suppress checks=".*" files=".*[\\/]test[\\/].*"/>
<suppress checks=".*" files=".*[\\/]tls[\\/].*"/>
- <suppress checks=".*" files=".*[\\/]tools[\\/].*"/>
<suppress checks=".*" files=".*[\\/]util[\\/].*"/>
- <suppress checks=".*" files=".*[\\/]versioning[\\/].*"/>
- <suppress checks=".*" files=".*[\\/]zookeeper[\\/].*"/>
<!-- suppress all checks in the generated directories -->
<suppress checks=".*" files=".+[\\/]generated[\\/].+\.java" />
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
