From commits-return-23900-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org Wed Jun 10 16:52:51 2020 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 [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 1A73F18062B for ; Wed, 10 Jun 2020 18:52:51 +0200 (CEST) Received: (qmail 28354 invoked by uid 500); 10 Jun 2020 16:52: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 28345 invoked by uid 99); 10 Jun 2020 16:52: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; Wed, 10 Jun 2020 16:52:50 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id CBECE8D417; Wed, 10 Jun 2020 16:52:49 +0000 (UTC) Date: Wed, 10 Jun 2020 16:52:49 +0000 To: "commits@accumulo.apache.org" Subject: [accumulo] branch master updated: Use more neutral language for banned item list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <159180796949.32621.1463518937825298651@gitbox.apache.org> From: ctubbsii@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: accumulo X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: b1e67f7ced838037965436fc1d1f255d139a4045 X-Git-Newrev: ef149d41f0d5f00ebd381394ef37bbd2cc21f9b5 X-Git-Rev: ef149d41f0d5f00ebd381394ef37bbd2cc21f9b5 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git The following commit(s) were added to refs/heads/master by this push: new ef149d4 Use more neutral language for banned item list ef149d4 is described below commit ef149d41f0d5f00ebd381394ef37bbd2cc21f9b5 Author: Christopher Tubbs AuthorDate: Wed Jun 10 12:50:38 2020 -0400 Use more neutral language for banned item list Rename 'blacklist' variable to the more neutral 'banList' to avoid the unnecessarily negative association between 'black' and 'bad'. --- start/src/main/java/org/apache/accumulo/start/Main.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/start/src/main/java/org/apache/accumulo/start/Main.java b/start/src/main/java/org/apache/accumulo/start/Main.java index e147106..6e04a72 100644 --- a/start/src/main/java/org/apache/accumulo/start/Main.java +++ b/start/src/main/java/org/apache/accumulo/start/Main.java @@ -238,16 +238,16 @@ public class Main { public static Map checkDuplicates(final Iterable services) { - TreeSet blacklist = new TreeSet<>(); + TreeSet banList = new TreeSet<>(); TreeMap results = new TreeMap<>(); for (KeywordExecutable service : services) { String keyword = service.keyword(); - if (blacklist.contains(keyword)) { + if (banList.contains(keyword)) { // subsequent times a duplicate is found, just warn and exclude it warnDuplicate(service); } else if (results.containsKey(keyword)) { - // the first time a duplicate is found, blacklist it and warn - blacklist.add(keyword); + // the first time a duplicate is found, banList it and warn + banList.add(keyword); warnDuplicate(results.remove(keyword)); warnDuplicate(service); } else {