Merge pull request #13 from typesense/tests

chore: model generation fix

Author: kishorenc

.circleci/config.yml

@@ -40,6 +40,9 @@ jobs:
           name: Run Typesense
           command: mkdir data && typesense-server --data-dir ./data --api-key=xyz
           background: true
+      - run:
+          name: Fetch JSONL file
+          command: sudo bash -c "curl https://gist.githubusercontent.com/harisarang/62a43d8a6c2dcf8d51ea4eab9d90c0c3/raw/090284f8c2aefaacba161b05cf2382836cadc31f/books.jsonl > /books.jsonl"
 
       # Download and cache dependencies
       - restore_cache:

.gitignore

@@ -1,4 +1,5 @@
 .gradle/
 .idea/
 **/build
-.out/
+.out/
+**/books.jsonl

src/main/java/org/typesense/api/Client.java

@@ -14,7 +14,7 @@ public class Client {
     private HashMap<String, Alias> individualAliases;
 
     private Keys keys;
-    private HashMap<String, Key> individualKeys;
+    private HashMap<Long, Key> individualKeys;
 
     public Health health;
     public Operations operations;
@@ -30,7 +30,7 @@ public class Client {
         this.aliases = new Aliases(this.apiCall);
         this.individualAliases = new HashMap<>();
         this.keys = new Keys(this.apiCall);
-        this.individualKeys = new HashMap<>();
+        this.individualKeys = new HashMap<Long, Key>();
         this.health = new Health(this.apiCall);
         this.operations = new Operations(this.apiCall);
         this.metrics = new Metrics(this.apiCall);
@@ -74,7 +74,7 @@ public Keys keys(){
         return this.keys;
     }
 
-    public Key keys(String id){
+    public Key keys(Long id){
         Key retVal;
 
         if(!this.individualKeys.containsKey(id)){

src/main/java/org/typesense/api/Key.java

@@ -4,10 +4,10 @@
 
 public class Key {
 
-    private String id;
+    private Long id;
     private ApiCall apiCall;
 
-    public Key(String id, ApiCall apiCall) {
+    public Key(Long id, ApiCall apiCall) {
         this.id = id;
         this.apiCall = apiCall;
     }

src/main/java/org/typesense/api/Keys.java

@@ -22,6 +22,9 @@ public Keys(ApiCall apiCall) {
     }
 
     public ApiKey create(ApiKeySchema apiKeySchema){
+        if (apiKeySchema.getExpiresAt() == null) {
+            apiKeySchema.setExpiresAt(System.currentTimeMillis() / 1000L + 315360000); // Adding 10 years for expiration.
+        }
         return this.apiCall.post(Keys.RESOURCEPATH, apiKeySchema, ApiKey.class);
     }
 

src/main/java/org/typesense/api/Synonyms.java

@@ -16,6 +16,9 @@ public Synonyms(String collectionName, ApiCall apiCall) {
     }
 
     public SearchSynonym upsert(String synonymId, SearchSynonymSchema searchSynonymSchema){
+        if (searchSynonymSchema.getRoot() == null) {
+            searchSynonymSchema.setRoot("");
+        }
         return this.apiCall.put(getEndpoint(synonymId), searchSynonymSchema,SearchSynonym.class);
     }
 

src/main/java/org/typesense/model/ApiKeySchema.java

@@ -26,7 +26,7 @@ public class ApiKeySchema   {
   @Schema(required = true, description = "")
   private List<String> collections = new ArrayList<String>();
 
-  @Schema(required = true, description = "")
+  @Schema(description = "")
   private Long expiresAt = null;
  /**
    * Get description

src/main/java/org/typesense/model/ExportDocumentsParameters.java

@@ -23,17 +23,17 @@ public class ExportDocumentsParameters   {
   **/
   private String filterBy = null;
 
-  @Schema(description = "List of fields from the document to include in the search result")
+  @Schema(required = true, description = "List of fields from the document to include in the search result")
  /**
    * List of fields from the document to include in the search result  
   **/
-  private List<String> includeFields = null;
+  private List<String> includeFields = new ArrayList<String>();
 
-  @Schema(description = "List of fields from the document to exclude in the search result")
+  @Schema(required = true, description = "List of fields from the document to exclude in the search result")
  /**
    * List of fields from the document to exclude in the search result  
   **/
-  private List<String> excludeFields = null;
+  private List<String> excludeFields = new ArrayList<String>();
  /**
    * Filter conditions for refining your search results. Separate multiple conditions with &amp;&amp;.
    * @return filterBy

src/main/java/org/typesense/model/ImportDocumentsParameters.java

@@ -20,6 +20,38 @@ public class ImportDocumentsParameters   {
 
   @Schema(description = "")
   private Integer batchSize = null;
+  public enum DirtyValuesEnum {
+    COERCE_OR_REJECT("coerce_or_reject"),
+    COERCE_OR_DROP("coerce_or_drop"),
+    DROP("drop"),
+    REJECT("reject");
+
+    private String value;
+
+    DirtyValuesEnum(String value) {
+      this.value = value;
+    }
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+    @JsonCreator
+    public static DirtyValuesEnum fromValue(String text) {
+      for (DirtyValuesEnum b : DirtyValuesEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+  }  
+  @Schema(description = "")
+  private DirtyValuesEnum dirtyValues = null;
  /**
    * Get action
    * @return action
@@ -56,6 +88,27 @@ public ImportDocumentsParameters batchSize(Integer batchSize) {
     return this;
   }
 
+ /**
+   * Get dirtyValues
+   * @return dirtyValues
+  **/
+  @JsonProperty("dirty_values")
+  public String getDirtyValues() {
+    if (dirtyValues == null) {
+      return null;
+    }
+    return dirtyValues.getValue();
+  }
+
+  public void setDirtyValues(DirtyValuesEnum dirtyValues) {
+    this.dirtyValues = dirtyValues;
+  }
+
+  public ImportDocumentsParameters dirtyValues(DirtyValuesEnum dirtyValues) {
+    this.dirtyValues = dirtyValues;
+    return this;
+  }
+
 
   @Override
   public String toString() {
@@ -64,6 +117,7 @@ public String toString() {
 
     sb.append("    action: ").append(toIndentedString(action)).append("\n");
     sb.append("    batchSize: ").append(toIndentedString(batchSize)).append("\n");
+    sb.append("    dirtyValues: ").append(toIndentedString(dirtyValues)).append("\n");
     sb.append("}");
     return sb.toString();
   }

src/test/java/org/typesense/api/AliasesTest.java

@@ -0,0 +1,53 @@
+package org.typesense.api;
+
+import junit.framework.TestCase;
+import org.typesense.model.CollectionAlias;
+import org.typesense.model.CollectionAliasSchema;
+import org.typesense.model.CollectionAliasesResponse;
+import org.typesense.resources.Node;
+
+import java.time.Duration;
+import java.util.ArrayList;
+
+public class AliasesTest extends TestCase {
+
+    private Client client;
+    private Helper helper;
+
+    public void setUp() throws Exception {
+        super.setUp();
+        helper = new Helper();
+        client = helper.getClient();
+        helper.createTestAlias();
+    }
+
+    public void tearDown() throws Exception {
+        super.tearDown();
+        helper.teardown();
+    }
+
+    public void testUpsert() {
+        CollectionAliasSchema collectionAliasSchema = new CollectionAliasSchema();
+        collectionAliasSchema.collectionName("books_june11");
+
+        System.out.println(client.aliases().upsert("books1", collectionAliasSchema));
+    }
+
+    public void testRetrieveAll() {
+        CollectionAliasesResponse collectionAliasesResponse = client.aliases().retrieve();
+
+        System.out.println(collectionAliasesResponse);
+    }
+
+    public void testRetrieveSingleAlias() {
+        CollectionAlias collectionAlias = client.aliases("books").retrieve();
+
+        System.out.println(collectionAlias);
+    }
+
+    public void testDelete() {
+        CollectionAlias collectionAlias = client.aliases("books").delete();
+
+        System.out.println(collectionAlias);
+    }
+}