Skip to content

Commit 8105b77

Browse files
committed
Review fixes
1 parent 4e8fd38 commit 8105b77

File tree

6 files changed

+16
-18
lines changed

6 files changed

+16
-18
lines changed

hermes-api/src/main/java/pl/allegro/tech/hermes/api/OfflineRetransmissionRequest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
import org.slf4j.Logger;
1515
import org.slf4j.LoggerFactory;
1616
import pl.allegro.tech.hermes.api.constraints.OneSourceRetransmission;
17-
import pl.allegro.tech.hermes.api.constraints.ProperTimeRangePresentForTopicRetransmission;
18-
import pl.allegro.tech.hermes.api.constraints.TimeRangeAbsentForViewRetransmission;
17+
import pl.allegro.tech.hermes.api.constraints.TimeRangeForTopicRetransmission;
18+
import pl.allegro.tech.hermes.api.constraints.TimeRangeForViewRetransmission;
1919
import pl.allegro.tech.hermes.api.jackson.OptionalInstantIsoSerializer;
2020

2121
@OneSourceRetransmission
22-
@TimeRangeAbsentForViewRetransmission
23-
@ProperTimeRangePresentForTopicRetransmission
22+
@TimeRangeForViewRetransmission
23+
@TimeRangeForTopicRetransmission
2424
public class OfflineRetransmissionRequest {
2525

2626
private static final List<DateTimeFormatter> formatters =
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
@Documented
1212
@Retention(RetentionPolicy.RUNTIME)
1313
@Target({TYPE})
14-
@Constraint(validatedBy = ProperTimeRangePresentForTopicRetransmissionValidator.class)
15-
public @interface ProperTimeRangePresentForTopicRetransmission {
14+
@Constraint(validatedBy = TimeRangeForTopicRetransmissionValidator.class)
15+
public @interface TimeRangeForTopicRetransmission {
1616
String message() default
1717
"Must contain both startTimestamp and endTimestamp when source topic is given, startTimestamp must be lower than endTimestamp";
1818

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
import jakarta.validation.ConstraintValidatorContext;
55
import pl.allegro.tech.hermes.api.OfflineRetransmissionRequest;
66

7-
public class ProperTimeRangePresentForTopicRetransmissionValidator
8-
implements ConstraintValidator<
9-
ProperTimeRangePresentForTopicRetransmission, OfflineRetransmissionRequest> {
7+
public class TimeRangeForTopicRetransmissionValidator
8+
implements ConstraintValidator<TimeRangeForTopicRetransmission, OfflineRetransmissionRequest> {
109

1110
@Override
1211
public boolean isValid(
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
@Documented
1212
@Retention(RetentionPolicy.RUNTIME)
1313
@Target({TYPE})
14-
@Constraint(validatedBy = TimeRangeAbsentForViewRetransmissionValidator.class)
15-
public @interface TimeRangeAbsentForViewRetransmission {
14+
@Constraint(validatedBy = TimeRangeForViewRetransmissionValidator.class)
15+
public @interface TimeRangeForViewRetransmission {
1616
String message() default
1717
"must not contain startTimestamp and endTimestamp when source view is given";
1818

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
import jakarta.validation.ConstraintValidatorContext;
55
import pl.allegro.tech.hermes.api.OfflineRetransmissionRequest;
66

7-
public class TimeRangeAbsentForViewRetransmissionValidator
8-
implements ConstraintValidator<
9-
TimeRangeAbsentForViewRetransmission, OfflineRetransmissionRequest> {
7+
public class TimeRangeForViewRetransmissionValidator
8+
implements ConstraintValidator<TimeRangeForViewRetransmission, OfflineRetransmissionRequest> {
109

1110
@Override
1211
public boolean isValid(
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class RetransmissionTimeRangeValidatorTest extends Specification {
2323
@Unroll
2424
def "View validator should validate view retransmission request when startTimestamp is '#startTimestamp', endTimestamp is '#endTimestamp'"() {
2525
given:
26-
TimeRangeAbsentForViewRetransmissionValidator validator = new TimeRangeAbsentForViewRetransmissionValidator()
26+
TimeRangeForViewRetransmissionValidator validator = new TimeRangeForViewRetransmissionValidator()
2727
def request = new OfflineRetransmissionRequest(
2828
"someSourceView",
2929
null,
@@ -44,7 +44,7 @@ class RetransmissionTimeRangeValidatorTest extends Specification {
4444

4545
def "View validator should skip validation for topic retransmission request"() {
4646
given:
47-
TimeRangeAbsentForViewRetransmissionValidator validator = new TimeRangeAbsentForViewRetransmissionValidator()
47+
TimeRangeForViewRetransmissionValidator validator = new TimeRangeForViewRetransmissionValidator()
4848
def invalidTopicRetransmissionRequest = new OfflineRetransmissionRequest(
4949
null,
5050
"someSourceTopic",
@@ -59,7 +59,7 @@ class RetransmissionTimeRangeValidatorTest extends Specification {
5959
@Unroll
6060
def "Topic validator should validate topic retransmission request when startTimestamp is '#startTimestamp', endTimestamp is '#endTimestamp'"() {
6161
given:
62-
ProperTimeRangePresentForTopicRetransmissionValidator validator = new ProperTimeRangePresentForTopicRetransmissionValidator()
62+
TimeRangeForTopicRetransmissionValidator validator = new TimeRangeForTopicRetransmissionValidator()
6363
def request = new OfflineRetransmissionRequest(
6464
null,
6565
"someSourceTopic",
@@ -82,7 +82,7 @@ class RetransmissionTimeRangeValidatorTest extends Specification {
8282

8383
def "Topic validator should skip validation for view retransmission request"() {
8484
given:
85-
ProperTimeRangePresentForTopicRetransmissionValidator validator = new ProperTimeRangePresentForTopicRetransmissionValidator()
85+
TimeRangeForTopicRetransmissionValidator validator = new TimeRangeForTopicRetransmissionValidator()
8686
def invalidViewRetransmissionRequest = new OfflineRetransmissionRequest(
8787
"someSourceView",
8888
null,

0 commit comments

Comments
 (0)