From 407eebbca9305537f2f4c3d2d6e57aa35b2a56d5 Mon Sep 17 00:00:00 2001 From: "bartlomiej.zylinski" Date: Thu, 6 Jun 2024 13:20:55 +0200 Subject: [PATCH 1/8] Added Docker Compose --- docker-compose.yaml | 24 ++++++++ pom.xml | 49 +++------------- src/main/java/otterjet/MsgsController.java | 58 +++++++++---------- .../monitoring/NatsMonitoringApiClient.java | 5 +- .../NatsMonitoringAutoConfiguration.java | 4 +- .../proto/ProtoBufMessageDeserializer.java | 2 +- 6 files changed, 65 insertions(+), 77 deletions(-) create mode 100644 docker-compose.yaml diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000..1c2b37d --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,24 @@ +version: '3.9' + +volumes: + nats-storage: + driver: local + +services: + nats: + image: nats:2.10.7 + command: [ "--jetstream", "-m", "8222" ] + deploy: + resources: + limits: + memory: 2g + reservations: + memory: 2g + volumes: + - nats-storage:/data + expose: + - "4222" + - "8222" + ports: + - "4222:4222" + - "8222:8222" \ No newline at end of file diff --git a/pom.xml b/pom.xml index 7784fc8..fbe00ce 100644 --- a/pom.xml +++ b/pom.xml @@ -3,10 +3,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.softwaremill - OtterJet + com.softwaremill.otter + jet 0.0.1 - war + jar Visualization of messages from a NATS JetStream server @@ -16,7 +16,6 @@ 17 2.41.1 1.19.3 - 5.10.1 3.2.0 2023.0.0 @@ -44,13 +43,6 @@ pom import - - org.junit - junit-bom - ${junit.version} - pom - import - @@ -107,11 +99,6 @@ 7.0 provided - - org.glassfish.ozark - ozark - 1.0.0-m02 - org.springframework.boot spring-boot-starter-web @@ -144,35 +131,20 @@ io.github.openfeign feign-jackson - - org.testcontainers - testcontainers - test - - - com.github.javafaker - javafaker - 1.0.2 - test - - - org.junit.jupiter - junit-jupiter - test - org.springframework.boot spring-boot-starter-test test - org.awaitility - awaitility + org.testcontainers + testcontainers test - org.assertj - assertj-core + com.github.javafaker + javafaker + 1.0.2 test @@ -185,11 +157,6 @@ - - org.apache.maven.plugins - maven-war-plugin - 3.4.0 - org.springframework.boot spring-boot-maven-plugin diff --git a/src/main/java/otterjet/MsgsController.java b/src/main/java/otterjet/MsgsController.java index e81debd..d16613d 100644 --- a/src/main/java/otterjet/MsgsController.java +++ b/src/main/java/otterjet/MsgsController.java @@ -2,6 +2,7 @@ import java.util.List; import java.util.Optional; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; @@ -12,37 +13,34 @@ @Controller public class MsgsController { - private static final String TEMPLATE_NAME = "msgs-page"; - private static final Logger LOG = LoggerFactory.getLogger(MsgsController.class); + private static final String TEMPLATE_NAME = "msgs-page"; + private static final Logger LOG = LoggerFactory.getLogger(MsgsController.class); - private final ReaderService readerService; - private String subjectFilter; - private String typeFilter; - private String bodyContentFilter; + private final ReaderService readerService; - public MsgsController(ReaderService readerService) { - this.readerService = readerService; - } + public MsgsController(ReaderService readerService) { + this.readerService = readerService; + } - @GetMapping("/msgs") - public String page( - @RequestParam(value = "subject", required = false) String subject, - @RequestParam(value = "type", required = false) String type, - @RequestParam(value = "bodyContent", required = false) String bodyContent, - @RequestParam(value = "page", defaultValue = "0") int page, - @RequestParam(value = "size", defaultValue = "10") int size, - Model model) { - this.subjectFilter = Optional.ofNullable(subject).orElse(""); - this.typeFilter = Optional.ofNullable(type).orElse(""); - this.bodyContentFilter = Optional.ofNullable(bodyContent).orElse(""); - List filteredMessages = readerService.filter(subjectFilter, typeFilter, page, size, bodyContentFilter); - LOG.info("amount of read messages: " + filteredMessages.size()); - model.addAttribute("messages", filteredMessages); - model.addAttribute("subject", subjectFilter); - model.addAttribute("type", typeFilter); - model.addAttribute("bodyContent", bodyContentFilter); - model.addAttribute("page", page); - model.addAttribute("size", size); - return TEMPLATE_NAME; - } + @GetMapping("/msgs") + public String page( + @RequestParam(value = "subject", required = false) String subject, + @RequestParam(value = "type", required = false) String type, + @RequestParam(value = "bodyContent", required = false) String bodyContent, + @RequestParam(value = "page", defaultValue = "0") int page, + @RequestParam(value = "size", defaultValue = "10") int size, + Model model) { + String subjectFilter = Optional.ofNullable(subject).orElse(""); + String typeFilter = Optional.ofNullable(type).orElse(""); + String bodyContentFilter = Optional.ofNullable(bodyContent).orElse(""); + List filteredMessages = readerService.filter(subjectFilter, typeFilter, page, size, bodyContentFilter); + LOG.info("amount of read messages: " + filteredMessages.size()); + model.addAttribute("messages", filteredMessages); + model.addAttribute("subject", subjectFilter); + model.addAttribute("type", typeFilter); + model.addAttribute("bodyContent", bodyContentFilter); + model.addAttribute("page", page); + model.addAttribute("size", size); + return TEMPLATE_NAME; + } } diff --git a/src/main/java/otterjet/monitoring/NatsMonitoringApiClient.java b/src/main/java/otterjet/monitoring/NatsMonitoringApiClient.java index 0e696bc..5caa4cf 100644 --- a/src/main/java/otterjet/monitoring/NatsMonitoringApiClient.java +++ b/src/main/java/otterjet/monitoring/NatsMonitoringApiClient.java @@ -1,9 +1,8 @@ package otterjet.monitoring; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.GetMapping; interface NatsMonitoringApiClient { - @RequestMapping(method = RequestMethod.GET, value = "/jsz?streams=true&config=true") + @GetMapping("/jsz?streams=true&config=true") JetStreamMonitoringResponse getJetStreamMonitoringData(); } diff --git a/src/main/java/otterjet/monitoring/NatsMonitoringAutoConfiguration.java b/src/main/java/otterjet/monitoring/NatsMonitoringAutoConfiguration.java index dd8430e..3c2f461 100644 --- a/src/main/java/otterjet/monitoring/NatsMonitoringAutoConfiguration.java +++ b/src/main/java/otterjet/monitoring/NatsMonitoringAutoConfiguration.java @@ -16,7 +16,7 @@ class NatsMonitoringAutoConfiguration { @Configuration - @ConditionalOnExpression("'${nats.server.monitoring.port:}' != ''") // monitoring configured + @ConditionalOnExpression("'${nats.server.monitoring.port:}' != ''") static class NatsMonitoringEnabledConfiguration { @Bean @@ -48,7 +48,7 @@ private static String createNatsMonitoringUrl( } @Configuration - @ConditionalOnExpression("'${nats.server.monitoring.port:}' == ''") // monitoring not configured + @ConditionalOnExpression("'${nats.server.monitoring.port:}' == ''") @AutoConfigureAfter(NatsMonitoringEnabledConfiguration.class) static class NatsMonitoringDisabledConfiguration { diff --git a/src/main/java/otterjet/proto/ProtoBufMessageDeserializer.java b/src/main/java/otterjet/proto/ProtoBufMessageDeserializer.java index d077985..f40a703 100644 --- a/src/main/java/otterjet/proto/ProtoBufMessageDeserializer.java +++ b/src/main/java/otterjet/proto/ProtoBufMessageDeserializer.java @@ -52,7 +52,7 @@ public DeserializedMessage deserializeMessage(ByteBuffer buffer) { final var descriptors = descs.stream() .flatMap(desc -> desc.getMessageTypes().stream()) - .collect(Collectors.toList()); + .toList(); final var messageDescriptor = descriptors.stream() .filter(desc -> messageTypeName.equals(desc.getName()) || messageTypeName.equals(desc.getFullName())) From e6e6ae5229ff6cfbfcd9d1e30aa37e602cdf7029 Mon Sep 17 00:00:00 2001 From: "bartlomiej.zylinski" Date: Thu, 6 Jun 2024 13:26:25 +0200 Subject: [PATCH 2/8] Fix CI desc --- .github/workflows/CI.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 97357e6..0e4fcc6 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -12,8 +12,7 @@ permissions: jobs: ci: - # run on 1) push, 2) external PRs, 3) - # do not run on internal, non-steward PRs since those will be run by push to branch + # run on push, external PRs do not run on internal PRs since those will be run by push to branch if: | github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository From 9d2a9aed77bfd2b73085daad8dc2e5725811cd1a Mon Sep 17 00:00:00 2001 From: "bartlomiej.zylinski" Date: Thu, 6 Jun 2024 13:31:27 +0200 Subject: [PATCH 3/8] Packages rename --- .../jet}/DeserializationException.java | 2 +- .../jet}/DeserializedMessage.java | 2 +- .../jet}/MainViewController.java | 4 ++-- .../jet}/MessageDeserializer.java | 2 +- .../jet}/MsgsController.java | 2 +- .../jet}/OtterJetApplication.java | 2 +- .../{otterjet => otter/jet}/ReadMessage.java | 2 +- .../jet}/ReaderConfiguration.java | 2 +- .../jet}/ReaderConfigurationProperties.java | 2 +- .../jet}/ReaderService.java | 2 +- .../monitoring/AccountDetailsResponse.java | 2 +- .../monitoring/DirectMonitoringResponse.java | 2 +- .../DirectNatsMonitoringDataLoader.java | 2 +- .../JetStreamMonitoringResponse.java | 2 +- .../jet}/monitoring/MonitoringController.java | 2 +- .../jet}/monitoring/MonitoringData.java | 2 +- .../MonitoringNotConfiguredResponse.java | 2 +- .../monitoring/NatsMonitoringApiClient.java | 2 +- .../NatsMonitoringAutoConfiguration.java | 2 +- .../monitoring/NatsMonitoringDataLoader.java | 2 +- .../NoMonitoringConfiguredDataLoader.java | 2 +- .../jet}/monitoring/StreamConfigResponse.java | 2 +- .../monitoring/StreamDetailsResponse.java | 2 +- .../jet}/monitoring/StreamStateResponse.java | 2 +- .../PlainTextMessageDeserializer.java | 6 +++--- ...nTextMessageDeserializerConfiguration.java | 4 ++-- ...toMessageToDynamicMessageDeserializer.java | 2 +- .../FromAnyProtoMessageTypeNameSelector.java | 2 +- .../jet}/proto/MessageTypeNameSelector.java | 2 +- .../proto/ProtoBufMessageDeserializer.java | 10 ++++----- ...ProtoMessageDeserializerConfiguration.java | 4 ++-- ...toMessageToDynamicMessageDeserializer.java | 2 +- .../ProvidedProtoMessageTypeNameSelector.java | 2 +- ...toMessageToDynamicMessageDeserializer.java | 2 +- src/main/resources/application.yml | 2 +- .../jet}/AbstractIntegrationTest.java | 2 +- .../jet}/JetStreamContainerInitializer.java | 2 +- .../jet}/JetStreamUtils.java | 2 +- .../jet}/LocalJetStreamDropApplication.java | 2 +- .../assertions/ComparisonConfiguration.java | 2 +- .../examples/RandomProtoPersonGenerator.java | 4 ++-- ...lainTextMessagePublisherConfiguration.java | 5 +++-- .../jet}/examples/protobuf/PersonProtos.java | 4 ++-- ...ProtobufMessagePublisherConfiguration.java | 7 ++++--- .../plaintext/PlainTextMessageReaderTest.java | 20 ++++++++++-------- .../jet}/proto/AnyProtoMessageReaderTest.java | 21 ++++++++++--------- .../proto/SimpleProtoMessageReaderTest.java | 21 ++++++++++--------- src/test/resources/person.proto | 2 +- 48 files changed, 94 insertions(+), 88 deletions(-) rename src/main/java/{otterjet => otter/jet}/DeserializationException.java (91%) rename src/main/java/{otterjet => otter/jet}/DeserializedMessage.java (77%) rename src/main/java/{otterjet => otter/jet}/MainViewController.java (88%) rename src/main/java/{otterjet => otter/jet}/MessageDeserializer.java (88%) rename src/main/java/{otterjet => otter/jet}/MsgsController.java (99%) rename src/main/java/{otterjet => otter/jet}/OtterJetApplication.java (96%) rename src/main/java/{otterjet => otter/jet}/ReadMessage.java (87%) rename src/main/java/{otterjet => otter/jet}/ReaderConfiguration.java (98%) rename src/main/java/{otterjet => otter/jet}/ReaderConfigurationProperties.java (97%) rename src/main/java/{otterjet => otter/jet}/ReaderService.java (99%) rename src/main/java/{otterjet => otter/jet}/monitoring/AccountDetailsResponse.java (87%) rename src/main/java/{otterjet => otter/jet}/monitoring/DirectMonitoringResponse.java (78%) rename src/main/java/{otterjet => otter/jet}/monitoring/DirectNatsMonitoringDataLoader.java (94%) rename src/main/java/{otterjet => otter/jet}/monitoring/JetStreamMonitoringResponse.java (89%) rename src/main/java/{otterjet => otter/jet}/monitoring/MonitoringController.java (96%) rename src/main/java/{otterjet => otter/jet}/monitoring/MonitoringData.java (79%) rename src/main/java/{otterjet => otter/jet}/monitoring/MonitoringNotConfiguredResponse.java (72%) rename src/main/java/{otterjet => otter/jet}/monitoring/NatsMonitoringApiClient.java (87%) rename src/main/java/{otterjet => otter/jet}/monitoring/NatsMonitoringAutoConfiguration.java (98%) rename src/main/java/{otterjet => otter/jet}/monitoring/NatsMonitoringDataLoader.java (79%) rename src/main/java/{otterjet => otter/jet}/monitoring/NoMonitoringConfiguredDataLoader.java (89%) rename src/main/java/{otterjet => otter/jet}/monitoring/StreamConfigResponse.java (74%) rename src/main/java/{otterjet => otter/jet}/monitoring/StreamDetailsResponse.java (79%) rename src/main/java/{otterjet => otter/jet}/monitoring/StreamStateResponse.java (83%) rename src/main/java/{otterjet => otter/jet}/plaintext/PlainTextMessageDeserializer.java (76%) rename src/main/java/{otterjet => otter/jet}/plaintext/PlainTextMessageDeserializerConfiguration.java (87%) rename src/main/java/{otterjet => otter/jet}/proto/AnyProtoMessageToDynamicMessageDeserializer.java (95%) rename src/main/java/{otterjet => otter/jet}/proto/FromAnyProtoMessageTypeNameSelector.java (95%) rename src/main/java/{otterjet => otter/jet}/proto/MessageTypeNameSelector.java (88%) rename src/main/java/{otterjet => otter/jet}/proto/ProtoBufMessageDeserializer.java (95%) rename src/main/java/{otterjet => otter/jet}/proto/ProtoMessageDeserializerConfiguration.java (97%) rename src/main/java/{otterjet => otter/jet}/proto/ProtoMessageToDynamicMessageDeserializer.java (92%) rename src/main/java/{otterjet => otter/jet}/proto/ProvidedProtoMessageTypeNameSelector.java (93%) rename src/main/java/{otterjet => otter/jet}/proto/SimpleProtoMessageToDynamicMessageDeserializer.java (95%) rename src/test/java/{otterjet => otter/jet}/AbstractIntegrationTest.java (97%) rename src/test/java/{otterjet => otter/jet}/JetStreamContainerInitializer.java (98%) rename src/test/java/{otterjet => otter/jet}/JetStreamUtils.java (98%) rename src/test/java/{otterjet => otter/jet}/LocalJetStreamDropApplication.java (92%) rename src/test/java/{otterjet => otter/jet}/assertions/ComparisonConfiguration.java (97%) rename src/test/java/{otterjet => otter/jet}/examples/RandomProtoPersonGenerator.java (86%) rename src/test/java/{otterjet => otter/jet}/examples/plaintext/PlainTextMessagePublisherConfiguration.java (95%) rename src/test/java/{otterjet => otter/jet}/examples/protobuf/PersonProtos.java (99%) rename src/test/java/{otterjet => otter/jet}/examples/protobuf/SimpleProtobufMessagePublisherConfiguration.java (91%) rename src/test/java/{otterjet => otter/jet}/plaintext/PlainTextMessageReaderTest.java (80%) rename src/test/java/{otterjet => otter/jet}/proto/AnyProtoMessageReaderTest.java (85%) rename src/test/java/{otterjet => otter/jet}/proto/SimpleProtoMessageReaderTest.java (85%) diff --git a/src/main/java/otterjet/DeserializationException.java b/src/main/java/otter/jet/DeserializationException.java similarity index 91% rename from src/main/java/otterjet/DeserializationException.java rename to src/main/java/otter/jet/DeserializationException.java index d66fd35..a85b8b9 100644 --- a/src/main/java/otterjet/DeserializationException.java +++ b/src/main/java/otter/jet/DeserializationException.java @@ -1,4 +1,4 @@ -package otterjet; +package otter.jet; public class DeserializationException extends RuntimeException { private static final long serialVersionUID = -2575341690419824332L; diff --git a/src/main/java/otterjet/DeserializedMessage.java b/src/main/java/otter/jet/DeserializedMessage.java similarity index 77% rename from src/main/java/otterjet/DeserializedMessage.java rename to src/main/java/otter/jet/DeserializedMessage.java index a64b919..a0c86e0 100644 --- a/src/main/java/otterjet/DeserializedMessage.java +++ b/src/main/java/otter/jet/DeserializedMessage.java @@ -1,3 +1,3 @@ -package otterjet; +package otter.jet; public record DeserializedMessage(String name, String content) {} diff --git a/src/main/java/otterjet/MainViewController.java b/src/main/java/otter/jet/MainViewController.java similarity index 88% rename from src/main/java/otterjet/MainViewController.java rename to src/main/java/otter/jet/MainViewController.java index 55a417f..32a38b4 100644 --- a/src/main/java/otterjet/MainViewController.java +++ b/src/main/java/otter/jet/MainViewController.java @@ -1,6 +1,6 @@ -package otterjet; +package otter.jet; -import otterjet.monitoring.NatsMonitoringDataLoader; +import otter.jet.monitoring.NatsMonitoringDataLoader; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/otterjet/MessageDeserializer.java b/src/main/java/otter/jet/MessageDeserializer.java similarity index 88% rename from src/main/java/otterjet/MessageDeserializer.java rename to src/main/java/otter/jet/MessageDeserializer.java index 90020cb..b02a54d 100644 --- a/src/main/java/otterjet/MessageDeserializer.java +++ b/src/main/java/otter/jet/MessageDeserializer.java @@ -1,4 +1,4 @@ -package otterjet; +package otter.jet; import java.nio.ByteBuffer; diff --git a/src/main/java/otterjet/MsgsController.java b/src/main/java/otter/jet/MsgsController.java similarity index 99% rename from src/main/java/otterjet/MsgsController.java rename to src/main/java/otter/jet/MsgsController.java index d16613d..1bbd2d5 100644 --- a/src/main/java/otterjet/MsgsController.java +++ b/src/main/java/otter/jet/MsgsController.java @@ -1,4 +1,4 @@ -package otterjet; +package otter.jet; import java.util.List; import java.util.Optional; diff --git a/src/main/java/otterjet/OtterJetApplication.java b/src/main/java/otter/jet/OtterJetApplication.java similarity index 96% rename from src/main/java/otterjet/OtterJetApplication.java rename to src/main/java/otter/jet/OtterJetApplication.java index f0d86d9..16644fd 100644 --- a/src/main/java/otterjet/OtterJetApplication.java +++ b/src/main/java/otter/jet/OtterJetApplication.java @@ -1,4 +1,4 @@ -package otterjet; +package otter.jet; import org.springframework.boot.Banner; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/src/main/java/otterjet/ReadMessage.java b/src/main/java/otter/jet/ReadMessage.java similarity index 87% rename from src/main/java/otterjet/ReadMessage.java rename to src/main/java/otter/jet/ReadMessage.java index bb0d26c..ea7bb59 100644 --- a/src/main/java/otterjet/ReadMessage.java +++ b/src/main/java/otter/jet/ReadMessage.java @@ -1,4 +1,4 @@ -package otterjet; +package otter.jet; import java.time.LocalDateTime; diff --git a/src/main/java/otterjet/ReaderConfiguration.java b/src/main/java/otter/jet/ReaderConfiguration.java similarity index 98% rename from src/main/java/otterjet/ReaderConfiguration.java rename to src/main/java/otter/jet/ReaderConfiguration.java index e77be66..5f7be19 100644 --- a/src/main/java/otterjet/ReaderConfiguration.java +++ b/src/main/java/otter/jet/ReaderConfiguration.java @@ -1,4 +1,4 @@ -package otterjet; +package otter.jet; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/src/main/java/otterjet/ReaderConfigurationProperties.java b/src/main/java/otter/jet/ReaderConfigurationProperties.java similarity index 97% rename from src/main/java/otterjet/ReaderConfigurationProperties.java rename to src/main/java/otter/jet/ReaderConfigurationProperties.java index 96e18f9..f9b5bca 100644 --- a/src/main/java/otterjet/ReaderConfigurationProperties.java +++ b/src/main/java/otter/jet/ReaderConfigurationProperties.java @@ -1,4 +1,4 @@ -package otterjet; +package otter.jet; import java.util.Objects; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/otterjet/ReaderService.java b/src/main/java/otter/jet/ReaderService.java similarity index 99% rename from src/main/java/otterjet/ReaderService.java rename to src/main/java/otter/jet/ReaderService.java index 8ac7c9b..f793eab 100644 --- a/src/main/java/otterjet/ReaderService.java +++ b/src/main/java/otter/jet/ReaderService.java @@ -1,4 +1,4 @@ -package otterjet; +package otter.jet; import io.nats.client.Connection; import io.nats.client.JetStream; diff --git a/src/main/java/otterjet/monitoring/AccountDetailsResponse.java b/src/main/java/otter/jet/monitoring/AccountDetailsResponse.java similarity index 87% rename from src/main/java/otterjet/monitoring/AccountDetailsResponse.java rename to src/main/java/otter/jet/monitoring/AccountDetailsResponse.java index 3d6d95f..5016241 100644 --- a/src/main/java/otterjet/monitoring/AccountDetailsResponse.java +++ b/src/main/java/otter/jet/monitoring/AccountDetailsResponse.java @@ -1,4 +1,4 @@ -package otterjet.monitoring; +package otter.jet.monitoring; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; diff --git a/src/main/java/otterjet/monitoring/DirectMonitoringResponse.java b/src/main/java/otter/jet/monitoring/DirectMonitoringResponse.java similarity index 78% rename from src/main/java/otterjet/monitoring/DirectMonitoringResponse.java rename to src/main/java/otter/jet/monitoring/DirectMonitoringResponse.java index eb19e35..9cc76b8 100644 --- a/src/main/java/otterjet/monitoring/DirectMonitoringResponse.java +++ b/src/main/java/otter/jet/monitoring/DirectMonitoringResponse.java @@ -1,4 +1,4 @@ -package otterjet.monitoring; +package otter.jet.monitoring; public record DirectMonitoringResponse(JetStreamMonitoringResponse response) implements MonitoringData {} diff --git a/src/main/java/otterjet/monitoring/DirectNatsMonitoringDataLoader.java b/src/main/java/otter/jet/monitoring/DirectNatsMonitoringDataLoader.java similarity index 94% rename from src/main/java/otterjet/monitoring/DirectNatsMonitoringDataLoader.java rename to src/main/java/otter/jet/monitoring/DirectNatsMonitoringDataLoader.java index c9e528f..acd23b4 100644 --- a/src/main/java/otterjet/monitoring/DirectNatsMonitoringDataLoader.java +++ b/src/main/java/otter/jet/monitoring/DirectNatsMonitoringDataLoader.java @@ -1,4 +1,4 @@ -package otterjet.monitoring; +package otter.jet.monitoring; class DirectNatsMonitoringDataLoader implements NatsMonitoringDataLoader { diff --git a/src/main/java/otterjet/monitoring/JetStreamMonitoringResponse.java b/src/main/java/otter/jet/monitoring/JetStreamMonitoringResponse.java similarity index 89% rename from src/main/java/otterjet/monitoring/JetStreamMonitoringResponse.java rename to src/main/java/otter/jet/monitoring/JetStreamMonitoringResponse.java index a2ab231..7db0815 100644 --- a/src/main/java/otterjet/monitoring/JetStreamMonitoringResponse.java +++ b/src/main/java/otter/jet/monitoring/JetStreamMonitoringResponse.java @@ -1,4 +1,4 @@ -package otterjet.monitoring; +package otter.jet.monitoring; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; diff --git a/src/main/java/otterjet/monitoring/MonitoringController.java b/src/main/java/otter/jet/monitoring/MonitoringController.java similarity index 96% rename from src/main/java/otterjet/monitoring/MonitoringController.java rename to src/main/java/otter/jet/monitoring/MonitoringController.java index 8dd12cc..c1fd540 100644 --- a/src/main/java/otterjet/monitoring/MonitoringController.java +++ b/src/main/java/otter/jet/monitoring/MonitoringController.java @@ -1,4 +1,4 @@ -package otterjet.monitoring; +package otter.jet.monitoring; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/src/main/java/otterjet/monitoring/MonitoringData.java b/src/main/java/otter/jet/monitoring/MonitoringData.java similarity index 79% rename from src/main/java/otterjet/monitoring/MonitoringData.java rename to src/main/java/otter/jet/monitoring/MonitoringData.java index 42a552e..58979ad 100644 --- a/src/main/java/otterjet/monitoring/MonitoringData.java +++ b/src/main/java/otter/jet/monitoring/MonitoringData.java @@ -1,4 +1,4 @@ -package otterjet.monitoring; +package otter.jet.monitoring; public sealed interface MonitoringData permits DirectMonitoringResponse, MonitoringNotConfiguredResponse {} diff --git a/src/main/java/otterjet/monitoring/MonitoringNotConfiguredResponse.java b/src/main/java/otter/jet/monitoring/MonitoringNotConfiguredResponse.java similarity index 72% rename from src/main/java/otterjet/monitoring/MonitoringNotConfiguredResponse.java rename to src/main/java/otter/jet/monitoring/MonitoringNotConfiguredResponse.java index 054bd84..d1464fa 100644 --- a/src/main/java/otterjet/monitoring/MonitoringNotConfiguredResponse.java +++ b/src/main/java/otter/jet/monitoring/MonitoringNotConfiguredResponse.java @@ -1,3 +1,3 @@ -package otterjet.monitoring; +package otter.jet.monitoring; public final class MonitoringNotConfiguredResponse implements MonitoringData {} diff --git a/src/main/java/otterjet/monitoring/NatsMonitoringApiClient.java b/src/main/java/otter/jet/monitoring/NatsMonitoringApiClient.java similarity index 87% rename from src/main/java/otterjet/monitoring/NatsMonitoringApiClient.java rename to src/main/java/otter/jet/monitoring/NatsMonitoringApiClient.java index 5caa4cf..42b43d8 100644 --- a/src/main/java/otterjet/monitoring/NatsMonitoringApiClient.java +++ b/src/main/java/otter/jet/monitoring/NatsMonitoringApiClient.java @@ -1,4 +1,4 @@ -package otterjet.monitoring; +package otter.jet.monitoring; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/otterjet/monitoring/NatsMonitoringAutoConfiguration.java b/src/main/java/otter/jet/monitoring/NatsMonitoringAutoConfiguration.java similarity index 98% rename from src/main/java/otterjet/monitoring/NatsMonitoringAutoConfiguration.java rename to src/main/java/otter/jet/monitoring/NatsMonitoringAutoConfiguration.java index 3c2f461..2314694 100644 --- a/src/main/java/otterjet/monitoring/NatsMonitoringAutoConfiguration.java +++ b/src/main/java/otter/jet/monitoring/NatsMonitoringAutoConfiguration.java @@ -1,4 +1,4 @@ -package otterjet.monitoring; +package otter.jet.monitoring; import feign.Feign; import feign.Logger; diff --git a/src/main/java/otterjet/monitoring/NatsMonitoringDataLoader.java b/src/main/java/otter/jet/monitoring/NatsMonitoringDataLoader.java similarity index 79% rename from src/main/java/otterjet/monitoring/NatsMonitoringDataLoader.java rename to src/main/java/otter/jet/monitoring/NatsMonitoringDataLoader.java index 12ee806..e1d5277 100644 --- a/src/main/java/otterjet/monitoring/NatsMonitoringDataLoader.java +++ b/src/main/java/otter/jet/monitoring/NatsMonitoringDataLoader.java @@ -1,4 +1,4 @@ -package otterjet.monitoring; +package otter.jet.monitoring; public interface NatsMonitoringDataLoader { boolean isMonitoringEnabled(); diff --git a/src/main/java/otterjet/monitoring/NoMonitoringConfiguredDataLoader.java b/src/main/java/otter/jet/monitoring/NoMonitoringConfiguredDataLoader.java similarity index 89% rename from src/main/java/otterjet/monitoring/NoMonitoringConfiguredDataLoader.java rename to src/main/java/otter/jet/monitoring/NoMonitoringConfiguredDataLoader.java index a3910ef..40ecd58 100644 --- a/src/main/java/otterjet/monitoring/NoMonitoringConfiguredDataLoader.java +++ b/src/main/java/otter/jet/monitoring/NoMonitoringConfiguredDataLoader.java @@ -1,4 +1,4 @@ -package otterjet.monitoring; +package otter.jet.monitoring; class NoMonitoringConfiguredDataLoader implements NatsMonitoringDataLoader { @Override diff --git a/src/main/java/otterjet/monitoring/StreamConfigResponse.java b/src/main/java/otter/jet/monitoring/StreamConfigResponse.java similarity index 74% rename from src/main/java/otterjet/monitoring/StreamConfigResponse.java rename to src/main/java/otter/jet/monitoring/StreamConfigResponse.java index e14092b..ef8fce6 100644 --- a/src/main/java/otterjet/monitoring/StreamConfigResponse.java +++ b/src/main/java/otter/jet/monitoring/StreamConfigResponse.java @@ -1,4 +1,4 @@ -package otterjet.monitoring; +package otter.jet.monitoring; import java.util.List; diff --git a/src/main/java/otterjet/monitoring/StreamDetailsResponse.java b/src/main/java/otter/jet/monitoring/StreamDetailsResponse.java similarity index 79% rename from src/main/java/otterjet/monitoring/StreamDetailsResponse.java rename to src/main/java/otter/jet/monitoring/StreamDetailsResponse.java index 81b8dae..bcbdc80 100644 --- a/src/main/java/otterjet/monitoring/StreamDetailsResponse.java +++ b/src/main/java/otter/jet/monitoring/StreamDetailsResponse.java @@ -1,4 +1,4 @@ -package otterjet.monitoring; +package otter.jet.monitoring; public record StreamDetailsResponse( String name, StreamConfigResponse config, StreamStateResponse state) {} diff --git a/src/main/java/otterjet/monitoring/StreamStateResponse.java b/src/main/java/otter/jet/monitoring/StreamStateResponse.java similarity index 83% rename from src/main/java/otterjet/monitoring/StreamStateResponse.java rename to src/main/java/otter/jet/monitoring/StreamStateResponse.java index b191ab5..2b2c16e 100644 --- a/src/main/java/otterjet/monitoring/StreamStateResponse.java +++ b/src/main/java/otter/jet/monitoring/StreamStateResponse.java @@ -1,4 +1,4 @@ -package otterjet.monitoring; +package otter.jet.monitoring; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/otterjet/plaintext/PlainTextMessageDeserializer.java b/src/main/java/otter/jet/plaintext/PlainTextMessageDeserializer.java similarity index 76% rename from src/main/java/otterjet/plaintext/PlainTextMessageDeserializer.java rename to src/main/java/otter/jet/plaintext/PlainTextMessageDeserializer.java index e72c13a..e68cd22 100644 --- a/src/main/java/otterjet/plaintext/PlainTextMessageDeserializer.java +++ b/src/main/java/otter/jet/plaintext/PlainTextMessageDeserializer.java @@ -1,9 +1,9 @@ -package otterjet.plaintext; +package otter.jet.plaintext; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; -import otterjet.DeserializedMessage; -import otterjet.MessageDeserializer; +import otter.jet.DeserializedMessage; +import otter.jet.MessageDeserializer; class PlainTextMessageDeserializer implements MessageDeserializer { @Override diff --git a/src/main/java/otterjet/plaintext/PlainTextMessageDeserializerConfiguration.java b/src/main/java/otter/jet/plaintext/PlainTextMessageDeserializerConfiguration.java similarity index 87% rename from src/main/java/otterjet/plaintext/PlainTextMessageDeserializerConfiguration.java rename to src/main/java/otter/jet/plaintext/PlainTextMessageDeserializerConfiguration.java index 2af5b77..361d9c4 100644 --- a/src/main/java/otterjet/plaintext/PlainTextMessageDeserializerConfiguration.java +++ b/src/main/java/otter/jet/plaintext/PlainTextMessageDeserializerConfiguration.java @@ -1,6 +1,6 @@ -package otterjet.plaintext; +package otter.jet.plaintext; -import otterjet.MessageDeserializer; +import otter.jet.MessageDeserializer; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/otterjet/proto/AnyProtoMessageToDynamicMessageDeserializer.java b/src/main/java/otter/jet/proto/AnyProtoMessageToDynamicMessageDeserializer.java similarity index 95% rename from src/main/java/otterjet/proto/AnyProtoMessageToDynamicMessageDeserializer.java rename to src/main/java/otter/jet/proto/AnyProtoMessageToDynamicMessageDeserializer.java index 1e925ec..a21149e 100644 --- a/src/main/java/otterjet/proto/AnyProtoMessageToDynamicMessageDeserializer.java +++ b/src/main/java/otter/jet/proto/AnyProtoMessageToDynamicMessageDeserializer.java @@ -1,4 +1,4 @@ -package otterjet.proto; +package otter.jet.proto; import com.google.protobuf.Any; import com.google.protobuf.Descriptors; diff --git a/src/main/java/otterjet/proto/FromAnyProtoMessageTypeNameSelector.java b/src/main/java/otter/jet/proto/FromAnyProtoMessageTypeNameSelector.java similarity index 95% rename from src/main/java/otterjet/proto/FromAnyProtoMessageTypeNameSelector.java rename to src/main/java/otter/jet/proto/FromAnyProtoMessageTypeNameSelector.java index 877a374..133aa71 100644 --- a/src/main/java/otterjet/proto/FromAnyProtoMessageTypeNameSelector.java +++ b/src/main/java/otter/jet/proto/FromAnyProtoMessageTypeNameSelector.java @@ -1,4 +1,4 @@ -package otterjet.proto; +package otter.jet.proto; import com.google.protobuf.Any; import java.io.IOException; diff --git a/src/main/java/otterjet/proto/MessageTypeNameSelector.java b/src/main/java/otter/jet/proto/MessageTypeNameSelector.java similarity index 88% rename from src/main/java/otterjet/proto/MessageTypeNameSelector.java rename to src/main/java/otter/jet/proto/MessageTypeNameSelector.java index 7cb7e4b..c36ce03 100644 --- a/src/main/java/otterjet/proto/MessageTypeNameSelector.java +++ b/src/main/java/otter/jet/proto/MessageTypeNameSelector.java @@ -1,4 +1,4 @@ -package otterjet.proto; +package otter.jet.proto; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/src/main/java/otterjet/proto/ProtoBufMessageDeserializer.java b/src/main/java/otter/jet/proto/ProtoBufMessageDeserializer.java similarity index 95% rename from src/main/java/otterjet/proto/ProtoBufMessageDeserializer.java rename to src/main/java/otter/jet/proto/ProtoBufMessageDeserializer.java index f40a703..7862a1a 100644 --- a/src/main/java/otterjet/proto/ProtoBufMessageDeserializer.java +++ b/src/main/java/otter/jet/proto/ProtoBufMessageDeserializer.java @@ -1,4 +1,4 @@ -package otterjet.proto; +package otter.jet.proto; import com.google.protobuf.DescriptorProtos.FileDescriptorProto; import com.google.protobuf.DescriptorProtos.FileDescriptorSet; @@ -14,10 +14,10 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; -import otterjet.DeserializationException; -import otterjet.DeserializedMessage; -import otterjet.MessageDeserializer; + +import otter.jet.DeserializationException; +import otter.jet.DeserializedMessage; +import otter.jet.MessageDeserializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/otterjet/proto/ProtoMessageDeserializerConfiguration.java b/src/main/java/otter/jet/proto/ProtoMessageDeserializerConfiguration.java similarity index 97% rename from src/main/java/otterjet/proto/ProtoMessageDeserializerConfiguration.java rename to src/main/java/otter/jet/proto/ProtoMessageDeserializerConfiguration.java index fdd5d11..9be0e7a 100644 --- a/src/main/java/otterjet/proto/ProtoMessageDeserializerConfiguration.java +++ b/src/main/java/otter/jet/proto/ProtoMessageDeserializerConfiguration.java @@ -1,8 +1,8 @@ -package otterjet.proto; +package otter.jet.proto; import java.io.File; import java.io.FileNotFoundException; -import otterjet.MessageDeserializer; +import otter.jet.MessageDeserializer; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/otterjet/proto/ProtoMessageToDynamicMessageDeserializer.java b/src/main/java/otter/jet/proto/ProtoMessageToDynamicMessageDeserializer.java similarity index 92% rename from src/main/java/otterjet/proto/ProtoMessageToDynamicMessageDeserializer.java rename to src/main/java/otter/jet/proto/ProtoMessageToDynamicMessageDeserializer.java index dd55897..99ab97b 100644 --- a/src/main/java/otterjet/proto/ProtoMessageToDynamicMessageDeserializer.java +++ b/src/main/java/otter/jet/proto/ProtoMessageToDynamicMessageDeserializer.java @@ -1,4 +1,4 @@ -package otterjet.proto; +package otter.jet.proto; import com.google.protobuf.Descriptors; import com.google.protobuf.DynamicMessage; diff --git a/src/main/java/otterjet/proto/ProvidedProtoMessageTypeNameSelector.java b/src/main/java/otter/jet/proto/ProvidedProtoMessageTypeNameSelector.java similarity index 93% rename from src/main/java/otterjet/proto/ProvidedProtoMessageTypeNameSelector.java rename to src/main/java/otter/jet/proto/ProvidedProtoMessageTypeNameSelector.java index 5ab5bef..949b291 100644 --- a/src/main/java/otterjet/proto/ProvidedProtoMessageTypeNameSelector.java +++ b/src/main/java/otter/jet/proto/ProvidedProtoMessageTypeNameSelector.java @@ -1,4 +1,4 @@ -package otterjet.proto; +package otter.jet.proto; import java.nio.ByteBuffer; diff --git a/src/main/java/otterjet/proto/SimpleProtoMessageToDynamicMessageDeserializer.java b/src/main/java/otter/jet/proto/SimpleProtoMessageToDynamicMessageDeserializer.java similarity index 95% rename from src/main/java/otterjet/proto/SimpleProtoMessageToDynamicMessageDeserializer.java rename to src/main/java/otter/jet/proto/SimpleProtoMessageToDynamicMessageDeserializer.java index 27832d9..f0c4784 100644 --- a/src/main/java/otterjet/proto/SimpleProtoMessageToDynamicMessageDeserializer.java +++ b/src/main/java/otter/jet/proto/SimpleProtoMessageToDynamicMessageDeserializer.java @@ -1,4 +1,4 @@ -package otterjet.proto; +package otter.jet.proto; import com.google.protobuf.CodedInputStream; import com.google.protobuf.Descriptors; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6dd1c82..d01f0ae 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -9,7 +9,7 @@ server: logging: level: - otterjet.monitoring.NatsMonitoringApiClient: DEBUG + otter.jet.monitoring.NatsMonitoringApiClient: DEBUG nats: server: diff --git a/src/test/java/otterjet/AbstractIntegrationTest.java b/src/test/java/otter/jet/AbstractIntegrationTest.java similarity index 97% rename from src/test/java/otterjet/AbstractIntegrationTest.java rename to src/test/java/otter/jet/AbstractIntegrationTest.java index 0f7122f..6d6f844 100644 --- a/src/test/java/otterjet/AbstractIntegrationTest.java +++ b/src/test/java/otter/jet/AbstractIntegrationTest.java @@ -1,4 +1,4 @@ -package otterjet; +package otter.jet; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/otterjet/JetStreamContainerInitializer.java b/src/test/java/otter/jet/JetStreamContainerInitializer.java similarity index 98% rename from src/test/java/otterjet/JetStreamContainerInitializer.java rename to src/test/java/otter/jet/JetStreamContainerInitializer.java index 5557163..494f6c0 100644 --- a/src/test/java/otterjet/JetStreamContainerInitializer.java +++ b/src/test/java/otter/jet/JetStreamContainerInitializer.java @@ -1,4 +1,4 @@ -package otterjet; +package otter.jet; import java.util.List; import java.util.Map; diff --git a/src/test/java/otterjet/JetStreamUtils.java b/src/test/java/otter/jet/JetStreamUtils.java similarity index 98% rename from src/test/java/otterjet/JetStreamUtils.java rename to src/test/java/otter/jet/JetStreamUtils.java index fa8faf2..b977815 100644 --- a/src/test/java/otterjet/JetStreamUtils.java +++ b/src/test/java/otter/jet/JetStreamUtils.java @@ -1,4 +1,4 @@ -package otterjet; +package otter.jet; import io.nats.client.Connection; import io.nats.client.JetStream; diff --git a/src/test/java/otterjet/LocalJetStreamDropApplication.java b/src/test/java/otter/jet/LocalJetStreamDropApplication.java similarity index 92% rename from src/test/java/otterjet/LocalJetStreamDropApplication.java rename to src/test/java/otter/jet/LocalJetStreamDropApplication.java index a0031df..e8ac16d 100644 --- a/src/test/java/otterjet/LocalJetStreamDropApplication.java +++ b/src/test/java/otter/jet/LocalJetStreamDropApplication.java @@ -1,4 +1,4 @@ -package otterjet; +package otter.jet; class LocalOtterJetApplication { public static void main(String[] args) { diff --git a/src/test/java/otterjet/assertions/ComparisonConfiguration.java b/src/test/java/otter/jet/assertions/ComparisonConfiguration.java similarity index 97% rename from src/test/java/otterjet/assertions/ComparisonConfiguration.java rename to src/test/java/otter/jet/assertions/ComparisonConfiguration.java index d22b567..6140cd1 100644 --- a/src/test/java/otterjet/assertions/ComparisonConfiguration.java +++ b/src/test/java/otter/jet/assertions/ComparisonConfiguration.java @@ -1,4 +1,4 @@ -package otterjet.assertions; +package otter.jet.assertions; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; diff --git a/src/test/java/otterjet/examples/RandomProtoPersonGenerator.java b/src/test/java/otter/jet/examples/RandomProtoPersonGenerator.java similarity index 86% rename from src/test/java/otterjet/examples/RandomProtoPersonGenerator.java rename to src/test/java/otter/jet/examples/RandomProtoPersonGenerator.java index f907295..638fd15 100644 --- a/src/test/java/otterjet/examples/RandomProtoPersonGenerator.java +++ b/src/test/java/otter/jet/examples/RandomProtoPersonGenerator.java @@ -1,8 +1,8 @@ -package otterjet.examples; +package otter.jet.examples; import com.github.javafaker.Faker; import org.jetbrains.annotations.NotNull; -import otterjet.examples.protobuf.PersonProtos; +import otter.jet.examples.protobuf.PersonProtos; public class RandomProtoPersonGenerator { @NotNull diff --git a/src/test/java/otterjet/examples/plaintext/PlainTextMessagePublisherConfiguration.java b/src/test/java/otter/jet/examples/plaintext/PlainTextMessagePublisherConfiguration.java similarity index 95% rename from src/test/java/otterjet/examples/plaintext/PlainTextMessagePublisherConfiguration.java rename to src/test/java/otter/jet/examples/plaintext/PlainTextMessagePublisherConfiguration.java index 0d186a4..1109215 100644 --- a/src/test/java/otterjet/examples/plaintext/PlainTextMessagePublisherConfiguration.java +++ b/src/test/java/otter/jet/examples/plaintext/PlainTextMessagePublisherConfiguration.java @@ -1,11 +1,12 @@ -package otterjet.examples.plaintext; +package otter.jet.examples.plaintext; import com.github.javafaker.Faker; import java.nio.charset.StandardCharsets; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import otterjet.JetStreamUtils; + +import otter.jet.JetStreamUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/src/test/java/otterjet/examples/protobuf/PersonProtos.java b/src/test/java/otter/jet/examples/protobuf/PersonProtos.java similarity index 99% rename from src/test/java/otterjet/examples/protobuf/PersonProtos.java rename to src/test/java/otter/jet/examples/protobuf/PersonProtos.java index 2271248..ad66ab4 100644 --- a/src/test/java/otterjet/examples/protobuf/PersonProtos.java +++ b/src/test/java/otter/jet/examples/protobuf/PersonProtos.java @@ -2,7 +2,7 @@ // source: person.proto // Protobuf Java Version: 3.25.1 -package otterjet.examples.protobuf; +package otter.jet.examples.protobuf; public final class PersonProtos { private PersonProtos() {} @@ -500,7 +500,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { PersonProtos.Person.Builder.class); } - // Construct using otterjet.examples.protobuf.PersonProtos.Person.newBuilder() + // Construct using otter.jet.examples.protobuf.PersonProtos.Person.newBuilder() private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { diff --git a/src/test/java/otterjet/examples/protobuf/SimpleProtobufMessagePublisherConfiguration.java b/src/test/java/otter/jet/examples/protobuf/SimpleProtobufMessagePublisherConfiguration.java similarity index 91% rename from src/test/java/otterjet/examples/protobuf/SimpleProtobufMessagePublisherConfiguration.java rename to src/test/java/otter/jet/examples/protobuf/SimpleProtobufMessagePublisherConfiguration.java index 39b1547..06c2714 100644 --- a/src/test/java/otterjet/examples/protobuf/SimpleProtobufMessagePublisherConfiguration.java +++ b/src/test/java/otter/jet/examples/protobuf/SimpleProtobufMessagePublisherConfiguration.java @@ -1,11 +1,12 @@ -package otterjet.examples.protobuf; +package otter.jet.examples.protobuf; import com.google.protobuf.Any; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import otterjet.JetStreamUtils; -import otterjet.examples.RandomProtoPersonGenerator; + +import otter.jet.JetStreamUtils; +import otter.jet.examples.RandomProtoPersonGenerator; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/src/test/java/otterjet/plaintext/PlainTextMessageReaderTest.java b/src/test/java/otter/jet/plaintext/PlainTextMessageReaderTest.java similarity index 80% rename from src/test/java/otterjet/plaintext/PlainTextMessageReaderTest.java rename to src/test/java/otter/jet/plaintext/PlainTextMessageReaderTest.java index 6430346..9fd8f5f 100644 --- a/src/test/java/otterjet/plaintext/PlainTextMessageReaderTest.java +++ b/src/test/java/otter/jet/plaintext/PlainTextMessageReaderTest.java @@ -1,4 +1,4 @@ -package otterjet.plaintext; +package otter.jet.plaintext; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -8,13 +8,15 @@ import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneOffset; -import otterjet.AbstractIntegrationTest; -import otterjet.JetStreamContainerInitializer; -import otterjet.JetStreamUtils; -import otterjet.ReadMessage; -import otterjet.ReaderConfigurationProperties; -import otterjet.ReaderService; -import otterjet.assertions.ComparisonConfiguration; + +import org.assertj.core.api.Assertions; +import otter.jet.AbstractIntegrationTest; +import otter.jet.JetStreamContainerInitializer; +import otter.jet.JetStreamUtils; +import otter.jet.ReadMessage; +import otter.jet.ReaderConfigurationProperties; +import otter.jet.ReaderService; +import otter.jet.assertions.ComparisonConfiguration; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.TestPropertySource; @@ -48,7 +50,7 @@ public void shouldReadMessagesSentInPlaintext() { await() .untilAsserted( () -> - assertThat(readerService.filter(subjectFilter, typeFilter, 0, 10, "")) + Assertions.assertThat(readerService.filter(subjectFilter, typeFilter, 0, 10, "")) .usingRecursiveFieldByFieldElementComparator( ComparisonConfiguration.configureReadMessageComparison()) .contains( diff --git a/src/test/java/otterjet/proto/AnyProtoMessageReaderTest.java b/src/test/java/otter/jet/proto/AnyProtoMessageReaderTest.java similarity index 85% rename from src/test/java/otterjet/proto/AnyProtoMessageReaderTest.java rename to src/test/java/otter/jet/proto/AnyProtoMessageReaderTest.java index 9c22e3a..112e795 100644 --- a/src/test/java/otterjet/proto/AnyProtoMessageReaderTest.java +++ b/src/test/java/otter/jet/proto/AnyProtoMessageReaderTest.java @@ -1,4 +1,4 @@ -package otterjet.proto; +package otter.jet.proto; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -7,20 +7,21 @@ import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneOffset; -import otterjet.AbstractIntegrationTest; -import otterjet.JetStreamContainerInitializer; -import otterjet.JetStreamUtils; -import otterjet.ReadMessage; -import otterjet.ReaderConfigurationProperties; -import otterjet.ReaderService; -import otterjet.assertions.ComparisonConfiguration; -import otterjet.examples.RandomProtoPersonGenerator; + +import otter.jet.AbstractIntegrationTest; +import otter.jet.JetStreamContainerInitializer; +import otter.jet.JetStreamUtils; +import otter.jet.ReadMessage; +import otter.jet.ReaderConfigurationProperties; +import otter.jet.ReaderService; +import otter.jet.assertions.ComparisonConfiguration; +import otter.jet.examples.RandomProtoPersonGenerator; import org.json.JSONArray; import org.json.JSONObject; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.TestPropertySource; -import otterjet.examples.protobuf.PersonProtos.Person; +import otter.jet.examples.protobuf.PersonProtos.Person; @TestPropertySource( properties = { diff --git a/src/test/java/otterjet/proto/SimpleProtoMessageReaderTest.java b/src/test/java/otter/jet/proto/SimpleProtoMessageReaderTest.java similarity index 85% rename from src/test/java/otterjet/proto/SimpleProtoMessageReaderTest.java rename to src/test/java/otter/jet/proto/SimpleProtoMessageReaderTest.java index a082983..c688cbf 100644 --- a/src/test/java/otterjet/proto/SimpleProtoMessageReaderTest.java +++ b/src/test/java/otter/jet/proto/SimpleProtoMessageReaderTest.java @@ -1,4 +1,4 @@ -package otterjet.proto; +package otter.jet.proto; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -6,20 +6,21 @@ import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneOffset; -import otterjet.AbstractIntegrationTest; -import otterjet.JetStreamContainerInitializer; -import otterjet.JetStreamUtils; -import otterjet.ReadMessage; -import otterjet.ReaderConfigurationProperties; -import otterjet.ReaderService; -import otterjet.assertions.ComparisonConfiguration; -import otterjet.examples.RandomProtoPersonGenerator; + +import otter.jet.AbstractIntegrationTest; +import otter.jet.JetStreamContainerInitializer; +import otter.jet.JetStreamUtils; +import otter.jet.ReadMessage; +import otter.jet.ReaderConfigurationProperties; +import otter.jet.ReaderService; +import otter.jet.assertions.ComparisonConfiguration; +import otter.jet.examples.RandomProtoPersonGenerator; import org.json.JSONArray; import org.json.JSONObject; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.TestPropertySource; -import otterjet.examples.protobuf.PersonProtos.Person; +import otter.jet.examples.protobuf.PersonProtos.Person; @TestPropertySource( properties = { diff --git a/src/test/resources/person.proto b/src/test/resources/person.proto index 80a8da4..5e410e5 100644 --- a/src/test/resources/person.proto +++ b/src/test/resources/person.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package protobuf; -option java_package = "otterjet.examples.protobuf"; +option java_package = "otter.jet.examples.protobuf"; option java_outer_classname = "PersonProtos"; message Person { int32 id = 1; From 71ce67f1c3641c918eb720085fdee01da7d21e3f Mon Sep 17 00:00:00 2001 From: "bartlomiej.zylinski" Date: Thu, 6 Jun 2024 13:35:28 +0200 Subject: [PATCH 4/8] Added packages for view and reader --- .../otter/jet/plaintext/PlainTextMessageDeserializer.java | 4 ++-- .../PlainTextMessageDeserializerConfiguration.java | 2 +- .../java/otter/jet/proto/ProtoBufMessageDeserializer.java | 6 +++--- .../jet/proto/ProtoMessageDeserializerConfiguration.java | 2 +- .../otter/jet/{ => reader}/DeserializationException.java | 2 +- .../java/otter/jet/{ => reader}/DeserializedMessage.java | 2 +- .../java/otter/jet/{ => reader}/MessageDeserializer.java | 2 +- src/main/java/otter/jet/{ => reader}/ReadMessage.java | 2 +- .../java/otter/jet/{ => reader}/ReaderConfiguration.java | 2 +- .../jet/{ => reader}/ReaderConfigurationProperties.java | 2 +- src/main/java/otter/jet/{ => reader}/ReaderService.java | 2 +- src/main/java/otter/jet/{ => rest}/MainViewController.java | 2 +- src/main/java/otter/jet/{ => rest}/MsgsController.java | 4 +++- .../otter/jet/plaintext/PlainTextMessageReaderTest.java | 6 +++--- .../java/otter/jet/proto/AnyProtoMessageReaderTest.java | 6 +++--- .../java/otter/jet/proto/SimpleProtoMessageReaderTest.java | 6 +++--- 16 files changed, 27 insertions(+), 25 deletions(-) rename src/main/java/otter/jet/{ => reader}/DeserializationException.java (88%) rename src/main/java/otter/jet/{ => reader}/DeserializedMessage.java (72%) rename src/main/java/otter/jet/{ => reader}/MessageDeserializer.java (85%) rename src/main/java/otter/jet/{ => reader}/ReadMessage.java (83%) rename src/main/java/otter/jet/{ => reader}/ReaderConfiguration.java (97%) rename src/main/java/otter/jet/{ => reader}/ReaderConfigurationProperties.java (96%) rename src/main/java/otter/jet/{ => reader}/ReaderService.java (99%) rename src/main/java/otter/jet/{ => rest}/MainViewController.java (96%) rename src/main/java/otter/jet/{ => rest}/MsgsController.java (94%) diff --git a/src/main/java/otter/jet/plaintext/PlainTextMessageDeserializer.java b/src/main/java/otter/jet/plaintext/PlainTextMessageDeserializer.java index e68cd22..e5d6a95 100644 --- a/src/main/java/otter/jet/plaintext/PlainTextMessageDeserializer.java +++ b/src/main/java/otter/jet/plaintext/PlainTextMessageDeserializer.java @@ -2,8 +2,8 @@ import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; -import otter.jet.DeserializedMessage; -import otter.jet.MessageDeserializer; +import otter.jet.reader.DeserializedMessage; +import otter.jet.reader.MessageDeserializer; class PlainTextMessageDeserializer implements MessageDeserializer { @Override diff --git a/src/main/java/otter/jet/plaintext/PlainTextMessageDeserializerConfiguration.java b/src/main/java/otter/jet/plaintext/PlainTextMessageDeserializerConfiguration.java index 361d9c4..c4a912e 100644 --- a/src/main/java/otter/jet/plaintext/PlainTextMessageDeserializerConfiguration.java +++ b/src/main/java/otter/jet/plaintext/PlainTextMessageDeserializerConfiguration.java @@ -1,6 +1,6 @@ package otter.jet.plaintext; -import otter.jet.MessageDeserializer; +import otter.jet.reader.MessageDeserializer; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/otter/jet/proto/ProtoBufMessageDeserializer.java b/src/main/java/otter/jet/proto/ProtoBufMessageDeserializer.java index 7862a1a..71c3323 100644 --- a/src/main/java/otter/jet/proto/ProtoBufMessageDeserializer.java +++ b/src/main/java/otter/jet/proto/ProtoBufMessageDeserializer.java @@ -15,9 +15,9 @@ import java.util.ArrayList; import java.util.List; -import otter.jet.DeserializationException; -import otter.jet.DeserializedMessage; -import otter.jet.MessageDeserializer; +import otter.jet.reader.DeserializationException; +import otter.jet.reader.DeserializedMessage; +import otter.jet.reader.MessageDeserializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/otter/jet/proto/ProtoMessageDeserializerConfiguration.java b/src/main/java/otter/jet/proto/ProtoMessageDeserializerConfiguration.java index 9be0e7a..27859f7 100644 --- a/src/main/java/otter/jet/proto/ProtoMessageDeserializerConfiguration.java +++ b/src/main/java/otter/jet/proto/ProtoMessageDeserializerConfiguration.java @@ -2,7 +2,7 @@ import java.io.File; import java.io.FileNotFoundException; -import otter.jet.MessageDeserializer; +import otter.jet.reader.MessageDeserializer; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/otter/jet/DeserializationException.java b/src/main/java/otter/jet/reader/DeserializationException.java similarity index 88% rename from src/main/java/otter/jet/DeserializationException.java rename to src/main/java/otter/jet/reader/DeserializationException.java index a85b8b9..af964d9 100644 --- a/src/main/java/otter/jet/DeserializationException.java +++ b/src/main/java/otter/jet/reader/DeserializationException.java @@ -1,4 +1,4 @@ -package otter.jet; +package otter.jet.reader; public class DeserializationException extends RuntimeException { private static final long serialVersionUID = -2575341690419824332L; diff --git a/src/main/java/otter/jet/DeserializedMessage.java b/src/main/java/otter/jet/reader/DeserializedMessage.java similarity index 72% rename from src/main/java/otter/jet/DeserializedMessage.java rename to src/main/java/otter/jet/reader/DeserializedMessage.java index a0c86e0..b743445 100644 --- a/src/main/java/otter/jet/DeserializedMessage.java +++ b/src/main/java/otter/jet/reader/DeserializedMessage.java @@ -1,3 +1,3 @@ -package otter.jet; +package otter.jet.reader; public record DeserializedMessage(String name, String content) {} diff --git a/src/main/java/otter/jet/MessageDeserializer.java b/src/main/java/otter/jet/reader/MessageDeserializer.java similarity index 85% rename from src/main/java/otter/jet/MessageDeserializer.java rename to src/main/java/otter/jet/reader/MessageDeserializer.java index b02a54d..6b2a2df 100644 --- a/src/main/java/otter/jet/MessageDeserializer.java +++ b/src/main/java/otter/jet/reader/MessageDeserializer.java @@ -1,4 +1,4 @@ -package otter.jet; +package otter.jet.reader; import java.nio.ByteBuffer; diff --git a/src/main/java/otter/jet/ReadMessage.java b/src/main/java/otter/jet/reader/ReadMessage.java similarity index 83% rename from src/main/java/otter/jet/ReadMessage.java rename to src/main/java/otter/jet/reader/ReadMessage.java index ea7bb59..4725b1d 100644 --- a/src/main/java/otter/jet/ReadMessage.java +++ b/src/main/java/otter/jet/reader/ReadMessage.java @@ -1,4 +1,4 @@ -package otter.jet; +package otter.jet.reader; import java.time.LocalDateTime; diff --git a/src/main/java/otter/jet/ReaderConfiguration.java b/src/main/java/otter/jet/reader/ReaderConfiguration.java similarity index 97% rename from src/main/java/otter/jet/ReaderConfiguration.java rename to src/main/java/otter/jet/reader/ReaderConfiguration.java index 5f7be19..544e265 100644 --- a/src/main/java/otter/jet/ReaderConfiguration.java +++ b/src/main/java/otter/jet/reader/ReaderConfiguration.java @@ -1,4 +1,4 @@ -package otter.jet; +package otter.jet.reader; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/src/main/java/otter/jet/ReaderConfigurationProperties.java b/src/main/java/otter/jet/reader/ReaderConfigurationProperties.java similarity index 96% rename from src/main/java/otter/jet/ReaderConfigurationProperties.java rename to src/main/java/otter/jet/reader/ReaderConfigurationProperties.java index f9b5bca..6aa245e 100644 --- a/src/main/java/otter/jet/ReaderConfigurationProperties.java +++ b/src/main/java/otter/jet/reader/ReaderConfigurationProperties.java @@ -1,4 +1,4 @@ -package otter.jet; +package otter.jet.reader; import java.util.Objects; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/otter/jet/ReaderService.java b/src/main/java/otter/jet/reader/ReaderService.java similarity index 99% rename from src/main/java/otter/jet/ReaderService.java rename to src/main/java/otter/jet/reader/ReaderService.java index f793eab..897721c 100644 --- a/src/main/java/otter/jet/ReaderService.java +++ b/src/main/java/otter/jet/reader/ReaderService.java @@ -1,4 +1,4 @@ -package otter.jet; +package otter.jet.reader; import io.nats.client.Connection; import io.nats.client.JetStream; diff --git a/src/main/java/otter/jet/MainViewController.java b/src/main/java/otter/jet/rest/MainViewController.java similarity index 96% rename from src/main/java/otter/jet/MainViewController.java rename to src/main/java/otter/jet/rest/MainViewController.java index 32a38b4..73dcf54 100644 --- a/src/main/java/otter/jet/MainViewController.java +++ b/src/main/java/otter/jet/rest/MainViewController.java @@ -1,4 +1,4 @@ -package otter.jet; +package otter.jet.rest; import otter.jet.monitoring.NatsMonitoringDataLoader; import org.springframework.stereotype.Controller; diff --git a/src/main/java/otter/jet/MsgsController.java b/src/main/java/otter/jet/rest/MsgsController.java similarity index 94% rename from src/main/java/otter/jet/MsgsController.java rename to src/main/java/otter/jet/rest/MsgsController.java index 1bbd2d5..da5b140 100644 --- a/src/main/java/otter/jet/MsgsController.java +++ b/src/main/java/otter/jet/rest/MsgsController.java @@ -1,4 +1,4 @@ -package otter.jet; +package otter.jet.rest; import java.util.List; import java.util.Optional; @@ -9,6 +9,8 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; +import otter.jet.reader.ReadMessage; +import otter.jet.reader.ReaderService; @Controller public class MsgsController { diff --git a/src/test/java/otter/jet/plaintext/PlainTextMessageReaderTest.java b/src/test/java/otter/jet/plaintext/PlainTextMessageReaderTest.java index 9fd8f5f..0a9c387 100644 --- a/src/test/java/otter/jet/plaintext/PlainTextMessageReaderTest.java +++ b/src/test/java/otter/jet/plaintext/PlainTextMessageReaderTest.java @@ -13,9 +13,9 @@ import otter.jet.AbstractIntegrationTest; import otter.jet.JetStreamContainerInitializer; import otter.jet.JetStreamUtils; -import otter.jet.ReadMessage; -import otter.jet.ReaderConfigurationProperties; -import otter.jet.ReaderService; +import otter.jet.reader.ReadMessage; +import otter.jet.reader.ReaderConfigurationProperties; +import otter.jet.reader.ReaderService; import otter.jet.assertions.ComparisonConfiguration; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/otter/jet/proto/AnyProtoMessageReaderTest.java b/src/test/java/otter/jet/proto/AnyProtoMessageReaderTest.java index 112e795..a8f0218 100644 --- a/src/test/java/otter/jet/proto/AnyProtoMessageReaderTest.java +++ b/src/test/java/otter/jet/proto/AnyProtoMessageReaderTest.java @@ -11,9 +11,9 @@ import otter.jet.AbstractIntegrationTest; import otter.jet.JetStreamContainerInitializer; import otter.jet.JetStreamUtils; -import otter.jet.ReadMessage; -import otter.jet.ReaderConfigurationProperties; -import otter.jet.ReaderService; +import otter.jet.reader.ReadMessage; +import otter.jet.reader.ReaderConfigurationProperties; +import otter.jet.reader.ReaderService; import otter.jet.assertions.ComparisonConfiguration; import otter.jet.examples.RandomProtoPersonGenerator; import org.json.JSONArray; diff --git a/src/test/java/otter/jet/proto/SimpleProtoMessageReaderTest.java b/src/test/java/otter/jet/proto/SimpleProtoMessageReaderTest.java index c688cbf..43cf7b1 100644 --- a/src/test/java/otter/jet/proto/SimpleProtoMessageReaderTest.java +++ b/src/test/java/otter/jet/proto/SimpleProtoMessageReaderTest.java @@ -10,9 +10,9 @@ import otter.jet.AbstractIntegrationTest; import otter.jet.JetStreamContainerInitializer; import otter.jet.JetStreamUtils; -import otter.jet.ReadMessage; -import otter.jet.ReaderConfigurationProperties; -import otter.jet.ReaderService; +import otter.jet.reader.ReadMessage; +import otter.jet.reader.ReaderConfigurationProperties; +import otter.jet.reader.ReaderService; import otter.jet.assertions.ComparisonConfiguration; import otter.jet.examples.RandomProtoPersonGenerator; import org.json.JSONArray; From 6fba5f7be1b7ee8e0cf12bc104e9158cda5f5853 Mon Sep 17 00:00:00 2001 From: "bartlomiej.zylinski" Date: Thu, 6 Jun 2024 13:43:28 +0200 Subject: [PATCH 5/8] Added Back button on frontend --- src/main/resources/static/css/index.css | 25 ++++++++++++++++++++ src/main/resources/templates/main.ftlh | 24 ------------------- src/main/resources/templates/monitoring.ftlh | 5 ++++ src/main/resources/templates/msgs-page.ftlh | 14 ++++------- 4 files changed, 35 insertions(+), 33 deletions(-) diff --git a/src/main/resources/static/css/index.css b/src/main/resources/static/css/index.css index fb540a3..ac21624 100644 --- a/src/main/resources/static/css/index.css +++ b/src/main/resources/static/css/index.css @@ -36,3 +36,28 @@ input[type="text"] { border: 1px solid #ddd; border-radius: 4px; } + + +nav ul { + list-style-type: none; + padding: 0; +} + +nav ul li { + display: inline; + margin-right: 10px; +} + +nav ul li a { + display: inline-block; + color: #fff; + text-decoration: none; + background-color: #5C6BC0; + padding: 10px 15px; + border-radius: 4px; + transition: background-color 0.3s ease; +} + +nav ul li a:hover { + background-color: #3F51B5; +} diff --git a/src/main/resources/templates/main.ftlh b/src/main/resources/templates/main.ftlh index 93bea16..fedeaf7 100644 --- a/src/main/resources/templates/main.ftlh +++ b/src/main/resources/templates/main.ftlh @@ -16,30 +16,6 @@ padding: 15px; } - nav ul { - list-style-type: none; - padding: 0; - } - - nav ul li { - display: inline; - margin-right: 10px; - } - - nav ul li a { - display: inline-block; - color: #fff; - text-decoration: none; - background-color: #5C6BC0; - padding: 10px 15px; - border-radius: 4px; - transition: background-color 0.3s ease; - } - - nav ul li a:hover { - background-color: #3F51B5; - } - .header { display: flex; align-items: center; diff --git a/src/main/resources/templates/monitoring.ftlh b/src/main/resources/templates/monitoring.ftlh index de50d52..7c0fc71 100644 --- a/src/main/resources/templates/monitoring.ftlh +++ b/src/main/resources/templates/monitoring.ftlh @@ -68,5 +68,10 @@ + diff --git a/src/main/resources/templates/msgs-page.ftlh b/src/main/resources/templates/msgs-page.ftlh index f9fbc24..3c99352 100644 --- a/src/main/resources/templates/msgs-page.ftlh +++ b/src/main/resources/templates/msgs-page.ftlh @@ -74,11 +74,6 @@ overflow-y: auto; } - .message__content.collapsed { - max-height: 0; - padding: 0; - } - .message__content, .message__header { width: 800px; max-width: 100%; @@ -100,10 +95,6 @@ align-items: center; } - .controls__form--refresh { - margin-left: 10px; - } - .controls__field { display: flex; align-items: center; @@ -249,5 +240,10 @@ }); + From 859ee4572a521445ade8aaecfa2461e5a9fca11a Mon Sep 17 00:00:00 2001 From: "bartlomiej.zylinski" Date: Thu, 6 Jun 2024 13:59:59 +0200 Subject: [PATCH 6/8] Removed unused dependencies --- .gitignore | 18 ---------- pom.xml | 97 +++++++++++++++++++++++------------------------------- 2 files changed, 42 insertions(+), 73 deletions(-) diff --git a/.gitignore b/.gitignore index ff7a4f6..7a5ba5e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,24 +6,6 @@ target/ ### IntelliJ IDEA ### .idea -### Eclipse ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ ### VS Code ### .vscode/ diff --git a/pom.xml b/pom.xml index fbe00ce..0de8efc 100644 --- a/pom.xml +++ b/pom.xml @@ -16,8 +16,8 @@ 17 2.41.1 1.19.3 - 3.2.0 - 2023.0.0 + 3.3.0 + 2023.0.2 @@ -48,57 +48,6 @@ - - com.google.protobuf - protobuf-java-util - 3.21.5 - - - com.fasterxml.jackson.module - jackson-module-jakarta-xmlbind-annotations - 2.16.0 - - - io.grpc - grpc-protobuf - 1.59.0 - - - com.google.protobuf - protobuf-java - 3.25.1 - - - io.envoyproxy.protoc-gen-validate - pgv-java-stub - 0.6.13 - - - javax.annotation - javax.annotation-api - 1.3.2 - - - io.grpc - grpc-stub - 1.59.0 - - - io.nats - jnats - 2.17.1 - - - org.slf4j - slf4j-api - 2.0.9 - - - javax - javaee-web-api - 7.0 - provided - org.springframework.boot spring-boot-starter-web @@ -131,6 +80,43 @@ io.github.openfeign feign-jackson + + com.google.protobuf + protobuf-java-util + 3.21.5 + + + com.google.protobuf + protobuf-java + 3.25.1 + + + io.grpc + grpc-stub + 1.59.0 + + + io.grpc + grpc-protobuf + 1.59.0 + + + io.nats + jnats + 2.18.1 + + + org.slf4j + slf4j-api + 2.0.9 + + + javax + javaee-web-api + 7.0 + provided + + org.springframework.boot spring-boot-starter-test @@ -153,13 +139,13 @@ 20231013 test - org.springframework.boot spring-boot-maven-plugin + 3.3.0 repackage @@ -186,8 +172,9 @@ + org.apache.maven.plugins maven-surefire-plugin - 3.2.1 + 3.2.5 From ec94d7b6d2a9d39c8e286c3726932f2049c5a0c4 Mon Sep 17 00:00:00 2001 From: "bartlomiej.zylinski" Date: Thu, 6 Jun 2024 14:17:09 +0200 Subject: [PATCH 7/8] Add dependencies versions --- pom.xml | 58 +++++++++++++++++++++------------------------------------ 1 file changed, 21 insertions(+), 37 deletions(-) diff --git a/pom.xml b/pom.xml index 0de8efc..e2bebcd 100644 --- a/pom.xml +++ b/pom.xml @@ -14,10 +14,16 @@ UTF-8 17 17 - 2.41.1 - 1.19.3 - 3.3.0 - 2023.0.2 + 1.19.8 + 3.3.0 + 2023.0.2 + 13.2.1 + 3.25.0 + 1.64.0 + 1.0.2 + 20240303 + 2.18.1 + 2.0.9 @@ -25,21 +31,14 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot.version} + ${spring.boot.version} pom import org.springframework.cloud spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - org.testcontainers - testcontainers-bom - ${testcontainers.version} + ${spring.cloud.version} pom import @@ -79,42 +78,37 @@ io.github.openfeign feign-jackson + ${feign.jackson.version} com.google.protobuf protobuf-java-util - 3.21.5 + ${protobuf.java.version} com.google.protobuf protobuf-java - 3.25.1 + ${protobuf.java.version} io.grpc grpc-stub - 1.59.0 + ${grpc.version} io.grpc grpc-protobuf - 1.59.0 + ${grpc.version} io.nats jnats - 2.18.1 + ${jnats.version} org.slf4j slf4j-api - 2.0.9 - - - javax - javaee-web-api - 7.0 - provided + ${slf4j-api.version} @@ -130,13 +124,13 @@ com.github.javafaker javafaker - 1.0.2 + ${javafaker.version} test org.json json - 20231013 + ${json.version} test @@ -161,16 +155,6 @@ - - com.diffplug.spotless - spotless-maven-plugin - ${spotless.plugin.version} - - - - - - org.apache.maven.plugins maven-surefire-plugin From 0f1de5ec7179fad68b5714253725b71f6155e203 Mon Sep 17 00:00:00 2001 From: "bartlomiej.zylinski" Date: Tue, 18 Jun 2024 08:03:03 +0200 Subject: [PATCH 8/8] Fix review issues --- docker-compose.yaml | 2 -- .../java/otter/jet/plaintext/PlainTextMessageReaderTest.java | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 1c2b37d..da0c292 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,5 +1,3 @@ -version: '3.9' - volumes: nats-storage: driver: local diff --git a/src/test/java/otter/jet/plaintext/PlainTextMessageReaderTest.java b/src/test/java/otter/jet/plaintext/PlainTextMessageReaderTest.java index 0a9c387..aeea381 100644 --- a/src/test/java/otter/jet/plaintext/PlainTextMessageReaderTest.java +++ b/src/test/java/otter/jet/plaintext/PlainTextMessageReaderTest.java @@ -9,7 +9,6 @@ import java.time.LocalDateTime; import java.time.ZoneOffset; -import org.assertj.core.api.Assertions; import otter.jet.AbstractIntegrationTest; import otter.jet.JetStreamContainerInitializer; import otter.jet.JetStreamUtils; @@ -50,7 +49,7 @@ public void shouldReadMessagesSentInPlaintext() { await() .untilAsserted( () -> - Assertions.assertThat(readerService.filter(subjectFilter, typeFilter, 0, 10, "")) + assertThat(readerService.filter(subjectFilter, typeFilter, 0, 10, "")) .usingRecursiveFieldByFieldElementComparator( ComparisonConfiguration.configureReadMessageComparison()) .contains(