Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 82918200CD3 for ; Fri, 28 Jul 2017 11:32:04 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 80D8316C8E0; Fri, 28 Jul 2017 09:32:04 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2AD9E16C8DA for ; Fri, 28 Jul 2017 11:32:03 +0200 (CEST) Received: (qmail 10219 invoked by uid 500); 28 Jul 2017 09:32:02 -0000 Mailing-List: contact commits-help@bookkeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bookkeeper-dev@bookkeeper.apache.org Delivered-To: mailing list commits@bookkeeper.apache.org Received: (qmail 10170 invoked by uid 99); 28 Jul 2017 09:32:00 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Jul 2017 09:32:00 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 09C2B84AAA; Fri, 28 Jul 2017 09:31:58 +0000 (UTC) Date: Fri, 28 Jul 2017 09:31:58 +0000 To: "commits@bookkeeper.apache.org" Subject: [bookkeeper] branch master updated: ISSUE #300: EnsemblePlacementPolicy must not use com.google.common.base.Optional but java.util.Optional MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <150123431827.30072.16745280724765537968@gitbox.apache.org> From: zhaijia@apache.org Reply-To: "commits@bookkeeper.apache.org" X-Git-Host: gitbox.apache.org X-Git-Repo: bookkeeper X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 0ccbc0e9c3e6a82d5e44b8347cc6567e043f253f X-Git-Newrev: b63eb86da3757a3740f922093128868d5a53394c X-Git-Rev: b63eb86da3757a3740f922093128868d5a53394c X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated archived-at: Fri, 28 Jul 2017 09:32:04 -0000 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 b63eb86 ISSUE #300: EnsemblePlacementPolicy must not use com.google.common.base.Optional but java.util.Optional b63eb86 is described below commit b63eb86da3757a3740f922093128868d5a53394c Author: Enrico Olivelli AuthorDate: Fri Jul 28 17:31:43 2017 +0800 ISSUE #300: EnsemblePlacementPolicy must not use com.google.common.base.Optional but java.util.Optional Use standard java8 java.util.Optional instead of Optional from Guava. In BookKeeper 4.5 we are shading Guava so this class is not available to downstream projects Author: Enrico Olivelli Reviewers: Jia Zhai , Matteo Merli , Sijie Guo This closes #302 from eolivelli/issue-300-no-guava, closes #300 --- .../bookie/LocalBookieEnsemblePlacementPolicy.java | 3 +- .../org/apache/bookkeeper/client/BookKeeper.java | 2 +- .../client/DefaultEnsemblePlacementPolicy.java | 5 +-- .../bookkeeper/client/EnsemblePlacementPolicy.java | 2 +- .../RackawareEnsemblePlacementPolicyImpl.java | 2 +- .../client/RegionAwareEnsemblePlacementPolicy.java | 5 +-- .../TestRackawareEnsemblePlacementPolicy.java | 24 +++++++-------- ...ackawareEnsemblePlacementPolicyUsingScript.java | 4 +-- .../TestRegionAwareEnsemblePlacementPolicy.java | 36 +++++++++++----------- 9 files changed, 38 insertions(+), 45 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LocalBookieEnsemblePlacementPolicy.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LocalBookieEnsemblePlacementPolicy.java index d74e7cd..e4ab92b 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LocalBookieEnsemblePlacementPolicy.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LocalBookieEnsemblePlacementPolicy.java @@ -17,8 +17,6 @@ */ package org.apache.bookkeeper.bookie; -import com.google.common.base.Optional; - import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Collection; @@ -42,6 +40,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import io.netty.util.HashedWheelTimer; +import java.util.Optional; /** * Special ensemble placement policy that always return local bookie. Only works with ledgers with ensemble=1. 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 7895af2..00f532d 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 @@ -439,7 +439,7 @@ public class BookKeeper implements AutoCloseable { throws IOException { try { Class policyCls = conf.getEnsemblePlacementPolicy(); - return ReflectionUtils.newInstance(policyCls).initialize(conf, Optional.fromNullable(dnsResolver), + return ReflectionUtils.newInstance(policyCls).initialize(conf, java.util.Optional.ofNullable(dnsResolver), timer, featureProvider, statsLogger); } catch (ConfigurationException e) { throw new IOException("Failed to initialize ensemble placement policy : ", e); diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultEnsemblePlacementPolicy.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultEnsemblePlacementPolicy.java index 7c3d46f..24b1c8e 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultEnsemblePlacementPolicy.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultEnsemblePlacementPolicy.java @@ -25,11 +25,8 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.locks.ReentrantReadWriteLock; - -import com.google.common.base.Optional; - import io.netty.util.HashedWheelTimer; - +import java.util.Optional; import org.apache.bookkeeper.client.BKException.BKNotEnoughBookiesException; import org.apache.bookkeeper.client.BookieInfoReader.BookieInfo; import org.apache.bookkeeper.client.WeightedRandomSelection.WeightedObject; diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/EnsemblePlacementPolicy.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/EnsemblePlacementPolicy.java index af49fa1..0561386 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/EnsemblePlacementPolicy.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/EnsemblePlacementPolicy.java @@ -23,9 +23,9 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.google.common.base.Optional; import io.netty.util.HashedWheelTimer; +import java.util.Optional; import org.apache.bookkeeper.client.BKException.BKNotEnoughBookiesException; import org.apache.bookkeeper.client.BookieInfoReader.BookieInfo; diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java index b5fdfed..020a101 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java @@ -51,11 +51,11 @@ import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import io.netty.util.HashedWheelTimer; +import java.util.Optional; /** * Simple rackware ensemble placement policy. diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RegionAwareEnsemblePlacementPolicy.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RegionAwareEnsemblePlacementPolicy.java index 787a5e3..c7f2802 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RegionAwareEnsemblePlacementPolicy.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RegionAwareEnsemblePlacementPolicy.java @@ -27,11 +27,8 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; - -import com.google.common.base.Optional; - import io.netty.util.HashedWheelTimer; - +import java.util.Optional; import org.apache.bookkeeper.conf.ClientConfiguration; import org.apache.bookkeeper.feature.Feature; import org.apache.bookkeeper.feature.FeatureProvider; diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicy.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicy.java index 99f8f5b..7ed90fd 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicy.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicy.java @@ -29,10 +29,10 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import com.google.common.base.Optional; import com.google.common.util.concurrent.ThreadFactoryBuilder; import io.netty.util.HashedWheelTimer; +import java.util.Optional; import junit.framework.TestCase; import org.apache.bookkeeper.client.BKException.BKNotEnoughBookiesException; import org.apache.bookkeeper.client.BookieInfoReader.BookieInfo; @@ -88,7 +88,7 @@ public class TestRackawareEnsemblePlacementPolicy extends TestCase { conf.getTimeoutTimerNumTicks()); repp = new RackawareEnsemblePlacementPolicy(); - repp.initialize(conf, Optional.absent(), timer, DISABLE_ALL, null); + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, null); } @Override @@ -110,7 +110,7 @@ public class TestRackawareEnsemblePlacementPolicy extends TestCase { updateMyRack(NetworkTopology.DEFAULT_RACK); repp = new RackawareEnsemblePlacementPolicy(); - repp.initialize(conf, Optional.absent(), timer, DISABLE_ALL, null); + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, null); Set addrs = new HashSet(); addrs.add(addr1); @@ -138,7 +138,7 @@ public class TestRackawareEnsemblePlacementPolicy extends TestCase { updateMyRack("/r1/rack1"); repp = new RackawareEnsemblePlacementPolicy(); - repp.initialize(conf, Optional.absent(), timer, DISABLE_ALL, null); + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, null); // Update cluster Set addrs = new HashSet(); @@ -169,7 +169,7 @@ public class TestRackawareEnsemblePlacementPolicy extends TestCase { updateMyRack("/r1/rack1"); repp = new RackawareEnsemblePlacementPolicy(); - repp.initialize(conf, Optional.absent(), timer, DISABLE_ALL, null); + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, null); // Update cluster Set addrs = new HashSet(); @@ -199,7 +199,7 @@ public class TestRackawareEnsemblePlacementPolicy extends TestCase { updateMyRack("/r1/rack1"); repp = new RackawareEnsemblePlacementPolicy(); - repp.initialize(conf, Optional.absent(), timer, DISABLE_ALL, null); + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, null); // Update cluster Set addrs = new HashSet(); @@ -444,7 +444,7 @@ public class TestRackawareEnsemblePlacementPolicy extends TestCase { int multiple = 10; conf.setDiskWeightBasedPlacementEnabled(true); conf.setBookieMaxWeightMultipleForWeightBasedPlacement(-1); // no max cap on weight - repp.initialize(conf, Optional.absent(), timer, DISABLE_ALL, null); + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, null); repp.onClusterChanged(addrs, new HashSet()); Map bookieInfoMap = new HashMap(); @@ -491,7 +491,7 @@ public class TestRackawareEnsemblePlacementPolicy extends TestCase { int multiple = 10, maxMultiple = 4; conf.setDiskWeightBasedPlacementEnabled(true); conf.setBookieMaxWeightMultipleForWeightBasedPlacement(maxMultiple); - repp.initialize(conf, Optional.absent(), timer, DISABLE_ALL, null); + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, null); repp.onClusterChanged(addrs, new HashSet()); Map bookieInfoMap = new HashMap(); @@ -567,7 +567,7 @@ public class TestRackawareEnsemblePlacementPolicy extends TestCase { int maxMultiple = 4; conf.setDiskWeightBasedPlacementEnabled(true); conf.setBookieMaxWeightMultipleForWeightBasedPlacement(maxMultiple); - repp.initialize(conf, Optional.absent(), timer, DISABLE_ALL, null); + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, null); repp.onClusterChanged(addrs, new HashSet()); Map bookieInfoMap = new HashMap(); @@ -637,7 +637,7 @@ public class TestRackawareEnsemblePlacementPolicy extends TestCase { int maxMultiple = 4; conf.setDiskWeightBasedPlacementEnabled(true); conf.setBookieMaxWeightMultipleForWeightBasedPlacement(maxMultiple); - repp.initialize(conf, Optional.absent(), timer, DISABLE_ALL, null); + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, null); repp.onClusterChanged(addrs, new HashSet()); Map bookieInfoMap = new HashMap(); @@ -690,7 +690,7 @@ public class TestRackawareEnsemblePlacementPolicy extends TestCase { updateMyRack(NetworkTopology.DEFAULT_RACK); repp = new RackawareEnsemblePlacementPolicy(); - repp.initialize(conf, Optional.absent(), timer, DISABLE_ALL, null); + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, null); Set addrs = new HashSet(); addrs.add(addr1); @@ -721,7 +721,7 @@ public class TestRackawareEnsemblePlacementPolicy extends TestCase { ClientConfiguration confLocal = new ClientConfiguration(); confLocal.addConfiguration(conf); confLocal.setNetworkTopologyStabilizePeriodSeconds(99999); - repp.initialize(confLocal, Optional.absent(), timer, DISABLE_ALL, null); + repp.initialize(confLocal, Optional.empty(), timer, DISABLE_ALL, null); Set addrs = new HashSet(); addrs.add(addr1); diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicyUsingScript.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicyUsingScript.java index ef90401..387b83a 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicyUsingScript.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicyUsingScript.java @@ -46,10 +46,10 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Optional; import com.google.common.util.concurrent.ThreadFactoryBuilder; import io.netty.util.HashedWheelTimer; +import java.util.Optional; /** * In this testsuite, ScriptBasedMapping is used as DNS_RESOLVER_CLASS for @@ -83,7 +83,7 @@ public class TestRackawareEnsemblePlacementPolicyUsingScript { conf.getTimeoutTimerNumTicks()); repp = new RackawareEnsemblePlacementPolicy(); - repp.initialize(conf, Optional.absent(), timer, DISABLE_ALL, null); + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, null); } @After diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java index 26d7e6b..74cf1f5 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java @@ -25,10 +25,10 @@ import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; -import com.google.common.base.Optional; import com.google.common.util.concurrent.ThreadFactoryBuilder; import io.netty.util.HashedWheelTimer; +import java.util.Optional; import org.apache.bookkeeper.client.BKException.BKNotEnoughBookiesException; import org.apache.bookkeeper.conf.ClientConfiguration; @@ -98,7 +98,7 @@ public class TestRegionAwareEnsemblePlacementPolicy extends TestCase { conf.getTimeoutTimerNumTicks()); repp = new RegionAwareEnsemblePlacementPolicy(); - repp.initialize(conf, Optional.absent(), timer, DISABLE_ALL, null); + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, null); } @Override @@ -113,7 +113,7 @@ public class TestRegionAwareEnsemblePlacementPolicy extends TestCase { updateMyRack(NetworkTopology.DEFAULT_RACK); repp = new RegionAwareEnsemblePlacementPolicy(); - repp.initialize(conf, Optional.absent(), timer, DISABLE_ALL, null); + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, null); List reorderSet = repp.reorderReadSequence(ensemble, writeSet, new HashMap()); assertFalse(reorderSet == writeSet); @@ -126,7 +126,7 @@ public class TestRegionAwareEnsemblePlacementPolicy extends TestCase { updateMyRack("/r1/rack3"); repp = new RegionAwareEnsemblePlacementPolicy(); - repp.initialize(conf, Optional.absent(), timer, DISABLE_ALL, null); + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, null); Set addrs = new HashSet(); addrs.add(addr1); @@ -152,7 +152,7 @@ public class TestRegionAwareEnsemblePlacementPolicy extends TestCase { updateMyRack("/r2/rack1"); repp = new RegionAwareEnsemblePlacementPolicy(); - repp.initialize(conf, Optional.absent(), timer, DISABLE_ALL, null); + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, null); List reoderSet = repp.reorderReadSequence(ensemble, writeSet, new HashMap()); LOG.info("reorder set : {}", reoderSet); @@ -166,7 +166,7 @@ public class TestRegionAwareEnsemblePlacementPolicy extends TestCase { updateMyRack("/r1/rack1"); repp = new RegionAwareEnsemblePlacementPolicy(); - repp.initialize(conf, Optional.absent(), timer, DISABLE_ALL, null); + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, null); // Update cluster Set addrs = new HashSet(); @@ -195,7 +195,7 @@ public class TestRegionAwareEnsemblePlacementPolicy extends TestCase { updateMyRack("/r1/rack1"); repp = new RegionAwareEnsemblePlacementPolicy(); - repp.initialize(conf, Optional.absent(), timer, DISABLE_ALL, null); + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, null); // Update cluster Set addrs = new HashSet(); @@ -226,7 +226,7 @@ public class TestRegionAwareEnsemblePlacementPolicy extends TestCase { updateMyRack("/r1/rack1"); repp = new RegionAwareEnsemblePlacementPolicy(); - repp.initialize(conf, Optional.absent(), timer, DISABLE_ALL, null); + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, null); // Update cluster Set addrs = new HashSet(); @@ -362,7 +362,7 @@ public class TestRegionAwareEnsemblePlacementPolicy extends TestCase { public void testNewEnsembleWithSingleRegion() throws Exception { repp.uninitalize(); repp = new RegionAwareEnsemblePlacementPolicy(); - repp.initialize(conf, Optional.absent(), timer, DISABLE_ALL, null); + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, null); BookieSocketAddress addr1 = new BookieSocketAddress("127.0.0.2", 3181); BookieSocketAddress addr2 = new BookieSocketAddress("127.0.0.3", 3181); BookieSocketAddress addr3 = new BookieSocketAddress("127.0.0.4", 3181); @@ -393,7 +393,7 @@ public class TestRegionAwareEnsemblePlacementPolicy extends TestCase { public void testNewEnsembleWithMultipleRegions() throws Exception { repp.uninitalize(); repp = new RegionAwareEnsemblePlacementPolicy(); - repp.initialize(conf, Optional.absent(), timer, DISABLE_ALL, null); + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, null); BookieSocketAddress addr1 = new BookieSocketAddress("127.0.0.2", 3181); BookieSocketAddress addr2 = new BookieSocketAddress("127.0.0.3", 3181); BookieSocketAddress addr3 = new BookieSocketAddress("127.0.0.4", 3181); @@ -471,7 +471,7 @@ public class TestRegionAwareEnsemblePlacementPolicy extends TestCase { public void testNewEnsembleWithThreeRegions() throws Exception { repp.uninitalize(); repp = new RegionAwareEnsemblePlacementPolicy(); - repp.initialize(conf, Optional.absent(), timer, DISABLE_ALL, null); + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, null); BookieSocketAddress addr1 = new BookieSocketAddress("127.0.0.2", 3181); BookieSocketAddress addr2 = new BookieSocketAddress("127.0.0.3", 3181); BookieSocketAddress addr3 = new BookieSocketAddress("127.0.0.4", 3181); @@ -538,7 +538,7 @@ public class TestRegionAwareEnsemblePlacementPolicy extends TestCase { repp.uninitalize(); repp = new RegionAwareEnsemblePlacementPolicy(); conf.setProperty(REPP_DISALLOW_BOOKIE_PLACEMENT_IN_REGION_FEATURE_NAME, "disallowBookies"); - repp.initialize(conf, Optional.absent(), timer, featureProvider, null); + repp.initialize(conf, Optional.empty(), timer, featureProvider, null); BookieSocketAddress addr1 = new BookieSocketAddress("127.0.0.2", 3181); BookieSocketAddress addr2 = new BookieSocketAddress("127.0.0.3", 3181); BookieSocketAddress addr3 = new BookieSocketAddress("127.0.0.4", 3181); @@ -617,7 +617,7 @@ public class TestRegionAwareEnsemblePlacementPolicy extends TestCase { repp = new RegionAwareEnsemblePlacementPolicy(); conf.setProperty(REPP_REGIONS_TO_WRITE, "region1;region2;region3;region4;region5"); conf.setProperty(REPP_MINIMUM_REGIONS_FOR_DURABILITY, 5); - repp.initialize(conf, Optional.absent(), timer, DISABLE_ALL, null); + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, null); BookieSocketAddress addr1 = new BookieSocketAddress("127.1.0.2", 3181); BookieSocketAddress addr2 = new BookieSocketAddress("127.1.0.3", 3181); BookieSocketAddress addr3 = new BookieSocketAddress("127.1.0.4", 3181); @@ -722,7 +722,7 @@ public class TestRegionAwareEnsemblePlacementPolicy extends TestCase { } conf.setProperty(REPP_DISALLOW_BOOKIE_PLACEMENT_IN_REGION_FEATURE_NAME, "disallowBookies"); - repp.initialize(conf, Optional.absent(), timer, featureProvider, null); + repp.initialize(conf, Optional.empty(), timer, featureProvider, null); BookieSocketAddress addr1 = new BookieSocketAddress("127.1.0.2", 3181); BookieSocketAddress addr2 = new BookieSocketAddress("127.1.0.3", 3181); BookieSocketAddress addr3 = new BookieSocketAddress("127.1.0.4", 3181); @@ -859,7 +859,7 @@ public class TestRegionAwareEnsemblePlacementPolicy extends TestCase { conf.setProperty(REPP_ENABLE_DURABILITY_ENFORCEMENT_IN_REPLACE, true); } - repp.initialize(conf, Optional.absent(), timer, featureProvider, null); + repp.initialize(conf, Optional.empty(), timer, featureProvider, null); BookieSocketAddress addr1 = new BookieSocketAddress("127.1.0.2", 3181); BookieSocketAddress addr2 = new BookieSocketAddress("127.1.0.3", 3181); BookieSocketAddress addr3 = new BookieSocketAddress("127.1.0.4", 3181); @@ -924,7 +924,7 @@ public class TestRegionAwareEnsemblePlacementPolicy extends TestCase { conf.setProperty(REPP_REGIONS_TO_WRITE, "region1;region2;region3;region4;region5"); conf.setProperty(REPP_MINIMUM_REGIONS_FOR_DURABILITY, 5); conf.setProperty(REPP_ENABLE_VALIDATION, false); - repp.initialize(conf, Optional.absent(), timer, DISABLE_ALL, null); + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, null); BookieSocketAddress addr1 = new BookieSocketAddress("127.0.0.2", 3181); BookieSocketAddress addr2 = new BookieSocketAddress("127.0.0.3", 3181); BookieSocketAddress addr3 = new BookieSocketAddress("127.0.0.4", 3181); @@ -977,7 +977,7 @@ public class TestRegionAwareEnsemblePlacementPolicy extends TestCase { updateMyRack("/" + myRegion); repp = new RegionAwareEnsemblePlacementPolicy(); - repp.initialize(conf, Optional.absent(), timer, DISABLE_ALL, null); + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, null); BookieSocketAddress addr1 = new BookieSocketAddress("127.0.0.2", 3181); BookieSocketAddress addr2 = new BookieSocketAddress("127.0.0.3", 3181); @@ -1207,7 +1207,7 @@ public class TestRegionAwareEnsemblePlacementPolicy extends TestCase { updateMyRack("/r2/rack1"); repp = new RegionAwareEnsemblePlacementPolicy(); - repp.initialize(conf, Optional.absent(), timer, DISABLE_ALL, null); + repp.initialize(conf, Optional.empty(), timer, DISABLE_ALL, null); BookieSocketAddress addr5 = new BookieSocketAddress("127.0.0.6", 3181); BookieSocketAddress addr6 = new BookieSocketAddress("127.0.0.7", 3181); -- To stop receiving notification emails like this one, please contact ['"commits@bookkeeper.apache.org" '].