Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-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 E2F17101BE for ; Sat, 1 Mar 2014 11:46:19 +0000 (UTC) Received: (qmail 61796 invoked by uid 500); 1 Mar 2014 11:46:18 -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 61789 invoked by uid 99); 1 Mar 2014 11:46:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Mar 2014 11:46:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Mar 2014 11:46:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D50AC23888E4; Sat, 1 Mar 2014 11:45:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1573157 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/CHANGES.txt lucene/facet/ lucene/facet/src/java/org/apache/lucene/facet/FacetsConfig.java lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java Date: Sat, 01 Mar 2014 11:45:53 -0000 To: commits@lucene.apache.org From: mikemccand@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140301114553.D50AC23888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mikemccand Date: Sat Mar 1 11:45:53 2014 New Revision: 1573157 URL: http://svn.apache.org/r1573157 Log: LUCENE-5479: make the default dimension config controllable via subclass of FacetsConfig Modified: lucene/dev/branches/branch_4x/ (props changed) lucene/dev/branches/branch_4x/lucene/ (props changed) lucene/dev/branches/branch_4x/lucene/CHANGES.txt (contents, props changed) lucene/dev/branches/branch_4x/lucene/facet/ (props changed) lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/FacetsConfig.java lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java Modified: lucene/dev/branches/branch_4x/lucene/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/CHANGES.txt?rev=1573157&r1=1573156&r2=1573157&view=diff ============================================================================== --- lucene/dev/branches/branch_4x/lucene/CHANGES.txt (original) +++ lucene/dev/branches/branch_4x/lucene/CHANGES.txt Sat Mar 1 11:45:53 2014 @@ -21,6 +21,9 @@ New Features * LUCENE-5482: Improve default TurkishAnalyzer by adding apostrophe handling suitable for Turkish. (Ahmet Arslan via Robert Muir) +* LUCENE-5479: FacetsConfig subclass can now customize the default + per-dim facets configuration. (Rob Audenaerde via Mike McCandless) + API Changes * LUCENE-5454: Add RandomAccessOrds, an optional extension of SortedSetDocValues Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/FacetsConfig.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/FacetsConfig.java?rev=1573157&r1=1573156&r2=1573157&view=diff ============================================================================== --- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/FacetsConfig.java (original) +++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/FacetsConfig.java Sat Mar 1 11:45:53 2014 @@ -98,11 +98,22 @@ public class FacetsConfig { public FacetsConfig() { } + /** Get the default configuration for new dimensions. Useful when + * the dimension is not known beforehand and may need different + * global default settings, like {@code multivalue = + * true}. + * + * @return The default configuration to be used for dimensions that + * are not yet set in the {@link FacetsConfig} */ + protected DimConfig getDefaultDimConfig(){ + return DEFAULT_DIM_CONFIG; + } + /** Get the current configuration for a dimension. */ public synchronized DimConfig getDimConfig(String dimName) { DimConfig ft = fieldTypes.get(dimName); if (ft == null) { - ft = DEFAULT_DIM_CONFIG; + ft = getDefaultDimConfig(); } return ft; } Modified: lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java?rev=1573157&r1=1573156&r2=1573157&view=diff ============================================================================== --- lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java (original) +++ lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java Sat Mar 1 11:45:53 2014 @@ -84,5 +84,18 @@ public class TestFacetsConfig extends Fa IOUtils.close(indexDir, taxoDir); } - + + /** LUCENE-5479 */ + public void testCustomDefault() { + FacetsConfig config = new FacetsConfig() { + @Override + protected DimConfig getDefaultDimConfig() { + DimConfig config = new DimConfig(); + config.hierarchical = true; + return config; + } + }; + + assertTrue(config.getDimConfig("foobar").hierarchical); + } }