From 0e9ab84e4a6dc6ae1352d005b78f8bf65d0fed72 Mon Sep 17 00:00:00 2001 From: nitram509 Date: Fri, 27 Dec 2024 12:13:18 +0100 Subject: [PATCH] reformat code and add hint for formatter --- .github/pull_request_template.md | 14 +++ CONTRIBUTING.md | 12 ++- .../io/zeebe/monitor/config/KafkaConfig.java | 3 +- .../io/zeebe/monitor/config/RedisConfig.java | 60 +++++------ .../monitor/entity/ElementInstanceEntity.java | 17 ++-- .../io/zeebe/monitor/entity/ErrorEntity.java | 15 +-- .../zeebe/monitor/entity/IncidentEntity.java | 13 +-- .../io/zeebe/monitor/entity/JobEntity.java | 11 ++- .../zeebe/monitor/entity/MessageEntity.java | 2 +- .../entity/MessageSubscriptionEntity.java | 14 ++- .../zeebe/monitor/entity/ProcessEntity.java | 9 +- .../io/zeebe/monitor/entity/TimerEntity.java | 11 ++- .../zeebe/monitor/entity/VariableEntity.java | 13 +-- .../IncidentEntityPredicatesBuilder.java | 20 ++-- .../monitor/repository/ErrorRepository.java | 3 +- .../repository/IncidentRepository.java | 6 +- .../monitor/repository/JobRepository.java | 3 +- .../monitor/repository/MessageRepository.java | 3 +- .../MessageSubscriptionRepository.java | 3 +- .../repository/ProcessInstanceRepository.java | 3 +- .../monitor/repository/ProcessRepository.java | 4 +- .../monitor/repository/TimerRepository.java | 3 +- .../repository/VariableRepository.java | 3 +- .../monitor/rest/AbstractViewController.java | 9 +- .../monitor/rest/IncidentsViewController.java | 41 ++++---- ...ncesCalledProcessesListViewController.java | 2 +- .../InstancesErrorListViewController.java | 2 +- .../InstancesIncidentListViewController.java | 2 +- .../rest/InstancesJobListViewController.java | 2 +- ...MessageSubscriptionListViewController.java | 2 +- .../InstancesTimerListViewController.java | 2 +- .../rest/InstancesVariableListController.java | 10 +- .../io/zeebe/monitor/rest/JobResource.java | 8 +- .../monitor/rest/ProcessesViewController.java | 39 +++++--- .../monitor/rest/dto/ClusterStatusDto.java | 1 - .../zeebe/ZeebeNotificationService.java | 12 ++- .../hazelcast/HazelcastImportService.java | 33 +++++-- .../hazelcast/HazelcastStateService.java | 37 +++---- .../zeebe/kafka/KafkaImportService.java | 29 +++--- .../zeebe/kafka/ZeebeKafkaService.java | 4 +- .../importers/IncidentKafkaImporter.java | 3 +- .../ProcessInstanceKafkaImporter.java | 3 +- .../importers/ErrorProtobufImporter.java | 5 +- .../importers/IncidentProtobufImporter.java | 15 ++- .../importers/JobProtobufImporter.java | 5 +- .../importers/MessageProtobufImporter.java | 5 +- .../MessageSubscriptionProtobufImporter.java | 13 ++- .../ProcessAndElementProtobufImporter.java | 61 ++++++++---- .../importers/TimerProtobufImporter.java | 5 +- .../importers/VariableProtobufImporter.java | 15 ++- .../zeebe/redis/RedisImportService.java | 99 ++++++++++--------- .../zeebe/redis/ZeebeRedisService.java | 58 ++++++----- .../monitor/zeebe/status/ClusterStatus.java | 23 ++--- .../zeebe/status/ZeebeStatusKeeper.java | 3 +- .../status/ZeebeStatusUpdateService.java | 16 ++- src/test/java/io/zeebe/monitor/Demo.java | 1 - .../ElementInstanceRepositoryTest.java | 11 +-- .../TestContextJpaConfiguration.java | 12 +-- .../repository/VariableRepositoryTest.java | 11 +-- .../repository/ZeebeApplicationMysqlTest.java | 19 ++-- .../ZeebeApplicationPostgresTest.java | 7 +- .../rest/CorsSettingsControllerTest.java | 23 ++--- .../InstancesTimerListViewControllerTest.java | 4 +- .../InstancesVariableListControllerTest.java | 1 - ...rocessAndElementHazelcastImporterTest.java | 23 ++--- .../VariableHazelcastImporterTest.java | 14 +-- .../importers/VariableKafkaImporterTest.java | 3 +- 67 files changed, 530 insertions(+), 408 deletions(-) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 00000000..45c72d39 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,14 @@ + +### PR Description + +*please, provide some context about the PR - e.g. try to answer these questions...* +- what problem you try to solve? +- what reasoning you had with this implementation? what alternative approaches exists? what are possible downsides? +- how have you tested your implementation? + +### Before creating a PR, please ensure... + +- [ ] the code is proper formatted (e.g. running `mvn com.spotify.fmt:fmt-maven-plugin:2.25:format`) +- [ ] your code contribution contains new unit tests (if applicable) +- [ ] the tests are alle 'green' +- [ ] the documentation is updated (if applicable) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8c00b7db..4876e67b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -50,12 +50,18 @@ Build the JAR files with mvn clean install ``` -## Styleguides +## Styleguide ### Source Code The Java code should be formatted using [Google's Java Format](https://github.com/google/google-java-format). +For re-formatting, you can use plugins in your code editor, or just run + +```shell +mvn com.spotify.fmt:fmt-maven-plugin:2.25:format +``` + ### Git Commit Messages Commit messages should follow the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/#summary) format. @@ -86,8 +92,8 @@ Available commit types: There's a file [docker-compose.yml](docker/docker-compose.yml) prepared in this repo, which can be used with recent Docker version to provide a backend. You just need to choose some profiles and specify them in a file [.env](docker/.env) using pattern `COMPOSE_PROFILES=profile1,profile2`: -* ```hazelcast``` runs Zeebe broker with Hazelcast exporter -* ```kafka``` runs Zeebe broker with Kafka exporter +* ```hazelcast``` runs Zeebe broker with Hazelcast exporter +* ```kafka``` runs Zeebe broker with Kafka exporter * ```postgres``` runs PostgreSQL database * ```mysql``` runs MySQL database diff --git a/src/main/java/io/zeebe/monitor/config/KafkaConfig.java b/src/main/java/io/zeebe/monitor/config/KafkaConfig.java index d04750e4..25aed0af 100644 --- a/src/main/java/io/zeebe/monitor/config/KafkaConfig.java +++ b/src/main/java/io/zeebe/monitor/config/KafkaConfig.java @@ -48,7 +48,8 @@ public ConcurrentKafkaListenerContainerFactory kafkaListenerConta factory.setBatchListener(true); factory.getContainerProperties().setAckMode(ContainerProperties.AckMode.BATCH); - // Any exception thrown from record of the batch will skip(NotRetryableExceptions) or retry the entire batch + // Any exception thrown from record of the batch will skip(NotRetryableExceptions) or retry the + // entire batch var errorHandler = new DefaultErrorHandler( (record, e) -> diff --git a/src/main/java/io/zeebe/monitor/config/RedisConfig.java b/src/main/java/io/zeebe/monitor/config/RedisConfig.java index 81ea85df..508bb985 100644 --- a/src/main/java/io/zeebe/monitor/config/RedisConfig.java +++ b/src/main/java/io/zeebe/monitor/config/RedisConfig.java @@ -8,45 +8,45 @@ @Configuration public class RedisConfig { - @Value("${zeebe.client.worker.redis.connection}") - private String redisConnection; + @Value("${zeebe.client.worker.redis.connection}") + private String redisConnection; - @Value("${zeebe.client.worker.redis.useClusterClient:false}") - private boolean useClusterClient; + @Value("${zeebe.client.worker.redis.useClusterClient:false}") + private boolean useClusterClient; - @Value("${zeebe.client.worker.redis.consumer-group:simple-monitor}") - private String redisConumerGroup; + @Value("${zeebe.client.worker.redis.consumer-group:simple-monitor}") + private String redisConumerGroup; - @Value("${zeebe.client.worker.redis.xread-count:500}") - private int redisXreadCount; + @Value("${zeebe.client.worker.redis.xread-count:500}") + private int redisXreadCount; - @Value("${zeebe.client.worker.redis.xread-block-millis:2000}") - private int redisXreadBlockMillis; + @Value("${zeebe.client.worker.redis.xread-block-millis:2000}") + private int redisXreadBlockMillis; - @Value("${zeebe.client.worker.redis.prefix:zeebe}") - private String redisPrefix; + @Value("${zeebe.client.worker.redis.prefix:zeebe}") + private String redisPrefix; - public String getRedisConnection() { - return redisConnection; - } + public String getRedisConnection() { + return redisConnection; + } - public boolean isUseClusterClient() { - return useClusterClient; - } + public boolean isUseClusterClient() { + return useClusterClient; + } - public String getRedisConumerGroup() { - return redisConumerGroup; - } + public String getRedisConumerGroup() { + return redisConumerGroup; + } - public int getRedisXreadCount() { - return redisXreadCount; - } + public int getRedisXreadCount() { + return redisXreadCount; + } - public int getRedisXreadBlockMillis() { - return redisXreadBlockMillis; - } + public int getRedisXreadBlockMillis() { + return redisXreadBlockMillis; + } - public String getRedisPrefix() { - return redisPrefix; - } + public String getRedisPrefix() { + return redisPrefix; + } } diff --git a/src/main/java/io/zeebe/monitor/entity/ElementInstanceEntity.java b/src/main/java/io/zeebe/monitor/entity/ElementInstanceEntity.java index 131edb6d..c62501d3 100644 --- a/src/main/java/io/zeebe/monitor/entity/ElementInstanceEntity.java +++ b/src/main/java/io/zeebe/monitor/entity/ElementInstanceEntity.java @@ -18,12 +18,17 @@ import jakarta.persistence.*; @Entity(name = "ELEMENT_INSTANCE") -@Table(indexes = { - @Index(name = "element_instance_processInstanceKeyIndex", columnList = "PROCESS_INSTANCE_KEY_"), - @Index(name = "element_instance_processDefinitionKeyIndex", columnList = "PROCESS_DEFINITION_KEY_"), - @Index(name = "element_instance_intentIndex", columnList = "INTENT_"), - @Index(name = "element_instance_bpmnElementTypeIndex", columnList = "BPMN_ELEMENT_TYPE_"), -}) +@Table( + indexes = { + @Index( + name = "element_instance_processInstanceKeyIndex", + columnList = "PROCESS_INSTANCE_KEY_"), + @Index( + name = "element_instance_processDefinitionKeyIndex", + columnList = "PROCESS_DEFINITION_KEY_"), + @Index(name = "element_instance_intentIndex", columnList = "INTENT_"), + @Index(name = "element_instance_bpmnElementTypeIndex", columnList = "BPMN_ELEMENT_TYPE_"), + }) public class ElementInstanceEntity { @Id diff --git a/src/main/java/io/zeebe/monitor/entity/ErrorEntity.java b/src/main/java/io/zeebe/monitor/entity/ErrorEntity.java index 7490749d..2db6b1d4 100644 --- a/src/main/java/io/zeebe/monitor/entity/ErrorEntity.java +++ b/src/main/java/io/zeebe/monitor/entity/ErrorEntity.java @@ -19,11 +19,12 @@ import org.hibernate.Length; @Entity(name = "ERROR") -@Table(indexes = { - // performance reason, because we use it in the - // {@link io.zeebe.monitor.repository.ErrorRepository#findByProcessInstanceKey(long)} - @Index(name = "error_processInstanceKeyIndex", columnList = "PROCESS_INSTANCE_KEY_"), -}) +@Table( + indexes = { + // performance reason, because we use it in the + // {@link io.zeebe.monitor.repository.ErrorRepository#findByProcessInstanceKey(long)} + @Index(name = "error_processInstanceKeyIndex", columnList = "PROCESS_INSTANCE_KEY_"), + }) public class ErrorEntity { @Id @@ -36,11 +37,11 @@ public class ErrorEntity { @Column(name = "PROCESS_INSTANCE_KEY_") private long processInstanceKey; - @Column(name = "EXCEPTION_MESSAGE_",length= Length.LONG16) + @Column(name = "EXCEPTION_MESSAGE_", length = Length.LONG16) @Lob private String exceptionMessage; - @Column(name = "STACKTRACE_",length= Length.LONG16) + @Column(name = "STACKTRACE_", length = Length.LONG16) @Lob private String stacktrace; diff --git a/src/main/java/io/zeebe/monitor/entity/IncidentEntity.java b/src/main/java/io/zeebe/monitor/entity/IncidentEntity.java index cc93bf59..efa93fe7 100644 --- a/src/main/java/io/zeebe/monitor/entity/IncidentEntity.java +++ b/src/main/java/io/zeebe/monitor/entity/IncidentEntity.java @@ -19,11 +19,12 @@ import org.hibernate.Length; @Entity(name = "INCIDENT") -@Table(indexes = { - // performance reason, because we use it in the - // {@link io.zeebe.monitor.repository.IncidentRepository#findByProcessInstanceKey(long)} - @Index(name = "incident_processInstanceKeyIndex", columnList = "PROCESS_INSTANCE_KEY_"), -}) +@Table( + indexes = { + // performance reason, because we use it in the + // {@link io.zeebe.monitor.repository.IncidentRepository#findByProcessInstanceKey(long)} + @Index(name = "incident_processInstanceKeyIndex", columnList = "PROCESS_INSTANCE_KEY_"), + }) public class IncidentEntity { @Id @@ -48,7 +49,7 @@ public class IncidentEntity { @Column(name = "ERROR_TYPE_") private String errorType; - @Column(name = "ERROR_MSG_",length= Length.LONG16) + @Column(name = "ERROR_MSG_", length = Length.LONG16) @Lob private String errorMessage; diff --git a/src/main/java/io/zeebe/monitor/entity/JobEntity.java b/src/main/java/io/zeebe/monitor/entity/JobEntity.java index 35cf2c36..27cc1c7b 100644 --- a/src/main/java/io/zeebe/monitor/entity/JobEntity.java +++ b/src/main/java/io/zeebe/monitor/entity/JobEntity.java @@ -18,11 +18,12 @@ import jakarta.persistence.*; @Entity(name = "JOB") -@Table(indexes = { - // performance reason, because we use it in the - // {@link io.zeebe.monitor.repository.JobRepository#findByProcessInstanceKey(long)} - @Index(name = "job_processInstanceKeyIndex", columnList = "PROCESS_INSTANCE_KEY_"), -}) +@Table( + indexes = { + // performance reason, because we use it in the + // {@link io.zeebe.monitor.repository.JobRepository#findByProcessInstanceKey(long)} + @Index(name = "job_processInstanceKeyIndex", columnList = "PROCESS_INSTANCE_KEY_"), + }) public class JobEntity { @Id diff --git a/src/main/java/io/zeebe/monitor/entity/MessageEntity.java b/src/main/java/io/zeebe/monitor/entity/MessageEntity.java index 28d3d852..40a9e3df 100644 --- a/src/main/java/io/zeebe/monitor/entity/MessageEntity.java +++ b/src/main/java/io/zeebe/monitor/entity/MessageEntity.java @@ -37,7 +37,7 @@ public class MessageEntity { @Column(name = "MESSAGE_ID_") private String messageId; - @Column(name = "PAYLOAD_",length= Length.LONG32) + @Column(name = "PAYLOAD_", length = Length.LONG32) @Lob private String payload; diff --git a/src/main/java/io/zeebe/monitor/entity/MessageSubscriptionEntity.java b/src/main/java/io/zeebe/monitor/entity/MessageSubscriptionEntity.java index 36b15ef0..5efec035 100644 --- a/src/main/java/io/zeebe/monitor/entity/MessageSubscriptionEntity.java +++ b/src/main/java/io/zeebe/monitor/entity/MessageSubscriptionEntity.java @@ -18,11 +18,15 @@ import jakarta.persistence.*; @Entity(name = "MESSAGE_SUBSCRIPTION") -@Table(indexes = { - // performance reason, because we use it in the - // {@link io.zeebe.monitor.repository.MessageSubscriptionRepository#findByProcessInstanceKey(long)} - @Index(name = "message_subscription_processInstanceKeyIndex", columnList = "PROCESS_INSTANCE_KEY_"), -}) +@Table( + indexes = { + // performance reason, because we use it in the + // {@link + // io.zeebe.monitor.repository.MessageSubscriptionRepository#findByProcessInstanceKey(long)} + @Index( + name = "message_subscription_processInstanceKeyIndex", + columnList = "PROCESS_INSTANCE_KEY_"), + }) public class MessageSubscriptionEntity { @Id diff --git a/src/main/java/io/zeebe/monitor/entity/ProcessEntity.java b/src/main/java/io/zeebe/monitor/entity/ProcessEntity.java index 937d4c2a..562380ba 100644 --- a/src/main/java/io/zeebe/monitor/entity/ProcessEntity.java +++ b/src/main/java/io/zeebe/monitor/entity/ProcessEntity.java @@ -19,9 +19,10 @@ import org.hibernate.Length; @Entity(name = "PROCESS") -@Table(indexes = { - @Index(name = "process_bpmnProcessId", columnList = "BPMN_PROCESS_ID_"), -}) +@Table( + indexes = { + @Index(name = "process_bpmnProcessId", columnList = "BPMN_PROCESS_ID_"), + }) public class ProcessEntity { @Id @Column(name = "KEY_") @@ -34,7 +35,7 @@ public class ProcessEntity { private int version; @Lob - @Column(name = "RESOURCE_",length= Length.LONG32) + @Column(name = "RESOURCE_", length = Length.LONG32) private String resource; @Column(name = "TIMESTAMP_") diff --git a/src/main/java/io/zeebe/monitor/entity/TimerEntity.java b/src/main/java/io/zeebe/monitor/entity/TimerEntity.java index ce707dbc..7699ba5e 100644 --- a/src/main/java/io/zeebe/monitor/entity/TimerEntity.java +++ b/src/main/java/io/zeebe/monitor/entity/TimerEntity.java @@ -18,11 +18,12 @@ import jakarta.persistence.*; @Entity(name = "TIMER") -@Table(indexes = { - // performance reason, because we use it in the - // {@link io.zeebe.monitor.repository.TimerRepository#findByProcessInstanceKey(long)} - @Index(name = "timer_processInstanceKeyIndex", columnList = "PROCESS_INSTANCE_KEY_"), -}) +@Table( + indexes = { + // performance reason, because we use it in the + // {@link io.zeebe.monitor.repository.TimerRepository#findByProcessInstanceKey(long)} + @Index(name = "timer_processInstanceKeyIndex", columnList = "PROCESS_INSTANCE_KEY_"), + }) public class TimerEntity { @Id diff --git a/src/main/java/io/zeebe/monitor/entity/VariableEntity.java b/src/main/java/io/zeebe/monitor/entity/VariableEntity.java index 59453406..f2fd5a96 100644 --- a/src/main/java/io/zeebe/monitor/entity/VariableEntity.java +++ b/src/main/java/io/zeebe/monitor/entity/VariableEntity.java @@ -19,10 +19,11 @@ import org.hibernate.Length; @Entity(name = "VARIABLE") -@Table(indexes = { - // performance reason, because we use it in the VariableRepository.findByProcessInstanceKey() - @Index(name = "variable_processInstanceKeyIndex", columnList = "PROCESS_INSTANCE_KEY_"), -}) +@Table( + indexes = { + // performance reason, because we use it in the VariableRepository.findByProcessInstanceKey() + @Index(name = "variable_processInstanceKeyIndex", columnList = "PROCESS_INSTANCE_KEY_"), + }) public class VariableEntity { @Id @@ -38,7 +39,7 @@ public class VariableEntity { @Column(name = "NAME_") private String name; - @Column(name = "VALUE_",length= Length.LONG32) + @Column(name = "VALUE_", length = Length.LONG32) @Lob private String value; @@ -68,7 +69,7 @@ public final String getGeneratedIdentifier() { } @PrePersist - private void prePersistDeriveIdField(){ + private void prePersistDeriveIdField() { setId(getGeneratedIdentifier()); } diff --git a/src/main/java/io/zeebe/monitor/querydsl/IncidentEntityPredicatesBuilder.java b/src/main/java/io/zeebe/monitor/querydsl/IncidentEntityPredicatesBuilder.java index 578ec234..b2c72f8e 100644 --- a/src/main/java/io/zeebe/monitor/querydsl/IncidentEntityPredicatesBuilder.java +++ b/src/main/java/io/zeebe/monitor/querydsl/IncidentEntityPredicatesBuilder.java @@ -1,11 +1,12 @@ package io.zeebe.monitor.querydsl; +import static org.apache.commons.lang3.StringUtils.isEmpty; + import com.querydsl.core.types.Predicate; import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.core.types.dsl.Expressions; import com.querydsl.core.types.dsl.PathBuilder; import io.zeebe.monitor.entity.QIncidentEntity; - import java.time.ZoneId; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; @@ -14,10 +15,9 @@ import java.util.List; import java.util.Optional; -import static org.apache.commons.lang3.StringUtils.isEmpty; - public class IncidentEntityPredicatesBuilder { - final PathBuilder pathBuilder = new PathBuilder<>(QIncidentEntity.class, QIncidentEntity.incidentEntity.getMetadata()); + final PathBuilder pathBuilder = + new PathBuilder<>(QIncidentEntity.class, QIncidentEntity.incidentEntity.getMetadata()); private final List predicates = new ArrayList<>(); public IncidentEntityPredicatesBuilder onlyUnresolved() { @@ -42,7 +42,8 @@ public IncidentEntityPredicatesBuilder withErrorType(String errorType) { public IncidentEntityPredicatesBuilder createdAfter(String timestamp) { if (!isEmpty(timestamp)) { final Optional created = parseIsoToUtcMillis(timestamp); - created.ifPresent(utcMillis -> predicates.add(pathBuilder.getNumber("created", Long.class).goe(utcMillis))); + created.ifPresent( + utcMillis -> predicates.add(pathBuilder.getNumber("created", Long.class).goe(utcMillis))); } return this; } @@ -50,7 +51,8 @@ public IncidentEntityPredicatesBuilder createdAfter(String timestamp) { public IncidentEntityPredicatesBuilder createdBefore(String timestamp) { if (!isEmpty(timestamp)) { final Optional created = parseIsoToUtcMillis(timestamp); - created.ifPresent(utcMillis -> predicates.add(pathBuilder.getNumber("created", Long.class).loe(utcMillis))); + created.ifPresent( + utcMillis -> predicates.add(pathBuilder.getNumber("created", Long.class).loe(utcMillis))); } return this; } @@ -65,8 +67,10 @@ public Predicate build() { private Optional parseIsoToUtcMillis(String timestamp) { try { - final ZonedDateTime zonedDateTime = ZonedDateTime.from(DateTimeFormatter.ISO_DATE_TIME.parse(timestamp)); - final long utcMillis = zonedDateTime.withZoneSameInstant(ZoneId.of("UTC")).toInstant().toEpochMilli(); + final ZonedDateTime zonedDateTime = + ZonedDateTime.from(DateTimeFormatter.ISO_DATE_TIME.parse(timestamp)); + final long utcMillis = + zonedDateTime.withZoneSameInstant(ZoneId.of("UTC")).toInstant().toEpochMilli(); return Optional.of(utcMillis); } catch (DateTimeParseException ignore) { // ignore diff --git a/src/main/java/io/zeebe/monitor/repository/ErrorRepository.java b/src/main/java/io/zeebe/monitor/repository/ErrorRepository.java index ed6acf6a..6d63cb31 100644 --- a/src/main/java/io/zeebe/monitor/repository/ErrorRepository.java +++ b/src/main/java/io/zeebe/monitor/repository/ErrorRepository.java @@ -21,7 +21,8 @@ import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.PagingAndSortingRepository; -public interface ErrorRepository extends PagingAndSortingRepository, CrudRepository { +public interface ErrorRepository + extends PagingAndSortingRepository, CrudRepository { Page findByProcessInstanceKey(long processInstanceKey, Pageable pageable); diff --git a/src/main/java/io/zeebe/monitor/repository/IncidentRepository.java b/src/main/java/io/zeebe/monitor/repository/IncidentRepository.java index 09284f38..a58890aa 100644 --- a/src/main/java/io/zeebe/monitor/repository/IncidentRepository.java +++ b/src/main/java/io/zeebe/monitor/repository/IncidentRepository.java @@ -20,8 +20,10 @@ import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.PagingAndSortingRepository; -public interface IncidentRepository extends PagingAndSortingRepository, QuerydslPredicateExecutor, CrudRepository { +public interface IncidentRepository + extends PagingAndSortingRepository, + QuerydslPredicateExecutor, + CrudRepository { Iterable findByProcessInstanceKey(long processInstanceKey); - } diff --git a/src/main/java/io/zeebe/monitor/repository/JobRepository.java b/src/main/java/io/zeebe/monitor/repository/JobRepository.java index 6956ff16..62e44a42 100644 --- a/src/main/java/io/zeebe/monitor/repository/JobRepository.java +++ b/src/main/java/io/zeebe/monitor/repository/JobRepository.java @@ -23,7 +23,8 @@ import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.PagingAndSortingRepository; -public interface JobRepository extends PagingAndSortingRepository, CrudRepository { +public interface JobRepository + extends PagingAndSortingRepository, CrudRepository { Page findByProcessInstanceKey(long processInstanceKey, Pageable pageable); diff --git a/src/main/java/io/zeebe/monitor/repository/MessageRepository.java b/src/main/java/io/zeebe/monitor/repository/MessageRepository.java index fd028d10..5055f3d6 100644 --- a/src/main/java/io/zeebe/monitor/repository/MessageRepository.java +++ b/src/main/java/io/zeebe/monitor/repository/MessageRepository.java @@ -19,4 +19,5 @@ import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.PagingAndSortingRepository; -public interface MessageRepository extends PagingAndSortingRepository, CrudRepository {} +public interface MessageRepository + extends PagingAndSortingRepository, CrudRepository {} diff --git a/src/main/java/io/zeebe/monitor/repository/MessageSubscriptionRepository.java b/src/main/java/io/zeebe/monitor/repository/MessageSubscriptionRepository.java index 78c71a03..d35371ea 100644 --- a/src/main/java/io/zeebe/monitor/repository/MessageSubscriptionRepository.java +++ b/src/main/java/io/zeebe/monitor/repository/MessageSubscriptionRepository.java @@ -24,7 +24,8 @@ import org.springframework.data.repository.PagingAndSortingRepository; public interface MessageSubscriptionRepository - extends PagingAndSortingRepository, CrudRepository { + extends PagingAndSortingRepository, + CrudRepository { Page findByProcessInstanceKey( long processInstanceKey, Pageable pageable); diff --git a/src/main/java/io/zeebe/monitor/repository/ProcessInstanceRepository.java b/src/main/java/io/zeebe/monitor/repository/ProcessInstanceRepository.java index 9688f7ac..c08ba365 100644 --- a/src/main/java/io/zeebe/monitor/repository/ProcessInstanceRepository.java +++ b/src/main/java/io/zeebe/monitor/repository/ProcessInstanceRepository.java @@ -23,7 +23,8 @@ import org.springframework.data.repository.PagingAndSortingRepository; public interface ProcessInstanceRepository - extends PagingAndSortingRepository, CrudRepository { + extends PagingAndSortingRepository, + CrudRepository { Page findByProcessDefinitionKey( long processDefinitionKey, Pageable pageable); diff --git a/src/main/java/io/zeebe/monitor/repository/ProcessRepository.java b/src/main/java/io/zeebe/monitor/repository/ProcessRepository.java index ffaed601..7e6486c6 100644 --- a/src/main/java/io/zeebe/monitor/repository/ProcessRepository.java +++ b/src/main/java/io/zeebe/monitor/repository/ProcessRepository.java @@ -20,14 +20,14 @@ import java.util.Collection; import java.util.List; import java.util.Optional; - import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; -public interface ProcessRepository extends PagingAndSortingRepository, CrudRepository { +public interface ProcessRepository + extends PagingAndSortingRepository, CrudRepository { Optional findByKey(long key); diff --git a/src/main/java/io/zeebe/monitor/repository/TimerRepository.java b/src/main/java/io/zeebe/monitor/repository/TimerRepository.java index 28d78f3b..e7bae4a4 100644 --- a/src/main/java/io/zeebe/monitor/repository/TimerRepository.java +++ b/src/main/java/io/zeebe/monitor/repository/TimerRepository.java @@ -22,7 +22,8 @@ import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.PagingAndSortingRepository; -public interface TimerRepository extends PagingAndSortingRepository, CrudRepository { +public interface TimerRepository + extends PagingAndSortingRepository, CrudRepository { Page findByProcessInstanceKey(Long processInstanceKey, Pageable pageable); diff --git a/src/main/java/io/zeebe/monitor/repository/VariableRepository.java b/src/main/java/io/zeebe/monitor/repository/VariableRepository.java index 4cfbcb1a..28eb4d39 100644 --- a/src/main/java/io/zeebe/monitor/repository/VariableRepository.java +++ b/src/main/java/io/zeebe/monitor/repository/VariableRepository.java @@ -16,9 +16,8 @@ package io.zeebe.monitor.repository; import io.zeebe.monitor.entity.VariableEntity; -import org.springframework.data.repository.CrudRepository; - import java.util.List; +import org.springframework.data.repository.CrudRepository; public interface VariableRepository extends CrudRepository { diff --git a/src/main/java/io/zeebe/monitor/rest/AbstractViewController.java b/src/main/java/io/zeebe/monitor/rest/AbstractViewController.java index 78234afb..2c43852c 100644 --- a/src/main/java/io/zeebe/monitor/rest/AbstractViewController.java +++ b/src/main/java/io/zeebe/monitor/rest/AbstractViewController.java @@ -9,13 +9,12 @@ import io.zeebe.monitor.rest.dto.PartitionInfoDto; import io.zeebe.monitor.zeebe.status.ClusterStatus; import io.zeebe.monitor.zeebe.status.ZeebeStatusKeeper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; - import java.util.Map; import java.util.jar.Attributes; import java.util.stream.Collectors; import java.util.stream.IntStream; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Pageable; abstract class AbstractViewController { @@ -86,7 +85,8 @@ private int getLastPage(final Pageable pageable, final long count) { protected void addDefaultAttributesToModel(Map model) { whitelabelPropertiesMapper.addPropertiesToModel(model, whitelabelProperties); final ClusterStatus status = zeebeStatusKeeper.getStatus(); - final String version = applicationAttributes.getValue(ZeebeSimpleMonitorApp.IMPLEMENTATION_VERSION); + final String version = + applicationAttributes.getValue(ZeebeSimpleMonitorApp.IMPLEMENTATION_VERSION); model.put("status", toStatusDto(status, version)); } @@ -123,7 +123,6 @@ private ClusterStatusDto toStatusDto(ClusterStatus status, String version) { return clusterStatusDto; } - private static class Page { private final int pageNumber; private final int displayNumber; diff --git a/src/main/java/io/zeebe/monitor/rest/IncidentsViewController.java b/src/main/java/io/zeebe/monitor/rest/IncidentsViewController.java index db4cc335..2edb4cba 100644 --- a/src/main/java/io/zeebe/monitor/rest/IncidentsViewController.java +++ b/src/main/java/io/zeebe/monitor/rest/IncidentsViewController.java @@ -5,6 +5,11 @@ import io.zeebe.monitor.querydsl.IncidentEntityPredicatesBuilder; import io.zeebe.monitor.repository.IncidentRepository; import io.zeebe.monitor.rest.dto.IncidentListDto; +import jakarta.transaction.Transactional; +import java.time.Instant; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -12,12 +17,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; -import jakarta.transaction.Transactional; -import java.time.Instant; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - @Controller public class IncidentsViewController extends AbstractViewController { @@ -25,20 +24,22 @@ public class IncidentsViewController extends AbstractViewController { @GetMapping("/views/incidents") @Transactional - public String incidentList(final Map model, - final Pageable pageable, - @RequestParam(required = false,name = "bpmnProcessId") String bpmnProcessId, - @RequestParam(required = false, name = "errorType") String errorType, - @RequestParam(required = false, name = "createdAfter") String createdAfter, - @RequestParam(required = false, name = "createdAfter") String createdBefore) { - - final Predicate predicate = new IncidentEntityPredicatesBuilder() - .onlyUnresolved() - .withProcessId(bpmnProcessId) - .withErrorType(errorType) - .createdAfter(createdAfter) - .createdBefore(createdBefore) - .build(); + public String incidentList( + final Map model, + final Pageable pageable, + @RequestParam(required = false, name = "bpmnProcessId") String bpmnProcessId, + @RequestParam(required = false, name = "errorType") String errorType, + @RequestParam(required = false, name = "createdAfter") String createdAfter, + @RequestParam(required = false, name = "createdAfter") String createdBefore) { + + final Predicate predicate = + new IncidentEntityPredicatesBuilder() + .onlyUnresolved() + .withProcessId(bpmnProcessId) + .withErrorType(errorType) + .createdAfter(createdAfter) + .createdBefore(createdBefore) + .build(); final Page dtos = incidentRepository.findAll(predicate, pageable); final List incidents = new ArrayList<>(); diff --git a/src/main/java/io/zeebe/monitor/rest/InstancesCalledProcessesListViewController.java b/src/main/java/io/zeebe/monitor/rest/InstancesCalledProcessesListViewController.java index 86a34e13..01558114 100644 --- a/src/main/java/io/zeebe/monitor/rest/InstancesCalledProcessesListViewController.java +++ b/src/main/java/io/zeebe/monitor/rest/InstancesCalledProcessesListViewController.java @@ -5,10 +5,10 @@ import io.zeebe.monitor.entity.ProcessInstanceEntity; import io.zeebe.monitor.rest.dto.CalledProcessInstanceDto; import io.zeebe.monitor.rest.dto.ProcessInstanceDto; +import jakarta.transaction.Transactional; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import jakarta.transaction.Transactional; import org.springframework.data.domain.Pageable; import org.springframework.data.web.PageableDefault; import org.springframework.stereotype.Controller; diff --git a/src/main/java/io/zeebe/monitor/rest/InstancesErrorListViewController.java b/src/main/java/io/zeebe/monitor/rest/InstancesErrorListViewController.java index afd324d9..5105dff4 100644 --- a/src/main/java/io/zeebe/monitor/rest/InstancesErrorListViewController.java +++ b/src/main/java/io/zeebe/monitor/rest/InstancesErrorListViewController.java @@ -5,10 +5,10 @@ import io.zeebe.monitor.entity.ProcessInstanceEntity; import io.zeebe.monitor.repository.ErrorRepository; import io.zeebe.monitor.rest.dto.ProcessInstanceDto; +import jakarta.transaction.Transactional; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import jakarta.transaction.Transactional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.data.web.PageableDefault; diff --git a/src/main/java/io/zeebe/monitor/rest/InstancesIncidentListViewController.java b/src/main/java/io/zeebe/monitor/rest/InstancesIncidentListViewController.java index b476e67e..ce84bdc6 100644 --- a/src/main/java/io/zeebe/monitor/rest/InstancesIncidentListViewController.java +++ b/src/main/java/io/zeebe/monitor/rest/InstancesIncidentListViewController.java @@ -5,11 +5,11 @@ import io.zeebe.monitor.entity.ProcessInstanceEntity; import io.zeebe.monitor.rest.dto.IncidentDto; import io.zeebe.monitor.rest.dto.ProcessInstanceDto; +import jakarta.transaction.Transactional; import java.time.Instant; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import jakarta.transaction.Transactional; import org.springframework.data.domain.Pageable; import org.springframework.data.web.PageableDefault; import org.springframework.stereotype.Controller; diff --git a/src/main/java/io/zeebe/monitor/rest/InstancesJobListViewController.java b/src/main/java/io/zeebe/monitor/rest/InstancesJobListViewController.java index ce213c8e..e3d5c36c 100644 --- a/src/main/java/io/zeebe/monitor/rest/InstancesJobListViewController.java +++ b/src/main/java/io/zeebe/monitor/rest/InstancesJobListViewController.java @@ -6,11 +6,11 @@ import io.zeebe.monitor.repository.JobRepository; import io.zeebe.monitor.rest.dto.JobDto; import io.zeebe.monitor.rest.dto.ProcessInstanceDto; +import jakarta.transaction.Transactional; import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import jakarta.transaction.Transactional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.data.web.PageableDefault; diff --git a/src/main/java/io/zeebe/monitor/rest/InstancesMessageSubscriptionListViewController.java b/src/main/java/io/zeebe/monitor/rest/InstancesMessageSubscriptionListViewController.java index 7c98d31f..7f7e7324 100644 --- a/src/main/java/io/zeebe/monitor/rest/InstancesMessageSubscriptionListViewController.java +++ b/src/main/java/io/zeebe/monitor/rest/InstancesMessageSubscriptionListViewController.java @@ -6,10 +6,10 @@ import io.zeebe.monitor.repository.MessageSubscriptionRepository; import io.zeebe.monitor.rest.dto.MessageSubscriptionDto; import io.zeebe.monitor.rest.dto.ProcessInstanceDto; +import jakarta.transaction.Transactional; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import jakarta.transaction.Transactional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.data.web.PageableDefault; diff --git a/src/main/java/io/zeebe/monitor/rest/InstancesTimerListViewController.java b/src/main/java/io/zeebe/monitor/rest/InstancesTimerListViewController.java index ef28690c..382df01b 100644 --- a/src/main/java/io/zeebe/monitor/rest/InstancesTimerListViewController.java +++ b/src/main/java/io/zeebe/monitor/rest/InstancesTimerListViewController.java @@ -6,10 +6,10 @@ import io.zeebe.monitor.repository.TimerRepository; import io.zeebe.monitor.rest.dto.ProcessInstanceDto; import io.zeebe.monitor.rest.dto.TimerDto; +import jakarta.transaction.Transactional; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import jakarta.transaction.Transactional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.data.web.PageableDefault; diff --git a/src/main/java/io/zeebe/monitor/rest/InstancesVariableListController.java b/src/main/java/io/zeebe/monitor/rest/InstancesVariableListController.java index 4916345d..1cc76c4a 100644 --- a/src/main/java/io/zeebe/monitor/rest/InstancesVariableListController.java +++ b/src/main/java/io/zeebe/monitor/rest/InstancesVariableListController.java @@ -8,12 +8,12 @@ import io.zeebe.monitor.rest.dto.ProcessInstanceDto; import io.zeebe.monitor.rest.dto.VariableEntry; import io.zeebe.monitor.rest.dto.VariableUpdateEntry; +import jakarta.transaction.Transactional; import java.time.Instant; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; -import jakarta.transaction.Transactional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.data.web.PageableDefault; @@ -38,7 +38,9 @@ public String instanceVariableList( @GetMapping("/views/instances/{key}/variable-list") @Transactional public String instanceDetailVariableList( - @PathVariable("key") final long key, final Map model, final Pageable pageable) { + @PathVariable("key") final long key, + final Map model, + final Pageable pageable) { initializeProcessInstanceDto(key, model, pageable); model.put("content-variable-list-view", new EnableConditionalViewRenderer()); @@ -55,7 +57,9 @@ protected void fillViewDetailsIntoDto( Pageable pageable, ProcessInstanceDto dto) { final Map> variablesByScopeAndName = - variableRepository.findByProcessInstanceKeyOrderByTimestampAscIdAsc(instance.getKey()).stream() + variableRepository + .findByProcessInstanceKeyOrderByTimestampAscIdAsc(instance.getKey()) + .stream() .collect(Collectors.groupingBy(v -> new VariableTuple(v.getScopeKey(), v.getName()))); variablesByScopeAndName.forEach( (scopeKeyName, variables) -> { diff --git a/src/main/java/io/zeebe/monitor/rest/JobResource.java b/src/main/java/io/zeebe/monitor/rest/JobResource.java index c3c49820..5f56b49d 100644 --- a/src/main/java/io/zeebe/monitor/rest/JobResource.java +++ b/src/main/java/io/zeebe/monitor/rest/JobResource.java @@ -36,12 +36,7 @@ public void completeJob( @RequestMapping(path = "/{key}/fail", method = RequestMethod.PUT) public void failJob(@PathVariable("key") final long key) { - zeebeClient - .newFailCommand(key) - .retries(0) - .errorMessage("Failed by user.") - .send() - .join(); + zeebeClient.newFailCommand(key).retries(0).errorMessage("Failed by user.").send().join(); } @RequestMapping(path = "/{key}/throw-error", method = RequestMethod.PUT) @@ -50,5 +45,4 @@ public void throwError( zeebeClient.newThrowErrorCommand(key).errorCode(dto.getErrorCode()).send().join(); } - } diff --git a/src/main/java/io/zeebe/monitor/rest/ProcessesViewController.java b/src/main/java/io/zeebe/monitor/rest/ProcessesViewController.java index b12a8eb3..76b0a8a6 100644 --- a/src/main/java/io/zeebe/monitor/rest/ProcessesViewController.java +++ b/src/main/java/io/zeebe/monitor/rest/ProcessesViewController.java @@ -62,11 +62,15 @@ public String index(final Map model, final Pageable pageable) { } @GetMapping("/views/processes") - public String processList(final Map model, final Pageable pageable, @RequestParam(value = "bpmnProcessId", required = false) Optional bpmnProcessId) { + public String processList( + final Map model, + final Pageable pageable, + @RequestParam(value = "bpmnProcessId", required = false) Optional bpmnProcessId) { if (bpmnProcessId.isPresent() && bpmnProcessId.get().length() >= 3) { final List processes = new ArrayList<>(); - for (final ProcessEntity processEntity : processRepository.findByBpmnProcessIdStartsWith(bpmnProcessId.get())) { + for (final ProcessEntity processEntity : + processRepository.findByBpmnProcessIdStartsWith(bpmnProcessId.get())) { final ProcessDto dto = toDto(processEntity); processes.add(dto); } @@ -100,7 +104,9 @@ public String processList(final Map model, final Pageable pageab @GetMapping("/views/processes/{key}") @Transactional public String processDetail( - @PathVariable("key") final long key, final Map model, final Pageable pageable) { + @PathVariable("key") final long key, + final Map model, + final Pageable pageable) { final ProcessEntity process = processRepository @@ -237,22 +243,22 @@ private List getElementInstanceStates(final long key) { ElementInstanceStatistics::getElementId, ElementInstanceStatistics::getCount)); return elementEnteredStatistics.stream() - .map( - s -> { - final ElementInstanceState state = new ElementInstanceState(); + .map( + s -> { + final ElementInstanceState state = new ElementInstanceState(); - final String elementId = s.getElementId(); - state.setElementId(elementId); + final String elementId = s.getElementId(); + state.setElementId(elementId); - final long completedInstances = elementCompletedCount.getOrDefault(elementId, 0L); - final long enteredInstances = s.getCount(); + final long completedInstances = elementCompletedCount.getOrDefault(elementId, 0L); + final long enteredInstances = s.getCount(); - state.setActiveInstances(enteredInstances - completedInstances); - state.setEndedInstances(completedInstances); + state.setActiveInstances(enteredInstances - completedInstances); + state.setEndedInstances(completedInstances); - return state; - }) - .collect(Collectors.toList()); + return state; + }) + .collect(Collectors.toList()); } static List getBpmnElementInfos(final BpmnModelInstance bpmn) { @@ -297,7 +303,8 @@ static List getBpmnElementInfos(final BpmnModelInstance bpmn) { eventDefinition -> { if (eventDefinition instanceof ErrorEventDefinition errorEventDefinition) { if (errorEventDefinition.getError() != null) { - info.setInfo("errorCode: " + errorEventDefinition.getError().getErrorCode()); + info.setInfo( + "errorCode: " + errorEventDefinition.getError().getErrorCode()); } else { info.setInfo("errorCode: "); } diff --git a/src/main/java/io/zeebe/monitor/rest/dto/ClusterStatusDto.java b/src/main/java/io/zeebe/monitor/rest/dto/ClusterStatusDto.java index 81dba620..144b8b3d 100644 --- a/src/main/java/io/zeebe/monitor/rest/dto/ClusterStatusDto.java +++ b/src/main/java/io/zeebe/monitor/rest/dto/ClusterStatusDto.java @@ -77,5 +77,4 @@ public void setSimpleMonitorVersion(String simpleMonitorVersion) { public String getSimpleMonitorVersion() { return simpleMonitorVersion; } - } diff --git a/src/main/java/io/zeebe/monitor/zeebe/ZeebeNotificationService.java b/src/main/java/io/zeebe/monitor/zeebe/ZeebeNotificationService.java index 2bc95047..0e2326ee 100644 --- a/src/main/java/io/zeebe/monitor/zeebe/ZeebeNotificationService.java +++ b/src/main/java/io/zeebe/monitor/zeebe/ZeebeNotificationService.java @@ -22,20 +22,24 @@ public ZeebeNotificationService(@Value("${server.servlet.context-path}") final S public void sendUpdatedProcessInstance( final long processInstanceKey, final long processDefinitionKey) { - sendNotification(createProcessInstanceNotification(processInstanceKey, processDefinitionKey, Type.UPDATED)); + sendNotification( + createProcessInstanceNotification(processInstanceKey, processDefinitionKey, Type.UPDATED)); } public void sendCreatedProcessInstance( final long processInstanceKey, final long processDefinitionKey) { - sendNotification(createProcessInstanceNotification(processInstanceKey, processDefinitionKey, Type.CREATED)); + sendNotification( + createProcessInstanceNotification(processInstanceKey, processDefinitionKey, Type.CREATED)); } public void sendEndedProcessInstance( final long processInstanceKey, final long processDefinitionKey) { - sendNotification(createProcessInstanceNotification(processInstanceKey, processDefinitionKey, Type.REMOVED)); + sendNotification( + createProcessInstanceNotification(processInstanceKey, processDefinitionKey, Type.REMOVED)); } - private ProcessInstanceNotification createProcessInstanceNotification(long processInstanceKey, long processDefinitionKey, Type type) { + private ProcessInstanceNotification createProcessInstanceNotification( + long processInstanceKey, long processDefinitionKey, Type type) { final ProcessInstanceNotification notification = new ProcessInstanceNotification(); notification.setProcessInstanceKey(processInstanceKey); notification.setProcessDefinitionKey(processDefinitionKey); diff --git a/src/main/java/io/zeebe/monitor/zeebe/hazelcast/HazelcastImportService.java b/src/main/java/io/zeebe/monitor/zeebe/hazelcast/HazelcastImportService.java index f369bdc5..004d4916 100644 --- a/src/main/java/io/zeebe/monitor/zeebe/hazelcast/HazelcastImportService.java +++ b/src/main/java/io/zeebe/monitor/zeebe/hazelcast/HazelcastImportService.java @@ -34,7 +34,11 @@ public ZeebeHazelcast importFrom(final HazelcastInstance hazelcast) { final var builder = ZeebeHazelcast.newBuilder(hazelcast) .addProcessListener( - record -> ifEvent(record, Schema.ProcessRecord::getMetadata, processAndElementImporter::importProcess)) + record -> + ifEvent( + record, + Schema.ProcessRecord::getMetadata, + processAndElementImporter::importProcess)) .addProcessInstanceListener( record -> ifEvent( @@ -42,30 +46,40 @@ record -> Schema.ProcessInstanceRecord::getMetadata, processAndElementImporter::importProcessInstance)) .addIncidentListener( - record -> ifEvent(record, Schema.IncidentRecord::getMetadata, incidentImporter::importIncident)) + record -> + ifEvent( + record, + Schema.IncidentRecord::getMetadata, + incidentImporter::importIncident)) .addJobListener( record -> ifEvent(record, Schema.JobRecord::getMetadata, jobImporter::importJob)) .addVariableListener( - record -> ifEvent(record, Schema.VariableRecord::getMetadata, variableImporter::importVariable)) + record -> + ifEvent( + record, + Schema.VariableRecord::getMetadata, + variableImporter::importVariable)) .addTimerListener( - record -> ifEvent(record, Schema.TimerRecord::getMetadata, timerImporter::importTimer)) + record -> + ifEvent(record, Schema.TimerRecord::getMetadata, timerImporter::importTimer)) .addMessageListener( - record -> ifEvent(record, Schema.MessageRecord::getMetadata, messageImporter::importMessage)) + record -> + ifEvent( + record, Schema.MessageRecord::getMetadata, messageImporter::importMessage)) .addMessageSubscriptionListener( record -> ifEvent( record, Schema.MessageSubscriptionRecord::getMetadata, - messageSubscriptionImporter::importMessageSubscription)) + messageSubscriptionImporter::importMessageSubscription)) .addMessageStartEventSubscriptionListener( record -> ifEvent( record, Schema.MessageStartEventSubscriptionRecord::getMetadata, - messageSubscriptionImporter::importMessageStartEventSubscription)) + messageSubscriptionImporter::importMessageStartEventSubscription)) .addErrorListener(errorImporter::importError) - .postProcessListener( - hazelcastStateService::saveSequenceNumber); + .postProcessListener(hazelcastStateService::saveSequenceNumber); final var lastSequence = hazelcastStateService.getLastSequenceNumber(); if (lastSequence >= 0) { @@ -90,5 +104,4 @@ private void ifEvent( private boolean isEvent(final Schema.RecordMetadata metadata) { return metadata.getRecordType() == Schema.RecordMetadata.RecordType.EVENT; } - } diff --git a/src/main/java/io/zeebe/monitor/zeebe/hazelcast/HazelcastStateService.java b/src/main/java/io/zeebe/monitor/zeebe/hazelcast/HazelcastStateService.java index 65311f2f..f3777a83 100644 --- a/src/main/java/io/zeebe/monitor/zeebe/hazelcast/HazelcastStateService.java +++ b/src/main/java/io/zeebe/monitor/zeebe/hazelcast/HazelcastStateService.java @@ -10,11 +10,12 @@ /** * The HazelcastStateService manages the current pointer of the Hazelcast import process. - *

- * That pointer is required to read the next-relevant message from the RingBuffer - *

- * Usually, that RingBuffer is read 1 by 1, but sometimes, the RingBuffer may overrun by the export process, - * and in that case, the Import process will set the sequence to the current position of the RingBuffer. + * + *

That pointer is required to read the next-relevant message from the RingBuffer + * + *

Usually, that RingBuffer is read 1 by 1, but sometimes, the RingBuffer may overrun by the + * export process, and in that case, the Import process will set the sequence to the current + * position of the RingBuffer. */ @Component public class HazelcastStateService { @@ -23,12 +24,14 @@ public class HazelcastStateService { private final Counter sequenceCounter; @Autowired - public HazelcastStateService(HazelcastConfigRepository hazelcastConfigRepository, MeterRegistry meterRegistry) { + public HazelcastStateService( + HazelcastConfigRepository hazelcastConfigRepository, MeterRegistry meterRegistry) { this.hazelcastConfigRepository = hazelcastConfigRepository; - sequenceCounter = Counter.builder("zeebemonitor_importer_ringbuffer_sequences_read"). - description("number of items read from Hazelcast's ringbuffer (sequence counter)"). - register(meterRegistry); + sequenceCounter = + Counter.builder("zeebemonitor_importer_ringbuffer_sequences_read") + .description("number of items read from Hazelcast's ringbuffer (sequence counter)") + .register(meterRegistry); } public long getLastSequenceNumber() { @@ -50,13 +53,13 @@ public void saveSequenceNumber(long sequence) { private HazelcastConfig getHazelcastConfig() { return hazelcastConfigRepository - .findById("cfg") - .orElseGet( - () -> { - final var config = new HazelcastConfig(); - config.setId("cfg"); - config.setSequence(-1); - return config; - }); + .findById("cfg") + .orElseGet( + () -> { + final var config = new HazelcastConfig(); + config.setId("cfg"); + config.setSequence(-1); + return config; + }); } } diff --git a/src/main/java/io/zeebe/monitor/zeebe/kafka/KafkaImportService.java b/src/main/java/io/zeebe/monitor/zeebe/kafka/KafkaImportService.java index 0bc06d7a..a15eff44 100644 --- a/src/main/java/io/zeebe/monitor/zeebe/kafka/KafkaImportService.java +++ b/src/main/java/io/zeebe/monitor/zeebe/kafka/KafkaImportService.java @@ -35,7 +35,10 @@ public class KafkaImportService { @Autowired private JobKafkaImporter jobImporter; @Autowired private MessageKafkaImporter messageImporter; @Autowired private MessageSubscriptionKafkaImporter messageSubscriptionImporter; - @Autowired private MessageStartEventSubscriptionKafkaImporter messageStartEventSubscriptionImporter; + + @Autowired + private MessageStartEventSubscriptionKafkaImporter messageStartEventSubscriptionImporter; + @Autowired private ProcessKafkaImporter processImporter; @Autowired private ProcessInstanceKafkaImporter processInstanceImporter; @Autowired private TimerKafkaImporter timerImporter; @@ -55,12 +58,10 @@ public class KafkaImportService { VARIABLE); /** - * Saves in separate transactions on each value type {@link #runAsync(KafkaImporter, ValueType, List)} - * to do it asynchronously. - * If some transactions rollbacks by an exception, previous executed will - * not. - * After the exception, invoker can save the entire batch again. It's ok, all operations is - * idempotent + * Saves in separate transactions on each value type {@link #runAsync(KafkaImporter, ValueType, + * List)} to do it asynchronously. If some transactions rollbacks by an exception, previous + * executed will not. After the exception, invoker can save the entire batch again. It's ok, all + * operations is idempotent * * @param records records to save */ @@ -76,13 +77,13 @@ public void save(List> records) { case INCIDENT -> runAsync(incidentImporter, valueType, recordList); case JOB -> runAsync(jobImporter, valueType, recordList); case MESSAGE -> runAsync(messageImporter, valueType, recordList); - case MESSAGE_SUBSCRIPTION -> runAsync( - messageSubscriptionImporter, valueType, recordList); - case MESSAGE_START_EVENT_SUBSCRIPTION -> runAsync( - messageStartEventSubscriptionImporter, valueType, recordList); + case MESSAGE_SUBSCRIPTION -> + runAsync(messageSubscriptionImporter, valueType, recordList); + case MESSAGE_START_EVENT_SUBSCRIPTION -> + runAsync(messageStartEventSubscriptionImporter, valueType, recordList); case PROCESS -> runAsync(processImporter, valueType, recordList); - case PROCESS_INSTANCE -> runAsync( - processInstanceImporter, valueType, recordList); + case PROCESS_INSTANCE -> + runAsync(processInstanceImporter, valueType, recordList); case TIMER -> runAsync(timerImporter, valueType, recordList); case VARIABLE -> runAsync(variableImporter, valueType, recordList); default -> CompletableFuture.completedFuture(Void.TYPE); @@ -97,7 +98,7 @@ public boolean isAvailableType(ValueType valueType) { } private CompletableFuture runAsync( - KafkaImporter kafkaImporter, ValueType valueType, List> recordList) { + KafkaImporter kafkaImporter, ValueType valueType, List> recordList) { return CompletableFuture.runAsync( () -> { kafkaImporter.importRecords(recordList); diff --git a/src/main/java/io/zeebe/monitor/zeebe/kafka/ZeebeKafkaService.java b/src/main/java/io/zeebe/monitor/zeebe/kafka/ZeebeKafkaService.java index f3214e4d..4b3f1509 100644 --- a/src/main/java/io/zeebe/monitor/zeebe/kafka/ZeebeKafkaService.java +++ b/src/main/java/io/zeebe/monitor/zeebe/kafka/ZeebeKafkaService.java @@ -26,7 +26,9 @@ public class ZeebeKafkaService { @Autowired private RecordDeserializer deserializer; @Autowired private KafkaImportService kafkaImportService; - @KafkaListener(topics = "${spring.kafka.template.default-topic}", groupId = "${spring.kafka.group-id}") + @KafkaListener( + topics = "${spring.kafka.template.default-topic}", + groupId = "${spring.kafka.group-id}") public void listener(List> messages) { try { final var records = diff --git a/src/main/java/io/zeebe/monitor/zeebe/kafka/importers/IncidentKafkaImporter.java b/src/main/java/io/zeebe/monitor/zeebe/kafka/importers/IncidentKafkaImporter.java index bcc18013..3585213b 100644 --- a/src/main/java/io/zeebe/monitor/zeebe/kafka/importers/IncidentKafkaImporter.java +++ b/src/main/java/io/zeebe/monitor/zeebe/kafka/importers/IncidentKafkaImporter.java @@ -33,7 +33,8 @@ public void importRecord(final Record record) { newEntity.setProcessInstanceKey(value.getProcessInstanceKey()); newEntity.setElementInstanceKey(value.getElementInstanceKey()); newEntity.setJobKey(value.getJobKey()); - newEntity.setErrorType(value.getErrorType() == null ? null : value.getErrorType().name()); + newEntity.setErrorType( + value.getErrorType() == null ? null : value.getErrorType().name()); newEntity.setErrorMessage(value.getErrorMessage()); return newEntity; }); diff --git a/src/main/java/io/zeebe/monitor/zeebe/kafka/importers/ProcessInstanceKafkaImporter.java b/src/main/java/io/zeebe/monitor/zeebe/kafka/importers/ProcessInstanceKafkaImporter.java index 22925343..1b86f38f 100644 --- a/src/main/java/io/zeebe/monitor/zeebe/kafka/importers/ProcessInstanceKafkaImporter.java +++ b/src/main/java/io/zeebe/monitor/zeebe/kafka/importers/ProcessInstanceKafkaImporter.java @@ -90,7 +90,8 @@ private void addElementInstance(final Record record) { entity.setElementId(value.getElementId()); entity.setFlowScopeKey(value.getFlowScopeKey()); entity.setProcessDefinitionKey(value.getProcessDefinitionKey()); - entity.setBpmnElementType(value.getBpmnElementType() == null ? null : value.getBpmnElementType().name()); + entity.setBpmnElementType( + value.getBpmnElementType() == null ? null : value.getBpmnElementType().name()); elementInstanceRepository.save(entity); notificationService.sendUpdatedProcessInstance( value.getProcessInstanceKey(), value.getProcessDefinitionKey()); diff --git a/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/ErrorProtobufImporter.java b/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/ErrorProtobufImporter.java index cd15a518..14bf8309 100644 --- a/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/ErrorProtobufImporter.java +++ b/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/ErrorProtobufImporter.java @@ -18,7 +18,10 @@ public class ErrorProtobufImporter { public ErrorProtobufImporter(ErrorRepository errorRepository, MeterRegistry meterRegistry) { this.errorRepository = errorRepository; - this.counter = Counter.builder("zeebemonitor_importer_error").description("number of processed errors").register(meterRegistry); + this.counter = + Counter.builder("zeebemonitor_importer_error") + .description("number of processed errors") + .register(meterRegistry); } public void importError(final Schema.ErrorRecord record) { diff --git a/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/IncidentProtobufImporter.java b/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/IncidentProtobufImporter.java index df0c58e3..3c926246 100644 --- a/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/IncidentProtobufImporter.java +++ b/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/IncidentProtobufImporter.java @@ -17,11 +17,20 @@ public class IncidentProtobufImporter { private final Counter resolvedCounter; @Autowired - public IncidentProtobufImporter(IncidentRepository incidentRepository, MeterRegistry meterRegistry) { + public IncidentProtobufImporter( + IncidentRepository incidentRepository, MeterRegistry meterRegistry) { this.incidentRepository = incidentRepository; - createdCounter = Counter.builder("zeebemonitor_importer_incident").tag("action", "created").description("number of processed incidents").register(meterRegistry); - resolvedCounter = Counter.builder("zeebemonitor_importer_incident").tag("action", "resolved").description("number of processed incidents").register(meterRegistry); + createdCounter = + Counter.builder("zeebemonitor_importer_incident") + .tag("action", "created") + .description("number of processed incidents") + .register(meterRegistry); + resolvedCounter = + Counter.builder("zeebemonitor_importer_incident") + .tag("action", "resolved") + .description("number of processed incidents") + .register(meterRegistry); } public void importIncident(final Schema.IncidentRecord record) { diff --git a/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/JobProtobufImporter.java b/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/JobProtobufImporter.java index 681a9aaa..4a7881e5 100644 --- a/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/JobProtobufImporter.java +++ b/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/JobProtobufImporter.java @@ -19,7 +19,10 @@ public class JobProtobufImporter { public JobProtobufImporter(JobRepository jobRepository, MeterRegistry meterRegistry) { this.jobRepository = jobRepository; - this.counter = Counter.builder("zeebemonitor_importer_job").description("number of processed jobs").register(meterRegistry); + this.counter = + Counter.builder("zeebemonitor_importer_job") + .description("number of processed jobs") + .register(meterRegistry); } public void importJob(final Schema.JobRecord record) { diff --git a/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/MessageProtobufImporter.java b/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/MessageProtobufImporter.java index d65fd17a..77c91dce 100644 --- a/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/MessageProtobufImporter.java +++ b/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/MessageProtobufImporter.java @@ -19,7 +19,10 @@ public class MessageProtobufImporter { public MessageProtobufImporter(MessageRepository messageRepository, MeterRegistry meterRegistry) { this.messageRepository = messageRepository; - this.counter = Counter.builder("zeebemonitor_importer_message").description("number of processed messages").register(meterRegistry); + this.counter = + Counter.builder("zeebemonitor_importer_message") + .description("number of processed messages") + .register(meterRegistry); } public void importMessage(final Schema.MessageRecord record) { diff --git a/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/MessageSubscriptionProtobufImporter.java b/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/MessageSubscriptionProtobufImporter.java index 5ae954b1..80e1bc67 100644 --- a/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/MessageSubscriptionProtobufImporter.java +++ b/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/MessageSubscriptionProtobufImporter.java @@ -19,12 +19,18 @@ public class MessageSubscriptionProtobufImporter { private final Counter eventCounter; @Autowired - public MessageSubscriptionProtobufImporter(MessageSubscriptionRepository messageSubscriptionRepository, MeterRegistry meterRegistry) { + public MessageSubscriptionProtobufImporter( + MessageSubscriptionRepository messageSubscriptionRepository, MeterRegistry meterRegistry) { this.messageSubscriptionRepository = messageSubscriptionRepository; this.subsCounter = - Counter.builder("zeebemonitor_importer_message_subscription").description("number of processed message subscriptions").register(meterRegistry); - this.eventCounter = Counter.builder("zeebemonitor_importer_message_start_event_subscription").description("number of processed message start events").register(meterRegistry); + Counter.builder("zeebemonitor_importer_message_subscription") + .description("number of processed message subscriptions") + .register(meterRegistry); + this.eventCounter = + Counter.builder("zeebemonitor_importer_message_start_event_subscription") + .description("number of processed message start events") + .register(meterRegistry); } public void importMessageSubscription(final Schema.MessageSubscriptionRecord record) { @@ -53,7 +59,6 @@ public void importMessageSubscription(final Schema.MessageSubscriptionRecord rec entity.setTimestamp(timestamp); messageSubscriptionRepository.save(entity); - subsCounter.increment(); } diff --git a/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/ProcessAndElementProtobufImporter.java b/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/ProcessAndElementProtobufImporter.java index 71b55073..49b0deda 100644 --- a/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/ProcessAndElementProtobufImporter.java +++ b/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/ProcessAndElementProtobufImporter.java @@ -30,17 +30,40 @@ public class ProcessAndElementProtobufImporter { private final Counter elementInstanceCounter; @Autowired - public ProcessAndElementProtobufImporter(ProcessRepository processRepository, ProcessInstanceRepository processInstanceRepository, ElementInstanceRepository elementInstanceRepository, MeterRegistry meterRegistry, ZeebeNotificationService notificationService) { + public ProcessAndElementProtobufImporter( + ProcessRepository processRepository, + ProcessInstanceRepository processInstanceRepository, + ElementInstanceRepository elementInstanceRepository, + MeterRegistry meterRegistry, + ZeebeNotificationService notificationService) { this.processRepository = processRepository; this.processInstanceRepository = processInstanceRepository; this.elementInstanceRepository = elementInstanceRepository; this.notificationService = notificationService; - this.processCounter = Counter.builder("zeebemonitor_importer_process").description("number of processed processes").register(meterRegistry); - this.instanceActivatedCounter = Counter.builder("zeebemonitor_importer_process_instance").tag("action", "activated").description("number of activated process instances").register(meterRegistry); - this.instanceCompletedCounter = Counter.builder("zeebemonitor_importer_process_instance").tag("action", "activated").description("number of activated process instances").register(meterRegistry); - this.instanceTerminatedCounter = Counter.builder("zeebemonitor_importer_process_instance").tag("action", "activated").description("number of activated process instances").register(meterRegistry); - this.elementInstanceCounter = Counter.builder("zeebemonitor_importer_element_instance").description("number of processed element_instances").register(meterRegistry); + this.processCounter = + Counter.builder("zeebemonitor_importer_process") + .description("number of processed processes") + .register(meterRegistry); + this.instanceActivatedCounter = + Counter.builder("zeebemonitor_importer_process_instance") + .tag("action", "activated") + .description("number of activated process instances") + .register(meterRegistry); + this.instanceCompletedCounter = + Counter.builder("zeebemonitor_importer_process_instance") + .tag("action", "activated") + .description("number of activated process instances") + .register(meterRegistry); + this.instanceTerminatedCounter = + Counter.builder("zeebemonitor_importer_process_instance") + .tag("action", "activated") + .description("number of activated process instances") + .register(meterRegistry); + this.elementInstanceCounter = + Counter.builder("zeebemonitor_importer_element_instance") + .description("number of processed element_instances") + .register(meterRegistry); } public void importProcess(final Schema.ProcessRecord record) { @@ -75,17 +98,21 @@ private void addOrUpdateProcessInstance(final Schema.ProcessInstanceRecord recor final long timestamp = record.getMetadata().getTimestamp(); final long processInstanceKey = record.getProcessInstanceKey(); - final ProcessInstanceEntity entity = processInstanceRepository.findById(processInstanceKey).orElseGet(() -> { - final ProcessInstanceEntity newEntity = new ProcessInstanceEntity(); - newEntity.setPartitionId(record.getMetadata().getPartitionId()); - newEntity.setKey(processInstanceKey); - newEntity.setBpmnProcessId(record.getBpmnProcessId()); - newEntity.setVersion(record.getVersion()); - newEntity.setProcessDefinitionKey(record.getProcessDefinitionKey()); - newEntity.setParentProcessInstanceKey(record.getParentProcessInstanceKey()); - newEntity.setParentElementInstanceKey(record.getParentElementInstanceKey()); - return newEntity; - }); + final ProcessInstanceEntity entity = + processInstanceRepository + .findById(processInstanceKey) + .orElseGet( + () -> { + final ProcessInstanceEntity newEntity = new ProcessInstanceEntity(); + newEntity.setPartitionId(record.getMetadata().getPartitionId()); + newEntity.setKey(processInstanceKey); + newEntity.setBpmnProcessId(record.getBpmnProcessId()); + newEntity.setVersion(record.getVersion()); + newEntity.setProcessDefinitionKey(record.getProcessDefinitionKey()); + newEntity.setParentProcessInstanceKey(record.getParentProcessInstanceKey()); + newEntity.setParentElementInstanceKey(record.getParentElementInstanceKey()); + return newEntity; + }); if (intent == ProcessInstanceIntent.ELEMENT_ACTIVATED) { entity.setState("Active"); diff --git a/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/TimerProtobufImporter.java b/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/TimerProtobufImporter.java index 50397118..a037bbd0 100644 --- a/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/TimerProtobufImporter.java +++ b/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/TimerProtobufImporter.java @@ -19,7 +19,10 @@ public class TimerProtobufImporter { public TimerProtobufImporter(TimerRepository timerRepository, MeterRegistry meterRegistry) { this.timerRepository = timerRepository; - this.timerCounter = Counter.builder("zeebemonitor_importer_timer").description("number of processed timers").register(meterRegistry); + this.timerCounter = + Counter.builder("zeebemonitor_importer_timer") + .description("number of processed timers") + .register(meterRegistry); } public void importTimer(final Schema.TimerRecord record) { diff --git a/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/VariableProtobufImporter.java b/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/VariableProtobufImporter.java index 34766d3e..07c2b05f 100644 --- a/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/VariableProtobufImporter.java +++ b/src/main/java/io/zeebe/monitor/zeebe/protobuf/importers/VariableProtobufImporter.java @@ -16,11 +16,20 @@ public class VariableProtobufImporter { private final Counter variableUpdatedCounter; @Autowired - public VariableProtobufImporter(VariableRepository variableRepository, MeterRegistry meterRegistry) { + public VariableProtobufImporter( + VariableRepository variableRepository, MeterRegistry meterRegistry) { this.variableRepository = variableRepository; - this.variableCreatedCounter = Counter.builder("zeebemonitor_importer_variable").tag("action", "imported").description("number of processed variables").register(meterRegistry); - this.variableUpdatedCounter = Counter.builder("zeebemonitor_importer_variable").tag("action", "updated").description("number of processed variables").register(meterRegistry); + this.variableCreatedCounter = + Counter.builder("zeebemonitor_importer_variable") + .tag("action", "imported") + .description("number of processed variables") + .register(meterRegistry); + this.variableUpdatedCounter = + Counter.builder("zeebemonitor_importer_variable") + .tag("action", "updated") + .description("number of processed variables") + .register(meterRegistry); } public void importVariable(final Schema.VariableRecord record) { diff --git a/src/main/java/io/zeebe/monitor/zeebe/redis/RedisImportService.java b/src/main/java/io/zeebe/monitor/zeebe/redis/RedisImportService.java index 5581ef65..a9d93db7 100644 --- a/src/main/java/io/zeebe/monitor/zeebe/redis/RedisImportService.java +++ b/src/main/java/io/zeebe/monitor/zeebe/redis/RedisImportService.java @@ -7,11 +7,10 @@ import io.zeebe.monitor.zeebe.protobuf.importers.*; import io.zeebe.redis.connect.java.RedisConnectionBuilder; import io.zeebe.redis.connect.java.ZeebeRedis; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - import java.util.function.Consumer; import java.util.function.Function; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; @Component public class RedisImportService { @@ -26,57 +25,70 @@ public class RedisImportService { @Autowired private ErrorProtobufImporter errorImporter; public ZeebeRedis importFrom(final RedisClient redisClient, RedisConfig redisConfig) { - final var builder = ZeebeRedis.newBuilder(redisClient) - .consumerGroup(redisConfig.getRedisConumerGroup()) - .xreadCount(redisConfig.getRedisXreadCount()).xreadBlockMillis(redisConfig.getRedisXreadBlockMillis()) - .prefix(redisConfig.getRedisPrefix()); + final var builder = + ZeebeRedis.newBuilder(redisClient) + .consumerGroup(redisConfig.getRedisConumerGroup()) + .xreadCount(redisConfig.getRedisXreadCount()) + .xreadBlockMillis(redisConfig.getRedisXreadBlockMillis()) + .prefix(redisConfig.getRedisPrefix()); addListener(builder); return builder.build(); } public ZeebeRedis importFrom(final RedisClusterClient redisClient, RedisConfig redisConfig) { - final var builder = ZeebeRedis.newBuilder(redisClient) - .withStandardClusterOptions() - .consumerGroup(redisConfig.getRedisConumerGroup()) - .xreadCount(redisConfig.getRedisXreadCount()).xreadBlockMillis(redisConfig.getRedisXreadBlockMillis()) - .prefix(redisConfig.getRedisPrefix()); + final var builder = + ZeebeRedis.newBuilder(redisClient) + .withStandardClusterOptions() + .consumerGroup(redisConfig.getRedisConumerGroup()) + .xreadCount(redisConfig.getRedisXreadCount()) + .xreadBlockMillis(redisConfig.getRedisXreadBlockMillis()) + .prefix(redisConfig.getRedisPrefix()); addListener(builder); return builder.build(); } private void addListener(RedisConnectionBuilder connectionBuilder) { connectionBuilder - .addProcessListener(record -> - ifEvent(record, Schema.ProcessRecord::getMetadata, processAndElementImporter::importProcess)) - .addProcessInstanceListener( - record -> - ifEvent( - record, - Schema.ProcessInstanceRecord::getMetadata, - processAndElementImporter::importProcessInstance)) - .addIncidentListener( - record -> ifEvent(record, Schema.IncidentRecord::getMetadata, incidentImporter::importIncident)) - .addJobListener( - record -> ifEvent(record, Schema.JobRecord::getMetadata, jobImporter::importJob)) - .addVariableListener( - record -> ifEvent(record, Schema.VariableRecord::getMetadata, variableImporter::importVariable)) - .addTimerListener( - record -> ifEvent(record, Schema.TimerRecord::getMetadata, timerImporter::importTimer)) - .addMessageListener( - record -> ifEvent(record, Schema.MessageRecord::getMetadata, messageImporter::importMessage)) - .addMessageSubscriptionListener( - record -> - ifEvent( - record, - Schema.MessageSubscriptionRecord::getMetadata, - messageSubscriptionImporter::importMessageSubscription)) - .addMessageStartEventSubscriptionListener( - record -> - ifEvent( - record, - Schema.MessageStartEventSubscriptionRecord::getMetadata, - messageSubscriptionImporter::importMessageStartEventSubscription)) - .addErrorListener(errorImporter::importError); + .addProcessListener( + record -> + ifEvent( + record, + Schema.ProcessRecord::getMetadata, + processAndElementImporter::importProcess)) + .addProcessInstanceListener( + record -> + ifEvent( + record, + Schema.ProcessInstanceRecord::getMetadata, + processAndElementImporter::importProcessInstance)) + .addIncidentListener( + record -> + ifEvent( + record, Schema.IncidentRecord::getMetadata, incidentImporter::importIncident)) + .addJobListener( + record -> ifEvent(record, Schema.JobRecord::getMetadata, jobImporter::importJob)) + .addVariableListener( + record -> + ifEvent( + record, Schema.VariableRecord::getMetadata, variableImporter::importVariable)) + .addTimerListener( + record -> ifEvent(record, Schema.TimerRecord::getMetadata, timerImporter::importTimer)) + .addMessageListener( + record -> + ifEvent(record, Schema.MessageRecord::getMetadata, messageImporter::importMessage)) + .addMessageSubscriptionListener( + record -> + ifEvent( + record, + Schema.MessageSubscriptionRecord::getMetadata, + messageSubscriptionImporter::importMessageSubscription)) + .addMessageStartEventSubscriptionListener( + record -> + ifEvent( + record, + Schema.MessageStartEventSubscriptionRecord::getMetadata, + messageSubscriptionImporter::importMessageStartEventSubscription)) + .addErrorListener(errorImporter::importError); } private void ifEvent( @@ -92,5 +104,4 @@ private void ifEvent( private boolean isEvent(final Schema.RecordMetadata metadata) { return metadata.getRecordType() == Schema.RecordMetadata.RecordType.EVENT; } - } diff --git a/src/main/java/io/zeebe/monitor/zeebe/redis/ZeebeRedisService.java b/src/main/java/io/zeebe/monitor/zeebe/redis/ZeebeRedisService.java index 3957d88c..ddb9e940 100644 --- a/src/main/java/io/zeebe/monitor/zeebe/redis/ZeebeRedisService.java +++ b/src/main/java/io/zeebe/monitor/zeebe/redis/ZeebeRedisService.java @@ -9,7 +9,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; @@ -17,39 +16,38 @@ @Component public class ZeebeRedisService { - private static final Logger LOG = LoggerFactory.getLogger(ZeebeRedisService.class); + private static final Logger LOG = LoggerFactory.getLogger(ZeebeRedisService.class); - private RedisConfig config; + private RedisConfig config; - public ZeebeRedisService(RedisConfig redisConfig) { - this.config = redisConfig; - } + public ZeebeRedisService(RedisConfig redisConfig) { + this.config = redisConfig; + } + + @Autowired private RedisImportService importService; + + private AutoCloseable closeable; + + @PostConstruct + public void start() { + var redisUri = RedisURI.create(config.getRedisConnection()); - @Autowired - private RedisImportService importService; - - private AutoCloseable closeable; - - @PostConstruct - public void start() { - var redisUri = RedisURI.create(config.getRedisConnection()); - - LOG.info("Connecting to Redis {}, consumer group {}", redisUri, config.getRedisConumerGroup()); - if (config.isUseClusterClient()) { - var redisClient = RedisClusterClient.create(redisUri); - LOG.info("Importing records from Redis cluster..."); - closeable = importService.importFrom(redisClient, config); - } else { - var redisClient = RedisClient.create(redisUri); - LOG.info("Importing records from Redis..."); - closeable = importService.importFrom(redisClient, config); - } + LOG.info("Connecting to Redis {}, consumer group {}", redisUri, config.getRedisConumerGroup()); + if (config.isUseClusterClient()) { + var redisClient = RedisClusterClient.create(redisUri); + LOG.info("Importing records from Redis cluster..."); + closeable = importService.importFrom(redisClient, config); + } else { + var redisClient = RedisClient.create(redisUri); + LOG.info("Importing records from Redis..."); + closeable = importService.importFrom(redisClient, config); } + } - @PreDestroy - public void close() throws Exception { - if (closeable != null) { - closeable.close(); - } + @PreDestroy + public void close() throws Exception { + if (closeable != null) { + closeable.close(); } + } } diff --git a/src/main/java/io/zeebe/monitor/zeebe/status/ClusterStatus.java b/src/main/java/io/zeebe/monitor/zeebe/status/ClusterStatus.java index e62d9fd4..436a4516 100644 --- a/src/main/java/io/zeebe/monitor/zeebe/status/ClusterStatus.java +++ b/src/main/java/io/zeebe/monitor/zeebe/status/ClusterStatus.java @@ -1,13 +1,12 @@ package io.zeebe.monitor.zeebe.status; +import static java.lang.String.valueOf; + import io.camunda.zeebe.client.api.response.PartitionBrokerHealth; import io.camunda.zeebe.client.api.response.PartitionInfo; import io.camunda.zeebe.client.api.response.Topology; - import java.util.Collection; -import static java.lang.String.valueOf; - public class ClusterStatus { private Topology topology; @@ -18,15 +17,18 @@ public void setTopology(Topology topology) { this.topology = topology; boolean unHealthy = true; if (topology != null) { - unHealthy = topology.getBrokers().stream() - .map(brokerInfo -> brokerInfo.getPartitions().stream() - .map(PartitionInfo::getHealth) - .toList()) - .flatMap(Collection::stream) - .anyMatch(health -> health != PartitionBrokerHealth.HEALTHY); + unHealthy = + topology.getBrokers().stream() + .map( + brokerInfo -> + brokerInfo.getPartitions().stream().map(PartitionInfo::getHealth).toList()) + .flatMap(Collection::stream) + .anyMatch(health -> health != PartitionBrokerHealth.HEALTHY); } healthy = topology != null && !unHealthy; - healthyString = valueOf(healthy ? PartitionBrokerHealth.HEALTHY : PartitionBrokerHealth.UNHEALTHY).toLowerCase(); + healthyString = + valueOf(healthy ? PartitionBrokerHealth.HEALTHY : PartitionBrokerHealth.UNHEALTHY) + .toLowerCase(); } public String getHealthyString() { @@ -40,5 +42,4 @@ public boolean isHealthy() { public Topology getTopology() { return topology; } - } diff --git a/src/main/java/io/zeebe/monitor/zeebe/status/ZeebeStatusKeeper.java b/src/main/java/io/zeebe/monitor/zeebe/status/ZeebeStatusKeeper.java index 2d39cd12..2eeaae75 100644 --- a/src/main/java/io/zeebe/monitor/zeebe/status/ZeebeStatusKeeper.java +++ b/src/main/java/io/zeebe/monitor/zeebe/status/ZeebeStatusKeeper.java @@ -1,9 +1,8 @@ package io.zeebe.monitor.zeebe.status; -import org.springframework.stereotype.Component; - import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; +import org.springframework.stereotype.Component; @Component public class ZeebeStatusKeeper { diff --git a/src/main/java/io/zeebe/monitor/zeebe/status/ZeebeStatusUpdateService.java b/src/main/java/io/zeebe/monitor/zeebe/status/ZeebeStatusUpdateService.java index fe237fc9..6e3d44d1 100644 --- a/src/main/java/io/zeebe/monitor/zeebe/status/ZeebeStatusUpdateService.java +++ b/src/main/java/io/zeebe/monitor/zeebe/status/ZeebeStatusUpdateService.java @@ -4,14 +4,13 @@ import io.camunda.zeebe.client.api.response.Topology; import io.zeebe.monitor.rest.ui.ClusterHealthyNotification; import io.zeebe.monitor.zeebe.ZeebeNotificationService; +import java.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import java.time.Duration; - @Component public class ZeebeStatusUpdateService { @@ -28,7 +27,9 @@ public void scheduleFixedRateWithInitialDelayTask() { status.setTopology(getTopologyFromCluster()); } catch (Exception e) { // Stacking the exceptions, to make them better readable, like this: - // Can't get status from cluster, errors (stacked): io exception; io.grpc.StatusRuntimeException: UNAVAILABLE: io exception; UNAVAILABLE: io exception; Connection refused: /127.0.0.1:26500; Connection refused; + // Can't get status from cluster, errors (stacked): io exception; + // io.grpc.StatusRuntimeException: UNAVAILABLE: io exception; UNAVAILABLE: io exception; + // Connection refused: /127.0.0.1:26500; Connection refused; StringBuilder sb = new StringBuilder(); for (Throwable t = e; t != null; t = t.getCause()) { sb.append(t.getMessage()).append("; "); @@ -36,14 +37,11 @@ public void scheduleFixedRateWithInitialDelayTask() { LOG.warn("Can't get status from cluster, errors (stacked): " + sb); } zeebeStatusKeeper.setStatus(status); - zeebeNotificationService.sendClusterStatusUpdate(new ClusterHealthyNotification(status.getHealthyString(), status.isHealthy())); + zeebeNotificationService.sendClusterStatusUpdate( + new ClusterHealthyNotification(status.getHealthyString(), status.isHealthy())); } private Topology getTopologyFromCluster() { - return zeebeClient.newTopologyRequest() - .requestTimeout(Duration.ofSeconds(2)) - .send() - .join(); + return zeebeClient.newTopologyRequest().requestTimeout(Duration.ofSeconds(2)).send().join(); } - } diff --git a/src/test/java/io/zeebe/monitor/Demo.java b/src/test/java/io/zeebe/monitor/Demo.java index ca3ad72b..f18f80d9 100644 --- a/src/test/java/io/zeebe/monitor/Demo.java +++ b/src/test/java/io/zeebe/monitor/Demo.java @@ -1,7 +1,6 @@ package io.zeebe.monitor; import io.camunda.zeebe.client.ZeebeClient; - import java.util.Collections; public class Demo { diff --git a/src/test/java/io/zeebe/monitor/repository/ElementInstanceRepositoryTest.java b/src/test/java/io/zeebe/monitor/repository/ElementInstanceRepositoryTest.java index f24e30e9..f3228cf0 100644 --- a/src/test/java/io/zeebe/monitor/repository/ElementInstanceRepositoryTest.java +++ b/src/test/java/io/zeebe/monitor/repository/ElementInstanceRepositoryTest.java @@ -1,17 +1,15 @@ package io.zeebe.monitor.repository; +import static org.assertj.core.api.Assertions.assertThat; + import io.zeebe.monitor.entity.ElementInstanceEntity; +import java.util.Optional; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import java.util.Optional; - -import static org.assertj.core.api.Assertions.assertThat; - public class ElementInstanceRepositoryTest extends ZeebeRepositoryTest { - @Autowired - private ElementInstanceRepository elementInstanceRepository; + @Autowired private ElementInstanceRepository elementInstanceRepository; @Test public void JPA_will_automatically_update_the_ID_attribute() { @@ -44,5 +42,4 @@ private ElementInstanceEntity createElementInstance() { elementInstance.setPosition(456L); return elementInstance; } - } diff --git a/src/test/java/io/zeebe/monitor/repository/TestContextJpaConfiguration.java b/src/test/java/io/zeebe/monitor/repository/TestContextJpaConfiguration.java index 15f9f041..af19d861 100644 --- a/src/test/java/io/zeebe/monitor/repository/TestContextJpaConfiguration.java +++ b/src/test/java/io/zeebe/monitor/repository/TestContextJpaConfiguration.java @@ -2,6 +2,8 @@ import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; +import java.util.Properties; +import javax.sql.DataSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -14,9 +16,6 @@ import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.annotation.EnableTransactionManagement; -import javax.sql.DataSource; -import java.util.Properties; - @Configuration @EnableJpaRepositories(basePackages = "io.zeebe.monitor.repository") @EnableTransactionManagement @@ -33,7 +32,8 @@ public DataSource dataSource() { } @Bean - public LocalContainerEntityManagerFactoryBean entityManagerFactory(@Autowired DataSource dataSource) { + public LocalContainerEntityManagerFactoryBean entityManagerFactory( + @Autowired DataSource dataSource) { LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean(); em.setDataSource(dataSource); em.setPackagesToScan("io.zeebe.monitor.entity"); @@ -46,7 +46,8 @@ public LocalContainerEntityManagerFactoryBean entityManagerFactory(@Autowired Da } @Bean - public PlatformTransactionManager transactionManager(@Autowired LocalContainerEntityManagerFactoryBean entityManagerFactory) { + public PlatformTransactionManager transactionManager( + @Autowired LocalContainerEntityManagerFactoryBean entityManagerFactory) { JpaTransactionManager transactionManager = new JpaTransactionManager(); transactionManager.setEntityManagerFactory(entityManagerFactory.getObject()); return transactionManager; @@ -63,5 +64,4 @@ private Properties getAdditionalJpaProperties() { p.setProperty("hibernate.hbm2ddl.auto", "update"); return p; } - } diff --git a/src/test/java/io/zeebe/monitor/repository/VariableRepositoryTest.java b/src/test/java/io/zeebe/monitor/repository/VariableRepositoryTest.java index c6999ef8..d0a1d53d 100644 --- a/src/test/java/io/zeebe/monitor/repository/VariableRepositoryTest.java +++ b/src/test/java/io/zeebe/monitor/repository/VariableRepositoryTest.java @@ -1,17 +1,15 @@ package io.zeebe.monitor.repository; +import static org.assertj.core.api.Assertions.assertThat; + import io.zeebe.monitor.entity.VariableEntity; +import java.util.Optional; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import java.util.Optional; - -import static org.assertj.core.api.Assertions.assertThat; - public class VariableRepositoryTest extends ZeebeRepositoryTest { - @Autowired - private VariableRepository variableRepository; + @Autowired private VariableRepository variableRepository; @Test public void JPA_will_automatically_update_the_ID_attribute() { @@ -44,5 +42,4 @@ private VariableEntity createVariable() { variable.setPosition(456L); return variable; } - } diff --git a/src/test/java/io/zeebe/monitor/repository/ZeebeApplicationMysqlTest.java b/src/test/java/io/zeebe/monitor/repository/ZeebeApplicationMysqlTest.java index 70248535..2e82a755 100644 --- a/src/test/java/io/zeebe/monitor/repository/ZeebeApplicationMysqlTest.java +++ b/src/test/java/io/zeebe/monitor/repository/ZeebeApplicationMysqlTest.java @@ -1,5 +1,7 @@ package io.zeebe.monitor.repository; +import static org.assertj.core.api.Assertions.assertThat; + import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -8,21 +10,18 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader; import org.springframework.transaction.annotation.Transactional; -import static org.assertj.core.api.Assertions.assertThat; - @SpringBootTest @ContextConfiguration( - classes = {TestContextJpaConfiguration.class}, - loader = AnnotationConfigContextLoader.class) + classes = {TestContextJpaConfiguration.class}, + loader = AnnotationConfigContextLoader.class) @Transactional @ActiveProfiles({"mysql-docker", "application-junittest.yaml"}) public class ZeebeApplicationMysqlTest { - @Autowired - private VariableRepository variableRepository; + @Autowired private VariableRepository variableRepository; - @Test - void setup_of_mysql_should_work() { - assertThat(variableRepository).isNotNull(); - } + @Test + void setup_of_mysql_should_work() { + assertThat(variableRepository).isNotNull(); + } } diff --git a/src/test/java/io/zeebe/monitor/repository/ZeebeApplicationPostgresTest.java b/src/test/java/io/zeebe/monitor/repository/ZeebeApplicationPostgresTest.java index 5082cd24..69b01266 100644 --- a/src/test/java/io/zeebe/monitor/repository/ZeebeApplicationPostgresTest.java +++ b/src/test/java/io/zeebe/monitor/repository/ZeebeApplicationPostgresTest.java @@ -1,5 +1,7 @@ package io.zeebe.monitor.repository; +import static org.assertj.core.api.Assertions.assertThat; + import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -8,8 +10,6 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader; import org.springframework.transaction.annotation.Transactional; -import static org.assertj.core.api.Assertions.assertThat; - @SpringBootTest @ContextConfiguration( classes = {TestContextJpaConfiguration.class}, @@ -18,8 +18,7 @@ @ActiveProfiles({"postgres-docker", "application-junittest.yaml"}) public class ZeebeApplicationPostgresTest { - @Autowired - private VariableRepository variableRepository; + @Autowired private VariableRepository variableRepository; @Test void setup_of_postgres_should_work() { diff --git a/src/test/java/io/zeebe/monitor/rest/CorsSettingsControllerTest.java b/src/test/java/io/zeebe/monitor/rest/CorsSettingsControllerTest.java index b7fc4b2f..a27f4430 100644 --- a/src/test/java/io/zeebe/monitor/rest/CorsSettingsControllerTest.java +++ b/src/test/java/io/zeebe/monitor/rest/CorsSettingsControllerTest.java @@ -18,26 +18,23 @@ @SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = { - "server.allowedOriginsUrls: http://www.someurl.com", - "logging.level.io.zeebe.monitor: info", + "server.allowedOriginsUrls: http://www.someurl.com", + "logging.level.io.zeebe.monitor: info", }) @AutoConfigureMockMvc @ActiveProfiles("junittest") public class CorsSettingsControllerTest { - @LocalServerPort - protected int port; - @Autowired - protected MockMvc mockMvc; + @LocalServerPort protected int port; + @Autowired protected MockMvc mockMvc; - @MockBean - protected HazelcastConfigRepository hazelcastConfigRepository; - @MockBean - protected ZeebeHazelcastService zeebeHazelcastService; + @MockBean protected HazelcastConfigRepository hazelcastConfigRepository; + @MockBean protected ZeebeHazelcastService zeebeHazelcastService; @Test public void access_control_origin_request_header_is_checked() throws Exception { - mockMvc.perform( + mockMvc + .perform( options("/") .header("Access-Control-Request-Method", "GET") .header("Host", "localhost") @@ -47,7 +44,8 @@ public void access_control_origin_request_header_is_checked() throws Exception { @Test public void access_control_allow_origin_response_header_is_send() throws Exception { - mockMvc.perform( + mockMvc + .perform( options("/") .header("Access-Control-Request-Method", "GET") .header("Host", "localhost") @@ -55,5 +53,4 @@ public void access_control_allow_origin_response_header_is_send() throws Excepti .andExpect(status().isOk()) .andExpect(header().string("Access-Control-Allow-Origin", "http://www.someurl.com")); } - } diff --git a/src/test/java/io/zeebe/monitor/rest/InstancesTimerListViewControllerTest.java b/src/test/java/io/zeebe/monitor/rest/InstancesTimerListViewControllerTest.java index bc0f5055..a670c23e 100644 --- a/src/test/java/io/zeebe/monitor/rest/InstancesTimerListViewControllerTest.java +++ b/src/test/java/io/zeebe/monitor/rest/InstancesTimerListViewControllerTest.java @@ -35,7 +35,9 @@ public void setUp() { @Test void timers_list_view_contains_pagination_elements() throws Exception { // GIVEN - BpmnModelInstance modelInstance = Bpmn.readModelFromStream(this.getClass().getClassLoader().getResourceAsStream("orderProcess.bpmn")); + BpmnModelInstance modelInstance = + Bpmn.readModelFromStream( + this.getClass().getClassLoader().getResourceAsStream("orderProcess.bpmn")); ProcessInstanceEntity processInstanceEntity = mock(ProcessInstanceEntity.class, RETURNS_MOCKS); ProcessEntity processEntity = mock(ProcessEntity.class, RETURNS_MOCKS); when(processEntity.getResource()).thenReturn(modelInstance.toString()); diff --git a/src/test/java/io/zeebe/monitor/rest/InstancesVariableListControllerTest.java b/src/test/java/io/zeebe/monitor/rest/InstancesVariableListControllerTest.java index f39551d5..1cb77906 100644 --- a/src/test/java/io/zeebe/monitor/rest/InstancesVariableListControllerTest.java +++ b/src/test/java/io/zeebe/monitor/rest/InstancesVariableListControllerTest.java @@ -11,7 +11,6 @@ import io.zeebe.monitor.entity.ProcessEntity; import io.zeebe.monitor.entity.ProcessInstanceEntity; - import java.util.Collections; import java.util.Optional; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/io/zeebe/monitor/zeebe/hazelcast/importers/ProcessAndElementHazelcastImporterTest.java b/src/test/java/io/zeebe/monitor/zeebe/hazelcast/importers/ProcessAndElementHazelcastImporterTest.java index 063ab431..9fdf979f 100644 --- a/src/test/java/io/zeebe/monitor/zeebe/hazelcast/importers/ProcessAndElementHazelcastImporterTest.java +++ b/src/test/java/io/zeebe/monitor/zeebe/hazelcast/importers/ProcessAndElementHazelcastImporterTest.java @@ -16,19 +16,14 @@ import org.springframework.test.context.ContextConfiguration; @ContextConfiguration( - classes = {ProcessAndElementProtobufImporter.class, - ZeebeNotificationService.class} -) + classes = {ProcessAndElementProtobufImporter.class, ZeebeNotificationService.class}) public class ProcessAndElementHazelcastImporterTest extends ZeebeRepositoryTest { - @Autowired - ProcessAndElementProtobufImporter processAndElementImporter; + @Autowired ProcessAndElementProtobufImporter processAndElementImporter; - @Autowired - ElementInstanceRepository elementInstanceRepository; + @Autowired ElementInstanceRepository elementInstanceRepository; - @MockBean - SimpMessagingTemplate simpMessagingTemplate; + @MockBean SimpMessagingTemplate simpMessagingTemplate; @Test public void only_storing_first_variable_event_prevents_duplicate_PartitionID_and_Position() { @@ -49,11 +44,11 @@ public void only_storing_first_variable_event_prevents_duplicate_PartitionID_and private Schema.ProcessInstanceRecord createElementInstanceWithId(String elementId) { return Schema.ProcessInstanceRecord.newBuilder() .setElementId(elementId) - .setMetadata(Schema.RecordMetadata.newBuilder() - .setPosition(333L) - .setPartitionId(55555) - .setIntent(ProcessInstanceIntent.ELEMENT_ACTIVATED.name())) + .setMetadata( + Schema.RecordMetadata.newBuilder() + .setPosition(333L) + .setPartitionId(55555) + .setIntent(ProcessInstanceIntent.ELEMENT_ACTIVATED.name())) .build(); } - } diff --git a/src/test/java/io/zeebe/monitor/zeebe/hazelcast/importers/VariableHazelcastImporterTest.java b/src/test/java/io/zeebe/monitor/zeebe/hazelcast/importers/VariableHazelcastImporterTest.java index 100e9fac..cf51d7b9 100644 --- a/src/test/java/io/zeebe/monitor/zeebe/hazelcast/importers/VariableHazelcastImporterTest.java +++ b/src/test/java/io/zeebe/monitor/zeebe/hazelcast/importers/VariableHazelcastImporterTest.java @@ -11,16 +11,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -@ContextConfiguration( - classes = {VariableProtobufImporter.class} -) +@ContextConfiguration(classes = {VariableProtobufImporter.class}) public class VariableHazelcastImporterTest extends ZeebeRepositoryTest { - @Autowired - VariableProtobufImporter variableImporter; + @Autowired VariableProtobufImporter variableImporter; - @Autowired - VariableRepository variableRepository; + @Autowired VariableRepository variableRepository; @Test public void only_storing_first_variable_event_prevents_duplicate_PartitionID_and_Position() { @@ -40,9 +36,7 @@ public void only_storing_first_variable_event_prevents_duplicate_PartitionID_and private Schema.VariableRecord createVariableRecordWithName(String name) { return Schema.VariableRecord.newBuilder() - .setMetadata(Schema.RecordMetadata.newBuilder() - .setPartitionId(123) - .setPosition(456L)) + .setMetadata(Schema.RecordMetadata.newBuilder().setPartitionId(123).setPosition(456L)) .setName(name) .build(); } diff --git a/src/test/java/io/zeebe/monitor/zeebe/kafka/importers/VariableKafkaImporterTest.java b/src/test/java/io/zeebe/monitor/zeebe/kafka/importers/VariableKafkaImporterTest.java index 8c47fbbb..0703e081 100644 --- a/src/test/java/io/zeebe/monitor/zeebe/kafka/importers/VariableKafkaImporterTest.java +++ b/src/test/java/io/zeebe/monitor/zeebe/kafka/importers/VariableKafkaImporterTest.java @@ -19,8 +19,7 @@ @ContextConfiguration(classes = {VariableKafkaImporter.class}) public class VariableKafkaImporterTest extends ZeebeRepositoryTest { - @Autowired - VariableKafkaImporter variableImporter; + @Autowired VariableKafkaImporter variableImporter; @Autowired VariableRepository variableRepository;