refactor: update "cqp-api" dependency in "cqp-storage-elasticsearch" to "0.0.15"

Update API

Author: SimarMugattarov

cqp-storage-elasticsearch/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 
 group = "com.quantori"
 description = "Chem query platform. Storage Elasticsearch"
-version = "0.0.12"
+version = "0.0.13"
 
 tasks.named<Javadoc>("javadoc") {
     exclude(
@@ -16,7 +16,7 @@ tasks.named<Javadoc>("javadoc") {
 }
 
 dependencies {
-    implementation("com.quantori:cqp-api:0.0.14")
+    implementation("com.quantori:cqp-api:0.0.15")
     implementation("com.quantori:cqp-core:0.0.13")
     implementation("co.elastic.clients:elasticsearch-java:8.6.2")
     implementation(libs.jackson)

cqp-storage-elasticsearch/src/main/java/com/quantori/cqp/storage/elasticsearch/ElasticsearchMoleculeUploader.java

@@ -2,8 +2,8 @@
 
 import co.elastic.clients.elasticsearch.ElasticsearchAsyncClient;
 import co.elastic.clients.elasticsearch.core.bulk.BulkOperation;
+import com.quantori.cqp.api.MoleculesFingerprintCalculator;
 import com.quantori.cqp.api.model.upload.Molecule;
-import com.quantori.cqp.api.service.MoleculesFingerprintCalculator;
 import com.quantori.cqp.core.model.ItemWriter;
 import lombok.extern.slf4j.Slf4j;
 

cqp-storage-elasticsearch/src/main/java/com/quantori/cqp/storage/elasticsearch/ElasticsearchReactionUploader.java

@@ -2,10 +2,10 @@
 
 import co.elastic.clients.elasticsearch.ElasticsearchAsyncClient;
 import co.elastic.clients.elasticsearch.core.bulk.BulkOperation;
+import com.quantori.cqp.api.ReactionsFingerprintCalculator;
 import com.quantori.cqp.api.model.upload.Reaction;
 import com.quantori.cqp.api.model.upload.ReactionParticipant;
 import com.quantori.cqp.api.model.upload.ReactionUploadDocument;
-import com.quantori.cqp.api.service.ReactionsFingerprintCalculator;
 import com.quantori.cqp.core.model.ItemWriter;
 import lombok.extern.slf4j.Slf4j;
 

cqp-storage-elasticsearch/src/main/java/com/quantori/cqp/storage/elasticsearch/ElasticsearchStorageConfiguration.java

@@ -7,14 +7,14 @@
 import co.elastic.clients.transport.ElasticsearchTransport;
 import co.elastic.clients.transport.rest_client.RestClientTransport;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.quantori.cqp.api.MoleculesFingerprintCalculator;
+import com.quantori.cqp.api.MoleculesMatcher;
+import com.quantori.cqp.api.ReactionsFingerprintCalculator;
+import com.quantori.cqp.api.ReactionsMatcher;
 import com.quantori.cqp.api.StorageConfiguration;
-import com.quantori.cqp.api.service.MoleculesFingerprintCalculator;
-import com.quantori.cqp.api.service.MoleculesMatcher;
-import com.quantori.cqp.api.service.ReactionsFingerprintCalculator;
-import com.quantori.cqp.api.service.ReactionsMatcher;
-import com.quantori.cqp.api.service.StorageLibrary;
-import com.quantori.cqp.api.service.StorageMolecules;
-import com.quantori.cqp.api.service.StorageReactions;
+import com.quantori.cqp.api.StorageLibrary;
+import com.quantori.cqp.api.StorageMolecules;
+import com.quantori.cqp.api.StorageReactions;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpHost;

cqp-storage-elasticsearch/src/main/java/com/quantori/cqp/storage/elasticsearch/ElasticsearchStorageLibrary.java

@@ -14,10 +14,10 @@
 import co.elastic.clients.elasticsearch.core.search.Hit;
 import co.elastic.clients.transport.ElasticsearchTransport;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.quantori.cqp.api.StorageLibrary;
 import com.quantori.cqp.api.model.Library;
 import com.quantori.cqp.api.model.LibraryType;
 import com.quantori.cqp.api.model.Property;
-import com.quantori.cqp.api.service.StorageLibrary;
 import com.quantori.cqp.storage.elasticsearch.model.LibraryDocument;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.tuple.Pair;

cqp-storage-elasticsearch/src/main/java/com/quantori/cqp/storage/elasticsearch/ElasticsearchStorageMolecules.java

@@ -15,15 +15,15 @@
 import co.elastic.clients.elasticsearch.core.search.Hit;
 import co.elastic.clients.json.JsonData;
 import co.elastic.clients.transport.ElasticsearchTransport;
+import com.quantori.cqp.api.MoleculesFingerprintCalculator;
+import com.quantori.cqp.api.MoleculesMatcher;
+import com.quantori.cqp.api.StorageMolecules;
 import com.quantori.cqp.api.model.ConjunctionCriteria;
 import com.quantori.cqp.api.model.FieldCriteria;
 import com.quantori.cqp.api.model.Flattened;
 import com.quantori.cqp.api.model.Library;
 import com.quantori.cqp.api.model.Property;
 import com.quantori.cqp.api.model.upload.Molecule;
-import com.quantori.cqp.api.service.MoleculesFingerprintCalculator;
-import com.quantori.cqp.api.service.MoleculesMatcher;
-import com.quantori.cqp.api.service.StorageMolecules;
 import com.quantori.cqp.api.util.FingerPrintUtilities;
 import com.quantori.cqp.core.model.Criteria;
 import com.quantori.cqp.core.model.ExactParams;

cqp-storage-elasticsearch/src/main/java/com/quantori/cqp/storage/elasticsearch/ElasticsearchStorageReactions.java

@@ -7,12 +7,12 @@
 import co.elastic.clients.elasticsearch.core.SearchResponse;
 import co.elastic.clients.elasticsearch.core.search.Hit;
 import co.elastic.clients.transport.ElasticsearchTransport;
+import com.quantori.cqp.api.ReactionsFingerprintCalculator;
+import com.quantori.cqp.api.ReactionsMatcher;
+import com.quantori.cqp.api.StorageReactions;
 import com.quantori.cqp.api.model.Flattened;
 import com.quantori.cqp.api.model.Library;
 import com.quantori.cqp.api.model.upload.ReactionUploadDocument;
-import com.quantori.cqp.api.service.ReactionsFingerprintCalculator;
-import com.quantori.cqp.api.service.ReactionsMatcher;
-import com.quantori.cqp.api.service.StorageReactions;
 import com.quantori.cqp.api.util.FingerPrintUtilities;
 import com.quantori.cqp.core.model.ExactParams;
 import com.quantori.cqp.core.model.ItemWriter;

cqp-storage-elasticsearch/src/main/java/com/quantori/cqp/storage/elasticsearch/Mapper.java

@@ -1,5 +1,8 @@
 package com.quantori.cqp.storage.elasticsearch;
 
+import com.quantori.cqp.api.BaseFingerprintCalculator;
+import com.quantori.cqp.api.MoleculesFingerprintCalculator;
+import com.quantori.cqp.api.ReactionsFingerprintCalculator;
 import com.quantori.cqp.api.model.Flattened;
 import com.quantori.cqp.api.model.Library;
 import com.quantori.cqp.api.model.LibraryType;
@@ -8,9 +11,6 @@
 import com.quantori.cqp.api.model.upload.Molecule;
 import com.quantori.cqp.api.model.upload.Reaction;
 import com.quantori.cqp.api.model.upload.ReactionParticipant;
-import com.quantori.cqp.api.service.BaseFingerprintCalculator;
-import com.quantori.cqp.api.service.MoleculesFingerprintCalculator;
-import com.quantori.cqp.api.service.ReactionsFingerprintCalculator;
 import com.quantori.cqp.api.util.FingerPrintUtilities;
 import com.quantori.cqp.storage.elasticsearch.model.BasicMoleculeDocument;
 import com.quantori.cqp.storage.elasticsearch.model.LibraryDocument;