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 89387200BE4 for ; Wed, 7 Dec 2016 00:13:04 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 87F32160B30; Tue, 6 Dec 2016 23:13:04 +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 CF0BD160B1B for ; Wed, 7 Dec 2016 00:13:03 +0100 (CET) Received: (qmail 49085 invoked by uid 500); 6 Dec 2016 23:12:58 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 47102 invoked by uid 99); 6 Dec 2016 23:12:57 -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; Tue, 06 Dec 2016 23:12:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9A065F16A5; Tue, 6 Dec 2016 23:12:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sarowe@apache.org To: commits@lucene.apache.org Date: Tue, 06 Dec 2016 23:13:21 -0000 Message-Id: <57a3e0545545481588b5a2d925a8fcea@git.apache.org> In-Reply-To: <3b2b6f35ed1c4dd3ac885912d9b2da60@git.apache.org> References: <3b2b6f35ed1c4dd3ac885912d9b2da60@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [26/50] [abbrv] lucene-solr:apiv2: SOLR-8871 - removed suppress for forbidden API, added locale to toUpperCase archived-at: Tue, 06 Dec 2016 23:13:04 -0000 SOLR-8871 - removed suppress for forbidden API, added locale to toUpperCase Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c36ec0b7 Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c36ec0b7 Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c36ec0b7 Branch: refs/heads/apiv2 Commit: c36ec0b75e06295143601e76de9b71c20295fb7d Parents: 641294a Author: Tommaso Teofili Authored: Mon Nov 28 09:22:36 2016 +0100 Committer: Tommaso Teofili Committed: Mon Nov 28 09:22:36 2016 +0100 ---------------------------------------------------------------------- .../processor/ClassificationUpdateProcessorFactory.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c36ec0b7/solr/core/src/java/org/apache/solr/update/processor/ClassificationUpdateProcessorFactory.java ---------------------------------------------------------------------- diff --git a/solr/core/src/java/org/apache/solr/update/processor/ClassificationUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/ClassificationUpdateProcessorFactory.java index cbe571b..8341ad4 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/ClassificationUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/ClassificationUpdateProcessorFactory.java @@ -17,12 +17,13 @@ package org.apache.solr.update.processor; +import java.util.Locale; + import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.Query; import org.apache.solr.common.SolrException; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.NamedList; -import org.apache.solr.common.util.SuppressForbidden; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.schema.IndexSchema; @@ -60,7 +61,6 @@ public class ClassificationUpdateProcessorFactory extends UpdateRequestProcessor private SolrParams params; private ClassificationUpdateProcessorParams classificationParams; - @SuppressForbidden(reason = "Need toUpperCase to match algorithm enum value") @Override public void init(final NamedList args) { if (args != null) { @@ -86,10 +86,10 @@ public class ClassificationUpdateProcessorFactory extends UpdateRequestProcessor String algorithmString = params.get(ALGORITHM_PARAM); Algorithm classificationAlgorithm; try { - if (algorithmString == null || Algorithm.valueOf(algorithmString.toUpperCase()) == null) { + if (algorithmString == null || Algorithm.valueOf(algorithmString.toUpperCase(Locale.ROOT)) == null) { classificationAlgorithm = DEFAULT_ALGORITHM; } else { - classificationAlgorithm = Algorithm.valueOf(algorithmString.toUpperCase()); + classificationAlgorithm = Algorithm.valueOf(algorithmString.toUpperCase(Locale.ROOT)); } } catch (IllegalArgumentException e) { throw new SolrException