Merge pull request #3762 from projectblacklight/revert_facet_search_builder

Revert "Extract FacetSearchBuilder"

Author: seanaery

app/controllers/concerns/blacklight/catalog.rb

@@ -9,7 +9,6 @@ module Blacklight::Catalog
   include Blacklight::Configurable
   include Blacklight::SearchContext
   include Blacklight::Searchable
-  include Blacklight::Facetable
 
   # The following code is executed when someone includes blacklight::catalog in their
   # own controller.
@@ -82,11 +81,11 @@ def facet
     raise ActionController::RoutingError, 'Not Found' unless @facet
 
     @response = if params[:query_fragment].present?
-                  facet_search_service.facet_suggest_response(@facet.key, params[:query_fragment])
+                  search_service.facet_suggest_response(@facet.key, params[:query_fragment])
                 else
-                  facet_search_service.facet_field_response(@facet.key)
+                  search_service.facet_field_response(@facet.key)
                 end
-
+    # @display_facet is a Blacklight::Solr::Response::Facets::FacetField
     @display_facet = @response.aggregations[@facet.field]
 
     # @presenter is a Blacklight::FacetFieldPresenter

app/controllers/concerns/blacklight/facetable.rb

@@ -103,9 +103,6 @@ def initialized_default_configuration?
       # @!attribute search_builder_class
       # @return [Class] class for converting Blacklight parameters to request parameters for the repository_class
       property :search_builder_class, default: ::SearchBuilder
-      # @!attribute search_builder_class
-      # @return [Class] class for converting Blacklight parameters to request parameters for the repository_class
-      property :facet_search_builder_class, default: ::FacetSearchBuilder
       # @!attribute response_model
       # model that maps index responses to the blacklight response model
       # @return [Class]