You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by eo...@apache.org on 2020/06/01 13:24:18 UTC
[bookkeeper] branch master updated: [BUG] Fix class not found
compilation failure
This is an automated email from the ASF dual-hosted git repository.
eolivelli 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 a9e6045 [BUG] Fix class not found compilation failure
a9e6045 is described below
commit a9e604525f4a784133d23666e94d16f101749197
Author: lamber-ken <la...@apache.org>
AuthorDate: Mon Jun 1 21:24:07 2020 +0800
[BUG] Fix class not found compilation failure
### Motivation
Fix compilation failure after merged https://github.com/apache/bookkeeper/pull/2338
### Changes
Fix wrong package location.
Reviewers: Matteo Minardi <mi...@hotmail.it>, Enrico Olivelli <eo...@apache.org>
This closes #2351 from lamber-ken/misscleass
---
.../java/org/apache/bookkeeper/bookie/BookieStateManager.java | 2 +-
.../main/java/org/apache/bookkeeper/bookie/EntryMemTable.java | 2 +-
.../src/main/java/org/apache/bookkeeper/bookie/FileInfo.java | 2 +-
.../java/org/apache/bookkeeper/bookie/LedgerDescriptorImpl.java | 2 +-
.../bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java | 2 +-
.../main/java/org/apache/bookkeeper/client/BookKeeperAdmin.java | 2 +-
.../org/apache/bookkeeper/client/ExplicitLacFlushPolicy.java | 3 +--
.../src/main/java/org/apache/bookkeeper/meta/LedgerLayout.java | 6 ++++--
.../main/java/org/apache/bookkeeper/net/ScriptBasedMapping.java | 2 +-
.../main/java/org/apache/bookkeeper/proto/BookieClientImpl.java | 2 +-
.../java/org/apache/bookkeeper/proto/BookieRequestProcessor.java | 2 +-
.../bookkeeper/server/http/service/DecommissionService.java | 2 +-
.../main/java/org/apache/bookkeeper/tls/TLSContextFactory.java | 3 ++-
.../tools/cli/commands/bookie/ReadLogMetadataCommand.java | 2 +-
.../bookkeeper/util/collections/ConcurrentOpenHashSet.java | 2 +-
.../java/org/apache/bookkeeper/client/BookKeeperAdminTest.java | 2 +-
circe-checksum/src/main/java/com/scurrilous/circe/Hashes.java | 9 ---------
.../main/java/org/apache/bookkeeper/proto/ProtocolBenchmark.java | 1 -
.../apache/bookkeeper/proto/checksum/DigestTypeBenchmark.java | 4 +++-
.../java/org/apache/bookkeeper/stats/StatsLoggerBenchmark.java | 4 ----
.../org/apache/bookkeeper/stats/codahale/TimerBenchmark.java | 2 --
21 files changed, 23 insertions(+), 35 deletions(-)
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStateManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStateManager.java
index b848c63..5464745 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStateManager.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStateManager.java
@@ -229,7 +229,7 @@ public class BookieStateManager implements StateManager {
shutdownHandler.shutdown(ExitCode.ZK_REG_FAIL);
}
}
- return (Void) null;
+ return null;
}
});
}
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryMemTable.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryMemTable.java
index 941906c..f54d73a 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryMemTable.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryMemTable.java
@@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
* flusher reports in that the flush succeeded. At that point we let the snapshot go.
*/
public class EntryMemTable implements AutoCloseable{
- private static Logger logger = LoggerFactory.getLogger(Journal.class);
+ private static Logger logger = LoggerFactory.getLogger(EntryMemTable.class);
/**
* Entry skip list.
*/
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileInfo.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileInfo.java
index 09b751e..acef43f 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileInfo.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileInfo.java
@@ -309,7 +309,7 @@ class FileInfo extends Watchable<LastAddConfirmedUpdateNotification> {
try {
readHeader();
} catch (BufferUnderflowException buf) {
- LOG.warn("Exception when reading header of {} : {}", lf, buf);
+ LOG.warn("Exception when reading header of {}.", lf, buf);
if (null != masterKey) {
LOG.warn("Attempting to write header of {} again.", lf);
writeHeader();
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerDescriptorImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerDescriptorImpl.java
index 77fafa1..fcad36e 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerDescriptorImpl.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerDescriptorImpl.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
* to write entries to a ledger and read entries from a ledger.
*/
public class LedgerDescriptorImpl extends LedgerDescriptor {
- private static final Logger LOG = LoggerFactory.getLogger(LedgerDescriptor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LedgerDescriptorImpl.class);
final LedgerStorage ledgerStorage;
private long ledgerId;
final byte[] masterKey;
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java
index a6ae8c5..60e3d64 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java
@@ -890,7 +890,7 @@ public class SingleDirectoryDbLedgerStorage implements CompactableLedgerStorage
void process(long entryId, long entryLogId, long position);
}
- private static final Logger log = LoggerFactory.getLogger(DbLedgerStorage.class);
+ private static final Logger log = LoggerFactory.getLogger(SingleDirectoryDbLedgerStorage.class);
@Override
public OfLong getListOfEntriesOfLedger(long ledgerId) throws IOException {
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 3cc50a4..c9cd86f 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
@@ -432,7 +432,7 @@ public class BookKeeperAdmin implements AutoCloseable {
close();
return false;
}
- LOG.error("Error reading entry {} from ledger {}", new Object[] { nextEntryId, ledgerId }, e);
+ LOG.error("Error reading entry {} from ledger {}", nextEntryId, ledgerId, e);
close();
throw new RuntimeException(e);
}
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ExplicitLacFlushPolicy.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ExplicitLacFlushPolicy.java
index c9e6def..e3a333c 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ExplicitLacFlushPolicy.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ExplicitLacFlushPolicy.java
@@ -124,8 +124,7 @@ interface ExplicitLacFlushPolicy {
scheduledFuture = clientCtx.getScheduler().scheduleAtFixedRateOrdered(lh.getId(), updateLacTask,
explicitLacIntervalInMs, explicitLacIntervalInMs, TimeUnit.MILLISECONDS);
} catch (RejectedExecutionException re) {
- LOG.error("Scheduling of ExplictLastAddConfirmedFlush for ledger: {} has failed because of {}",
- lh.getId(), re);
+ LOG.error("Scheduling of ExplictLastAddConfirmedFlush for ledger: {} has failed.", lh.getId(), re);
}
}
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerLayout.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerLayout.java
index 09f3a70..f0ee03c 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerLayout.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerLayout.java
@@ -18,6 +18,8 @@
package org.apache.bookkeeper.meta;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.ToString;
@@ -82,7 +84,7 @@ public class LedgerLayout {
if (log.isDebugEnabled()) {
log.debug("Serialized layout info: {}", s);
}
- return s.getBytes("UTF-8");
+ return s.getBytes(StandardCharsets.UTF_8);
}
/**
@@ -95,7 +97,7 @@ public class LedgerLayout {
* if the given byte[] cannot be parsed
*/
public static LedgerLayout parseLayout(byte[] bytes) throws IOException {
- String layout = new String(bytes, "UTF-8");
+ String layout = new String(bytes, StandardCharsets.UTF_8);
if (log.isDebugEnabled()) {
log.debug("Parsing Layout: {}", layout);
}
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/ScriptBasedMapping.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/ScriptBasedMapping.java
index 890bcfc..467baca 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/ScriptBasedMapping.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/ScriptBasedMapping.java
@@ -130,7 +130,7 @@ public final class ScriptBasedMapping extends CachedDNSToSwitchMapping {
private static final class RawScriptBasedMapping extends AbstractDNSToSwitchMapping {
private String scriptName;
private int maxArgs; //max hostnames per call of the script
- private static final Logger LOG = LoggerFactory.getLogger(ScriptBasedMapping.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RawScriptBasedMapping.class);
/*
* extract 'scriptName' and 'maxArgs' parameters from the conf and throw
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieClientImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieClientImpl.java
index 63c70fc..8fb0f1d 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieClientImpl.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieClientImpl.java
@@ -78,7 +78,7 @@ import org.slf4j.LoggerFactory;
*
*/
public class BookieClientImpl implements BookieClient, PerChannelBookieClientFactory {
- static final Logger LOG = LoggerFactory.getLogger(BookieClient.class);
+ static final Logger LOG = LoggerFactory.getLogger(BookieClientImpl.class);
private final OrderedExecutor executor;
private final ScheduledExecutorService scheduler;
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestProcessor.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestProcessor.java
index f46d19c..82f9f2a 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestProcessor.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestProcessor.java
@@ -567,7 +567,7 @@ public class BookieRequestProcessor implements RequestProcessor {
if (future.isSuccess()) {
LOG.info("Session is protected by: {}", sslHandler.engine().getSession().getCipherSuite());
} else {
- LOG.error("TLS Handshake failure: {}", future.cause());
+ LOG.error("TLS Handshake failure.", future.cause());
BookkeeperProtocol.Response.Builder errResponse = BookkeeperProtocol.Response.newBuilder()
.setHeader(r.getHeader()).setStatus(BookkeeperProtocol.StatusCode.EIO);
c.writeAndFlush(errResponse.build());
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/DecommissionService.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/DecommissionService.java
index 41f18cb..5295bb7 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/DecommissionService.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/DecommissionService.java
@@ -84,7 +84,7 @@ public class DecommissionService implements HttpEndpointService {
bka.decommissionBookie(bookieSrc);
LOG.info("Complete decommissioning bookie.");
} catch (Exception e) {
- LOG.error("Error handling decommissionBookie: {} with exception {}", bookieSrc, e);
+ LOG.error("Error handling decommissionBookie: {}.", bookieSrc, e);
}
});
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/tls/TLSContextFactory.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/tls/TLSContextFactory.java
index 2a9f6df..a973486 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/tls/TLSContextFactory.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/tls/TLSContextFactory.java
@@ -32,6 +32,7 @@ import io.netty.handler.ssl.SslProvider;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
@@ -102,7 +103,7 @@ public class TLSContextFactory implements SecurityHandlerFactory {
return "";
}
pwd = FileUtils.readFileToByteArray(passwdFile);
- return new String(pwd, "UTF-8");
+ return new String(pwd, StandardCharsets.UTF_8);
}
@SuppressFBWarnings(
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/cli/commands/bookie/ReadLogMetadataCommand.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/cli/commands/bookie/ReadLogMetadataCommand.java
index 4b73742..12acd4d 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/cli/commands/bookie/ReadLogMetadataCommand.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/cli/commands/bookie/ReadLogMetadataCommand.java
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
*/
public class ReadLogMetadataCommand extends BookieCommand<ReadLogMetadataFlags> {
- static final Logger LOG = LoggerFactory.getLogger(ReadLogMetadataFlags.class);
+ static final Logger LOG = LoggerFactory.getLogger(ReadLogMetadataCommand.class);
private static final String NAME = "readlogmetadata";
private static final String DESC = "Prints entrylog's metadata";
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentOpenHashSet.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentOpenHashSet.java
index 9cf6d22..19482e4 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentOpenHashSet.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/collections/ConcurrentOpenHashSet.java
@@ -67,7 +67,7 @@ public class ConcurrentOpenHashSet<V> {
int numSections = concurrencyLevel;
int perSectionExpectedItems = expectedItems / numSections;
int perSectionCapacity = (int) (perSectionExpectedItems / MapFillFactor);
- this.sections = (Section<V>[]) new Section[numSections];
+ this.sections = new Section[numSections];
for (int i = 0; i < numSections; i++) {
sections[i] = new Section<>(perSectionCapacity);
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperAdminTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperAdminTest.java
index d10d9ab..1916880 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperAdminTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperAdminTest.java
@@ -66,9 +66,9 @@ import org.apache.bookkeeper.replication.ReplicationException.UnavailableExcepti
import org.apache.bookkeeper.server.Main;
import org.apache.bookkeeper.server.conf.BookieConfiguration;
import org.apache.bookkeeper.test.BookKeeperClusterTestCase;
-import org.apache.bookkeeper.test.PortManager;
import org.apache.bookkeeper.util.AvailabilityOfEntriesOfLedger;
import org.apache.bookkeeper.util.BookKeeperConstants;
+import org.apache.bookkeeper.util.PortManager;
import org.apache.commons.io.FileUtils;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.ZooDefs.Ids;
diff --git a/circe-checksum/src/main/java/com/scurrilous/circe/Hashes.java b/circe-checksum/src/main/java/com/scurrilous/circe/Hashes.java
index 786ead5..16e3b4a 100644
--- a/circe-checksum/src/main/java/com/scurrilous/circe/Hashes.java
+++ b/circe-checksum/src/main/java/com/scurrilous/circe/Hashes.java
@@ -17,15 +17,6 @@ package com.scurrilous.circe;
import java.util.EnumSet;
-import com.scurrilous.circe.HashParameters;
-import com.scurrilous.circe.HashProviders;
-import com.scurrilous.circe.HashSupport;
-import com.scurrilous.circe.IncrementalIntHash;
-import com.scurrilous.circe.IncrementalLongHash;
-import com.scurrilous.circe.StatefulHash;
-import com.scurrilous.circe.StatelessIntHash;
-import com.scurrilous.circe.StatelessLongHash;
-
/**
* Static methods to obtain various forms of abstract hash functions. Each
* method uses {@link HashProviders#best} to find the best provider for the
diff --git a/microbenchmarks/src/main/java/org/apache/bookkeeper/proto/ProtocolBenchmark.java b/microbenchmarks/src/main/java/org/apache/bookkeeper/proto/ProtocolBenchmark.java
index 5baad80..8ecf3a9 100644
--- a/microbenchmarks/src/main/java/org/apache/bookkeeper/proto/ProtocolBenchmark.java
+++ b/microbenchmarks/src/main/java/org/apache/bookkeeper/proto/ProtocolBenchmark.java
@@ -25,7 +25,6 @@ import io.netty.buffer.ByteBufAllocator;
import io.netty.buffer.Unpooled;
import io.netty.util.ReferenceCountUtil;
-import java.util.Map;
import java.util.Random;
import java.util.concurrent.TimeUnit;
import org.apache.bookkeeper.proto.BookieProtoEncoding.EnDecoder;
diff --git a/microbenchmarks/src/main/java/org/apache/bookkeeper/proto/checksum/DigestTypeBenchmark.java b/microbenchmarks/src/main/java/org/apache/bookkeeper/proto/checksum/DigestTypeBenchmark.java
index 2319b2e..b65b759 100644
--- a/microbenchmarks/src/main/java/org/apache/bookkeeper/proto/checksum/DigestTypeBenchmark.java
+++ b/microbenchmarks/src/main/java/org/apache/bookkeeper/proto/checksum/DigestTypeBenchmark.java
@@ -26,6 +26,8 @@ import io.netty.buffer.ByteBufAllocator;
import io.netty.buffer.CompositeByteBuf;
import io.netty.buffer.PooledByteBufAllocator;
import io.netty.buffer.Unpooled;
+
+import java.nio.charset.StandardCharsets;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
import org.apache.bookkeeper.proto.DataFormats.LedgerMetadataFormat.DigestType;
@@ -105,7 +107,7 @@ public class DigestTypeBenchmark {
@Setup(Level.Trial)
public void doSetup() throws Exception {
- final byte[] password = "password".getBytes("UTF-8");
+ final byte[] password = "password".getBytes(StandardCharsets.UTF_8);
crc32 = DigestManager.instantiate(ThreadLocalRandom.current().nextLong(0, Long.MAX_VALUE),
password, DigestType.CRC32, PooledByteBufAllocator.DEFAULT, true);
diff --git a/microbenchmarks/src/main/java/org/apache/bookkeeper/stats/StatsLoggerBenchmark.java b/microbenchmarks/src/main/java/org/apache/bookkeeper/stats/StatsLoggerBenchmark.java
index 3986ffa..1a88bd0 100644
--- a/microbenchmarks/src/main/java/org/apache/bookkeeper/stats/StatsLoggerBenchmark.java
+++ b/microbenchmarks/src/main/java/org/apache/bookkeeper/stats/StatsLoggerBenchmark.java
@@ -23,10 +23,6 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.function.Supplier;
-import org.apache.bookkeeper.stats.Counter;
-import org.apache.bookkeeper.stats.OpStatsLogger;
-import org.apache.bookkeeper.stats.StatsLogger;
-import org.apache.bookkeeper.stats.StatsProvider;
import org.apache.bookkeeper.stats.codahale.CodahaleMetricsProvider;
import org.apache.bookkeeper.stats.codahale.FastCodahaleMetricsProvider;
import org.apache.bookkeeper.stats.prometheus.PrometheusMetricsProvider;
diff --git a/microbenchmarks/src/main/java/org/apache/bookkeeper/stats/codahale/TimerBenchmark.java b/microbenchmarks/src/main/java/org/apache/bookkeeper/stats/codahale/TimerBenchmark.java
index 5d1cf06..6d98313 100644
--- a/microbenchmarks/src/main/java/org/apache/bookkeeper/stats/codahale/TimerBenchmark.java
+++ b/microbenchmarks/src/main/java/org/apache/bookkeeper/stats/codahale/TimerBenchmark.java
@@ -21,8 +21,6 @@ import java.util.concurrent.TimeUnit;
import org.apache.bookkeeper.stats.OpStatsLogger;
import org.apache.bookkeeper.stats.StatsLogger;
-import org.apache.bookkeeper.stats.codahale.CodahaleMetricsProvider;
-import org.apache.bookkeeper.stats.codahale.FastCodahaleMetricsProvider;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
import org.openjdk.jmh.annotations.Fork;