From d644a4cb4a5dadc0fdc857b94cec468726a9db5a Mon Sep 17 00:00:00 2001
From: Sulejman Karisik <sulejman.karisik@LNDS-MSK01.local>
Date: Mon, 10 Jun 2024 15:59:57 +0200
Subject: [PATCH] feat: rename operator classes for more clarity

---
 .../discovery/services/CkanFacetsQueryBuilder.java         | 7 ++++---
 .../discovery/services/CkanQueryOperator.java              | 3 ++-
 .../discovery/services/CkanQueryOperatorMapper.java        | 4 ++--
 .../discovery/services/CkanFacetsQueryBuilderTest.java     | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/github/genomicdatainfrastructure/discovery/services/CkanFacetsQueryBuilder.java b/src/main/java/io/github/genomicdatainfrastructure/discovery/services/CkanFacetsQueryBuilder.java
index dfc139d..779a200 100644
--- a/src/main/java/io/github/genomicdatainfrastructure/discovery/services/CkanFacetsQueryBuilder.java
+++ b/src/main/java/io/github/genomicdatainfrastructure/discovery/services/CkanFacetsQueryBuilder.java
@@ -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) {
@@ -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);
     }
diff --git a/src/main/java/io/github/genomicdatainfrastructure/discovery/services/CkanQueryOperator.java b/src/main/java/io/github/genomicdatainfrastructure/discovery/services/CkanQueryOperator.java
index 6824454..8dac73e 100644
--- a/src/main/java/io/github/genomicdatainfrastructure/discovery/services/CkanQueryOperator.java
+++ b/src/main/java/io/github/genomicdatainfrastructure/discovery/services/CkanQueryOperator.java
@@ -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";
 }
\ No newline at end of file
diff --git a/src/main/java/io/github/genomicdatainfrastructure/discovery/services/CkanQueryOperatorMapper.java b/src/main/java/io/github/genomicdatainfrastructure/discovery/services/CkanQueryOperatorMapper.java
index cdc9cc5..9da756c 100644
--- a/src/main/java/io/github/genomicdatainfrastructure/discovery/services/CkanQueryOperatorMapper.java
+++ b/src/main/java/io/github/genomicdatainfrastructure/discovery/services/CkanQueryOperatorMapper.java
@@ -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;
     }
 }
diff --git a/src/test/java/io/github/genomicdatainfrastructure/discovery/services/CkanFacetsQueryBuilderTest.java b/src/test/java/io/github/genomicdatainfrastructure/discovery/services/CkanFacetsQueryBuilderTest.java
index ae4403a..29101e0 100644
--- a/src/test/java/io/github/genomicdatainfrastructure/discovery/services/CkanFacetsQueryBuilderTest.java
+++ b/src/test/java/io/github/genomicdatainfrastructure/discovery/services/CkanFacetsQueryBuilderTest.java
@@ -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);
@@ -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);