[bookkeeper] branch master updated: Fix checkstyle in EntryLogTest

[si...@apache.org]

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 9a0bf5a  Fix checkstyle in EntryLogTest
9a0bf5a is described below

commit 9a0bf5a0d9fc6606a57ff87bdb484386e4caab49
Author: Sijie Guo <si...@apache.org>
AuthorDate: Tue Jun 5 23:55:34 2018 -0700

    Fix checkstyle in EntryLogTest
    
    Descriptions of the changes in this PR:
    
    *Problem*
    
    PR #1465 introduces a checkstyle error, but somehow it wasn't caught by CI jobs.
    
    *Solution*
    
    Fix the checkstyle error and bring master back to normal.
    
    Author: Sijie Guo <si...@apache.org>
    
    Reviewers: Charan Reddy Guttapalem <re...@gmail.com>, Jia Zhai <None>, Enrico Olivelli <eo...@gmail.com>
    
    This closes #1483 from sijie/fix_checkstyle_complains_entrylogtest
---
 .travis.yml                                                            | 3 ---
 .../src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java       | 2 +-
 .../tests/integration/cluster/BookKeeperClusterTestBase.java           | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5cda919..56b6805 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,9 +36,6 @@ matrix:
       env: CUSTOM_JDK="oraclejdk9"
     - os: linux
       env: CUSTOM_JDK="oraclejdk10"
-    - os: linux
-      dist: trusty
-      env: CUSTOM_JDK="openjdk8"
 
 before_install: 
 - |
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
index 65fe4c9..2fd84ad 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
@@ -1111,7 +1111,7 @@ public class EntryLogTest {
         EntryLogManagerForEntryLogPerLedger entryLogManager = (EntryLogManagerForEntryLogPerLedger) entryLogger
                 .getEntryLogManager();
 
-        long ledgerId = 0l;
+        long ledgerId = 0L;
         entryLogManager.createNewLog(ledgerId);
         int entrySize = 200;
         int numOfEntries = 4;
diff --git a/tests/integration/cluster/src/test/java/org/apache/bookkeeper/tests/integration/cluster/BookKeeperClusterTestBase.java b/tests/integration/cluster/src/test/java/org/apache/bookkeeper/tests/integration/cluster/BookKeeperClusterTestBase.java
index 9070789..73a458d 100644
--- a/tests/integration/cluster/src/test/java/org/apache/bookkeeper/tests/integration/cluster/BookKeeperClusterTestBase.java
+++ b/tests/integration/cluster/src/test/java/org/apache/bookkeeper/tests/integration/cluster/BookKeeperClusterTestBase.java
@@ -21,11 +21,11 @@ package org.apache.bookkeeper.tests.integration.cluster;
 import com.google.common.base.Stopwatch;
 import java.net.URI;
 import java.util.Optional;
+import java.util.Random;
 import java.util.Set;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import java.util.Random;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.bookkeeper.common.concurrent.FutureUtils;
 import org.apache.bookkeeper.conf.ClientConfiguration;

-- 
To stop receiving notification emails like this one, please contact
sijie@apache.org.