From 72ea5d985f41ed4fdf4c5b3f9b48a5c843b20659 Mon Sep 17 00:00:00 2001 From: edinstance Date: Mon, 3 Nov 2025 22:23:53 +0000 Subject: [PATCH] fix: fixed search packaging --- k8s/aircraft/service.yml | 2 +- k8s/flights/service.yml | 2 +- k8s/gateway/service.yml | 2 +- k8s/search/service.yml | 2 +- .../src/main/java/search/config/OpenSearchConfig.java | 2 +- .../search/src/main/java/search/config/SearchLogger.java | 2 +- .../config/metrics/graphql/GraphqlMetricsHelpers.java | 2 +- .../metrics/graphql/GraphqlMetricsInstrumentation.java | 4 ++-- .../main/java/search/consumer/FlightEventConsumer.java | 8 ++++---- .../src/main/java/search/exceptions/DomainException.java | 2 +- .../main/java/search/exceptions/ExceptionCategories.java | 2 +- .../search/exceptions/GlobalGraphQlExceptionHandler.java | 2 +- .../java/search/exceptions/UnauthorizedException.java | 2 +- .../src/main/java/search/helpers/SearchHelpers.java | 6 +++--- .../search/src/main/java/search/model/FlightDocument.java | 2 +- .../main/java/search/resolver/FlightSearchResolver.java | 6 +++--- .../src/main/java/search/service/FlightIndexService.java | 2 +- .../src/main/java/search/service/FlightSearchService.java | 8 ++++---- .../test/java/{aviation => }/search/ApplicationTests.java | 2 +- 19 files changed, 30 insertions(+), 30 deletions(-) rename services/search/src/test/java/{aviation => }/search/ApplicationTests.java (91%) diff --git a/k8s/aircraft/service.yml b/k8s/aircraft/service.yml index 06dd693..5fa1173 100644 --- a/k8s/aircraft/service.yml +++ b/k8s/aircraft/service.yml @@ -41,7 +41,7 @@ spec: command: [ "sh", "-c", "until nc -z aircraft-cache.aircraft.svc.cluster.local 6379; do sleep 2; done;" ] containers: - name: aircraft-service - image: ghcr.io/edinstance/distributed-aviation-system-services/aircraft:latest + image: ghcr.io/edinstance/distributed-aviation-system-services/aircraft:dev ports: - containerPort: 8080 name: http diff --git a/k8s/flights/service.yml b/k8s/flights/service.yml index 3587b5b..6cb7474 100644 --- a/k8s/flights/service.yml +++ b/k8s/flights/service.yml @@ -36,7 +36,7 @@ spec: command: [ "sh", "-c", "until nc -z flights-cache.flights.svc.cluster.local 6379; do sleep 2; done;" ] containers: - name: flights-service - image: ghcr.io/edinstance/distributed-aviation-system-services/flights:latest + image: ghcr.io/edinstance/distributed-aviation-system-services/flights:dev ports: - containerPort: 8081 env: diff --git a/k8s/gateway/service.yml b/k8s/gateway/service.yml index 0423e34..37fc454 100644 --- a/k8s/gateway/service.yml +++ b/k8s/gateway/service.yml @@ -29,7 +29,7 @@ spec: spec: containers: - name: gateway-service - image: ghcr.io/edinstance/distributed-aviation-system-services/gateway:latest + image: ghcr.io/edinstance/distributed-aviation-system-services/gateway:dev ports: - containerPort: 4001 env: diff --git a/k8s/search/service.yml b/k8s/search/service.yml index 339d354..2045730 100644 --- a/k8s/search/service.yml +++ b/k8s/search/service.yml @@ -29,7 +29,7 @@ spec: spec: containers: - name: search-service - image: ghcr.io/edinstance/distributed-aviation-system-services/search:latest + image: ghcr.io/edinstance/distributed-aviation-system-services/search:dev ports: - containerPort: 8082 env: diff --git a/services/search/src/main/java/search/config/OpenSearchConfig.java b/services/search/src/main/java/search/config/OpenSearchConfig.java index ac44222..b3f2e0c 100644 --- a/services/search/src/main/java/search/config/OpenSearchConfig.java +++ b/services/search/src/main/java/search/config/OpenSearchConfig.java @@ -1,4 +1,4 @@ -package aviation.search.config; +package search.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; diff --git a/services/search/src/main/java/search/config/SearchLogger.java b/services/search/src/main/java/search/config/SearchLogger.java index 28a67ba..103f61c 100644 --- a/services/search/src/main/java/search/config/SearchLogger.java +++ b/services/search/src/main/java/search/config/SearchLogger.java @@ -1,4 +1,4 @@ -package aviation.search.config; +package search.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/services/search/src/main/java/search/config/metrics/graphql/GraphqlMetricsHelpers.java b/services/search/src/main/java/search/config/metrics/graphql/GraphqlMetricsHelpers.java index 045250c..ebe4839 100644 --- a/services/search/src/main/java/search/config/metrics/graphql/GraphqlMetricsHelpers.java +++ b/services/search/src/main/java/search/config/metrics/graphql/GraphqlMetricsHelpers.java @@ -1,4 +1,4 @@ -package aviation.search.config.metrics.graphql; +package search.config.metrics.graphql; import graphql.execution.instrumentation.parameters.InstrumentationFieldFetchParameters; import graphql.language.Definition; diff --git a/services/search/src/main/java/search/config/metrics/graphql/GraphqlMetricsInstrumentation.java b/services/search/src/main/java/search/config/metrics/graphql/GraphqlMetricsInstrumentation.java index 1444dfa..b5ced18 100644 --- a/services/search/src/main/java/search/config/metrics/graphql/GraphqlMetricsInstrumentation.java +++ b/services/search/src/main/java/search/config/metrics/graphql/GraphqlMetricsInstrumentation.java @@ -1,4 +1,4 @@ -package aviation.search.config.metrics.graphql; +package search.config.metrics.graphql; import graphql.ExecutionResult; import graphql.execution.DataFetcherResult; @@ -37,7 +37,7 @@ public class GraphqlMetricsInstrumentation implements Instrumentation { * A constructor for the instrumentation. */ public GraphqlMetricsInstrumentation() { - Meter meter = GlobalOpenTelemetry.getMeter("aviation.search.graphql"); + Meter meter = GlobalOpenTelemetry.getMeter("search.graphql"); this.graphqlRequests = meter.counterBuilder("search_graphql_requests_total") .setDescription("Total GraphQL operations") diff --git a/services/search/src/main/java/search/consumer/FlightEventConsumer.java b/services/search/src/main/java/search/consumer/FlightEventConsumer.java index c8d8133..f0aae70 100644 --- a/services/search/src/main/java/search/consumer/FlightEventConsumer.java +++ b/services/search/src/main/java/search/consumer/FlightEventConsumer.java @@ -1,8 +1,8 @@ -package aviation.search.consumer; +package search.consumer; -import aviation.search.config.SearchLogger; -import aviation.search.model.FlightDocument; -import aviation.search.service.FlightSearchService; +import search.config.SearchLogger; +import search.model.FlightDocument; +import search.service.FlightSearchService; import java.time.Instant; import lombok.RequiredArgsConstructor; import org.apache.avro.Schema; diff --git a/services/search/src/main/java/search/exceptions/DomainException.java b/services/search/src/main/java/search/exceptions/DomainException.java index d0cf911..bd0554e 100644 --- a/services/search/src/main/java/search/exceptions/DomainException.java +++ b/services/search/src/main/java/search/exceptions/DomainException.java @@ -1,4 +1,4 @@ -package aviation.search.exceptions; +package search.exceptions; import lombok.Getter; diff --git a/services/search/src/main/java/search/exceptions/ExceptionCategories.java b/services/search/src/main/java/search/exceptions/ExceptionCategories.java index a6956ea..2ce91bb 100644 --- a/services/search/src/main/java/search/exceptions/ExceptionCategories.java +++ b/services/search/src/main/java/search/exceptions/ExceptionCategories.java @@ -1,4 +1,4 @@ -package aviation.search.exceptions; +package search.exceptions; /** * An enum for managing exception categories. diff --git a/services/search/src/main/java/search/exceptions/GlobalGraphQlExceptionHandler.java b/services/search/src/main/java/search/exceptions/GlobalGraphQlExceptionHandler.java index 36aa776..a1ae453 100644 --- a/services/search/src/main/java/search/exceptions/GlobalGraphQlExceptionHandler.java +++ b/services/search/src/main/java/search/exceptions/GlobalGraphQlExceptionHandler.java @@ -1,4 +1,4 @@ -package aviation.search.exceptions; +package search.exceptions; import graphql.GraphQLError; import graphql.GraphqlErrorBuilder; diff --git a/services/search/src/main/java/search/exceptions/UnauthorizedException.java b/services/search/src/main/java/search/exceptions/UnauthorizedException.java index 23cc32f..5ad648a 100644 --- a/services/search/src/main/java/search/exceptions/UnauthorizedException.java +++ b/services/search/src/main/java/search/exceptions/UnauthorizedException.java @@ -1,4 +1,4 @@ -package aviation.search.exceptions; +package search.exceptions; /** * An exception for when a user is unauthorized. diff --git a/services/search/src/main/java/search/helpers/SearchHelpers.java b/services/search/src/main/java/search/helpers/SearchHelpers.java index 257b555..481f2a7 100644 --- a/services/search/src/main/java/search/helpers/SearchHelpers.java +++ b/services/search/src/main/java/search/helpers/SearchHelpers.java @@ -1,7 +1,7 @@ -package aviation.search.helpers; +package search.helpers; -import aviation.search.model.FlightDocument; -import aviation.search.service.FlightIndexService; +import search.model.FlightDocument; +import search.service.FlightIndexService; import java.io.IOException; import java.util.List; import java.util.stream.Collectors; diff --git a/services/search/src/main/java/search/model/FlightDocument.java b/services/search/src/main/java/search/model/FlightDocument.java index 2b31dc4..54d96f3 100644 --- a/services/search/src/main/java/search/model/FlightDocument.java +++ b/services/search/src/main/java/search/model/FlightDocument.java @@ -1,4 +1,4 @@ -package aviation.search.model; +package search.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/services/search/src/main/java/search/resolver/FlightSearchResolver.java b/services/search/src/main/java/search/resolver/FlightSearchResolver.java index 025a883..f044f39 100644 --- a/services/search/src/main/java/search/resolver/FlightSearchResolver.java +++ b/services/search/src/main/java/search/resolver/FlightSearchResolver.java @@ -1,7 +1,7 @@ -package aviation.search.resolver; +package search.resolver; -import aviation.search.model.FlightDocument; -import aviation.search.service.FlightSearchService; +import search.model.FlightDocument; +import search.service.FlightSearchService; import com.netflix.graphql.dgs.DgsComponent; import com.netflix.graphql.dgs.DgsQuery; import com.netflix.graphql.dgs.InputArgument; diff --git a/services/search/src/main/java/search/service/FlightIndexService.java b/services/search/src/main/java/search/service/FlightIndexService.java index 892920f..cb61adf 100644 --- a/services/search/src/main/java/search/service/FlightIndexService.java +++ b/services/search/src/main/java/search/service/FlightIndexService.java @@ -1,4 +1,4 @@ -package aviation.search.service; +package search.service; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/services/search/src/main/java/search/service/FlightSearchService.java b/services/search/src/main/java/search/service/FlightSearchService.java index 0e520f2..1f3c5a6 100644 --- a/services/search/src/main/java/search/service/FlightSearchService.java +++ b/services/search/src/main/java/search/service/FlightSearchService.java @@ -1,8 +1,8 @@ -package aviation.search.service; +package search.service; -import aviation.search.config.SearchLogger; -import aviation.search.helpers.SearchHelpers; -import aviation.search.model.FlightDocument; +import search.config.SearchLogger; +import search.helpers.SearchHelpers; +import search.model.FlightDocument; import java.io.IOException; import java.util.List; import lombok.RequiredArgsConstructor; diff --git a/services/search/src/test/java/aviation/search/ApplicationTests.java b/services/search/src/test/java/search/ApplicationTests.java similarity index 91% rename from services/search/src/test/java/aviation/search/ApplicationTests.java rename to services/search/src/test/java/search/ApplicationTests.java index bbe923c..c2e7f30 100644 --- a/services/search/src/test/java/aviation/search/ApplicationTests.java +++ b/services/search/src/test/java/search/ApplicationTests.java @@ -1,4 +1,4 @@ -package aviation.search; +package search; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest;