From ecd2c1b3eaadbd59ce222880d891d3fd1a45a02b Mon Sep 17 00:00:00 2001
From: Gethin James <gethin.james@alfresco.com>
Date: Thu, 1 Jun 2017 11:12:27 +0000
Subject: [PATCH] Merged searchrep (5.2.1) to 5.2.N (5.2.1)    136941 msuzuki:
 Search-340, added date parsing to range

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137072 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../api/search/impl/RangeResultMapper.java    | 45 ++-----------------
 .../rest/api/search/ResultMapperTests.java    |  7 ++-
 2 files changed, 8 insertions(+), 44 deletions(-)

diff --git a/source/java/org/alfresco/rest/api/search/impl/RangeResultMapper.java b/source/java/org/alfresco/rest/api/search/impl/RangeResultMapper.java
index dadd013f06..83eac40e67 100644
--- a/source/java/org/alfresco/rest/api/search/impl/RangeResultMapper.java
+++ b/source/java/org/alfresco/rest/api/search/impl/RangeResultMapper.java
@@ -71,46 +71,7 @@ public class RangeResultMapper
         }
         return ffcs;
     }
-    private static boolean isRangeStartInclusive(List<String> values)
-    {
-        if(values != null && !values.isEmpty())
-        {
-            for(String startInc : values)
-            switch (startInc)
-            {
-            case "upper":
-                return  false;
-            case "outer":
-                return  false;
-            default:
-                break;
-            }
-        }
-        return true;
-    }
-    private static boolean isRangeEndInclusive(List<String> endIncs)
-    {
-        if(endIncs != null && !endIncs.isEmpty())
-        {
-            for(String endInc : endIncs)
-            {
-                switch (endInc)
-                {
-                case "upper":
-                    return  true;
-                case "edge":
-                    return  true;
-                case "outer":
-                    return  true;
-                case "all":
-                    return  true;
-                default:
-                    break;
-                }
-            }
-        }
-        return false;
-    }
+    
     /**
      * Builds the generic facet response out of range results.
      * @param facetField
@@ -131,8 +92,8 @@ public class RangeResultMapper
                 List<String> includes = range.getInclude();
                 if(includes != null && !includes.isEmpty())
                 {
-                    startInclusive = isRangeStartInclusive(includes); 
-                    endInclusive = isRangeEndInclusive(includes);
+                    startInclusive = range.isRangeStartInclusive(); 
+                    endInclusive = range.isRangeEndInclusive();
                 }
             }
         }
diff --git a/source/test-java/org/alfresco/rest/api/search/ResultMapperTests.java b/source/test-java/org/alfresco/rest/api/search/ResultMapperTests.java
index 6535d98b2a..04f6ae7082 100644
--- a/source/test-java/org/alfresco/rest/api/search/ResultMapperTests.java
+++ b/source/test-java/org/alfresco/rest/api/search/ResultMapperTests.java
@@ -533,14 +533,17 @@ public class ResultMapperTests
         assertEquals(4, rangeFacets.get(0).getBuckets().size());
         assertEquals(3, rangeFacets.get(1).getBuckets().size());
         assertEquals("content.size",rangeFacets.get(1).getLabel());
-        assertEquals("(0 - 100]",rangeFacets.get(1).getBuckets().get(0).getLabel());
+        assertEquals("[0 - 100]",rangeFacets.get(1).getBuckets().get(0).getLabel());
         Object[] metrics = rangeFacets.get(1).getBuckets().get(0).getMetrics().toArray();
         assertEquals("4",((SimpleMetric) metrics[0]).getValue().get("count"));
-        assertEquals("content.size:<0 TO 100]", rangeFacets.get(1).getBuckets().get(0).getFilterQuery());
+        assertEquals("content.size:[0 TO 100]", rangeFacets.get(1).getBuckets().get(0).getFilterQuery());
         assertEquals(null,rangeFacets.get(1).getBuckets().get(0).getBucketInfo().get("count"));
         Map<String, String> facetInfo = rangeFacets.get(1).getBuckets().get(0).getBucketInfo();
         assertEquals("0",facetInfo.get("start"));
         assertEquals("100",facetInfo.get("end"));
+        assertEquals("true",facetInfo.get("startInclusive"));
+        assertEquals("true",facetInfo.get("endInclusive"));
+        
     }
 
     @Test