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 0B83E17909 for ; Wed, 22 Apr 2015 17:39:55 +0000 (UTC) Received: (qmail 78349 invoked by uid 500); 22 Apr 2015 17:39:55 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 78314 invoked by uid 500); 22 Apr 2015 17:39:54 -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 78172 invoked by uid 99); 22 Apr 2015 17:39:54 -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; Wed, 22 Apr 2015 17:39:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AA7BFE03C0; Wed, 22 Apr 2015 17:39:54 +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: Wed, 22 Apr 2015 17:39:55 -0000 Message-Id: <0ffff3f52fce48f6900f351563695bf5@git.apache.org> In-Reply-To: <105ce3f01f4e4f4da678de1463c487d9@git.apache.org> References: <105ce3f01f4e4f4da678de1463c487d9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] accumulo git commit: ACCUMULO-3488 Reference non-deprecated method in javadoc ACCUMULO-3488 Reference non-deprecated method in javadoc Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d26fc146 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d26fc146 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d26fc146 Branch: refs/heads/master Commit: d26fc146b828a38626cc282f011526f4d390d50b Parents: ac08cc4 Author: Christopher Tubbs Authored: Wed Apr 22 13:21:18 2015 -0400 Committer: Christopher Tubbs Committed: Wed Apr 22 13:21:18 2015 -0400 ---------------------------------------------------------------------- .../core/client/MutationsRejectedException.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d26fc146/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java b/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java index d046991..e8f675b 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java +++ b/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java @@ -46,9 +46,9 @@ public class MutationsRejectedException extends AccumuloException { private Collection es; private int unknownErrors; - private static Map transformKeys(Map map, Function keyFunction) { - HashMap ret = new HashMap(); - for(Entry entry : map.entrySet()){ + private static Map transformKeys(Map map, Function keyFunction) { + HashMap ret = new HashMap(); + for (Entry entry : map.entrySet()) { ret.put(keyFunction.apply(entry.getKey()), entry.getValue()); } @@ -65,7 +65,7 @@ public class MutationsRejectedException extends AccumuloException { * @param unknownErrors * number of unknown errors * - * @deprecated since 1.6.0, see {@link #MutationsRejectedException(Instance, List, HashMap, Collection, int, Throwable)} + * @deprecated since 1.6.0, see {@link #MutationsRejectedException(Instance, List, Map, Collection, int, Throwable)} */ @Deprecated public MutationsRejectedException(List cvsList, HashMap> hashMap, @@ -91,8 +91,8 @@ public class MutationsRejectedException extends AccumuloException { * @deprecated since 1.7.0 see {@link #MutationsRejectedException(Instance, List, Map, Collection, int, Throwable)} */ @Deprecated - public MutationsRejectedException(Instance instance, List cvsList, HashMap> hashMap, - Collection serverSideErrors, int unknownErrors, Throwable cause) { + public MutationsRejectedException(Instance instance, List cvsList, + HashMap> hashMap, Collection serverSideErrors, int unknownErrors, Throwable cause) { super("# constraint violations : " + cvsList.size() + " security codes: " + format(transformKeys(hashMap, TabletIdImpl.KE_2_TID_OLD), instance) + " # server errors " + serverSideErrors.size() + " # exceptions " + unknownErrors, cause); this.cvsl = cvsList; @@ -169,7 +169,7 @@ public class MutationsRejectedException extends AccumuloException { /** * @return the internal mapping of TabletID to SecurityErrorCodes */ - public Map> getSecurityErrorCodes(){ + public Map> getSecurityErrorCodes() { return af; }