From 2eeab6b6ad60f8ac622c2f51716b73c3e76f7060 Mon Sep 17 00:00:00 2001 From: Marina Selivanova Date: Tue, 22 Apr 2025 20:46:00 +0200 Subject: [PATCH] update version of cqp-core and cqp-api --- cqp-storage-elasticsearch/build.gradle.kts | 6 +++--- .../elasticsearch/ElasticsearchStorageLibrary.java | 12 ++++++------ .../ElasticsearchStoragePropertiesMapping.java | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cqp-storage-elasticsearch/build.gradle.kts b/cqp-storage-elasticsearch/build.gradle.kts index eea6fcd..276dee8 100644 --- a/cqp-storage-elasticsearch/build.gradle.kts +++ b/cqp-storage-elasticsearch/build.gradle.kts @@ -6,7 +6,7 @@ plugins { group = "com.quantori" description = "Chem query platform. Storage Elasticsearch" -version = "0.0.11" +version = "0.0.12" tasks.named("javadoc") { exclude( @@ -16,8 +16,8 @@ tasks.named("javadoc") { } dependencies { - implementation("com.quantori:cqp-api:0.0.13") - implementation("com.quantori:cqp-core:0.0.10") + implementation("com.quantori:cqp-api:0.0.14") + implementation("com.quantori:cqp-core:0.0.13") implementation("co.elastic.clients:elasticsearch-java:8.6.2") implementation(libs.jackson) implementation(libs.jackson.jsr310) diff --git a/cqp-storage-elasticsearch/src/main/java/com/quantori/cqp/storage/elasticsearch/ElasticsearchStorageLibrary.java b/cqp-storage-elasticsearch/src/main/java/com/quantori/cqp/storage/elasticsearch/ElasticsearchStorageLibrary.java index dcbf0c5..01e51c5 100644 --- a/cqp-storage-elasticsearch/src/main/java/com/quantori/cqp/storage/elasticsearch/ElasticsearchStorageLibrary.java +++ b/cqp-storage-elasticsearch/src/main/java/com/quantori/cqp/storage/elasticsearch/ElasticsearchStorageLibrary.java @@ -111,8 +111,8 @@ Map> getPropertiesMapping(String[] libraryIds) { public Library createLibrary(String libraryName, LibraryType libraryType, Map propertiesMapping, Map serviceData) { var creatable = switch (libraryType) { - case MOLECULES -> moleculesAllocator; - case REACTIONS -> reactionsAllocator; + case molecules -> moleculesAllocator; + case reactions -> reactionsAllocator; default -> throw new ElasticsearchStorageException( "Not supported operation create library for library " + libraryName); }; @@ -277,8 +277,8 @@ public Map getDefaultServiceData() { @Override public boolean deleteLibrary(Library library) { - if (library.getType() != LibraryType.REACTIONS && - library.getType() != LibraryType.MOLECULES) { + if (library.getType() != LibraryType.reactions && + library.getType() != LibraryType.molecules) { throw new ElasticsearchStorageException("A library type must be molecule or reaction"); } @@ -288,8 +288,8 @@ public boolean deleteLibrary(Library library) { // delete library indexes for molecules / reactions if (deleted) { var removable = switch (library.getType()) { - case MOLECULES -> moleculesAllocator; - case REACTIONS -> reactionsAllocator; + case molecules -> moleculesAllocator; + case reactions -> reactionsAllocator; default -> throw new ElasticsearchStorageException( "Not supported operation remove library for library " + library.getId()); }; diff --git a/cqp-storage-elasticsearch/src/main/java/com/quantori/cqp/storage/elasticsearch/ElasticsearchStoragePropertiesMapping.java b/cqp-storage-elasticsearch/src/main/java/com/quantori/cqp/storage/elasticsearch/ElasticsearchStoragePropertiesMapping.java index bd95272..d057246 100644 --- a/cqp-storage-elasticsearch/src/main/java/com/quantori/cqp/storage/elasticsearch/ElasticsearchStoragePropertiesMapping.java +++ b/cqp-storage-elasticsearch/src/main/java/com/quantori/cqp/storage/elasticsearch/ElasticsearchStoragePropertiesMapping.java @@ -208,8 +208,8 @@ private OperationStatus createAndUpdatePropertiesMapping(String libraryId, Libra Map propertiesMapping) { Library library = Mapper.toLibrary(libraryId, libraryDocument); var updatable = switch (library.getType()) { - case MOLECULES -> moleculesAllocator; - case REACTIONS -> reactionsAllocator; + case molecules -> moleculesAllocator; + case reactions -> reactionsAllocator; default -> throw new ElasticsearchStorageException( "Not supported operation create library for library " + libraryDocument.getName()); };