Add fields API

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/Index.java

@@ -0,0 +1,13 @@
+package fr.codeanddata.semrack.core;
+
+import fr.codeanddata.semrack.core.models.IndexSearchResult;
+import fr.codeanddata.semrack.core.models.Search;
+import io.smallrye.mutiny.Uni;
+
+public interface Index {
+  Uni<Long> count(Search request);
+  Uni<Boolean> exist(Search query);
+  Uni<Void> index(String documentId);
+  Uni<IndexSearchResult> search(Search search);
+  Uni<Void> clear(String documentId);
+}

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/LookupExpression.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.enterprise.inject.spi.CDI;
 
-public interface SemrackLookupExpression<T> {
+public interface LookupExpression<T> {
   String apply(Object params);
 
   default T convert(Object params) {

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/ReadInterceptor.java

@@ -0,0 +1,8 @@
+package fr.codeanddata.semrack.core;
+
+import fr.codeanddata.semrack.core.models.ReadContext;
+import io.smallrye.mutiny.Uni;
+
+public interface ReadInterceptor {
+  Uni<Void> interceptSemdocRead(ReadContext context);
+}

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/SearchInterceptor.java

@@ -0,0 +1,8 @@
+package fr.codeanddata.semrack.core;
+
+import fr.codeanddata.semrack.core.models.SearchContext;
+import io.smallrye.mutiny.Uni;
+
+public interface SearchInterceptor {
+  Uni<Void> interceptSemdocSearch(SearchContext context);
+}

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/SemdocIndex.java

@@ -1,13 +0,0 @@
-package fr.codeanddata.semrack.core;
-
-import fr.codeanddata.semrack.core.models.IndexSearchResult;
-import fr.codeanddata.semrack.core.models.SearchRequest;
-import io.smallrye.mutiny.Uni;
-
-public interface SemdocIndex {
-  Uni<Long> count(SearchRequest request);
-  Uni<Boolean> exist(SearchRequest query);
-  Uni<Void> index(String documentId);
-  Uni<IndexSearchResult> search(SearchRequest searchRequest);
-  Uni<Void> clear(String documentId);
-}

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/SemdocReadInterceptor.java

@@ -1,8 +0,0 @@
-package fr.codeanddata.semrack.core;
-
-import fr.codeanddata.semrack.core.models.SemdocReadContext;
-import io.smallrye.mutiny.Uni;
-
-public interface SemdocReadInterceptor {
-  Uni<Void> interceptSemdocRead(SemdocReadContext context);
-}

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/SemdocSearchInterceptor.java

@@ -1,8 +0,0 @@
-package fr.codeanddata.semrack.core;
-
-import fr.codeanddata.semrack.core.models.SemdocSearchContext;
-import io.smallrye.mutiny.Uni;
-
-public interface SemdocSearchInterceptor {
-  Uni<Void> interceptSemdocSearch(SemdocSearchContext context);
-}

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/SemdocStorage.java

@@ -1,12 +0,0 @@
-package fr.codeanddata.semrack.core;
-
-import fr.codeanddata.semrack.core.models.SemrackDocument;
-import io.smallrye.mutiny.Uni;
-
-import java.util.List;
-
-public interface SemdocStorage {
-  Uni<SemrackDocument> get(String uid);
-  Uni<List<SemrackDocument>> get(List<String> uids);
-  Uni<SemrackDocument> storeDocument(SemrackDocument document);
-}

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/SemdocWriteInterceptor.java

@@ -1,8 +0,0 @@
-package fr.codeanddata.semrack.core;
-
-import fr.codeanddata.semrack.core.models.SemdocWriteContext;
-import io.smallrye.mutiny.Uni;
-
-public interface SemdocWriteInterceptor {
-  Uni<Void> interceptSemdocWrite(SemdocWriteContext context);
-}

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/Storage.java

@@ -0,0 +1,13 @@
+package fr.codeanddata.semrack.core;
+
+import fr.codeanddata.semrack.core.models.Document;
+import fr.codeanddata.semrack.core.models.StorageGet;
+import io.smallrye.mutiny.Uni;
+
+import java.util.List;
+
+public interface Storage {
+  Uni<Document> get(String uid, StorageGet request);
+  Uni<List<Document>> get(List<String> uids, StorageGet request);
+  Uni<Document> storeDocument(Document document);
+}

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/WriteInterceptor.java

@@ -0,0 +1,8 @@
+package fr.codeanddata.semrack.core;
+
+import fr.codeanddata.semrack.core.models.WriteContext;
+import io.smallrye.mutiny.Uni;
+
+public interface WriteInterceptor {
+  Uni<Void> interceptSemdocWrite(WriteContext context);
+}

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/enums/SortDirection.java

@@ -1,5 +1,5 @@
 package fr.codeanddata.semrack.core.enums;
 
-public enum SemrackSortDirection {
+public enum SortDirection {
   asc, desc
 }

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/interceptors/AnnotateWriteInterceptor.java

@@ -2,8 +2,8 @@ package fr.codeanddata.semrack.core.interceptors;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import fr.codeanddata.semrack.core.SemdocWriteInterceptor;
-import fr.codeanddata.semrack.core.models.SemdocWriteContext;
+import fr.codeanddata.semrack.core.WriteInterceptor;
+import fr.codeanddata.semrack.core.models.WriteContext;
 import io.smallrye.mutiny.Uni;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
@@ -11,7 +11,7 @@ import jakarta.inject.Inject;
 import java.util.Map;
 
 @ApplicationScoped
-public class AnnotateWriteInterceptor implements SemdocWriteInterceptor {
+public class AnnotateWriteInterceptor implements WriteInterceptor {
 
   public static final String ANNOTATE_KEY = "annotate";
   public static final String CUSTOM_PREFIX = "custom/";
@@ -20,7 +20,7 @@ public class AnnotateWriteInterceptor implements SemdocWriteInterceptor {
   ObjectMapper objectMapper;
 
   @Override
-  public Uni<Void> interceptSemdocWrite(SemdocWriteContext context) {
+  public Uni<Void> interceptSemdocWrite(WriteContext context) {
     final Map<String, Object> directives = context.getDirectives();
 
     if (directives.containsKey(ANNOTATE_KEY)) {

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/interceptors/PublishWriteInterceptor.java

@@ -1,8 +1,8 @@
 package fr.codeanddata.semrack.core.interceptors;
 
-import fr.codeanddata.semrack.core.SemdocWriteInterceptor;
-import fr.codeanddata.semrack.core.models.SemdocWriteContext;
-import fr.codeanddata.semrack.core.models.SemrackDocument;
+import fr.codeanddata.semrack.core.WriteInterceptor;
+import fr.codeanddata.semrack.core.models.WriteContext;
+import fr.codeanddata.semrack.core.models.Document;
 import fr.codeanddata.semrack.core.utils.UIDGenerator;
 import io.smallrye.mutiny.Uni;
 import jakarta.enterprise.context.ApplicationScoped;
@@ -12,7 +12,7 @@ import java.util.Map;
 import java.util.Optional;
 
 @ApplicationScoped
-public class PublishWriteInterceptor implements SemdocWriteInterceptor {
+public class PublishWriteInterceptor implements WriteInterceptor {
 
   final String PUBLICATION_PREFIX = "publication/";
 
@@ -20,18 +20,18 @@ public class PublishWriteInterceptor implements SemdocWriteInterceptor {
   UIDGenerator uidGenerator;
 
   @Override
-  public Uni<Void> interceptSemdocWrite(SemdocWriteContext context) {
+  public Uni<Void> interceptSemdocWrite(WriteContext context) {
     final Map<String, Object> directives = context.getDirectives();
-    final SemrackDocument current = context.getCurrentDocument();
-    final SemrackDocument next = context.getNextDocument();
+    final Document current = context.getCurrentDocument();
+    final Document next = context.getNextDocument();
 
     int version = (int) Optional.ofNullable(current)
-      .map(SemrackDocument::getAnnotations)
+      .map(Document::getAnnotations)
       .map(annotations -> annotations.getOrDefault(PUBLICATION_PREFIX + "version", 0))
       .orElse(0);
 
     next.getAnnotations().put(PUBLICATION_PREFIX + "reference", Optional.ofNullable(current)
-      .map(SemrackDocument::getAnnotations)
+      .map(Document::getAnnotations)
       .map(annotations -> annotations.getOrDefault(PUBLICATION_PREFIX + "reference", next.getUid()))
       .orElse(next.getUid()));
 

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/mappers/DocumentMapper.java

@@ -1,14 +1,14 @@
 package fr.codeanddata.semrack.core.mappers;
 
-import fr.codeanddata.semrack.core.models.SemrackDocument;
-import fr.codeanddata.semrack.core.models.PushDocumentRequest;
+import fr.codeanddata.semrack.core.models.Document;
+import fr.codeanddata.semrack.core.models.PushDocument;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.MappingConstants;
 
 @Mapper(componentModel = MappingConstants.ComponentModel.CDI)
-public abstract class SemrackDocumentMapper {
+public abstract class DocumentMapper {
   @Mapping(source = "uid", target = "uid")
   @Mapping(source = "metadata", target = "metadata")
-  abstract SemrackDocument toDocument(PushDocumentRequest document);
+  abstract Document toDocument(PushDocument document);
 }

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/models/Document.java

@@ -11,7 +11,7 @@ import java.util.Map;
 @AllArgsConstructor
 @NoArgsConstructor
 @RegisterForReflection(serialization = true)
-public class SemrackDocument {
+public class Document {
 
   /**
    * L'identifiant unique du document.
@@ -29,4 +29,8 @@ public class SemrackDocument {
    */
   Map<String, Object> metadata;
 
+  /**
+   *
+   */
+  Map<String, Object> fields;
 }

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/models/Pagination.java

@@ -7,7 +7,7 @@ import lombok.*;
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-public class SemrackPagination {
+public class Pagination {
   Integer page;
   Integer size;
 }

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/models/PushDocument.java

@@ -9,7 +9,7 @@ import java.util.Map;
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-public class PushDocumentRequest {
+public class PushDocument {
   /**
    * L'identifiant unique du document.
    */

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/models/ReadContext.java

@@ -2,15 +2,11 @@ package fr.codeanddata.semrack.core.models;
 
 import lombok.*;
 
-import java.util.Map;
-
 @Getter
 @Setter
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class SemdocReadContext {
-
-  SemrackDocument currentDocument;
-
+public class ReadContext {
+  Document currentDocument;
 }

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/models/Search.java

@@ -10,9 +10,11 @@ import java.util.Map;
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-public class SearchRequest {
+public class Search {
   Map<String, Object> filter;
-  List<SemrackSort> sort;
-  SemrackPagination paginate;
-  List<String> fields;
+  List<Sort> sort;
+  Pagination paginate;
+  Boolean annotations;
+  Boolean metadata;
+  Map<String, String> fields;
 }

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/models/SearchContext.java

@@ -9,7 +9,7 @@ import java.util.Map;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class SemdocSearchContext {
+public class SearchContext {
 
   Map<String, Object> search;
 }

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/models/SearchResult.java

@@ -10,6 +10,6 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 public class SearchResult {
-  List<SemrackDocument> documents;
+  List<Document> documents;
   PaginationInfo pagination;
 }

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/models/Sort.java

@@ -1,6 +1,6 @@
 package fr.codeanddata.semrack.core.models;
 
-import fr.codeanddata.semrack.core.enums.SemrackSortDirection;
+import fr.codeanddata.semrack.core.enums.SortDirection;
 import lombok.*;
 
 @Getter
@@ -8,7 +8,7 @@ import lombok.*;
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-public class SemrackSort {
+public class Sort {
   String field;
-  SemrackSortDirection direction;
+  SortDirection direction;
 }

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/models/StorageGet.java

@@ -0,0 +1,16 @@
+package fr.codeanddata.semrack.core.models;
+
+import lombok.*;
+
+import java.util.Map;
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class StorageGet {
+  Boolean metadataSource;
+  Boolean annotationsSource;
+  Map<String, String> fields;
+}

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/models/WriteContext.java

@@ -9,19 +9,19 @@ import java.util.Map;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class SemdocWriteContext {
+public class WriteContext {
 
   /**
    * Previous stored document
    */
-  SemrackDocument currentDocument;
+  Document currentDocument;
 
   /**
    * Document to be store. It initialized with :
    * - the currentDocument uid if exists, or a new one
    * - the metadata to be persisted
    */
-  SemrackDocument nextDocument;
+  Document nextDocument;
 
   /**
    * The directives to be applied

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/repositories/DocumentRepository.java

@@ -1,9 +1,9 @@
 package fr.codeanddata.semrack.core.repositories;
 
-import fr.codeanddata.semrack.core.SemdocWriteInterceptor;
+import fr.codeanddata.semrack.core.WriteInterceptor;
 import fr.codeanddata.semrack.core.exceptions.SemrackRuntimeException;
 import fr.codeanddata.semrack.core.models.*;
-import fr.codeanddata.semrack.core.storages.SemdocStorageProxy;
+import fr.codeanddata.semrack.core.storages.StorageProxy;
 import fr.codeanddata.semrack.core.utils.UIDGenerator;
 import io.smallrye.mutiny.Uni;
 import jakarta.enterprise.context.ApplicationScoped;
@@ -16,35 +16,43 @@ import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 
 @ApplicationScoped
-public class SemdocRepository {
+public class DocumentRepository {
 
   @Inject
-  SemdocStorageProxy semdocStorage;
+  StorageProxy semdocStorage;
 
   @Inject
   @Any
-  Instance<SemdocWriteInterceptor> writeInterceptors;
+  Instance<WriteInterceptor> writeInterceptors;
 
   @Inject
   UIDGenerator uidGenerator;
 
-  public Uni<SearchResult> searchDocument(SearchRequest query) {
+  public Uni<SearchResult> searchDocument(Search query) {
     return semdocStorage.searchDocument(query);
   }
 
-  public Uni<SemrackDocument> get(String documentId) {
-    return semdocStorage.readDocument(documentId);
+  public Uni<Document> get(String documentId) {
+    return get(documentId, StorageGet.builder().build());
   }
 
-  public Uni<SemrackDocument> pushDocument(PushDocumentRequest pushDocument) {
-    return Optional.ofNullable(pushDocument.getUid()).map(semdocStorage::readDocument).orElse(Uni.createFrom().nullItem())
+  public Uni<Document> get(String documentId, StorageGet request) {
+    return semdocStorage.readDocument(documentId, request);
+  }
+
+  public Uni<Document> pushDocument(PushDocument pushDocument) {
+    return Optional.ofNullable(pushDocument.getUid()).map(uid -> semdocStorage.readDocument(uid, StorageGet.builder()
+        .annotationsSource(true)
+        .metadataSource(true)
+        .build()))
+      .orElse(Uni.createFrom().nullItem())
       .chain(currentDocument -> {
 
-        final SemdocWriteContext context = SemdocWriteContext.builder()
+        final WriteContext context = WriteContext.builder()
           .directives(pushDocument.getDirectives())
           .currentDocument(currentDocument)
-          .nextDocument(SemrackDocument.builder()
-            .uid(Optional.ofNullable(currentDocument).map(SemrackDocument::getUid).orElse(uidGenerator.apply(null)))
+          .nextDocument(Document.builder()
+            .uid(Optional.ofNullable(currentDocument).map(Document::getUid).orElse(uidGenerator.apply(null)))
             .metadata(pushDocument.getMetadata())
             .annotations(new HashMap<>())
             .build())
@@ -57,7 +65,7 @@ public class SemdocRepository {
       });
   }
 
-  public Uni<SemrackDocument> getOrCreate(SearchRequest query, PushDocumentRequest toCreate) {
+  public Uni<Document> getOrCreate(Search query, PushDocument toCreate) {
     return searchDocument(query)
       .chain(searchResult -> {
         if (searchResult.getDocuments().isEmpty()) {

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/services/IndexService.java

@@ -0,0 +1,35 @@
+package fr.codeanddata.semrack.core.services;
+
+import fr.codeanddata.semrack.core.Index;
+import fr.codeanddata.semrack.core.models.IndexSearchResult;
+import fr.codeanddata.semrack.core.models.Search;
+import io.smallrye.mutiny.Uni;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
+@ApplicationScoped
+public class IndexService {
+
+  @Inject
+  Index index;
+
+  public Uni<Void> index(String documentId) {
+    return index.index(documentId);
+  }
+
+  public Uni<IndexSearchResult> search(Search search) {
+    return index.search(search);
+  }
+
+  public Uni<Long> count(Search request) {
+    return index.count(request);
+  }
+
+  public Uni<Boolean> exist(Search query) {
+    return index.exist(query);
+  }
+
+  public Uni<Void> clear(String documentId) {
+    return index.clear(documentId);
+  }
+}

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/services/LookupService.java

@@ -1,6 +1,6 @@
 package fr.codeanddata.semrack.core.services;
 
-import fr.codeanddata.semrack.core.SemrackLookupExpression;
+import fr.codeanddata.semrack.core.LookupExpression;
 import io.quarkus.runtime.StartupEvent;
 import io.smallrye.common.annotation.Identifier;
 import jakarta.enterprise.context.ApplicationScoped;
@@ -14,13 +14,13 @@ import java.util.Map;
 import java.util.Set;
 
 @ApplicationScoped
-public class SemrackLookupService {
+public class LookupService {
 
   @Inject
   @Any
-  Instance<SemrackLookupExpression<?>> operators;
+  Instance<LookupExpression<?>> operators;
 
-  final Map<String, SemrackLookupExpression<?>> operatorsIndex = new HashMap<>();
+  final Map<String, LookupExpression<?>> operatorsIndex = new HashMap<>();
 
   void startup(@Observes StartupEvent event) {
     operators.stream()
@@ -42,7 +42,7 @@ public class SemrackLookupService {
       if (! operatorsIndex.containsKey(lookupKey)) {
         throw new RuntimeException("Unknown lookup expression '" + lookupKey + "'");
       } else {
-        final SemrackLookupExpression<?> lookup = operatorsIndex.get(lookupKey);
+        final LookupExpression<?> lookup = operatorsIndex.get(lookupKey);
         final Object lookupParams = lookupExpression.get(lookupKey);
         return lookup.apply(lookupParams);
       }

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/services/SemrackIndexService.java

@@ -1,35 +0,0 @@
-package fr.codeanddata.semrack.core.services;
-
-import fr.codeanddata.semrack.core.SemdocIndex;
-import fr.codeanddata.semrack.core.models.IndexSearchResult;
-import fr.codeanddata.semrack.core.models.SearchRequest;
-import io.smallrye.mutiny.Uni;
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
-@ApplicationScoped
-public class SemrackIndexService {
-
-  @Inject
-  SemdocIndex semdocIndex;
-
-  public Uni<Void> index(String documentId) {
-    return semdocIndex.index(documentId);
-  }
-
-  public Uni<IndexSearchResult> search(SearchRequest searchRequest) {
-    return semdocIndex.search(searchRequest);
-  }
-
-  public Uni<Long> count(SearchRequest request) {
-    return semdocIndex.count(request);
-  }
-
-  public Uni<Boolean> exist(SearchRequest query) {
-    return semdocIndex.exist(query);
-  }
-
-  public Uni<Void> clear(String documentId) {
-    return semdocIndex.clear(documentId);
-  }
-}

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/storages/SemdocStorageProxy.java

@@ -1,46 +0,0 @@
-package fr.codeanddata.semrack.core.storages;
-
-import fr.codeanddata.semrack.core.SemdocIndex;
-import fr.codeanddata.semrack.core.SemdocStorage;
-import fr.codeanddata.semrack.core.models.SearchRequest;
-import fr.codeanddata.semrack.core.models.SearchResult;
-import fr.codeanddata.semrack.core.models.SemrackDocument;
-import io.smallrye.mutiny.Uni;
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
-@ApplicationScoped
-public class SemdocStorageProxy {
-
-  @Inject
-  SemdocStorage storage;
-
-  @Inject
-  SemdocIndex index;
-
-  public Uni<SemrackDocument> readDocument(String uid) {
-    return storage.get(uid);
-  }
-
-  public Uni<SearchResult> searchDocument(SearchRequest query) {
-    return index.search(query)
-      .chain(searchResult -> storage.get(searchResult.getUids())
-        .map(documents -> SearchResult.builder()
-          .documents(documents)
-          .pagination(searchResult.getPagination())
-          .build()));
-  }
-
-  public Uni<Long> countDocuments(SearchRequest request) {
-    return index.count(request);
-  }
-
-  public Uni<Boolean> documentsExist(SearchRequest query) {
-    return index.exist(query);
-  }
-
-  public Uni<SemrackDocument> storeDocument(SemrackDocument document) {
-    return storage.storeDocument(document)
-      .call(x -> index.index(x.getUid()));
-  }
-}

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/storages/StorageProxy.java

@@ -0,0 +1,55 @@
+package fr.codeanddata.semrack.core.storages;
+
+import fr.codeanddata.semrack.core.Index;
+import fr.codeanddata.semrack.core.Storage;
+import fr.codeanddata.semrack.core.models.Search;
+import fr.codeanddata.semrack.core.models.SearchResult;
+import fr.codeanddata.semrack.core.models.Document;
+import fr.codeanddata.semrack.core.models.StorageGet;
+import io.smallrye.mutiny.Uni;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
+@ApplicationScoped
+public class StorageProxy {
+
+  @Inject
+  Storage storage;
+
+  @Inject
+  Index index;
+
+  public Uni<Document> readDocument(String uid) {
+    return readDocument(uid, StorageGet.builder().build());
+  }
+
+  public Uni<Document> readDocument(String uid, StorageGet request) {
+    return storage.get(uid, request);
+  }
+
+  public Uni<SearchResult> searchDocument(Search query) {
+    return index.search(query)
+      .chain(searchResult -> storage.get(searchResult.getUids(), StorageGet.builder()
+          .annotationsSource(query.getAnnotations())
+          .metadataSource(query.getMetadata())
+          .fields(query.getFields())
+          .build())
+        .map(documents -> SearchResult.builder()
+          .documents(documents)
+          .pagination(searchResult.getPagination())
+          .build()));
+  }
+
+  public Uni<Long> countDocuments(Search request) {
+    return index.count(request);
+  }
+
+  public Uni<Boolean> documentsExist(Search query) {
+    return index.exist(query);
+  }
+
+  public Uni<Document> storeDocument(Document document) {
+    return storage.storeDocument(document)
+      .call(x -> index.index(x.getUid()));
+  }
+}

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/utils/DocumentUtils.java

@@ -8,7 +8,7 @@ import jakarta.inject.Inject;
 import java.util.Map;
 
 @ApplicationScoped
-public class SemdocUtils {
+public class DocumentUtils {
   @Inject
   ObjectMapper objectMapper;
 

modules/semrack-core/runtime/src/main/java/fr/codeanddata/semrack/core/utils/UIDGenerator.java

@@ -1,6 +1,6 @@
 package fr.codeanddata.semrack.core.utils;
 
-import fr.codeanddata.semrack.core.models.SemrackDocument;
+import fr.codeanddata.semrack.core.models.Document;
 import jakarta.enterprise.context.ApplicationScoped;
 import org.apache.commons.codec.digest.DigestUtils;
 
@@ -10,10 +10,10 @@ import java.util.UUID;
 import java.util.function.Function;
 
 @ApplicationScoped
-public class UIDGenerator implements Function<SemrackDocument, String> {
+public class UIDGenerator implements Function<Document, String> {
 
   @Override
-  public String apply(SemrackDocument semrackDocument) {
+  public String apply(Document document) {
     final String uuid = UUID.randomUUID().toString();
     final LocalDateTime now = LocalDateTime.now();
     final long timestamp = now.toInstant(ZoneOffset.UTC).toEpochMilli();