This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit fa89538733e1febb27df3daed3486386e8a09d12
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Tue Feb 13 13:22:57 2024 -0500
Start Hazelcast in blocking thread
---
.../camel/karavan/api/ContainerResource.java | 4 +--
.../apache/camel/karavan/api/DevModeResource.java | 4 +--
.../camel/karavan/api/InfrastructureResource.java | 4 +--
.../apache/camel/karavan/api/KameletResources.java | 4 +--
.../camel/karavan/api/ProjectFileResource.java | 4 +--
.../camel/karavan/api/ProjectGitResource.java | 2 --
.../apache/camel/karavan/api/ProjectResource.java | 8 +++---
.../apache/camel/karavan/api/StatusResource.java | 6 ++---
.../camel/karavan/cache/KaravanCacheService.java | 30 +++++++++++++---------
.../org/apache/camel/karavan/code/CodeService.java | 6 ++---
.../camel/karavan/code/DockerComposeConverter.java | 4 +--
.../camel/karavan/docker/DockerEventListener.java | 2 +-
.../camel/karavan/docker/DockerForGitea.java | 2 +-
.../camel/karavan/docker/DockerForKaravan.java | 4 +--
.../camel/karavan/docker/DockerForRegistry.java | 2 +-
.../apache/camel/karavan/docker/DockerService.java | 4 +--
.../camel/karavan/docker/DockerServiceUtils.java | 6 ++---
.../org/apache/camel/karavan/git/GitService.java | 4 +--
.../karavan/kubernetes/DeploymentEventHandler.java | 2 +-
.../karavan/kubernetes/KubernetesService.java | 4 +--
.../camel/karavan/kubernetes/PodEventHandler.java | 2 +-
.../karavan/kubernetes/ServiceEventHandler.java | 2 +-
.../karavan/{cache => }/model/CamelStatus.java | 2 +-
.../{cache => }/model/CamelStatusValue.java | 2 +-
.../karavan/{cache => }/model/ContainerPort.java | 2 +-
.../karavan/{cache => }/model/ContainerStatus.java | 2 +-
.../{cache => }/model/DeploymentStatus.java | 2 +-
.../karavan/{code => }/model/DockerCompose.java | 3 +--
.../{code => }/model/DockerComposeHealthCheck.java | 2 +-
.../{code => }/model/DockerComposeNetwork.java | 2 +-
.../{code => }/model/DockerComposeService.java | 2 +-
.../karavan/{cache => }/model/GroupedKey.java | 2 +-
.../camel/karavan/{cache => }/model/Project.java | 2 +-
.../karavan/{cache => }/model/ProjectFile.java | 2 +-
.../karavan/{cache => }/model/ServiceStatus.java | 2 +-
.../apache/camel/karavan/service/CamelService.java | 6 ++---
.../karavan/service/ContainerStatusService.java | 2 +-
.../camel/karavan/service/ProjectService.java | 10 ++++----
.../project/ProjectFileCreateValidator.java | 2 +-
.../validation/project/ProjectModifyValidator.java | 2 +-
40 files changed, 81 insertions(+), 78 deletions(-)
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ContainerResource.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ContainerResource.java
index 1ad6fd5b..5b7e8b3a 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ContainerResource.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ContainerResource.java
@@ -25,9 +25,9 @@ import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import org.apache.camel.karavan.cache.KaravanCacheService;
-import org.apache.camel.karavan.cache.model.ContainerStatus;
+import org.apache.camel.karavan.model.ContainerStatus;
import org.apache.camel.karavan.code.DockerComposeConverter;
-import org.apache.camel.karavan.code.model.DockerComposeService;
+import org.apache.camel.karavan.model.DockerComposeService;
import org.apache.camel.karavan.docker.DockerService;
import org.apache.camel.karavan.kubernetes.KubernetesService;
import org.apache.camel.karavan.service.ConfigService;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/DevModeResource.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/DevModeResource.java
index 226cc894..ecde5aae 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/DevModeResource.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/DevModeResource.java
@@ -23,8 +23,8 @@ import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import org.apache.camel.karavan.cache.KaravanCacheService;
-import org.apache.camel.karavan.cache.model.ContainerStatus;
-import org.apache.camel.karavan.cache.model.Project;
+import org.apache.camel.karavan.model.ContainerStatus;
+import org.apache.camel.karavan.model.Project;
import org.apache.camel.karavan.docker.DockerService;
import org.apache.camel.karavan.kubernetes.KubernetesService;
import org.apache.camel.karavan.service.CamelService;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/InfrastructureResource.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/InfrastructureResource.java
index a456120e..832ec968 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/InfrastructureResource.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/InfrastructureResource.java
@@ -21,8 +21,8 @@ import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import org.apache.camel.karavan.cache.KaravanCacheService;
-import org.apache.camel.karavan.cache.model.DeploymentStatus;
-import org.apache.camel.karavan.cache.model.ServiceStatus;
+import org.apache.camel.karavan.model.DeploymentStatus;
+import org.apache.camel.karavan.model.ServiceStatus;
import org.apache.camel.karavan.kubernetes.KubernetesService;
import org.apache.camel.karavan.service.ConfigService;
import org.eclipse.microprofile.config.inject.ConfigProperty;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/KameletResources.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/KameletResources.java
index 39552860..3e1cc8e0 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/KameletResources.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/KameletResources.java
@@ -22,8 +22,8 @@ import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import org.apache.camel.karavan.cache.KaravanCacheService;
-import org.apache.camel.karavan.cache.model.Project;
-import org.apache.camel.karavan.cache.model.ProjectFile;
+import org.apache.camel.karavan.model.Project;
+import org.apache.camel.karavan.model.ProjectFile;
import org.apache.camel.karavan.code.CodeService;
import org.yaml.snakeyaml.Yaml;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectFileResource.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectFileResource.java
index 8f5b5322..aa513cbb 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectFileResource.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectFileResource.java
@@ -21,8 +21,8 @@ import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import org.apache.camel.karavan.code.CodeService;
import org.apache.camel.karavan.cache.KaravanCacheService;
-import org.apache.camel.karavan.cache.model.Project;
-import org.apache.camel.karavan.cache.model.ProjectFile;
+import org.apache.camel.karavan.model.Project;
+import org.apache.camel.karavan.model.ProjectFile;
import org.apache.camel.karavan.validation.project.ProjectFileCreateValidator;
import java.net.URLDecoder;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectGitResource.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectGitResource.java
index b617f7b0..871c700b 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectGitResource.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectGitResource.java
@@ -22,12 +22,10 @@ import jakarta.inject.Inject;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
-import org.apache.camel.karavan.cache.model.Project;
import org.apache.camel.karavan.service.ProjectService;
import org.jboss.logging.Logger;
import java.util.HashMap;
-import java.util.Map;
import static org.apache.camel.karavan.service.ProjectService.PUSH_PROJECT;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectResource.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectResource.java
index 08ab2132..092745de 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectResource.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectResource.java
@@ -23,10 +23,10 @@ import jakarta.ws.rs.core.Response;
import org.apache.camel.karavan.docker.DockerService;
import org.apache.camel.karavan.git.GitService;
import org.apache.camel.karavan.cache.KaravanCacheService;
-import org.apache.camel.karavan.cache.model.CamelStatus;
-import org.apache.camel.karavan.cache.model.CamelStatusValue;
-import org.apache.camel.karavan.cache.model.ContainerStatus;
-import org.apache.camel.karavan.cache.model.Project;
+import org.apache.camel.karavan.model.CamelStatus;
+import org.apache.camel.karavan.model.CamelStatusValue;
+import org.apache.camel.karavan.model.ContainerStatus;
+import org.apache.camel.karavan.model.Project;
import org.apache.camel.karavan.kubernetes.KubernetesService;
import org.apache.camel.karavan.service.ConfigService;
import org.apache.camel.karavan.service.ProjectService;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/StatusResource.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/StatusResource.java
index a7b5867c..4d40b350 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/StatusResource.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/StatusResource.java
@@ -21,9 +21,9 @@ import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import org.apache.camel.karavan.cache.KaravanCacheService;
-import org.apache.camel.karavan.cache.model.CamelStatus;
-import org.apache.camel.karavan.cache.model.CamelStatusValue;
-import org.apache.camel.karavan.cache.model.DeploymentStatus;
+import org.apache.camel.karavan.model.CamelStatus;
+import org.apache.camel.karavan.model.CamelStatusValue;
+import org.apache.camel.karavan.model.DeploymentStatus;
import org.jboss.logging.Logger;
import java.util.List;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/KaravanCacheService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/KaravanCacheService.java
index 86cb1600..ba320ee2 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/KaravanCacheService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/KaravanCacheService.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.karavan.cache;
-import com.hazelcast.config.ClasspathXmlConfig;
import com.hazelcast.config.ClasspathYamlConfig;
import com.hazelcast.config.Config;
import com.hazelcast.core.Hazelcast;
@@ -25,26 +24,31 @@ import com.hazelcast.map.IMap;
import com.hazelcast.query.Predicate;
import com.hazelcast.query.Predicates;
import io.quarkus.runtime.ShutdownEvent;
-import io.quarkus.runtime.StartupEvent;
+import io.quarkus.vertx.ConsumeEvent;
import jakarta.enterprise.event.Observes;
import jakarta.enterprise.inject.Default;
import jakarta.inject.Singleton;
-import org.apache.camel.karavan.cache.model.*;
+import org.apache.camel.karavan.model.*;
import org.jboss.logging.Logger;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.time.Instant;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
+import static org.apache.camel.karavan.service.KaravanService.START_SERVICES;
+
@Default
@Singleton
public class KaravanCacheService {
- private final Config config = new ClasspathYamlConfig("hazelcast.yaml");
- private final HazelcastInstance hz =
Hazelcast.getOrCreateHazelcastInstance(config);
-
+ private HazelcastInstance hz;
private IMap<GroupedKey, Project> projects;
private IMap<GroupedKey, ProjectFile> files;
private IMap<GroupedKey, DeploymentStatus> deploymentStatuses;
@@ -53,14 +57,16 @@ public class KaravanCacheService {
private IMap<GroupedKey, ServiceStatus> serviceStatuses;
private IMap<GroupedKey, CamelStatus> camelStatuses;
-
private final AtomicBoolean ready = new AtomicBoolean(false);
private static final Logger LOGGER =
Logger.getLogger(KaravanCacheService.class.getName());
private static final String DEFAULT_ENVIRONMENT = "dev";
- void onStart(@Observes StartupEvent ev) {
+ @ConsumeEvent(value = START_SERVICES, blocking = true, ordered = true)
+ void start(String data) {
LOGGER.info("KaravanCacheService is starting");
+ Config config = new ClasspathYamlConfig("hazelcast.yaml");
+ hz = Hazelcast.getOrCreateHazelcastInstance(config);
projects = hz.getMap(Project.CACHE);
files = hz.getMap(ProjectFile.CACHE);
deploymentStatuses = hz.getMap(DeploymentStatus.CACHE);
@@ -70,11 +76,11 @@ public class KaravanCacheService {
camelStatuses = hz.getMap(CamelStatus.CACHE);
LOGGER.info("KaravanCacheService is started");
ready.set(true);
-
}
void onStop(@Observes ShutdownEvent ev) {
- LOGGER.info("KaravanCacheService is stopped");
+ LOGGER.info("KaravanCacheService is stopping");
+ hz.shutdown();
ready.set(false);
}
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/CodeService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/CodeService.java
index 6880bc6a..de039b83 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/CodeService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/CodeService.java
@@ -32,13 +32,13 @@ import org.apache.camel.CamelContext;
import org.apache.camel.generator.openapi.RestDslGenerator;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.karavan.api.KameletResources;
-import org.apache.camel.karavan.code.model.DockerComposeService;
+import org.apache.camel.karavan.model.DockerComposeService;
import org.apache.camel.karavan.docker.DockerService;
import org.apache.camel.karavan.git.model.GitRepo;
import org.apache.camel.karavan.git.model.GitRepoFile;
import org.apache.camel.karavan.cache.KaravanCacheService;
-import org.apache.camel.karavan.cache.model.Project;
-import org.apache.camel.karavan.cache.model.ProjectFile;
+import org.apache.camel.karavan.model.Project;
+import org.apache.camel.karavan.model.ProjectFile;
import org.apache.camel.karavan.kubernetes.KubernetesService;
import org.apache.camel.karavan.service.ConfigService;
import org.eclipse.microprofile.config.inject.ConfigProperty;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/DockerComposeConverter.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/DockerComposeConverter.java
index d008faf0..991bf040 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/DockerComposeConverter.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/DockerComposeConverter.java
@@ -19,8 +19,8 @@ package org.apache.camel.karavan.code;
import io.vertx.core.json.JsonArray;
import io.vertx.core.json.JsonObject;
-import org.apache.camel.karavan.code.model.DockerCompose;
-import org.apache.camel.karavan.code.model.DockerComposeService;
+import org.apache.camel.karavan.model.DockerCompose;
+import org.apache.camel.karavan.model.DockerComposeService;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.introspector.Property;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerEventListener.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerEventListener.java
index 5536b68a..83ce5094 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerEventListener.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerEventListener.java
@@ -23,7 +23,7 @@ import com.github.dockerjava.api.model.Event;
import com.github.dockerjava.api.model.EventType;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
-import org.apache.camel.karavan.cache.model.ContainerStatus;
+import org.apache.camel.karavan.model.ContainerStatus;
import org.apache.camel.karavan.registry.RegistryService;
import org.jboss.logging.Logger;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForGitea.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForGitea.java
index 12d57409..ba8be1ed 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForGitea.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForGitea.java
@@ -23,7 +23,7 @@ import jakarta.inject.Inject;
import org.apache.camel.karavan.code.CodeService;
import org.apache.camel.karavan.git.GitService;
import org.apache.camel.karavan.git.model.GitConfig;
-import org.apache.camel.karavan.cache.model.ContainerStatus;
+import org.apache.camel.karavan.model.ContainerStatus;
import org.jboss.logging.Logger;
@ApplicationScoped
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForKaravan.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForKaravan.java
index b681b6a2..7c07cbc4 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForKaravan.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForKaravan.java
@@ -21,8 +21,8 @@ import com.github.dockerjava.api.model.HealthCheck;
import com.github.dockerjava.api.model.RestartPolicy;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
-import org.apache.camel.karavan.cache.model.ContainerStatus;
-import org.apache.camel.karavan.cache.model.Project;
+import org.apache.camel.karavan.model.ContainerStatus;
+import org.apache.camel.karavan.model.Project;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.jboss.logging.Logger;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForRegistry.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForRegistry.java
index db1a0718..d395582e 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForRegistry.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForRegistry.java
@@ -19,7 +19,7 @@ package org.apache.camel.karavan.docker;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.apache.camel.karavan.code.CodeService;
-import org.apache.camel.karavan.cache.model.ContainerStatus;
+import org.apache.camel.karavan.model.ContainerStatus;
import org.jboss.logging.Logger;
@ApplicationScoped
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerService.java
index 7b8efdc4..7f69dfab 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerService.java
@@ -31,8 +31,8 @@ import io.vertx.core.buffer.Buffer;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.apache.camel.karavan.code.CodeService;
-import org.apache.camel.karavan.code.model.DockerComposeService;
-import org.apache.camel.karavan.cache.model.ContainerStatus;
+import org.apache.camel.karavan.model.DockerComposeService;
+import org.apache.camel.karavan.model.ContainerStatus;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
import org.apache.commons.io.IOUtils;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerServiceUtils.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerServiceUtils.java
index b4e4db51..10a030e9 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerServiceUtils.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerServiceUtils.java
@@ -19,9 +19,9 @@ package org.apache.camel.karavan.docker;
import com.github.dockerjava.api.model.*;
import io.smallrye.mutiny.tuples.Tuple2;
import org.apache.camel.karavan.api.KameletResources;
-import org.apache.camel.karavan.code.model.DockerComposeHealthCheck;
-import org.apache.camel.karavan.cache.model.ContainerPort;
-import org.apache.camel.karavan.cache.model.ContainerStatus;
+import org.apache.camel.karavan.model.DockerComposeHealthCheck;
+import org.apache.camel.karavan.model.ContainerPort;
+import org.apache.camel.karavan.model.ContainerStatus;
import java.io.BufferedReader;
import java.io.InputStream;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/git/GitService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/git/GitService.java
index 08df0a7c..b2fff8cd 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/git/GitService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/git/GitService.java
@@ -27,8 +27,8 @@ import jakarta.inject.Inject;
import org.apache.camel.karavan.git.model.GitConfig;
import org.apache.camel.karavan.git.model.GitRepo;
import org.apache.camel.karavan.git.model.GitRepoFile;
-import org.apache.camel.karavan.cache.model.Project;
-import org.apache.camel.karavan.cache.model.ProjectFile;
+import org.apache.camel.karavan.model.Project;
+import org.apache.camel.karavan.model.ProjectFile;
import org.apache.camel.karavan.service.ConfigService;
import org.eclipse.jgit.api.*;
import org.eclipse.jgit.api.errors.GitAPIException;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/DeploymentEventHandler.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/DeploymentEventHandler.java
index 5d35a153..ee8335f6 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/DeploymentEventHandler.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/DeploymentEventHandler.java
@@ -20,7 +20,7 @@ package org.apache.camel.karavan.kubernetes;
import io.fabric8.kubernetes.api.model.apps.Deployment;
import io.fabric8.kubernetes.client.informers.ResourceEventHandler;
import org.apache.camel.karavan.cache.KaravanCacheService;
-import org.apache.camel.karavan.cache.model.DeploymentStatus;
+import org.apache.camel.karavan.model.DeploymentStatus;
import org.jboss.logging.Logger;
public class DeploymentEventHandler implements
ResourceEventHandler<Deployment> {
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
index 88f2ea1c..89a3010c 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
@@ -34,8 +34,8 @@ import jakarta.enterprise.inject.Produces;
import jakarta.inject.Inject;
import org.apache.camel.karavan.code.CodeService;
import org.apache.camel.karavan.cache.KaravanCacheService;
-import org.apache.camel.karavan.cache.model.ContainerStatus;
-import org.apache.camel.karavan.cache.model.Project;
+import org.apache.camel.karavan.model.ContainerStatus;
+import org.apache.camel.karavan.model.Project;
import org.apache.camel.karavan.service.ConfigService;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.eclipse.microprofile.health.HealthCheck;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/PodEventHandler.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/PodEventHandler.java
index 5dbf274d..c4464378 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/PodEventHandler.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/PodEventHandler.java
@@ -25,7 +25,7 @@ import
io.fabric8.kubernetes.client.informers.ResourceEventHandler;
import io.vertx.core.json.JsonObject;
import io.vertx.mutiny.core.eventbus.EventBus;
import org.apache.camel.karavan.cache.KaravanCacheService;
-import org.apache.camel.karavan.cache.model.ContainerStatus;
+import org.apache.camel.karavan.model.ContainerStatus;
import org.jboss.logging.Logger;
import java.util.List;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/ServiceEventHandler.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/ServiceEventHandler.java
index 4e7b0f19..1da82323 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/ServiceEventHandler.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/ServiceEventHandler.java
@@ -20,7 +20,7 @@ package org.apache.camel.karavan.kubernetes;
import io.fabric8.kubernetes.api.model.Service;
import io.fabric8.kubernetes.client.informers.ResourceEventHandler;
import org.apache.camel.karavan.cache.KaravanCacheService;
-import org.apache.camel.karavan.cache.model.ServiceStatus;
+import org.apache.camel.karavan.model.ServiceStatus;
import org.jboss.logging.Logger;
public class ServiceEventHandler implements ResourceEventHandler<Service> {
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/model/CamelStatus.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/CamelStatus.java
similarity index 97%
rename from
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/model/CamelStatus.java
rename to
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/CamelStatus.java
index 977a7fbf..093ed99a 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/model/CamelStatus.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/CamelStatus.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.camel.karavan.cache.model;
+package org.apache.camel.karavan.model;
import java.io.Serial;
import java.io.Serializable;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/model/CamelStatusValue.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/CamelStatusValue.java
similarity index 97%
rename from
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/model/CamelStatusValue.java
rename to
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/CamelStatusValue.java
index c00d6752..880eac3f 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/model/CamelStatusValue.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/CamelStatusValue.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.camel.karavan.cache.model;
+package org.apache.camel.karavan.model;
import java.io.Serial;
import java.io.Serializable;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/model/ContainerPort.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/ContainerPort.java
similarity index 97%
rename from
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/model/ContainerPort.java
rename to
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/ContainerPort.java
index 55cf79ba..b621cd7a 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/model/ContainerPort.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/ContainerPort.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.camel.karavan.cache.model;
+package org.apache.camel.karavan.model;
import java.io.Serial;
import java.io.Serializable;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/model/ContainerStatus.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/ContainerStatus.java
similarity index 99%
rename from
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/model/ContainerStatus.java
rename to
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/ContainerStatus.java
index 56905a97..13b578f8 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/model/ContainerStatus.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/ContainerStatus.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.camel.karavan.cache.model;
+package org.apache.camel.karavan.model;
import java.io.Serial;
import java.io.Serializable;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/model/DeploymentStatus.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/DeploymentStatus.java
similarity index 98%
rename from
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/model/DeploymentStatus.java
rename to
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/DeploymentStatus.java
index 048b36ff..08b26d75 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/model/DeploymentStatus.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/DeploymentStatus.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.camel.karavan.cache.model;
+package org.apache.camel.karavan.model;
import java.io.Serial;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/model/DockerCompose.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/DockerCompose.java
similarity index 97%
rename from
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/model/DockerCompose.java
rename to
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/DockerCompose.java
index d75ba9ec..4572d459 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/model/DockerCompose.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/DockerCompose.java
@@ -15,8 +15,7 @@
* limitations under the License.
*/
-package org.apache.camel.karavan.code.model;
-
+package org.apache.camel.karavan.model;
import java.util.HashMap;
import java.util.Map;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/model/DockerComposeHealthCheck.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/DockerComposeHealthCheck.java
similarity index 97%
rename from
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/model/DockerComposeHealthCheck.java
rename to
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/DockerComposeHealthCheck.java
index a56911af..09749666 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/model/DockerComposeHealthCheck.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/DockerComposeHealthCheck.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.camel.karavan.code.model;
+package org.apache.camel.karavan.model;
import java.util.List;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/model/DockerComposeNetwork.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/DockerComposeNetwork.java
similarity index 96%
rename from
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/model/DockerComposeNetwork.java
rename to
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/DockerComposeNetwork.java
index fb682af3..10950d3b 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/model/DockerComposeNetwork.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/DockerComposeNetwork.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.camel.karavan.code.model;
+package org.apache.camel.karavan.model;
public class DockerComposeNetwork {
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/model/DockerComposeService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/DockerComposeService.java
similarity index 99%
rename from
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/model/DockerComposeService.java
rename to
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/DockerComposeService.java
index a9df8b33..5936af4f 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/model/DockerComposeService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/DockerComposeService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.camel.karavan.code.model;
+package org.apache.camel.karavan.model;
import java.util.ArrayList;
import java.util.HashMap;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/model/GroupedKey.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/GroupedKey.java
similarity index 98%
rename from
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/model/GroupedKey.java
rename to
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/GroupedKey.java
index 8f03898b..9eca7e39 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/model/GroupedKey.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/GroupedKey.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.camel.karavan.cache.model;
+package org.apache.camel.karavan.model;
import java.io.Serial;
import java.io.Serializable;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/model/Project.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/Project.java
similarity index 98%
rename from
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/model/Project.java
rename to
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/Project.java
index 3424f8cf..d2d5e38c 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/model/Project.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/Project.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.camel.karavan.cache.model;
+package org.apache.camel.karavan.model;
import jakarta.validation.constraints.NotBlank;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/model/ProjectFile.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/ProjectFile.java
similarity index 97%
rename from
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/model/ProjectFile.java
rename to
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/ProjectFile.java
index c0f9fa28..3ae89265 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/model/ProjectFile.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/ProjectFile.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.camel.karavan.cache.model;
+package org.apache.camel.karavan.model;
import java.io.Serial;
import java.io.Serializable;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/model/ServiceStatus.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/ServiceStatus.java
similarity index 98%
rename from
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/model/ServiceStatus.java
rename to
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/ServiceStatus.java
index ad249360..e3fa268d 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/model/ServiceStatus.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/ServiceStatus.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.camel.karavan.cache.model;
+package org.apache.camel.karavan.model;
import java.io.Serial;
import java.io.Serializable;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelService.java
index 3e3c98c2..aba29489 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelService.java
@@ -27,9 +27,9 @@ import io.vertx.mutiny.ext.web.client.WebClient;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.apache.camel.karavan.cache.KaravanCacheService;
-import org.apache.camel.karavan.cache.model.CamelStatus;
-import org.apache.camel.karavan.cache.model.CamelStatusValue;
-import org.apache.camel.karavan.cache.model.ContainerStatus;
+import org.apache.camel.karavan.model.CamelStatus;
+import org.apache.camel.karavan.model.CamelStatusValue;
+import org.apache.camel.karavan.model.ContainerStatus;
import org.apache.camel.karavan.code.CodeService;
import org.apache.camel.karavan.kubernetes.KubernetesService;
import org.apache.camel.karavan.shared.Constants;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ContainerStatusService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ContainerStatusService.java
index 1f54a52e..2de708ad 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ContainerStatusService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ContainerStatusService.java
@@ -24,7 +24,7 @@ import io.vertx.core.json.JsonObject;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.apache.camel.karavan.cache.KaravanCacheService;
-import org.apache.camel.karavan.cache.model.ContainerStatus;
+import org.apache.camel.karavan.model.ContainerStatus;
import org.apache.camel.karavan.docker.DockerService;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.jboss.logging.Logger;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
index a97c137e..8ed83f16 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
@@ -24,13 +24,13 @@ import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.inject.Default;
import jakarta.inject.Inject;
import org.apache.camel.karavan.cache.KaravanCacheService;
-import org.apache.camel.karavan.cache.model.ContainerStatus;
-import org.apache.camel.karavan.cache.model.GroupedKey;
-import org.apache.camel.karavan.cache.model.Project;
-import org.apache.camel.karavan.cache.model.ProjectFile;
+import org.apache.camel.karavan.model.ContainerStatus;
+import org.apache.camel.karavan.model.GroupedKey;
+import org.apache.camel.karavan.model.Project;
+import org.apache.camel.karavan.model.ProjectFile;
import org.apache.camel.karavan.code.CodeService;
import org.apache.camel.karavan.code.DockerComposeConverter;
-import org.apache.camel.karavan.code.model.DockerComposeService;
+import org.apache.camel.karavan.model.DockerComposeService;
import org.apache.camel.karavan.docker.DockerForKaravan;
import org.apache.camel.karavan.git.GitService;
import org.apache.camel.karavan.git.model.GitRepo;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/validation/project/ProjectFileCreateValidator.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/validation/project/ProjectFileCreateValidator.java
index f753e74e..093e2715 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/validation/project/ProjectFileCreateValidator.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/validation/project/ProjectFileCreateValidator.java
@@ -3,7 +3,7 @@ package org.apache.camel.karavan.validation.project;
import java.util.List;
import org.apache.camel.karavan.cache.KaravanCacheService;
-import org.apache.camel.karavan.cache.model.ProjectFile;
+import org.apache.camel.karavan.model.ProjectFile;
import org.apache.camel.karavan.shared.validation.SimpleValidator;
import org.apache.camel.karavan.shared.validation.ValidationError;
import org.apache.camel.karavan.shared.validation.Validator;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/validation/project/ProjectModifyValidator.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/validation/project/ProjectModifyValidator.java
index a59d9cc6..038645af 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/validation/project/ProjectModifyValidator.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/validation/project/ProjectModifyValidator.java
@@ -3,7 +3,7 @@ package org.apache.camel.karavan.validation.project;
import java.util.List;
import org.apache.camel.karavan.cache.KaravanCacheService;
-import org.apache.camel.karavan.cache.model.Project;
+import org.apache.camel.karavan.model.Project;
import org.apache.camel.karavan.shared.validation.SimpleValidator;
import org.apache.camel.karavan.shared.validation.ValidationError;
import org.apache.camel.karavan.shared.validation.Validator;
