Review fixes

allegro · Oct 30, 2024 · 8105b77 · 8105b77
1 parent 4e8fd38
commit 8105b77
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 18 deletions.
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OfflineRetransmissionRequest.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OfflineRetransmissionRequest.java
@@ -14,13 +14,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.constraints.OneSourceRetransmission;
-import pl.allegro.tech.hermes.api.constraints.ProperTimeRangePresentForTopicRetransmission;
-import pl.allegro.tech.hermes.api.constraints.TimeRangeAbsentForViewRetransmission;
+import pl.allegro.tech.hermes.api.constraints.TimeRangeForTopicRetransmission;
+import pl.allegro.tech.hermes.api.constraints.TimeRangeForViewRetransmission;
 import pl.allegro.tech.hermes.api.jackson.OptionalInstantIsoSerializer;
 
 @OneSourceRetransmission
-@TimeRangeAbsentForViewRetransmission
-@ProperTimeRangePresentForTopicRetransmission
+@TimeRangeForViewRetransmission
+@TimeRangeForTopicRetransmission
 public class OfflineRetransmissionRequest {
 
   private static final List<DateTimeFormatter> formatters =

diff --git a/...meRangePresentForTopicRetransmission.java → ...ints/TimeRangeForTopicRetransmission.java b/...meRangePresentForTopicRetransmission.java → ...ints/TimeRangeForTopicRetransmission.java
@@ -11,8 +11,8 @@
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({TYPE})
-@Constraint(validatedBy = ProperTimeRangePresentForTopicRetransmissionValidator.class)
-public @interface ProperTimeRangePresentForTopicRetransmission {
+@Constraint(validatedBy = TimeRangeForTopicRetransmissionValidator.class)
+public @interface TimeRangeForTopicRetransmission {
   String message() default
       "Must contain both startTimestamp and endTimestamp when source topic is given, startTimestamp must be lower than endTimestamp";
 

diff --git a/...esentForTopicRetransmissionValidator.java → ...RangeForTopicRetransmissionValidator.java b/...esentForTopicRetransmissionValidator.java → ...RangeForTopicRetransmissionValidator.java
@@ -4,9 +4,8 @@
 import jakarta.validation.ConstraintValidatorContext;
 import pl.allegro.tech.hermes.api.OfflineRetransmissionRequest;
 
-public class ProperTimeRangePresentForTopicRetransmissionValidator
-    implements ConstraintValidator<
-        ProperTimeRangePresentForTopicRetransmission, OfflineRetransmissionRequest> {
+public class TimeRangeForTopicRetransmissionValidator
+    implements ConstraintValidator<TimeRangeForTopicRetransmission, OfflineRetransmissionRequest> {
 
   @Override
   public boolean isValid(

diff --git a/...TimeRangeAbsentForViewRetransmission.java → ...aints/TimeRangeForViewRetransmission.java b/...TimeRangeAbsentForViewRetransmission.java → ...aints/TimeRangeForViewRetransmission.java
@@ -11,8 +11,8 @@
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({TYPE})
-@Constraint(validatedBy = TimeRangeAbsentForViewRetransmissionValidator.class)
-public @interface TimeRangeAbsentForViewRetransmission {
+@Constraint(validatedBy = TimeRangeForViewRetransmissionValidator.class)
+public @interface TimeRangeForViewRetransmission {
   String message() default
       "must not contain startTimestamp and endTimestamp when source view is given";
 

diff --git a/...AbsentForViewRetransmissionValidator.java → ...eRangeForViewRetransmissionValidator.java b/...AbsentForViewRetransmissionValidator.java → ...eRangeForViewRetransmissionValidator.java
@@ -4,9 +4,8 @@
 import jakarta.validation.ConstraintValidatorContext;
 import pl.allegro.tech.hermes.api.OfflineRetransmissionRequest;
 
-public class TimeRangeAbsentForViewRetransmissionValidator
-    implements ConstraintValidator<
-        TimeRangeAbsentForViewRetransmission, OfflineRetransmissionRequest> {
+public class TimeRangeForViewRetransmissionValidator
+    implements ConstraintValidator<TimeRangeForViewRetransmission, OfflineRetransmissionRequest> {
 
   @Override
   public boolean isValid(

diff --git a/...ForViewRetransmissionValidatorTest.groovy → ...transmissionTimeRangeValidatorTest.groovy b/...ForViewRetransmissionValidatorTest.groovy → ...transmissionTimeRangeValidatorTest.groovy
@@ -23,7 +23,7 @@ class RetransmissionTimeRangeValidatorTest extends Specification {
     @Unroll
     def "View validator should validate view retransmission request when startTimestamp is '#startTimestamp', endTimestamp is '#endTimestamp'"() {
         given:
-        TimeRangeAbsentForViewRetransmissionValidator validator = new TimeRangeAbsentForViewRetransmissionValidator()
+        TimeRangeForViewRetransmissionValidator validator = new TimeRangeForViewRetransmissionValidator()
         def request = new OfflineRetransmissionRequest(
                 "someSourceView",
                 null,
@@ -44,7 +44,7 @@ class RetransmissionTimeRangeValidatorTest extends Specification {
 
     def "View validator should skip validation for topic retransmission request"() {
         given:
-        TimeRangeAbsentForViewRetransmissionValidator validator = new TimeRangeAbsentForViewRetransmissionValidator()
+        TimeRangeForViewRetransmissionValidator validator = new TimeRangeForViewRetransmissionValidator()
         def invalidTopicRetransmissionRequest = new OfflineRetransmissionRequest(
                 null,
                 "someSourceTopic",
@@ -59,7 +59,7 @@ class RetransmissionTimeRangeValidatorTest extends Specification {
     @Unroll
     def "Topic validator should validate topic retransmission request when startTimestamp is '#startTimestamp', endTimestamp is '#endTimestamp'"() {
         given:
-        ProperTimeRangePresentForTopicRetransmissionValidator validator = new ProperTimeRangePresentForTopicRetransmissionValidator()
+        TimeRangeForTopicRetransmissionValidator validator = new TimeRangeForTopicRetransmissionValidator()
         def request = new OfflineRetransmissionRequest(
                 null,
                 "someSourceTopic",
@@ -82,7 +82,7 @@ class RetransmissionTimeRangeValidatorTest extends Specification {
 
     def "Topic validator should skip validation for view retransmission request"() {
         given:
-        ProperTimeRangePresentForTopicRetransmissionValidator validator = new ProperTimeRangePresentForTopicRetransmissionValidator()
+        TimeRangeForTopicRetransmissionValidator validator = new TimeRangeForTopicRetransmissionValidator()
         def invalidViewRetransmissionRequest = new OfflineRetransmissionRequest(
                 "someSourceView",
                 null,