Skip to content

Commit 455c413

Browse files
committed
feat: rename DefaultEvent to Event
1 parent 0567efd commit 455c413

File tree

12 files changed

+32
-32
lines changed

12 files changed

+32
-32
lines changed

micrometer-support/src/main/java/io/javaoperatorsdk/operator/monitoring/micrometer/MicrometerMetrics.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import io.javaoperatorsdk.operator.api.RetryInfo;
99
import io.javaoperatorsdk.operator.api.monitoring.Metrics;
1010
import io.javaoperatorsdk.operator.processing.event.CustomResourceID;
11-
import io.javaoperatorsdk.operator.processing.event.DefaultEvent;
11+
import io.javaoperatorsdk.operator.processing.event.Event;
1212
import io.micrometer.core.instrument.MeterRegistry;
1313
import io.micrometer.core.instrument.Timer;
1414

@@ -47,7 +47,7 @@ public <T> T timeControllerExecution(ControllerExecution<T> execution) {
4747
}
4848
}
4949

50-
public void receivedEvent(DefaultEvent event) {
50+
public void receivedEvent(Event event) {
5151
incrementCounter(event.getRelatedCustomResourceID(), "events.received", "event",
5252
event.getClass().getSimpleName());
5353
}

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/monitoring/Metrics.java

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

55
import io.javaoperatorsdk.operator.api.RetryInfo;
66
import io.javaoperatorsdk.operator.processing.event.CustomResourceID;
7-
import io.javaoperatorsdk.operator.processing.event.DefaultEvent;
7+
import io.javaoperatorsdk.operator.processing.event.Event;
88

99
public interface Metrics {
1010
Metrics NOOP = new Metrics() {};
1111

12-
default void receivedEvent(DefaultEvent event) {}
12+
default void receivedEvent(Event event) {}
1313

1414
default void reconcileCustomResource(CustomResourceID customResourceID,
1515
RetryInfo retryInfo) {}

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/DefaultEventHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public void setEventSourceManager(DefaultEventSourceManager<R> eventSourceManage
9090
}
9191

9292
@Override
93-
public void handleEvent(DefaultEvent event) {
93+
public void handleEvent(Event event) {
9494
lock.lock();
9595
try {
9696
log.debug("Received event: {}", event);
@@ -144,7 +144,7 @@ private void submitReconciliationExecution(CustomResourceID customResourceUid) {
144144
}
145145
}
146146

147-
private void handleEventMarking(DefaultEvent event) {
147+
private void handleEventMarking(Event event) {
148148
if (event instanceof CustomResourceEvent &&
149149
((CustomResourceEvent) event).getAction() == ResourceAction.DELETED) {
150150
eventMarker.markDeleteEventReceived(event);

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/EventMarker.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.util.HashMap;
44

55
import io.javaoperatorsdk.operator.processing.event.CustomResourceID;
6-
import io.javaoperatorsdk.operator.processing.event.DefaultEvent;
6+
import io.javaoperatorsdk.operator.processing.event.Event;
77

88
/**
99
* Manages the state of received events. Basically there can be only three distinct states relevant
@@ -33,7 +33,7 @@ private void setEventingState(CustomResourceID customResourceID, EventingState s
3333
eventingState.put(customResourceID, state);
3434
}
3535

36-
public void markEventReceived(DefaultEvent event) {
36+
public void markEventReceived(Event event) {
3737
markEventReceived(event.getRelatedCustomResourceID());
3838
}
3939

@@ -56,7 +56,7 @@ public void unMarkEventReceived(CustomResourceID customResourceID) {
5656
}
5757
}
5858

59-
public void markDeleteEventReceived(DefaultEvent event) {
59+
public void markDeleteEventReceived(Event event) {
6060
markDeleteEventReceived(event.getRelatedCustomResourceID());
6161
}
6262

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

33
@SuppressWarnings("rawtypes")
4-
public class DefaultEvent {
4+
public class Event {
55

66
private final CustomResourceID relatedCustomResource;
77

8-
public DefaultEvent(CustomResourceID targetCustomResource) {
8+
public Event(CustomResourceID targetCustomResource) {
99
this.relatedCustomResource = targetCustomResource;
1010
}
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
public interface EventHandler {
44

5-
void handleEvent(DefaultEvent event);
5+
void handleEvent(Event event);
66

77
}

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
@@ -1,9 +1,9 @@
11
package io.javaoperatorsdk.operator.processing.event.internal;
22

33
import io.javaoperatorsdk.operator.processing.event.CustomResourceID;
4-
import io.javaoperatorsdk.operator.processing.event.DefaultEvent;
4+
import io.javaoperatorsdk.operator.processing.event.Event;
55

6-
public class CustomResourceEvent extends DefaultEvent {
6+
public class CustomResourceEvent extends Event {
77

88
private final ResourceAction action;
99

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import io.fabric8.kubernetes.client.informers.cache.Store;
1414
import io.javaoperatorsdk.operator.processing.event.AbstractEventSource;
1515
import io.javaoperatorsdk.operator.processing.event.CustomResourceID;
16-
import io.javaoperatorsdk.operator.processing.event.DefaultEvent;
16+
import io.javaoperatorsdk.operator.processing.event.Event;
1717

1818
public class InformerEventSource<T extends HasMetadata> extends AbstractEventSource {
1919

@@ -82,7 +82,7 @@ private void propagateEvent(T object) {
8282
return;
8383
}
8484
uids.forEach(uid -> {
85-
DefaultEvent event = new DefaultEvent(CustomResourceID.fromResource(object));
85+
Event event = new Event(CustomResourceID.fromResource(object));
8686
this.eventHandler.handleEvent(event);
8787
});
8888
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import io.fabric8.kubernetes.client.CustomResource;
1414
import io.javaoperatorsdk.operator.processing.event.AbstractEventSource;
1515
import io.javaoperatorsdk.operator.processing.event.CustomResourceID;
16-
import io.javaoperatorsdk.operator.processing.event.DefaultEvent;
16+
import io.javaoperatorsdk.operator.processing.event.Event;
1717

1818
public class TimerEventSource<R extends CustomResource<?, ?>> extends AbstractEventSource {
1919
private static final Logger log = LoggerFactory.getLogger(TimerEventSource.class);
@@ -95,7 +95,7 @@ public EventProducerTimeTask(CustomResourceID customResourceUid) {
9595
public void run() {
9696
if (running.get()) {
9797
log.debug("Producing event for custom resource id: {}", customResourceUid);
98-
eventHandler.handleEvent(new DefaultEvent(customResourceUid));
98+
eventHandler.handleEvent(new Event(customResourceUid));
9999
}
100100
}
101101
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
import io.fabric8.kubernetes.client.CustomResource;
1515
import io.javaoperatorsdk.operator.processing.event.CustomResourceID;
16-
import io.javaoperatorsdk.operator.processing.event.DefaultEvent;
16+
import io.javaoperatorsdk.operator.processing.event.Event;
1717
import io.javaoperatorsdk.operator.processing.event.DefaultEventSourceManager;
1818
import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEvent;
1919
import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEventSource;
@@ -67,7 +67,7 @@ public void dispatchesEventsIfNoExecutionInProgress() {
6767

6868
@Test
6969
public void skipProcessingIfLatestCustomResourceNotInCache() {
70-
DefaultEvent event = prepareCREvent();
70+
Event event = prepareCREvent();
7171
when(resourceCacheMock.getCustomResource(event.getRelatedCustomResourceID()))
7272
.thenReturn(Optional.empty());
7373

@@ -102,7 +102,7 @@ public void schedulesAnEventRetryOnException() {
102102

103103
@Test
104104
public void executesTheControllerInstantlyAfterErrorIfEventsBuffered() {
105-
DefaultEvent event = prepareCREvent();
105+
Event event = prepareCREvent();
106106
TestCustomResource customResource = testCustomResource();
107107
overrideData(event.getRelatedCustomResourceID(), customResource);
108108
PostExecutionControl postExecutionControl =
@@ -131,7 +131,7 @@ public void executesTheControllerInstantlyAfterErrorIfEventsBuffered() {
131131
public void successfulExecutionResetsTheRetry() {
132132
log.info("Starting successfulExecutionResetsTheRetry");
133133

134-
DefaultEvent event = prepareCREvent();
134+
Event event = prepareCREvent();
135135
TestCustomResource customResource = testCustomResource();
136136
overrideData(event.getRelatedCustomResourceID(), customResource);
137137
PostExecutionControl postExecutionControlWithException =
@@ -202,7 +202,7 @@ public void doNotFireEventsIfClosing() {
202202

203203
@Test
204204
public void cleansUpWhenDeleteEventReceivedAndNoEventPresent() {
205-
DefaultEvent deleteEvent =
205+
Event deleteEvent =
206206
new CustomResourceEvent(DELETED, prepareCREvent().getRelatedCustomResourceID());
207207

208208
defaultEventHandler.handleEvent(deleteEvent);
@@ -297,7 +297,7 @@ private CustomResourceID eventAlreadyUnderProcessing() {
297297
Thread.sleep(FAKE_CONTROLLER_EXECUTION_DURATION);
298298
return PostExecutionControl.defaultDispatch();
299299
});
300-
DefaultEvent event = prepareCREvent();
300+
Event event = prepareCREvent();
301301
defaultEventHandler.handleEvent(event);
302302
return event.getRelatedCustomResourceID();
303303
}
@@ -313,8 +313,8 @@ private CustomResourceEvent prepareCREvent(CustomResourceID uid) {
313313
CustomResourceID.fromResource(customResource));
314314
}
315315

316-
private DefaultEvent nonCREvent(CustomResourceID relatedCustomResourceUid) {
317-
return new DefaultEvent(relatedCustomResourceUid);
316+
private Event nonCREvent(CustomResourceID relatedCustomResourceUid) {
317+
return new Event(relatedCustomResourceUid);
318318
}
319319

320320
private void overrideData(CustomResourceID id, CustomResource<?, ?> applyTo) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
2121
import io.javaoperatorsdk.operator.api.monitoring.Metrics;
2222
import io.javaoperatorsdk.operator.processing.event.CustomResourceID;
23-
import io.javaoperatorsdk.operator.processing.event.DefaultEvent;
23+
import io.javaoperatorsdk.operator.processing.event.Event;
2424
import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEvent;
2525
import io.javaoperatorsdk.operator.processing.event.internal.ResourceAction;
2626

@@ -329,10 +329,10 @@ private void removeFinalizers(CustomResource customResource) {
329329
}
330330

331331
public ExecutionScope executionScopeWithCREvent(
332-
ResourceAction action, CustomResource resource, DefaultEvent... otherEvents) {
332+
ResourceAction action, CustomResource resource, Event... otherEvents) {
333333
CustomResourceEvent event =
334334
new CustomResourceEvent(action, CustomResourceID.fromResource(resource));
335-
List<DefaultEvent> eventList = new ArrayList<>(1 + otherEvents.length);
335+
List<Event> eventList = new ArrayList<>(1 + otherEvents.length);
336336
eventList.add(event);
337337
eventList.addAll(Arrays.asList(otherEvents));
338338
return new ExecutionScope(resource, null);

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/internal/TimerEventSourceTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
import io.javaoperatorsdk.operator.TestUtils;
1515
import io.javaoperatorsdk.operator.processing.event.CustomResourceID;
16-
import io.javaoperatorsdk.operator.processing.event.DefaultEvent;
16+
import io.javaoperatorsdk.operator.processing.event.Event;
1717
import io.javaoperatorsdk.operator.processing.event.EventHandler;
1818
import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
1919

@@ -149,10 +149,10 @@ private void untilAsserted(long initialDelay, long interval, ThrowingRunnable as
149149
}
150150

151151
private static class CapturingEventHandler implements EventHandler {
152-
private final List<DefaultEvent> events = new CopyOnWriteArrayList<>();
152+
private final List<Event> events = new CopyOnWriteArrayList<>();
153153

154154
@Override
155-
public void handleEvent(DefaultEvent event) {
155+
public void handleEvent(Event event) {
156156
events.add(event);
157157
}
158158
}

0 commit comments

Comments
 (0)