From commits-return-21486-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org Thu Feb 15 04:29:51 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 643E4180656 for ; Thu, 15 Feb 2018 04:29:51 +0100 (CET) Received: (qmail 68273 invoked by uid 500); 15 Feb 2018 03:29:50 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 68263 invoked by uid 99); 15 Feb 2018 03:29:50 -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; Thu, 15 Feb 2018 03:29:50 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 19E41823D0; Thu, 15 Feb 2018 03:29:48 +0000 (UTC) Date: Thu, 15 Feb 2018 03:29:50 +0000 To: "commits@accumulo.apache.org" Subject: [accumulo] 02/02: made modernizer happy MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: kturner@apache.org In-Reply-To: <151866538868.12639.7448489551434000978@gitbox.apache.org> References: <151866538868.12639.7448489551434000978@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: accumulo X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 5d07cdb66a368ffa8f306be08dcf2d12972c4906 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180215032949.19E41823D0@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. kturner pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 5d07cdb66a368ffa8f306be08dcf2d12972c4906 Author: Keith Turner AuthorDate: Wed Feb 14 22:29:39 2018 -0500 made modernizer happy --- .../accumulo/core/client/impl/ClientContext.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ClientContext.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ClientContext.java index 1fec4a3..49c5750 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/ClientContext.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ClientContext.java @@ -24,6 +24,7 @@ import java.util.Iterator; import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.function.Predicate; +import java.util.function.Supplier; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; @@ -42,7 +43,6 @@ import org.apache.accumulo.core.security.thrift.TCredentials; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Supplier; import com.google.common.base.Suppliers; /** @@ -68,6 +68,11 @@ public class ClientContext { private Supplier sslSupplier; private TCredentials rpcCreds; + private static Supplier memoizeWithExpiration(Supplier s) { + //This insanity exists to make modernizer plugin happy. We are living in the future now. + return () -> Suppliers.memoizeWithExpiration(() -> s.get(), 100, TimeUnit.MILLISECONDS).get(); + } + /** * Instantiate a client context */ @@ -90,10 +95,6 @@ public class ClientContext { rpcConf = requireNonNull(serverConf, "serverConf is null"); clientConf = null; - timeoutSupplier = () -> getConfiguration().getTimeInMillis(Property.GENERAL_RPC_TIMEOUT); - - sslSupplier = () -> SslConnectionParams.forClient(getConfiguration()); - saslSupplier = new Supplier() { @Override public SaslConnectionParams get() { @@ -111,10 +112,10 @@ public class ClientContext { return new SaslConnectionParams(conf, getCredentials().getToken()); } }; - - timeoutSupplier = Suppliers.memoizeWithExpiration(timeoutSupplier, 100, TimeUnit.MILLISECONDS); - sslSupplier = Suppliers.memoizeWithExpiration(sslSupplier, 100, TimeUnit.MILLISECONDS); - saslSupplier = Suppliers.memoizeWithExpiration(saslSupplier, 100, TimeUnit.MILLISECONDS); + + timeoutSupplier = memoizeWithExpiration(() -> getConfiguration().getTimeInMillis(Property.GENERAL_RPC_TIMEOUT)); + sslSupplier = memoizeWithExpiration(() -> SslConnectionParams.forClient(getConfiguration())); + saslSupplier = memoizeWithExpiration(saslSupplier); } -- To stop receiving notification emails like this one, please contact kturner@apache.org.