fix: PR comments

tigrisdata-archive · Aug 12, 2022 · 68d9ccc · 68d9ccc
1 parent 21d9412
commit 68d9ccc
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 23 deletions.
diff --git a/client/src/main/java/com/tigrisdata/db/client/FieldSort.java b/client/src/main/java/com/tigrisdata/db/client/FieldSort.java
@@ -23,17 +23,17 @@
 public final class FieldSort implements TigrisSort {
 
   private final String fieldName;
-  private final SortingOperator operator;
+  private final SortOrder operator;
   private Map<String, Object> cachedMap;
 
-  FieldSort(String fieldName, SortingOperator op) {
+  FieldSort(String fieldName, SortOrder op) {
     this.fieldName = fieldName;
     this.operator = op;
   }
 
   /** {@inheritDoc} */
   @Override
-  public Map<String, Object> toMap() {
+  public Map<String, Object> getOrder() {
     if (cachedMap == null) {
       cachedMap =
           Collections.unmodifiableMap(

diff --git a/client/src/main/java/com/tigrisdata/db/client/Sort.java b/client/src/main/java/com/tigrisdata/db/client/Sort.java
@@ -19,22 +19,22 @@ public final class Sort {
   private Sort() {}
 
   /**
-   * Creates ascending sort order for given key
+   * Creates ascending sort order for given field name
    *
-   * @param key collection field name
+   * @param fieldName collection field name
    * @return constructed {@link FieldSort} of ascending order
    */
-  public static FieldSort ascending(String key) {
-    return new FieldSort(key, SortingOperator.ASC);
+  public static FieldSort ascending(String fieldName) {
+    return new FieldSort(fieldName, SortOrder.ASC);
   }
 
   /**
-   * Creates descending sort order for given key
+   * Creates descending sort order for given field name
    *
-   * @param key collection field name
+   * @param fieldName collection field name
    * @return constructed {@link FieldSort} of descending order
    */
-  public static FieldSort descending(String key) {
-    return new FieldSort(key, SortingOperator.DESC);
+  public static FieldSort descending(String fieldName) {
+    return new FieldSort(fieldName, SortOrder.DESC);
   }
 }
diff --git a/...tigrisdata/db/client/SortingOperator.java → ...a/com/tigrisdata/db/client/SortOrder.java b/...tigrisdata/db/client/SortingOperator.java → ...a/com/tigrisdata/db/client/SortOrder.java
@@ -14,13 +14,13 @@
 
 package com.tigrisdata.db.client;
 
-enum SortingOperator {
+enum SortOrder {
   ASC("$asc"),
   DESC("$desc");
 
   private final String operator;
 
-  SortingOperator(String operator) {
+  SortOrder(String operator) {
     this.operator = operator;
   }
 

diff --git a/client/src/main/java/com/tigrisdata/db/client/TigrisSort.java b/client/src/main/java/com/tigrisdata/db/client/TigrisSort.java
@@ -24,12 +24,12 @@ public interface TigrisSort {
    *
    * @return non-null immutable {@link Map}
    */
-  public Map<String, Object> toMap();
+  Map<String, Object> getOrder();
 
   /**
    * Gets collection field name that this order represents
    *
    * @return {@link String}
    */
-  public String getFieldName();
+  String getFieldName();
 }
diff --git a/client/src/main/java/com/tigrisdata/db/client/search/SortingOrder.java b/client/src/main/java/com/tigrisdata/db/client/search/SortingOrder.java
@@ -54,7 +54,7 @@ public String toJSON(ObjectMapper objectMapper) {
 
     List<Map<String, Object>> list = new ArrayList<>();
     for (TigrisSort sort : orders) {
-      list.add(sort.toMap());
+      list.add(sort.getOrder());
     }
     try {
       cachedJSON = objectMapper.writeValueAsString(list);

diff --git a/client/src/test/java/com/tigrisdata/db/client/FieldSortTest.java b/client/src/test/java/com/tigrisdata/db/client/FieldSortTest.java
@@ -23,10 +23,10 @@ public class FieldSortTest {
   @Test
   public void testToMap() {
     String expectedFieldName = "parent.nested_field";
-    FieldSort fs = new FieldSort(expectedFieldName, SortingOperator.DESC);
+    FieldSort fs = new FieldSort(expectedFieldName, SortOrder.DESC);
     Assert.assertEquals(expectedFieldName, fs.getFieldName());
-    Assert.assertEquals(1, fs.toMap().size());
-    Assert.assertEquals(SortingOperator.DESC.getOperator(), fs.toMap().get(expectedFieldName));
+    Assert.assertEquals(1, fs.getOrder().size());
+    Assert.assertEquals(SortOrder.DESC.getOperator(), fs.getOrder().get(expectedFieldName));
   }
 
   @Test

diff --git a/client/src/test/java/com/tigrisdata/db/client/SortTest.java b/client/src/test/java/com/tigrisdata/db/client/SortTest.java
@@ -27,11 +27,11 @@ public void testAscending() {
     Map<String, String> expected =
         new HashMap<String, String>() {
           {
-            put("field_1", SortingOperator.ASC.getOperator());
+            put("field_1", SortOrder.ASC.getOperator());
           }
         };
 
-    Assert.assertEquals(expected, sort.toMap());
+    Assert.assertEquals(expected, sort.getOrder());
   }
 
   @Test
@@ -40,10 +40,10 @@ public void testDescending() {
     Map<String, String> expected =
         new HashMap<String, String>() {
           {
-            put("field_1", SortingOperator.DESC.getOperator());
+            put("field_1", SortOrder.DESC.getOperator());
           }
         };
 
-    Assert.assertEquals(expected, sort.toMap());
+    Assert.assertEquals(expected, sort.getOrder());
   }
 }