Skip to content

Commit 69bddb0

Browse files
committed
refactor: rename AbstractEvent to DefaultEvent and make it concrete
1 parent 9bba3d1 commit 69bddb0

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
import java.util.function.Predicate;
55

66
@SuppressWarnings("rawtypes")
7-
public abstract class AbstractEvent implements Event {
7+
public class DefaultEvent implements Event {
88

99
private final String relatedCustomResourceUid;
1010
private final Predicate<CustomResource> customResourcesSelector;
1111
private final EventSource eventSource;
1212

13-
public AbstractEvent(String relatedCustomResourceUid, EventSource eventSource) {
13+
public DefaultEvent(String relatedCustomResourceUid, EventSource eventSource) {
1414
this.relatedCustomResourceUid = relatedCustomResourceUid;
1515
this.customResourcesSelector = null;
1616
this.eventSource = eventSource;
1717
}
1818

19-
public AbstractEvent(Predicate<CustomResource> customResourcesSelector, EventSource eventSource) {
19+
public DefaultEvent(Predicate<CustomResource> customResourcesSelector, EventSource eventSource) {
2020
this.relatedCustomResourceUid = null;
2121
this.customResourcesSelector = customResourcesSelector;
2222
this.eventSource = eventSource;

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceEvent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import io.fabric8.kubernetes.client.CustomResource;
66
import io.fabric8.kubernetes.client.Watcher;
77
import io.javaoperatorsdk.operator.processing.KubernetesResourceUtils;
8-
import io.javaoperatorsdk.operator.processing.event.AbstractEvent;
8+
import io.javaoperatorsdk.operator.processing.event.DefaultEvent;
99

10-
public class CustomResourceEvent extends AbstractEvent {
10+
public class CustomResourceEvent extends DefaultEvent {
1111

1212
private final Watcher.Action action;
1313
private final CustomResource customResource;

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/internal/TimerEvent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.javaoperatorsdk.operator.processing.event.internal;
22

3-
import io.javaoperatorsdk.operator.processing.event.AbstractEvent;
3+
import io.javaoperatorsdk.operator.processing.event.DefaultEvent;
44

5-
public class TimerEvent extends AbstractEvent {
5+
public class TimerEvent extends DefaultEvent {
66

77
public TimerEvent(String relatedCustomResourceUid, TimerEventSource eventSource) {
88
super(relatedCustomResourceUid, eventSource);

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/CustomResourceSelectorTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
import io.fabric8.kubernetes.client.Watcher;
1414
import io.javaoperatorsdk.operator.api.config.ConfigurationService;
15-
import io.javaoperatorsdk.operator.processing.event.AbstractEvent;
15+
import io.javaoperatorsdk.operator.processing.event.DefaultEvent;
1616
import io.javaoperatorsdk.operator.processing.event.DefaultEventSourceManager;
1717
import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEvent;
1818
import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
@@ -74,13 +74,13 @@ public void dispatchEventsWithPredicate() {
7474
customResourceCache.cacheResource(cr3);
7575

7676
defaultEventHandler.handleEvent(
77-
new AbstractEvent(
77+
new DefaultEvent(
7878
c -> {
7979
var tcr = ((TestCustomResource) c);
8080
return Objects.equals("1", tcr.getSpec().getValue())
8181
|| Objects.equals("3", tcr.getSpec().getValue());
8282
},
83-
null) {});
83+
null));
8484

8585
verify(eventDispatcherMock, timeout(SEPARATE_EXECUTION_TIMEOUT).times(2))
8686
.handleExecution(any());
@@ -97,7 +97,7 @@ public void dispatchEventsWithPredicate() {
9797
.hasSize(2)
9898
.allSatisfy(
9999
s -> {
100-
assertThat(s.getEvents()).isNotEmpty().hasOnlyElementsOfType(AbstractEvent.class);
100+
assertThat(s.getEvents()).isNotEmpty().hasOnlyElementsOfType(DefaultEvent.class);
101101
assertThat(s)
102102
.satisfiesAnyOf(
103103
e -> Objects.equals(cr1.getMetadata().getUid(), e.getCustomResourceUid()),

0 commit comments

Comments
 (0)