svn commit: r1680669 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/core/ solr/core/src/java/org/apache/solr/search/facet/FacetModule.java

[yo...@apache.org]

Author: yonik
Date: Wed May 20 20:23:57 2015
New Revision: 1680669

URL: http://svn.apache.org/r1680669
Log:
SOLR-7446: make FacetMerger abstract

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/core/   (props changed)
    lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java

Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java?rev=1680669&r1=1680668&r2=1680669&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java Wed May 20 20:23:57 2015
@@ -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 FacetSorta
 
 
 // base class for facets that create buckets (and can hence have sub-facets)
-class FacetBucketMerger<FacetRequestT extends FacetRequest> extends FacetMerger {
+abstract class FacetBucketMerger<FacetRequestT extends FacetRequest> extends FacetMerger {
   FacetRequestT freq;
 
   public FacetBucketMerger(FacetRequestT freq) {
@@ -454,7 +449,7 @@ class FacetFieldMerger extends FacetBuck
 
   private static class SortVal implements Comparable<SortVal> {
     FacetBucket bucket;
-    FacetSortableMerger merger;
+    FacetSortableMerger merger;  // make this class inner and access merger , direction in parent?
     FacetField.SortDirection direction;
 
     @Override