From dbce914d9fabbd22b4c556d7417b59e20ca5c604 Mon Sep 17 00:00:00 2001 From: Yonik Seeley Date: Wed, 20 May 2015 20:23:01 +0000 Subject: [PATCH] SOLR-7446: make FacetMerger abstract git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1680668 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/solr/search/facet/FacetModule.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java b/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java index 9a842b14f20..19766e19d8d 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java +++ b/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java @@ -221,14 +221,9 @@ class FacetComponentState { // files after the interfaces are locked down more. // -class FacetMerger { - public void merge(Object facetResult) { - - } - - public Object getMergedResult() { - return null; // TODO - } +abstract class FacetMerger { + public abstract void merge(Object facetResult); + public abstract Object getMergedResult(); } @@ -305,7 +300,7 @@ class FacetLongMerger extends FacetSortableMerger { // base class for facets that create buckets (and can hence have sub-facets) -class FacetBucketMerger extends FacetMerger { +abstract class FacetBucketMerger extends FacetMerger { FacetRequestT freq; public FacetBucketMerger(FacetRequestT freq) { @@ -454,7 +449,7 @@ class FacetFieldMerger extends FacetBucketMerger { private static class SortVal implements Comparable { FacetBucket bucket; - FacetSortableMerger merger; + FacetSortableMerger merger; // make this class inner and access merger , direction in parent? FacetField.SortDirection direction; @Override