Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F2DEC1868B for ; Fri, 29 May 2015 21:18:02 +0000 (UTC) Received: (qmail 29092 invoked by uid 500); 29 May 2015 21:18:02 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 29009 invoked by uid 500); 29 May 2015 21:18:02 -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 28863 invoked by uid 99); 29 May 2015 21:18:02 -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, 29 May 2015 21:18:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8C9D5E1110; Fri, 29 May 2015 21:18:02 +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, 29 May 2015 21:18:08 -0000 Message-Id: In-Reply-To: <18b21cceeade4167845692c5fd8c00b1@git.apache.org> References: <18b21cceeade4167845692c5fd8c00b1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [7/8] accumulo git commit: ACCUMULO-3862 Fix generics on Map parameter ACCUMULO-3862 Fix generics on Map parameter Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f7be66e6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f7be66e6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f7be66e6 Branch: refs/heads/1.7 Commit: f7be66e6938b40c888efc1ea7b6d161ab9e6ce05 Parents: 782dc23 Author: Christopher Tubbs Authored: Fri May 29 17:15:13 2015 -0400 Committer: Christopher Tubbs Committed: Fri May 29 17:15:13 2015 -0400 ---------------------------------------------------------------------- .../apache/accumulo/tracer/AsyncSpanReceiverTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/f7be66e6/server/tracer/src/test/java/org/apache/accumulo/tracer/AsyncSpanReceiverTest.java ---------------------------------------------------------------------- diff --git a/server/tracer/src/test/java/org/apache/accumulo/tracer/AsyncSpanReceiverTest.java b/server/tracer/src/test/java/org/apache/accumulo/tracer/AsyncSpanReceiverTest.java index 6744efc..e735373 100644 --- a/server/tracer/src/test/java/org/apache/accumulo/tracer/AsyncSpanReceiverTest.java +++ b/server/tracer/src/test/java/org/apache/accumulo/tracer/AsyncSpanReceiverTest.java @@ -16,17 +16,17 @@ */ package org.apache.accumulo.tracer; -import org.apache.accumulo.tracer.thrift.RemoteSpan; -import org.apache.htrace.HTraceConfiguration; -import org.apache.htrace.Span; -import org.apache.htrace.impl.MilliSpan; -import org.junit.Test; +import static org.junit.Assert.assertEquals; import java.util.Collections; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import static org.junit.Assert.assertEquals; +import org.apache.accumulo.tracer.thrift.RemoteSpan; +import org.apache.htrace.HTraceConfiguration; +import org.apache.htrace.Span; +import org.apache.htrace.impl.MilliSpan; +import org.junit.Test; public class AsyncSpanReceiverTest { static class TestReceiver extends AsyncSpanReceiver { @@ -51,7 +51,7 @@ public class AsyncSpanReceiverTest { } @Override - protected String getSpanKey(Map data) { + protected String getSpanKey(Map data) { return "DEST"; }