inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Search-340, simplified the logic for inclusive range

Browse Source
This commit is contained in:
Michael Suzuki
2017-05-31 17:57:44 +01:00
parent 5012809385
commit c75ad355c3
2 changed files with 15 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
src/main/java/org/alfresco/service/cmr/search/RangeParameters.java
View File

@@ -25,7 +25,6 @@
*/ */
package org.alfresco.service.cmr.search; package org.alfresco.service.cmr.search;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@@ -134,16 +133,14 @@ public class RangeParameters
case "before": case "before":
break; break;
case "edge": case "edge":
return "["; return "[";
case "upper":
return "]";
case "lower": case "lower":
break; return "[";
default: default:
} }
} }
} }
return "["; return "<";
} }
public String getRangeFirstBucketEndInclusive() public String getRangeFirstBucketEndInclusive()
{ {
@@ -153,83 +150,22 @@ public class RangeParameters
{ {
switch (startInc) switch (startInc)
{ {
case "before":
break;
case "edge":
return "<";
case "outer":
return "]";
case "lower":
return "<";
case "upper": case "upper":
return ">"; return "]";
case "outer":
if(other != null && (other.contains("before") || other.contains("after")))
{
return "]";
}
break;
default: default:
break;
} }
} }
} }
return ">"; return ">";
} }
public boolean isRangeStartInclusive()
{
List<String> options = new ArrayList<String>();
if(include != null && !include.isEmpty())
{
options.addAll(include);
}
if(other != null && !other.isEmpty())
{
options.addAll(other);
}
if(!options.isEmpty())
{
for(String startInc : options)
{
switch (startInc)
{
case "before":
return false;
case "upper":
return false;
case "edge":
return false;
default:
break;
}
}
}
return true;
}
public boolean isRangeEndInclusive()
{
List<String> options = new ArrayList<String>();
if(include != null && !include.isEmpty())
{
options.addAll(include);
}
if(other != null && !other.isEmpty())
{
options.addAll(other);
}
if(!options.isEmpty())
{
for(String endInc : options)
{
switch (endInc)
{
case "edge":
return true;
case "upper":
return true;
case "all":
return true;
default:
break;
}
}
}
return false;
}
public String getRangeBucketStartInclusive() public String getRangeBucketStartInclusive()
{ {
@@ -246,7 +182,7 @@ public class RangeParameters
} }
} }
} }
return "]"; return "<";
} }
public String getRangeBucketEndInclusive() public String getRangeBucketEndInclusive()
{ {
@@ -257,36 +193,15 @@ public class RangeParameters
switch (key) switch (key)
{ {
case "upper": case "upper":
return ">"; return "]";
default: default:
break; break;
} }
} }
} }
return "<"; return ">";
} }
public String getRangeLastBucketStartInclusive()
{
if(include != null && !include.isEmpty())
{
for(String key : include)
{
switch (key)
{
case "lower":
return "[";
case "edge":
return "]";
case "upper":
return "]";
default:
break;
}
}
}
return "<";
}
public String getRangeLastBucketEndInclusive() public String getRangeLastBucketEndInclusive()
{ {
@@ -296,8 +211,6 @@ public class RangeParameters
{ {
switch (key) switch (key)
{ {
case "lower":
return ">";
case "edge": case "edge":
return "]"; return "]";
case "upper": case "upper":
@@ -307,6 +220,6 @@ public class RangeParameters
} }
} }
} }
return "<"; return ">";
} }
} }

47
src/test/java/org/alfresco/repo/search/cmr/search/RangeParametersTest.java
View File

@@ -1,47 +0,0 @@
package org.alfresco.repo.search.cmr.search;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.alfresco.service.cmr.search.RangeParameters;
import org.junit.Assert;
import org.junit.Test;
public class RangeParametersTest
{
@Test
public void startInclusiveTest()
{
RangeParameters p = new RangeParameters("test", "0", "10", "1", true, null, null, null, null);
Assert.assertTrue(p.isRangeStartInclusive());
p = new RangeParameters("test", "0", "10", "1", true, Collections.emptyList(), Collections.emptyList(), null, null);
Assert.assertTrue(p.isRangeStartInclusive());
List<String> includes = new ArrayList<String>();
List<String> other = new ArrayList<String>();
includes.add("upper");
p = new RangeParameters("test", "0", "10", "1", true, Collections.emptyList(), includes, null, null);
Assert.assertFalse(p.isRangeStartInclusive());
other.add("before");
p = new RangeParameters("test", "0", "10", "1", true, other, null, null, null);
Assert.assertFalse(p.isRangeStartInclusive());
p = new RangeParameters("test", "0", "10", "1", true, other, includes, null, null);
Assert.assertFalse(p.isRangeStartInclusive());
}
@Test
public void endInclusiveTest()
{
RangeParameters p = new RangeParameters("test", "0", "10", "1", true, null, null, null, null);
Assert.assertFalse(p.isRangeEndInclusive());
p = new RangeParameters("test", "0", "10", "1", true, Collections.emptyList(), Collections.emptyList(), null, null);
Assert.assertFalse(p.isRangeEndInclusive());
List<String> includes = new ArrayList<String>();
List<String> other = new ArrayList<String>();
includes.add("upper");
p = new RangeParameters("test", "0", "10", "1", true, Collections.emptyList(), includes, null, null);
Assert.assertTrue(p.isRangeEndInclusive());
other.add("before");
p = new RangeParameters("test", "0", "10", "1", true, other, null, null, null);
Assert.assertFalse(p.isRangeEndInclusive());
}
}