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 69949200BC0 for ; Sat, 8 Oct 2016 01:16:46 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 66A25160AF3; Fri, 7 Oct 2016 23:16:46 +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 B116B160AF5 for ; Sat, 8 Oct 2016 01:16:45 +0200 (CEST) Received: (qmail 39929 invoked by uid 500); 7 Oct 2016 23:16:44 -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 39870 invoked by uid 99); 7 Oct 2016 23:16:44 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Oct 2016 23:16:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 97B56E78A1; Fri, 7 Oct 2016 23:16:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Fri, 07 Oct 2016 23:16:49 -0000 Message-Id: <02231b92edda402cbce5ae52bab12f61@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/6] accumulo git commit: ACCUMULO-4456 Remove redundant type args (use diamond) archived-at: Fri, 07 Oct 2016 23:16:46 -0000 ACCUMULO-4456 Remove redundant type args (use diamond) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c57a3801 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c57a3801 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c57a3801 Branch: refs/heads/master Commit: c57a3801b843a2d8648ab9cd299ce463a0b71a3e Parents: 59a6218 Author: Christopher Tubbs Authored: Fri Oct 7 19:02:53 2016 -0400 Committer: Christopher Tubbs Committed: Fri Oct 7 19:02:53 2016 -0400 ---------------------------------------------------------------------- .../apache/accumulo/server/rpc/HighlyAvailableServiceWrapper.java | 2 +- server/master/src/main/java/org/apache/accumulo/master/Master.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c57a3801/server/base/src/main/java/org/apache/accumulo/server/rpc/HighlyAvailableServiceWrapper.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/HighlyAvailableServiceWrapper.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/HighlyAvailableServiceWrapper.java index 89d7ed4..153f784 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/rpc/HighlyAvailableServiceWrapper.java +++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/HighlyAvailableServiceWrapper.java @@ -43,6 +43,6 @@ public class HighlyAvailableServiceWrapper { } protected HighlyAvailableServiceInvocationHandler getInvocationHandler(final T instance, final HighlyAvailableService service) { - return new HighlyAvailableServiceInvocationHandler(instance, service); + return new HighlyAvailableServiceInvocationHandler<>(instance, service); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/c57a3801/server/master/src/main/java/org/apache/accumulo/master/Master.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java index ec0b8f3..0213ad5 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/Master.java +++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java @@ -1157,7 +1157,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List MasterReplicationCoordinator impl = new MasterReplicationCoordinator(this); ReplicationCoordinator.Iface haReplicationProxy = HighlyAvailableServiceWrapper.service(impl, this); ReplicationCoordinator.Processor replicationCoordinatorProcessor = new ReplicationCoordinator.Processor<>(RpcWrapper.service( - impl, new ReplicationCoordinator.Processor(haReplicationProxy))); + impl, new ReplicationCoordinator.Processor<>(haReplicationProxy))); ServerAddress replAddress = TServerUtils.startServer(this, hostname, Property.MASTER_REPLICATION_COORDINATOR_PORT, replicationCoordinatorProcessor, "Master Replication Coordinator", "Replication Coordinator", null, Property.MASTER_REPLICATION_COORDINATOR_MINTHREADS, Property.MASTER_REPLICATION_COORDINATOR_THREADCHECK, Property.GENERAL_MAX_MESSAGE_SIZE);