diff --git a/CLAUDE.md b/CLAUDE.md index b290be8e..45d42493 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -10,7 +10,7 @@ Cameleer Server — observability server that receives, stores, and serves Camel - **cameleer** (`https://gitea.siegeln.net/cameleer/cameleer`) — the Java agent that instruments Camel applications - Protocol defined in `cameleer-common/PROTOCOL.md` in the agent repo -- This server depends on `com.cameleer:cameleer-common` (shared models and graph API). The agent repo's groupId stays on `com.cameleer` until that project is institutionalized — this server's own modules are `io.cameleer.*`. +- This server depends on `io.cameleer:cameleer-common` (shared models and graph API). ## Registry naming (buildtime vs public) @@ -56,7 +56,7 @@ java -jar cameleer-server-app/target/cameleer-server-app-1.0-SNAPSHOT.jar - Java 17+ required - Spring Boot 3.4.3 parent POM -- Depends on `com.cameleer:cameleer-common` from Gitea Maven registry +- Depends on `io.cameleer:cameleer-common` from Gitea Maven registry - Jackson `JavaTimeModule` for `Instant` deserialization - Communication: receives HTTP POST data from agents (executions, diagrams, metrics, logs), serves SSE event streams for config push/commands (config-update, deep-trace, replay, route-control) - URL taxonomy: user-facing data, config, and query endpoints live under `/api/v1/environments/{envSlug}/...`. Env is a path segment, resolved via the `@EnvPath` argument resolver (404 on unknown slug). Flat endpoints are only for: agent self-service (JWT-authoritative), cross-env admin (RBAC, OIDC, audit, license, thresholds, env CRUD), cross-env discovery (`/catalog`), content-addressed lookups (`/diagrams/{contentHash}/render`, `/executions/{id}`), and auth. See `.claude/rules/app-classes.md` for the full allow-list. diff --git a/cameleer-license-minter/README.md b/cameleer-license-minter/README.md index 9b025a9a..0a1d3a9a 100644 --- a/cameleer-license-minter/README.md +++ b/cameleer-license-minter/README.md @@ -2,11 +2,11 @@ Standalone vendor-side tool for producing signed Ed25519 license tokens consumed by `cameleer-server`. The minter is intentionally **not** a runtime or compile-scope dependency of the server — the server only ships with the matching public key and validates tokens via `LicenseValidator`. The private signing key never leaves the vendor's environment. -- Module GAV: `com.cameleer:cameleer-license-minter:1.0-SNAPSHOT` -- Maven coordinates of the runtime server (does **not** transitively pull this module): `com.cameleer:cameleer-server-app:1.0-SNAPSHOT` +- Module GAV: `io.cameleer:cameleer-license-minter:1.0-SNAPSHOT` +- Maven coordinates of the runtime server (does **not** transitively pull this module): `io.cameleer:cameleer-server-app:1.0-SNAPSHOT` - Build artifacts (after `mvn -pl cameleer-license-minter package`): - `target/cameleer-license-minter-1.0-SNAPSHOT.jar` — plain library JAR (consumable as a Maven `test` dependency or via the `LicenseMinter` API in custom tooling) - - `target/cameleer-license-minter-1.0-SNAPSHOT-cli.jar` — fat CLI JAR with main class `com.cameleer.license.minter.cli.LicenseMinterCli` + - `target/cameleer-license-minter-1.0-SNAPSHOT-cli.jar` — fat CLI JAR with main class `io.cameleer.license.minter.cli.LicenseMinterCli` ## Table of contents @@ -50,15 +50,15 @@ Two JARs land in `cameleer-license-minter/target/`: | Artifact | Purpose | |---|---| | `cameleer-license-minter-1.0-SNAPSHOT.jar` | Plain library (the `repackage` execution for the main artifact is disabled; see `pom.xml:50-54`). Use this when embedding the minter inside your own tooling or a unit test that needs a fresh signed token. | -| `cameleer-license-minter-1.0-SNAPSHOT-cli.jar` | Fat CLI JAR. Repackaged by Spring Boot's `spring-boot-maven-plugin` with classifier `cli`; main class is `com.cameleer.license.minter.cli.LicenseMinterCli`. | +| `cameleer-license-minter-1.0-SNAPSHOT-cli.jar` | Fat CLI JAR. Repackaged by Spring Boot's `spring-boot-maven-plugin` with classifier `cli`; main class is `io.cameleer.license.minter.cli.LicenseMinterCli`. | ## Public Java API -`com.cameleer.license.minter.LicenseMinter` is the only entry point for the library. It is a final, stateless utility class: +`io.cameleer.license.minter.LicenseMinter` is the only entry point for the library. It is a final, stateless utility class: ```java -import com.cameleer.license.minter.LicenseMinter; -import com.cameleer.license.LicenseInfo; +import io.cameleer.license.minter.LicenseMinter; +import io.cameleer.license.LicenseInfo; LicenseInfo info = new LicenseInfo( java.util.UUID.randomUUID(), @@ -87,7 +87,7 @@ The method is thread-safe; the underlying Jackson `ObjectMapper` is configured o ## CLI usage -The CLI entry point is `com.cameleer.license.minter.cli.LicenseMinterCli`. Run it from the fat JAR produced by the build: +The CLI entry point is `io.cameleer.license.minter.cli.LicenseMinterCli`. Run it from the fat JAR produced by the build: ```bash java -jar cameleer-license-minter/target/cameleer-license-minter-1.0-SNAPSHOT-cli.jar \ diff --git a/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/AgentConfigController.java b/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/AgentConfigController.java index be32077b..ca850390 100644 --- a/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/AgentConfigController.java +++ b/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/AgentConfigController.java @@ -1,6 +1,6 @@ package io.cameleer.server.app.controller; -import com.cameleer.common.model.ApplicationConfig; +import io.cameleer.common.model.ApplicationConfig; import io.cameleer.server.app.dto.AppConfigResponse; import io.cameleer.server.app.security.JwtAuthenticationFilter; import io.cameleer.server.app.storage.PostgresApplicationConfigRepository; diff --git a/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/AgentRegistrationController.java b/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/AgentRegistrationController.java index dc5d94d5..ab03387d 100644 --- a/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/AgentRegistrationController.java +++ b/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/AgentRegistrationController.java @@ -7,7 +7,7 @@ import io.cameleer.server.app.dto.AgentRefreshResponse; import io.cameleer.server.app.dto.AgentRegistrationRequest; import io.cameleer.server.app.dto.AgentRegistrationResponse; import io.cameleer.server.app.dto.ErrorResponse; -import com.cameleer.common.model.HeartbeatRequest; +import io.cameleer.common.model.HeartbeatRequest; import io.cameleer.server.app.security.BootstrapTokenValidator; import io.cameleer.server.app.security.JwtAuthenticationFilter; import io.cameleer.server.core.admin.AuditCategory; diff --git a/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/AppController.java b/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/AppController.java index a1925a63..53667eae 100644 --- a/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/AppController.java +++ b/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/AppController.java @@ -1,6 +1,6 @@ package io.cameleer.server.app.controller; -import com.cameleer.common.model.ApplicationConfig; +import io.cameleer.common.model.ApplicationConfig; import io.cameleer.server.app.dto.DirtyStateResponse; import io.cameleer.server.app.storage.PostgresApplicationConfigRepository; import io.cameleer.server.app.storage.PostgresDeploymentRepository; diff --git a/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/ApplicationConfigController.java b/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/ApplicationConfigController.java index e2ce5a39..c091b220 100644 --- a/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/ApplicationConfigController.java +++ b/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/ApplicationConfigController.java @@ -1,6 +1,6 @@ package io.cameleer.server.app.controller; -import com.cameleer.common.model.ApplicationConfig; +import io.cameleer.common.model.ApplicationConfig; import io.cameleer.server.app.dto.AppConfigResponse; import io.cameleer.server.app.dto.CommandGroupResponse; import io.cameleer.server.app.dto.ConfigUpdateResponse; diff --git a/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/CatalogController.java b/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/CatalogController.java index c90698ea..81be2fb6 100644 --- a/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/CatalogController.java +++ b/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/CatalogController.java @@ -4,7 +4,7 @@ import io.cameleer.server.app.config.TenantProperties; import io.cameleer.server.app.dto.AgentSummary; import io.cameleer.server.app.dto.CatalogApp; import io.cameleer.server.app.dto.RouteSummary; -import com.cameleer.common.graph.RouteGraph; +import io.cameleer.common.graph.RouteGraph; import io.cameleer.server.core.agent.AgentInfo; import io.cameleer.server.core.agent.AgentRegistryService; import io.cameleer.server.core.agent.AgentState; diff --git a/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/ChunkIngestionController.java b/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/ChunkIngestionController.java index befb380d..dbd82f55 100644 --- a/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/ChunkIngestionController.java +++ b/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/ChunkIngestionController.java @@ -1,7 +1,7 @@ package io.cameleer.server.app.controller; import io.cameleer.server.core.ingestion.ChunkAccumulator; -import com.cameleer.common.model.ExecutionChunk; +import io.cameleer.common.model.ExecutionChunk; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/DiagramController.java b/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/DiagramController.java index 28130f3c..952abe3b 100644 --- a/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/DiagramController.java +++ b/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/DiagramController.java @@ -1,6 +1,6 @@ package io.cameleer.server.app.controller; -import com.cameleer.common.graph.RouteGraph; +import io.cameleer.common.graph.RouteGraph; import io.cameleer.server.core.agent.AgentInfo; import io.cameleer.server.core.agent.AgentRegistryService; import io.cameleer.server.core.ingestion.IngestionService; diff --git a/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/DiagramRenderController.java b/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/DiagramRenderController.java index 5a793c0d..9ea84225 100644 --- a/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/DiagramRenderController.java +++ b/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/DiagramRenderController.java @@ -1,6 +1,6 @@ package io.cameleer.server.app.controller; -import com.cameleer.common.graph.RouteGraph; +import io.cameleer.common.graph.RouteGraph; import io.cameleer.server.app.web.EnvPath; import io.cameleer.server.core.diagram.DiagramLayout; import io.cameleer.server.core.diagram.DiagramRenderer; diff --git a/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/EventIngestionController.java b/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/EventIngestionController.java index 9c8d5ec8..225546d9 100644 --- a/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/EventIngestionController.java +++ b/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/EventIngestionController.java @@ -1,6 +1,6 @@ package io.cameleer.server.app.controller; -import com.cameleer.common.model.AgentEvent; +import io.cameleer.common.model.AgentEvent; import io.cameleer.server.core.agent.AgentEventService; import io.cameleer.server.core.agent.AgentInfo; import io.cameleer.server.core.agent.AgentRegistryService; diff --git a/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/LogIngestionController.java b/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/LogIngestionController.java index e4f16424..3d5305b2 100644 --- a/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/LogIngestionController.java +++ b/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/LogIngestionController.java @@ -1,6 +1,6 @@ package io.cameleer.server.app.controller; -import com.cameleer.common.model.LogEntry; +import io.cameleer.common.model.LogEntry; import io.cameleer.server.app.metrics.ServerMetrics; import io.cameleer.server.app.security.JwtAuthenticationFilter; import io.cameleer.server.core.ingestion.BufferedLogEntry; diff --git a/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/RouteCatalogController.java b/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/RouteCatalogController.java index e64a7d3f..c75bbce8 100644 --- a/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/RouteCatalogController.java +++ b/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/RouteCatalogController.java @@ -4,7 +4,7 @@ import io.cameleer.server.app.dto.AgentSummary; import io.cameleer.server.app.dto.AppCatalogEntry; import io.cameleer.server.app.dto.RouteSummary; import io.cameleer.server.app.web.EnvPath; -import com.cameleer.common.graph.RouteGraph; +import io.cameleer.common.graph.RouteGraph; import io.cameleer.server.core.agent.AgentInfo; import io.cameleer.server.core.agent.AgentRegistryService; import io.cameleer.server.core.agent.AgentState; diff --git a/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/SensitiveKeysAdminController.java b/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/SensitiveKeysAdminController.java index f36d9d8f..3487022a 100644 --- a/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/SensitiveKeysAdminController.java +++ b/cameleer-server-app/src/main/java/io/cameleer/server/app/controller/SensitiveKeysAdminController.java @@ -1,6 +1,6 @@ package io.cameleer.server.app.controller; -import com.cameleer.common.model.ApplicationConfig; +import io.cameleer.common.model.ApplicationConfig; import io.cameleer.server.app.dto.CommandGroupResponse; import io.cameleer.server.app.dto.SensitiveKeysRequest; import io.cameleer.server.app.dto.SensitiveKeysResponse; diff --git a/cameleer-server-app/src/main/java/io/cameleer/server/app/diagram/ElkDiagramRenderer.java b/cameleer-server-app/src/main/java/io/cameleer/server/app/diagram/ElkDiagramRenderer.java index b7db5b2c..79048dad 100644 --- a/cameleer-server-app/src/main/java/io/cameleer/server/app/diagram/ElkDiagramRenderer.java +++ b/cameleer-server-app/src/main/java/io/cameleer/server/app/diagram/ElkDiagramRenderer.java @@ -1,9 +1,9 @@ package io.cameleer.server.app.diagram; -import com.cameleer.common.graph.NodeType; -import com.cameleer.common.graph.RouteEdge; -import com.cameleer.common.graph.RouteGraph; -import com.cameleer.common.graph.RouteNode; +import io.cameleer.common.graph.NodeType; +import io.cameleer.common.graph.RouteEdge; +import io.cameleer.common.graph.RouteGraph; +import io.cameleer.common.graph.RouteNode; import io.cameleer.server.core.diagram.DiagramLayout; import io.cameleer.server.core.diagram.DiagramRenderer; import io.cameleer.server.core.diagram.PositionedEdge; diff --git a/cameleer-server-app/src/main/java/io/cameleer/server/app/dto/AppConfigResponse.java b/cameleer-server-app/src/main/java/io/cameleer/server/app/dto/AppConfigResponse.java index c80aef61..2c3ae5f7 100644 --- a/cameleer-server-app/src/main/java/io/cameleer/server/app/dto/AppConfigResponse.java +++ b/cameleer-server-app/src/main/java/io/cameleer/server/app/dto/AppConfigResponse.java @@ -1,6 +1,6 @@ package io.cameleer.server.app.dto; -import com.cameleer.common.model.ApplicationConfig; +import io.cameleer.common.model.ApplicationConfig; import java.util.List; diff --git a/cameleer-server-app/src/main/java/io/cameleer/server/app/dto/ConfigUpdateResponse.java b/cameleer-server-app/src/main/java/io/cameleer/server/app/dto/ConfigUpdateResponse.java index a01c1106..81822eb3 100644 --- a/cameleer-server-app/src/main/java/io/cameleer/server/app/dto/ConfigUpdateResponse.java +++ b/cameleer-server-app/src/main/java/io/cameleer/server/app/dto/ConfigUpdateResponse.java @@ -1,6 +1,6 @@ package io.cameleer.server.app.dto; -import com.cameleer.common.model.ApplicationConfig; +import io.cameleer.common.model.ApplicationConfig; public record ConfigUpdateResponse( ApplicationConfig config, diff --git a/cameleer-server-app/src/main/java/io/cameleer/server/app/runtime/ContainerLogForwarder.java b/cameleer-server-app/src/main/java/io/cameleer/server/app/runtime/ContainerLogForwarder.java index ea9c55bf..4c150b76 100644 --- a/cameleer-server-app/src/main/java/io/cameleer/server/app/runtime/ContainerLogForwarder.java +++ b/cameleer-server-app/src/main/java/io/cameleer/server/app/runtime/ContainerLogForwarder.java @@ -1,6 +1,6 @@ package io.cameleer.server.app.runtime; -import com.cameleer.common.model.LogEntry; +import io.cameleer.common.model.LogEntry; import io.cameleer.server.app.search.ClickHouseLogStore; import io.cameleer.server.core.ingestion.BufferedLogEntry; import com.github.dockerjava.api.DockerClient; diff --git a/cameleer-server-app/src/main/java/io/cameleer/server/app/runtime/DeploymentExecutor.java b/cameleer-server-app/src/main/java/io/cameleer/server/app/runtime/DeploymentExecutor.java index 5d2c054a..878635b6 100644 --- a/cameleer-server-app/src/main/java/io/cameleer/server/app/runtime/DeploymentExecutor.java +++ b/cameleer-server-app/src/main/java/io/cameleer/server/app/runtime/DeploymentExecutor.java @@ -1,6 +1,6 @@ package io.cameleer.server.app.runtime; -import com.cameleer.common.model.ApplicationConfig; +import io.cameleer.common.model.ApplicationConfig; import io.cameleer.server.app.license.LicenseEnforcer; import io.cameleer.server.app.license.LicenseUsageReader; import io.cameleer.server.app.metrics.ServerMetrics; diff --git a/cameleer-server-app/src/main/java/io/cameleer/server/app/search/ClickHouseLogStore.java b/cameleer-server-app/src/main/java/io/cameleer/server/app/search/ClickHouseLogStore.java index f3d8fcda..1b7ef29a 100644 --- a/cameleer-server-app/src/main/java/io/cameleer/server/app/search/ClickHouseLogStore.java +++ b/cameleer-server-app/src/main/java/io/cameleer/server/app/search/ClickHouseLogStore.java @@ -1,6 +1,6 @@ package io.cameleer.server.app.search; -import com.cameleer.common.model.LogEntry; +import io.cameleer.common.model.LogEntry; import io.cameleer.server.core.ingestion.BufferedLogEntry; import io.cameleer.server.core.search.LogSearchRequest; import io.cameleer.server.core.search.LogSearchResponse; diff --git a/cameleer-server-app/src/main/java/io/cameleer/server/app/storage/ClickHouseDiagramStore.java b/cameleer-server-app/src/main/java/io/cameleer/server/app/storage/ClickHouseDiagramStore.java index db2b4b99..9bbd247f 100644 --- a/cameleer-server-app/src/main/java/io/cameleer/server/app/storage/ClickHouseDiagramStore.java +++ b/cameleer-server-app/src/main/java/io/cameleer/server/app/storage/ClickHouseDiagramStore.java @@ -1,7 +1,7 @@ package io.cameleer.server.app.storage; -import com.cameleer.common.graph.RouteGraph; -import com.cameleer.common.graph.RouteNode; +import io.cameleer.common.graph.RouteGraph; +import io.cameleer.common.graph.RouteNode; import io.cameleer.server.core.ingestion.TaggedDiagram; import io.cameleer.server.core.storage.DiagramStore; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/cameleer-server-app/src/main/java/io/cameleer/server/app/storage/ClickHouseExecutionStore.java b/cameleer-server-app/src/main/java/io/cameleer/server/app/storage/ClickHouseExecutionStore.java index ad028147..c8a6fe6f 100644 --- a/cameleer-server-app/src/main/java/io/cameleer/server/app/storage/ClickHouseExecutionStore.java +++ b/cameleer-server-app/src/main/java/io/cameleer/server/app/storage/ClickHouseExecutionStore.java @@ -3,7 +3,7 @@ package io.cameleer.server.app.storage; import io.cameleer.server.core.ingestion.ChunkAccumulator; import io.cameleer.server.core.ingestion.MergedExecution; import io.cameleer.server.core.storage.ExecutionStore; -import com.cameleer.common.model.FlatProcessorRecord; +import io.cameleer.common.model.FlatProcessorRecord; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/cameleer-server-app/src/main/java/io/cameleer/server/app/storage/PostgresApplicationConfigRepository.java b/cameleer-server-app/src/main/java/io/cameleer/server/app/storage/PostgresApplicationConfigRepository.java index 9fb97e82..315016b9 100644 --- a/cameleer-server-app/src/main/java/io/cameleer/server/app/storage/PostgresApplicationConfigRepository.java +++ b/cameleer-server-app/src/main/java/io/cameleer/server/app/storage/PostgresApplicationConfigRepository.java @@ -1,6 +1,6 @@ package io.cameleer.server.app.storage; -import com.cameleer.common.model.ApplicationConfig; +import io.cameleer.common.model.ApplicationConfig; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/cameleer-server-app/src/test/java/io/cameleer/server/app/alerting/AlertingFullLifecycleIT.java b/cameleer-server-app/src/test/java/io/cameleer/server/app/alerting/AlertingFullLifecycleIT.java index a6598c60..0c05d60e 100644 --- a/cameleer-server-app/src/test/java/io/cameleer/server/app/alerting/AlertingFullLifecycleIT.java +++ b/cameleer-server-app/src/test/java/io/cameleer/server/app/alerting/AlertingFullLifecycleIT.java @@ -1,6 +1,6 @@ package io.cameleer.server.app.alerting; -import com.cameleer.common.model.LogEntry; +import io.cameleer.common.model.LogEntry; import io.cameleer.server.app.AbstractPostgresIT; import io.cameleer.server.app.TestSecurityHelper; import io.cameleer.server.app.alerting.eval.AlertEvaluatorJob; diff --git a/cameleer-server-app/src/test/java/io/cameleer/server/app/controller/ApplicationConfigControllerIT.java b/cameleer-server-app/src/test/java/io/cameleer/server/app/controller/ApplicationConfigControllerIT.java index e6d66ddb..0d45984b 100644 --- a/cameleer-server-app/src/test/java/io/cameleer/server/app/controller/ApplicationConfigControllerIT.java +++ b/cameleer-server-app/src/test/java/io/cameleer/server/app/controller/ApplicationConfigControllerIT.java @@ -1,6 +1,6 @@ package io.cameleer.server.app.controller; -import com.cameleer.common.model.ApplicationConfig; +import io.cameleer.common.model.ApplicationConfig; import io.cameleer.server.app.AbstractPostgresIT; import io.cameleer.server.app.TestSecurityHelper; import io.cameleer.server.app.storage.PostgresApplicationConfigRepository; diff --git a/cameleer-server-app/src/test/java/io/cameleer/server/app/diagram/ElkDiagramRendererTest.java b/cameleer-server-app/src/test/java/io/cameleer/server/app/diagram/ElkDiagramRendererTest.java index aa682b68..4ddc7c54 100644 --- a/cameleer-server-app/src/test/java/io/cameleer/server/app/diagram/ElkDiagramRendererTest.java +++ b/cameleer-server-app/src/test/java/io/cameleer/server/app/diagram/ElkDiagramRendererTest.java @@ -1,9 +1,9 @@ package io.cameleer.server.app.diagram; -import com.cameleer.common.graph.NodeType; -import com.cameleer.common.graph.RouteEdge; -import com.cameleer.common.graph.RouteGraph; -import com.cameleer.common.graph.RouteNode; +import io.cameleer.common.graph.NodeType; +import io.cameleer.common.graph.RouteEdge; +import io.cameleer.common.graph.RouteGraph; +import io.cameleer.common.graph.RouteNode; import io.cameleer.server.core.diagram.DiagramLayout; import io.cameleer.server.core.diagram.PositionedNode; import org.junit.jupiter.api.BeforeEach; diff --git a/cameleer-server-app/src/test/java/io/cameleer/server/app/runtime/DeploymentSnapshotIT.java b/cameleer-server-app/src/test/java/io/cameleer/server/app/runtime/DeploymentSnapshotIT.java index be5f49c1..df89d1ca 100644 --- a/cameleer-server-app/src/test/java/io/cameleer/server/app/runtime/DeploymentSnapshotIT.java +++ b/cameleer-server-app/src/test/java/io/cameleer/server/app/runtime/DeploymentSnapshotIT.java @@ -1,6 +1,6 @@ package io.cameleer.server.app.runtime; -import com.cameleer.common.model.ApplicationConfig; +import io.cameleer.common.model.ApplicationConfig; import io.cameleer.server.app.AbstractPostgresIT; import io.cameleer.server.app.TestSecurityHelper; import io.cameleer.server.app.storage.PostgresDeploymentRepository; diff --git a/cameleer-server-app/src/test/java/io/cameleer/server/app/search/ClickHouseLogStoreCountIT.java b/cameleer-server-app/src/test/java/io/cameleer/server/app/search/ClickHouseLogStoreCountIT.java index 955abe43..b023f35b 100644 --- a/cameleer-server-app/src/test/java/io/cameleer/server/app/search/ClickHouseLogStoreCountIT.java +++ b/cameleer-server-app/src/test/java/io/cameleer/server/app/search/ClickHouseLogStoreCountIT.java @@ -1,6 +1,6 @@ package io.cameleer.server.app.search; -import com.cameleer.common.model.LogEntry; +import io.cameleer.common.model.LogEntry; import io.cameleer.server.core.ingestion.BufferedLogEntry; import io.cameleer.server.core.search.LogSearchRequest; import io.cameleer.server.app.ClickHouseTestHelper; diff --git a/cameleer-server-app/src/test/java/io/cameleer/server/app/search/ClickHouseLogStoreIT.java b/cameleer-server-app/src/test/java/io/cameleer/server/app/search/ClickHouseLogStoreIT.java index d31f21e2..e4ddabf3 100644 --- a/cameleer-server-app/src/test/java/io/cameleer/server/app/search/ClickHouseLogStoreIT.java +++ b/cameleer-server-app/src/test/java/io/cameleer/server/app/search/ClickHouseLogStoreIT.java @@ -1,6 +1,6 @@ package io.cameleer.server.app.search; -import com.cameleer.common.model.LogEntry; +import io.cameleer.common.model.LogEntry; import io.cameleer.server.core.search.LogSearchRequest; import io.cameleer.server.core.search.LogSearchResponse; import io.cameleer.server.core.storage.LogEntryResult; diff --git a/cameleer-server-app/src/test/java/io/cameleer/server/app/search/ClickHouseLogStoreInstanceIdsIT.java b/cameleer-server-app/src/test/java/io/cameleer/server/app/search/ClickHouseLogStoreInstanceIdsIT.java index 2c485115..2a87be35 100644 --- a/cameleer-server-app/src/test/java/io/cameleer/server/app/search/ClickHouseLogStoreInstanceIdsIT.java +++ b/cameleer-server-app/src/test/java/io/cameleer/server/app/search/ClickHouseLogStoreInstanceIdsIT.java @@ -3,7 +3,7 @@ package io.cameleer.server.app.search; import io.cameleer.server.core.ingestion.BufferedLogEntry; import io.cameleer.server.core.search.LogSearchRequest; import io.cameleer.server.core.search.LogSearchResponse; -import com.cameleer.common.model.LogEntry; +import io.cameleer.common.model.LogEntry; import io.cameleer.server.app.ClickHouseTestHelper; import com.zaxxer.hikari.HikariDataSource; import org.junit.jupiter.api.AfterEach; diff --git a/cameleer-server-app/src/test/java/io/cameleer/server/app/search/ClickHouseSearchIndexIT.java b/cameleer-server-app/src/test/java/io/cameleer/server/app/search/ClickHouseSearchIndexIT.java index 538027b1..b0e87eed 100644 --- a/cameleer-server-app/src/test/java/io/cameleer/server/app/search/ClickHouseSearchIndexIT.java +++ b/cameleer-server-app/src/test/java/io/cameleer/server/app/search/ClickHouseSearchIndexIT.java @@ -6,8 +6,8 @@ import io.cameleer.server.core.search.AttributeFilter; import io.cameleer.server.core.search.ExecutionSummary; import io.cameleer.server.core.search.SearchRequest; import io.cameleer.server.core.search.SearchResult; -import com.cameleer.common.model.ExecutionStatus; -import com.cameleer.common.model.FlatProcessorRecord; +import io.cameleer.common.model.ExecutionStatus; +import io.cameleer.common.model.FlatProcessorRecord; import com.zaxxer.hikari.HikariDataSource; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/cameleer-server-app/src/test/java/io/cameleer/server/app/storage/ClickHouseChunkPipelineIT.java b/cameleer-server-app/src/test/java/io/cameleer/server/app/storage/ClickHouseChunkPipelineIT.java index e2b661c8..2a1db482 100644 --- a/cameleer-server-app/src/test/java/io/cameleer/server/app/storage/ClickHouseChunkPipelineIT.java +++ b/cameleer-server-app/src/test/java/io/cameleer/server/app/storage/ClickHouseChunkPipelineIT.java @@ -7,9 +7,9 @@ import io.cameleer.server.core.storage.DiagramStore; import io.cameleer.server.core.search.ExecutionSummary; import io.cameleer.server.core.search.SearchRequest; import io.cameleer.server.core.search.SearchResult; -import com.cameleer.common.model.ExecutionChunk; -import com.cameleer.common.model.ExecutionStatus; -import com.cameleer.common.model.FlatProcessorRecord; +import io.cameleer.common.model.ExecutionChunk; +import io.cameleer.common.model.ExecutionStatus; +import io.cameleer.common.model.FlatProcessorRecord; import com.zaxxer.hikari.HikariDataSource; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/cameleer-server-app/src/test/java/io/cameleer/server/app/storage/ClickHouseDiagramStoreIT.java b/cameleer-server-app/src/test/java/io/cameleer/server/app/storage/ClickHouseDiagramStoreIT.java index ef1d2456..75092ba7 100644 --- a/cameleer-server-app/src/test/java/io/cameleer/server/app/storage/ClickHouseDiagramStoreIT.java +++ b/cameleer-server-app/src/test/java/io/cameleer/server/app/storage/ClickHouseDiagramStoreIT.java @@ -1,8 +1,8 @@ package io.cameleer.server.app.storage; -import com.cameleer.common.graph.NodeType; -import com.cameleer.common.graph.RouteGraph; -import com.cameleer.common.graph.RouteNode; +import io.cameleer.common.graph.NodeType; +import io.cameleer.common.graph.RouteGraph; +import io.cameleer.common.graph.RouteNode; import io.cameleer.server.core.ingestion.TaggedDiagram; import com.zaxxer.hikari.HikariDataSource; import org.junit.jupiter.api.BeforeEach; diff --git a/cameleer-server-app/src/test/java/io/cameleer/server/app/storage/ClickHouseExecutionReadIT.java b/cameleer-server-app/src/test/java/io/cameleer/server/app/storage/ClickHouseExecutionReadIT.java index 1b7d51ec..a89c0d0c 100644 --- a/cameleer-server-app/src/test/java/io/cameleer/server/app/storage/ClickHouseExecutionReadIT.java +++ b/cameleer-server-app/src/test/java/io/cameleer/server/app/storage/ClickHouseExecutionReadIT.java @@ -1,7 +1,7 @@ package io.cameleer.server.app.storage; -import com.cameleer.common.model.ExecutionStatus; -import com.cameleer.common.model.FlatProcessorRecord; +import io.cameleer.common.model.ExecutionStatus; +import io.cameleer.common.model.FlatProcessorRecord; import io.cameleer.server.core.detail.DetailService; import io.cameleer.server.core.detail.ExecutionDetail; import io.cameleer.server.core.detail.ProcessorNode; diff --git a/cameleer-server-app/src/test/java/io/cameleer/server/app/storage/ClickHouseExecutionStoreIT.java b/cameleer-server-app/src/test/java/io/cameleer/server/app/storage/ClickHouseExecutionStoreIT.java index fa3faf4d..a2f9542b 100644 --- a/cameleer-server-app/src/test/java/io/cameleer/server/app/storage/ClickHouseExecutionStoreIT.java +++ b/cameleer-server-app/src/test/java/io/cameleer/server/app/storage/ClickHouseExecutionStoreIT.java @@ -1,8 +1,8 @@ package io.cameleer.server.app.storage; import io.cameleer.server.core.ingestion.MergedExecution; -import com.cameleer.common.model.ExecutionStatus; -import com.cameleer.common.model.FlatProcessorRecord; +import io.cameleer.common.model.ExecutionStatus; +import io.cameleer.common.model.FlatProcessorRecord; import com.zaxxer.hikari.HikariDataSource; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/cameleer-server-app/src/test/java/io/cameleer/server/app/storage/ConfigEnvIsolationIT.java b/cameleer-server-app/src/test/java/io/cameleer/server/app/storage/ConfigEnvIsolationIT.java index 8f89f41f..becf875b 100644 --- a/cameleer-server-app/src/test/java/io/cameleer/server/app/storage/ConfigEnvIsolationIT.java +++ b/cameleer-server-app/src/test/java/io/cameleer/server/app/storage/ConfigEnvIsolationIT.java @@ -1,6 +1,6 @@ package io.cameleer.server.app.storage; -import com.cameleer.common.model.ApplicationConfig; +import io.cameleer.common.model.ApplicationConfig; import io.cameleer.server.app.AbstractPostgresIT; import io.cameleer.server.core.admin.AppSettings; import io.cameleer.server.core.admin.AppSettingsRepository; diff --git a/cameleer-server-app/src/test/java/io/cameleer/server/app/storage/PostgresDeploymentRepositoryIT.java b/cameleer-server-app/src/test/java/io/cameleer/server/app/storage/PostgresDeploymentRepositoryIT.java index 52fae39f..ab22c01c 100644 --- a/cameleer-server-app/src/test/java/io/cameleer/server/app/storage/PostgresDeploymentRepositoryIT.java +++ b/cameleer-server-app/src/test/java/io/cameleer/server/app/storage/PostgresDeploymentRepositoryIT.java @@ -1,6 +1,6 @@ package io.cameleer.server.app.storage; -import com.cameleer.common.model.ApplicationConfig; +import io.cameleer.common.model.ApplicationConfig; import io.cameleer.server.app.AbstractPostgresIT; import io.cameleer.server.core.runtime.Deployment; import io.cameleer.server.core.runtime.DeploymentConfigSnapshot; diff --git a/cameleer-server-core/pom.xml b/cameleer-server-core/pom.xml index cbe925e8..0b51b9c6 100644 --- a/cameleer-server-core/pom.xml +++ b/cameleer-server-core/pom.xml @@ -20,7 +20,7 @@ cameleer-license-api - com.cameleer + io.cameleer cameleer-common diff --git a/cameleer-server-core/src/main/java/io/cameleer/server/core/detail/DetailService.java b/cameleer-server-core/src/main/java/io/cameleer/server/core/detail/DetailService.java index d839812d..8cbeb45a 100644 --- a/cameleer-server-core/src/main/java/io/cameleer/server/core/detail/DetailService.java +++ b/cameleer-server-core/src/main/java/io/cameleer/server/core/detail/DetailService.java @@ -1,6 +1,6 @@ package io.cameleer.server.core.detail; -import com.cameleer.common.model.ProcessorExecution; +import io.cameleer.common.model.ProcessorExecution; import io.cameleer.server.core.storage.ExecutionStore; import io.cameleer.server.core.storage.ExecutionStore.ProcessorRecord; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/cameleer-server-core/src/main/java/io/cameleer/server/core/diagram/DiagramRenderer.java b/cameleer-server-core/src/main/java/io/cameleer/server/core/diagram/DiagramRenderer.java index df8cb9f0..426f62b7 100644 --- a/cameleer-server-core/src/main/java/io/cameleer/server/core/diagram/DiagramRenderer.java +++ b/cameleer-server-core/src/main/java/io/cameleer/server/core/diagram/DiagramRenderer.java @@ -1,6 +1,6 @@ package io.cameleer.server.core.diagram; -import com.cameleer.common.graph.RouteGraph; +import io.cameleer.common.graph.RouteGraph; /** * Renders a route graph as SVG or as a positioned JSON layout. diff --git a/cameleer-server-core/src/main/java/io/cameleer/server/core/ingestion/BufferedLogEntry.java b/cameleer-server-core/src/main/java/io/cameleer/server/core/ingestion/BufferedLogEntry.java index 36bf0e3a..6e0b886a 100644 --- a/cameleer-server-core/src/main/java/io/cameleer/server/core/ingestion/BufferedLogEntry.java +++ b/cameleer-server-core/src/main/java/io/cameleer/server/core/ingestion/BufferedLogEntry.java @@ -1,6 +1,6 @@ package io.cameleer.server.core.ingestion; -import com.cameleer.common.model.LogEntry; +import io.cameleer.common.model.LogEntry; /** * A log entry paired with its agent metadata, ready for buffered ClickHouse insertion. diff --git a/cameleer-server-core/src/main/java/io/cameleer/server/core/ingestion/ChunkAccumulator.java b/cameleer-server-core/src/main/java/io/cameleer/server/core/ingestion/ChunkAccumulator.java index bfdd57d6..8e21cc77 100644 --- a/cameleer-server-core/src/main/java/io/cameleer/server/core/ingestion/ChunkAccumulator.java +++ b/cameleer-server-core/src/main/java/io/cameleer/server/core/ingestion/ChunkAccumulator.java @@ -1,8 +1,8 @@ package io.cameleer.server.core.ingestion; -import com.cameleer.common.model.ExchangeSnapshot; -import com.cameleer.common.model.ExecutionChunk; -import com.cameleer.common.model.FlatProcessorRecord; +import io.cameleer.common.model.ExchangeSnapshot; +import io.cameleer.common.model.ExecutionChunk; +import io.cameleer.common.model.FlatProcessorRecord; import io.cameleer.server.core.storage.DiagramStore; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/cameleer-server-core/src/main/java/io/cameleer/server/core/ingestion/TaggedDiagram.java b/cameleer-server-core/src/main/java/io/cameleer/server/core/ingestion/TaggedDiagram.java index 1e8e41e9..e09f8bed 100644 --- a/cameleer-server-core/src/main/java/io/cameleer/server/core/ingestion/TaggedDiagram.java +++ b/cameleer-server-core/src/main/java/io/cameleer/server/core/ingestion/TaggedDiagram.java @@ -1,6 +1,6 @@ package io.cameleer.server.core.ingestion; -import com.cameleer.common.graph.RouteGraph; +import io.cameleer.common.graph.RouteGraph; /** * Pairs a {@link RouteGraph} with the authenticated agent identity and environment. diff --git a/cameleer-server-core/src/main/java/io/cameleer/server/core/runtime/DeploymentConfigSnapshot.java b/cameleer-server-core/src/main/java/io/cameleer/server/core/runtime/DeploymentConfigSnapshot.java index bd229060..53fab78a 100644 --- a/cameleer-server-core/src/main/java/io/cameleer/server/core/runtime/DeploymentConfigSnapshot.java +++ b/cameleer-server-core/src/main/java/io/cameleer/server/core/runtime/DeploymentConfigSnapshot.java @@ -1,6 +1,6 @@ package io.cameleer.server.core.runtime; -import com.cameleer.common.model.ApplicationConfig; +import io.cameleer.common.model.ApplicationConfig; import java.util.List; import java.util.Map; diff --git a/cameleer-server-core/src/main/java/io/cameleer/server/core/runtime/DirtyStateCalculator.java b/cameleer-server-core/src/main/java/io/cameleer/server/core/runtime/DirtyStateCalculator.java index b45f894d..cb5226e0 100644 --- a/cameleer-server-core/src/main/java/io/cameleer/server/core/runtime/DirtyStateCalculator.java +++ b/cameleer-server-core/src/main/java/io/cameleer/server/core/runtime/DirtyStateCalculator.java @@ -1,6 +1,6 @@ package io.cameleer.server.core.runtime; -import com.cameleer.common.model.ApplicationConfig; +import io.cameleer.common.model.ApplicationConfig; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/cameleer-server-core/src/main/java/io/cameleer/server/core/storage/DiagramStore.java b/cameleer-server-core/src/main/java/io/cameleer/server/core/storage/DiagramStore.java index b95c201f..84f166b7 100644 --- a/cameleer-server-core/src/main/java/io/cameleer/server/core/storage/DiagramStore.java +++ b/cameleer-server-core/src/main/java/io/cameleer/server/core/storage/DiagramStore.java @@ -1,6 +1,6 @@ package io.cameleer.server.core.storage; -import com.cameleer.common.graph.RouteGraph; +import io.cameleer.common.graph.RouteGraph; import io.cameleer.server.core.ingestion.TaggedDiagram; import java.util.Map; diff --git a/cameleer-server-core/src/main/java/io/cameleer/server/core/storage/LogIndex.java b/cameleer-server-core/src/main/java/io/cameleer/server/core/storage/LogIndex.java index 903beb41..b74b6923 100644 --- a/cameleer-server-core/src/main/java/io/cameleer/server/core/storage/LogIndex.java +++ b/cameleer-server-core/src/main/java/io/cameleer/server/core/storage/LogIndex.java @@ -1,6 +1,6 @@ package io.cameleer.server.core.storage; -import com.cameleer.common.model.LogEntry; +import io.cameleer.common.model.LogEntry; import io.cameleer.server.core.search.LogSearchRequest; import io.cameleer.server.core.search.LogSearchResponse; diff --git a/cameleer-server-core/src/test/java/io/cameleer/server/core/ingestion/ChunkAccumulatorTest.java b/cameleer-server-core/src/test/java/io/cameleer/server/core/ingestion/ChunkAccumulatorTest.java index 4de10215..fe092ce7 100644 --- a/cameleer-server-core/src/test/java/io/cameleer/server/core/ingestion/ChunkAccumulatorTest.java +++ b/cameleer-server-core/src/test/java/io/cameleer/server/core/ingestion/ChunkAccumulatorTest.java @@ -1,8 +1,8 @@ package io.cameleer.server.core.ingestion; -import com.cameleer.common.model.ExecutionChunk; -import com.cameleer.common.model.ExecutionStatus; -import com.cameleer.common.model.FlatProcessorRecord; +import io.cameleer.common.model.ExecutionChunk; +import io.cameleer.common.model.ExecutionStatus; +import io.cameleer.common.model.FlatProcessorRecord; import io.cameleer.server.core.storage.DiagramStore; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -20,7 +20,7 @@ class ChunkAccumulatorTest { private static final DiagramStore NO_OP_DIAGRAM_STORE = new DiagramStore() { public void store(io.cameleer.server.core.ingestion.TaggedDiagram d) {} - public Optional findByContentHash(String h) { return Optional.empty(); } + public Optional findByContentHash(String h) { return Optional.empty(); } public Optional findContentHashForRoute(String r, String a) { return Optional.empty(); } public Optional findLatestContentHashForAppRoute(String app, String r, String env) { return Optional.empty(); } public Map findProcessorRouteMapping(String app, String env) { return Map.of(); } diff --git a/cameleer-server-core/src/test/java/io/cameleer/server/core/runtime/DirtyStateCalculatorTest.java b/cameleer-server-core/src/test/java/io/cameleer/server/core/runtime/DirtyStateCalculatorTest.java index 8c931260..27387b7f 100644 --- a/cameleer-server-core/src/test/java/io/cameleer/server/core/runtime/DirtyStateCalculatorTest.java +++ b/cameleer-server-core/src/test/java/io/cameleer/server/core/runtime/DirtyStateCalculatorTest.java @@ -1,6 +1,6 @@ package io.cameleer.server.core.runtime; -import com.cameleer.common.model.ApplicationConfig; +import io.cameleer.common.model.ApplicationConfig; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import org.junit.jupiter.api.Test; diff --git a/pom.xml b/pom.xml index 86d75e8c..a326d0c8 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ - com.cameleer + io.cameleer cameleer-common ${cameleer-common.version}