test + prod docker compose

Author: Croway

core/core-persistence/core-persistence-api/src/main/java/ai/wanaku/core/persistence/WanakuMarshallerService.java

@@ -4,6 +4,8 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Default;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -12,6 +14,8 @@
  * Service class responsible for marshalling and unmarshalling objects to and from JSON format.
  * This class provides functionality to convert Java objects to JSON strings and vice versa.
  */
+@ApplicationScoped
+@Default
 public class WanakuMarshallerService {
 
     private ObjectMapper mapper;

core/core-persistence/core-persistence-api/src/main/java/ai/wanaku/core/persistence/api/ServiceRepository.java

@@ -3,17 +3,16 @@
 import ai.wanaku.core.mcp.providers.ServiceRegistry;
 import ai.wanaku.core.persistence.WanakuMarshallerService;
 import ai.wanaku.core.persistence.api.ResourceReferenceRepository;
-import ai.wanaku.core.persistence.api.ServiceRepository;
 import ai.wanaku.core.persistence.api.ToolReferenceRepository;
 import io.quarkus.arc.DefaultBean;
+import io.quarkus.arc.lookup.LookupUnlessProperty;
 import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Default;
 import jakarta.enterprise.inject.Produces;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
 import java.nio.file.Path;
 
-@ApplicationScoped
 public class FilePersistenceConfiguration {
 
     @ConfigProperty(name = "wanaku.persistence.file.base-folder", defaultValue = "${user.home}/.wanaku/router/")
@@ -28,27 +27,21 @@ public class FilePersistenceConfiguration {
     @ConfigProperty(name = "wanaku.persistence.file.services", defaultValue = "targets.json")
     String servicesFileName;
 
-    @DefaultBean
+    @LookupUnlessProperty(name = "wanaku.persistence", stringValue = "mongodb", lookupIfMissing = true)
     @Produces
     ResourceReferenceRepository resourceReferenceRepository() {
         return new FileResourceReferenceRepository(new WanakuMarshallerService(), Path.of(
                 baseFolder.replace("${user.home}", System.getProperty("user.home")), resourceReferenceFileName));
     }
 
-    @DefaultBean
+    @LookupUnlessProperty(name = "wanaku.persistence", stringValue = "mongodb", lookupIfMissing = true)
     @Produces
     ToolReferenceRepository toolReferenceRepository() {
         return new FileToolReferenceRepository(new WanakuMarshallerService(), Path.of(
                 baseFolder.replace("${user.home}", System.getProperty("user.home")), toolReferenceFileName));
     }
 
-    @DefaultBean
-    @Produces
-    ServiceRepository serviceRepository() {
-        return new FileServiceRepository(new WanakuMarshallerService(), Path.of(
-                baseFolder.replace("${user.home}", System.getProperty("user.home")), servicesFileName));
-    }
-
+    @LookupUnlessProperty(name = "wanaku.service.persistence", stringValue = "valkey", lookupIfMissing = true)
     @DefaultBean
     @Produces
     ServiceRegistry serviceRegistry() {

core/core-persistence/core-persistence-api/src/main/java/ai/wanaku/core/persistence/types/ConfigurationEntity.java

@@ -3,6 +3,7 @@
 import ai.wanaku.api.types.ResourceReference;
 import ai.wanaku.core.persistence.api.ResourceReferenceRepository;
 import io.quarkus.test.junit.QuarkusTest;
+import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.junit.jupiter.api.Assertions;
@@ -22,7 +23,7 @@
 public class ResourceReferenceTest {
 
     @Inject
-    ResourceReferenceRepository resourceReferenceRepository;
+    Instance<ResourceReferenceRepository> resourceReferenceRepository;
 
     private static Path path;
 
@@ -56,7 +57,7 @@ public void insertThreeFiles() {
             param2.setValue("value2" + i);
 
             resourceReference.setParams(List.of(param1, param2));
-            resourceReferenceRepository.persist(resourceReference);
+            resourceReferenceRepository.get().persist(resourceReference);
         }
 
         Assertions.assertTrue(Files.exists(path));
@@ -65,7 +66,7 @@ public void insertThreeFiles() {
     @Test
     @Order(2)
     public void list() {
-        List<ResourceReference> entities = resourceReferenceRepository.listAll();
+        List<ResourceReference> entities = resourceReferenceRepository.get().listAll();
 
         Assertions.assertTrue(entities.size() == 3);
         Assertions.assertTrue(entities.get(0).getName().equals("name1"));
@@ -74,25 +75,25 @@ public void list() {
     @Test
     @Order(3)
     public void find() {
-        ResourceReference model = resourceReferenceRepository.findById("name1");
+        ResourceReference model = resourceReferenceRepository.get().findById("name1");
 
         Assertions.assertNotNull(model);
     }
 
     @Test
     @Order(4)
     public void findNonExistent() {
-        Assertions.assertNull(resourceReferenceRepository.findById("nameNotExists"));
+        Assertions.assertNull(resourceReferenceRepository.get().findById("nameNotExists"));
     }
 
     @Test
     @Order(5)
     public void delete() {
-        int initialSize = resourceReferenceRepository.listAll().size();
+        int initialSize = resourceReferenceRepository.get().listAll().size();
 
-        resourceReferenceRepository.deleteById("name2");
+        resourceReferenceRepository.get().deleteById("name2");
 
-        int finalSize = resourceReferenceRepository.listAll().size();
+        int finalSize = resourceReferenceRepository.get().listAll().size();
 
         Assertions.assertTrue(finalSize < initialSize);
     }