Skip to content

Commit

Permalink
feat: rename operator classes for more clarity
Browse files Browse the repository at this point in the history
  • Loading branch information
Sulejman Karisik authored and Sulejman Karisik committed Jun 10, 2024
1 parent 2ef5cb3 commit d644a4c
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public String buildFacetQuery(DatasetSearchQuery query) {

return nonNullFacets.entrySet().stream()
.map(entry -> getFacetQuery(entry.getKey(), entry.getValue(), operator))
.collect(joining(OperatorMapper.getOperator(operator)));
.collect(joining(CkanQueryOperatorMapper.getOperator(operator)));
}

private Boolean isCkanGroupAndFacetIsNotBlank(DatasetSearchQueryFacet facet) {
Expand All @@ -46,10 +46,11 @@ private Boolean isCkanGroupAndFacetIsNotBlank(DatasetSearchQueryFacet facet) {
!facet.getValue().isBlank();
}

private String getFacetQuery(String key, List<DatasetSearchQueryFacet> facets, String operator) {
private String getFacetQuery(String key, List<DatasetSearchQueryFacet> facets,
String operator) {
var values = facets.stream()
.map(facet -> QUOTED_VALUE.formatted(facet.getValue()))
.collect(joining(OperatorMapper.getOperator(operator)));
.collect(joining(CkanQueryOperatorMapper.getOperator(operator)));

return FACET_PATTERN.formatted(key, values);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
import lombok.experimental.UtilityClass;

@UtilityClass
public class Operator {
public class CkanQueryOperator {

public static final String Or = "or";
public static final String And = "and";
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
import lombok.experimental.UtilityClass;

@UtilityClass
public class OperatorMapper {
public class CkanQueryOperatorMapper {

private final String AND = " AND ";
private final String OR = " OR ";

public String getOperator(String operator) {
return operator.equals(Operator.Or) ? OR : AND;
return operator.equals(CkanQueryOperator.Or) ? OR : AND;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ void can_parse_with_and_operator(String value) {

var query = new DatasetSearchQuery();
query.setFacets(facets);
query.setOperator(Operator.And);
query.setOperator(CkanQueryOperator.And);

var expected = "field1:(\"value1\" AND \"value2\") AND field2:(\"value3\")";
var actual = CkanFacetsQueryBuilder.buildFacetQuery(query);
Expand All @@ -75,7 +75,7 @@ void can_parse_with_or_operator(String value) {

var query = new DatasetSearchQuery();
query.setFacets(facets);
query.setOperator(Operator.Or);
query.setOperator(CkanQueryOperator.Or);

var expected = "field1:(\"value1\" OR \"value2\") OR field2:(\"value3\")";
var actual = CkanFacetsQueryBuilder.buildFacetQuery(query);
Expand Down

0 comments on commit d644a4c

Please sign in to comment.