fixing local issues

This commit is contained in:
Michael Suzuki
2017-06-01 11:37:10 +01:00

View File

@@ -38,16 +38,15 @@ import org.codehaus.jackson.annotate.JsonProperty;
@AlfrescoPublicApi @AlfrescoPublicApi
public class RangeParameters public class RangeParameters
{ {
private String field; private final String field;
private String start; private final String start;
private String end; private final String end;
private String gap; private final String gap;
private boolean hardend; private final boolean hardend;
private List<String> other; private final List<String> other;
private List<String> include; private final List<String> include;
private List<String> tags; private final String label;
private List<String> excludeFilters; private final List<String> excludeFilters;
/** /**
* Constructor. * Constructor.
@@ -59,7 +58,7 @@ public class RangeParameters
* @param hardend * @param hardend
* @param other can have one of the following values: before,after,between,none * @param other can have one of the following values: before,after,between,none
* @param include can have one of the following values: lower,upper,edge,outer,all * @param include can have one of the following values: lower,upper,edge,outer,all
* @param tags * @param label
* @param excludeFilters * @param excludeFilters
*/ */
@JsonCreator @JsonCreator
@@ -70,7 +69,7 @@ public class RangeParameters
@JsonProperty("hardend") boolean hardend, @JsonProperty("hardend") boolean hardend,
@JsonProperty("other")List<String> other, @JsonProperty("other")List<String> other,
@JsonProperty("include")List<String> include, @JsonProperty("include")List<String> include,
@JsonProperty("tags")List<String> tags, @JsonProperty("label") String label,
@JsonProperty("excludeFilters")List<String> excludeFilters) @JsonProperty("excludeFilters")List<String> excludeFilters)
{ {
super(); super();
@@ -79,9 +78,9 @@ public class RangeParameters
this.end = end; this.end = end;
this.gap = gap; this.gap = gap;
this.hardend = hardend; this.hardend = hardend;
this.other = other; this.other = other == null? Collections.emptyList():other;
this.include = include; this.include = include == null? Collections.emptyList():include;
this.tags = tags == null? Collections.emptyList():tags; this.label = label;
this.excludeFilters = excludeFilters == null? Collections.emptyList():excludeFilters; this.excludeFilters = excludeFilters == null? Collections.emptyList():excludeFilters;
} }
@@ -113,10 +112,11 @@ public class RangeParameters
{ {
return include; return include;
} }
public List<String> getTags() public String getLabel()
{ {
return tags; return label;
} }
public List<String> getExcludeFilters() public List<String> getExcludeFilters()
{ {
return excludeFilters; return excludeFilters;
@@ -202,7 +202,6 @@ public class RangeParameters
return ">"; return ">";
} }
public String getRangeLastBucketEndInclusive() public String getRangeLastBucketEndInclusive()
{ {
if(include != null && !include.isEmpty()) if(include != null && !include.isEmpty())