From 7a78667f8c73cc751ad1a788a80011fde936cbfb Mon Sep 17 00:00:00 2001
From: Gethin James <gethin.james@alfresco.com>
Date: Thu, 1 Jun 2017 11:09:50 +0000
Subject: [PATCH] Merged searchrep (5.2.1) to 5.2.N (5.2.1)    136768 msuzuki:
 Search-347, refactor to use search parmeters hasFaceting method

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137051 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../solr/DbOrIndexSwitchingQueryLanguage.java | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/source/java/org/alfresco/repo/search/impl/solr/DbOrIndexSwitchingQueryLanguage.java b/source/java/org/alfresco/repo/search/impl/solr/DbOrIndexSwitchingQueryLanguage.java
index 60561cbb4e..1ae4f1fb3e 100644
--- a/source/java/org/alfresco/repo/search/impl/solr/DbOrIndexSwitchingQueryLanguage.java
+++ b/source/java/org/alfresco/repo/search/impl/solr/DbOrIndexSwitchingQueryLanguage.java
@@ -183,7 +183,7 @@ public class DbOrIndexSwitchingQueryLanguage extends AbstractLuceneQueryLanguage
         default:
             StopWatch stopWatch = new StopWatch("DB if possible");
             //SEARCH-347, exclude TMDQ calls if faceting present.
-            if(dbQueryLanguage != null && !hasFaceting(searchParameters))
+            if(dbQueryLanguage != null && !searchParameters.hasFaceting())
             {
                 try
                 {
@@ -284,24 +284,6 @@ public class DbOrIndexSwitchingQueryLanguage extends AbstractLuceneQueryLanguage
         }
     }
 
-    /**
-     * Checks if faceted fields or faceted queries are present if so it needs 
-     * to be excluded from the TMDQ call.
-     * @param searchParameters
-     * @return true if exists
-     */
-    private boolean hasFaceting(SearchParameters searchParameters)
-    {
-        if(searchParameters.getFacetQueries() != null && !searchParameters.getFacetQueries().isEmpty())
-        {
-            return true;
-        }
-        if(searchParameters.getFieldFacets() != null && !searchParameters.getFieldFacets().isEmpty())
-        {
-            return true;
-        }
-        return false;
-    }
     private ResultSet executeHybridQuery(SearchParameters searchParameters,
                                          ADMLuceneSearcherImpl admLuceneSearcher)
     {