From 49ba37ac4dac2421c08728d87843b0a5e4245828 Mon Sep 17 00:00:00 2001
From: jbernste <jbernste@apache.org>
Date: Tue, 23 Aug 2016 15:25:18 -0400
Subject: [PATCH] SOLR-9432: Fix-up precommit

---
 .../solr/search/facet/FacetFieldMerger.java   | 22 +++++++---------
 .../apache/solr/search/facet/FacetModule.java |  8 +-----
 .../solr/search/facet/FacetRangeMerger.java   | 16 ++++++------
 .../facet/FacetRequestSortedMerger.java       | 26 +++++++++----------
 4 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetFieldMerger.java b/solr/core/src/java/org/apache/solr/search/facet/FacetFieldMerger.java
index 8a26f51d892..432e1a7a715 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/FacetFieldMerger.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetFieldMerger.java
@@ -1,15 +1,3 @@
-package org.apache.solr.search.facet;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.solr.common.util.SimpleOrderedMap;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -27,6 +15,16 @@ import org.apache.solr.common.util.SimpleOrderedMap;
  * limitations under the License.
  */
 
+package org.apache.solr.search.facet;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.solr.common.util.SimpleOrderedMap;
+
+
 // TODO: refactor more out to base class
 public class FacetFieldMerger extends FacetRequestSortedMerger<FacetField> {
   FacetBucket missingBucket;
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 b2831a326ef..8767e5b3bdb 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
@@ -17,16 +17,10 @@
 package org.apache.solr.search.facet;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import org.apache.solr.client.solrj.SolrResponse;
 import org.apache.solr.common.SolrException;
@@ -586,7 +580,7 @@ class FacetBucket {
   }
 
   public Map<String, Object> getRefinement2(FacetMerger.Context mcontext, Collection<String> refineTags) {
-    // TODO nocommit - partial results should turn off refining!!!
+    // TODO - partial results should turn off refining!!!
 
     boolean parentMissing = mcontext.bucketWasMissing();
 
diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetRangeMerger.java b/solr/core/src/java/org/apache/solr/search/facet/FacetRangeMerger.java
index 587b9195775..5fae6c67490 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/FacetRangeMerger.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetRangeMerger.java
@@ -1,11 +1,3 @@
-package org.apache.solr.search.facet;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-
-import org.apache.solr.common.params.FacetParams;
-import org.apache.solr.common.util.SimpleOrderedMap;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -24,6 +16,14 @@ import org.apache.solr.common.util.SimpleOrderedMap;
  * limitations under the License.
  */
 
+package org.apache.solr.search.facet;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.solr.common.params.FacetParams;
+import org.apache.solr.common.util.SimpleOrderedMap;
+
 public class FacetRangeMerger extends FacetRequestSortedMerger<FacetRange> {
   FacetBucket beforeBucket;
   FacetBucket afterBucket;
diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetRequestSortedMerger.java b/solr/core/src/java/org/apache/solr/search/facet/FacetRequestSortedMerger.java
index 955882d8167..a9810069670 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/FacetRequestSortedMerger.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetRequestSortedMerger.java
@@ -1,16 +1,3 @@
-package org.apache.solr.search.facet;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.solr.common.util.SimpleOrderedMap;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -28,6 +15,19 @@ import org.apache.solr.common.util.SimpleOrderedMap;
  * limitations under the License.
  */
 
+package org.apache.solr.search.facet;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.solr.common.util.SimpleOrderedMap;
+
 // base class for facets that create a list of buckets that can be sorted
 abstract class FacetRequestSortedMerger<FacetRequestT extends FacetRequestSorted> extends FacetBucketMerger<FacetRequestT> {
   LinkedHashMap<Object,FacetBucket> buckets = new LinkedHashMap<>();