Skip to content

Commit 7edf048

Browse files
csviricsviri
committed
formatting
1 parent e82a7b8 commit 7edf048

File tree

4 files changed

+77
-76
lines changed

4 files changed

+77
-76
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@
33
import io.javaoperatorsdk.operator.processing.event.AbstractEvent;
44
import io.javaoperatorsdk.operator.processing.event.Event;
55
import io.javaoperatorsdk.operator.processing.event.EventSource;
6-
76
import java.util.Collections;
87
import java.util.List;
98

109
public class OneTimerEvent extends AbstractEvent {
1110

12-
private final List<Event> events;
11+
private final List<Event> events;
1312

14-
public OneTimerEvent(String relatedCustomResourceUid, EventSource eventSource, List<Event> events) {
15-
super(relatedCustomResourceUid, eventSource);
16-
this.events = events;
17-
}
13+
public OneTimerEvent(
14+
String relatedCustomResourceUid, EventSource eventSource, List<Event> events) {
15+
super(relatedCustomResourceUid, eventSource);
16+
this.events = events;
17+
}
1818

19-
public List<Event> getEvents() {
20-
if (events == null) {
21-
return Collections.EMPTY_LIST;
22-
}
23-
return events;
19+
public List<Event> getEvents() {
20+
if (events == null) {
21+
return Collections.EMPTY_LIST;
2422
}
23+
return events;
24+
}
2525
}

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

Lines changed: 62 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -3,90 +3,89 @@
33
import io.fabric8.kubernetes.client.CustomResource;
44
import io.javaoperatorsdk.operator.processing.KubernetesResourceUtils;
55
import io.javaoperatorsdk.operator.processing.event.AbstractEventSource;
6-
6+
import io.javaoperatorsdk.operator.processing.event.Event;
77
import java.util.List;
88
import java.util.Map;
99
import java.util.Timer;
1010
import java.util.TimerTask;
1111
import java.util.concurrent.ConcurrentHashMap;
12-
13-
import io.javaoperatorsdk.operator.processing.event.Event;
1412
import org.slf4j.Logger;
1513
import org.slf4j.LoggerFactory;
1614

1715
public class TimerEventSource extends AbstractEventSource {
1816

19-
private Logger log = LoggerFactory.getLogger(TimerEventSource.class);
17+
private Logger log = LoggerFactory.getLogger(TimerEventSource.class);
2018

21-
private final Timer timer = new Timer();
19+
private final Timer timer = new Timer();
2220

23-
private final Map<String, EventProducerTimeTask> onceTasks = new ConcurrentHashMap<>();
24-
private final Map<String, EventProducerTimeTask> timerTasks = new ConcurrentHashMap<>();
21+
private final Map<String, EventProducerTimeTask> onceTasks = new ConcurrentHashMap<>();
22+
private final Map<String, EventProducerTimeTask> timerTasks = new ConcurrentHashMap<>();
2523

26-
public void schedule(CustomResource customResource, long delay, long period) {
27-
String resourceUid = KubernetesResourceUtils.getUID(customResource);
28-
if (timerTasks.containsKey(resourceUid)) {
29-
return;
30-
}
31-
EventProducerTimeTask task = new EventProducerTimeTask(resourceUid, true, null);
32-
timerTasks.put(resourceUid, task);
33-
timer.schedule(task, delay, period);
24+
public void schedule(CustomResource customResource, long delay, long period) {
25+
String resourceUid = KubernetesResourceUtils.getUID(customResource);
26+
if (timerTasks.containsKey(resourceUid)) {
27+
return;
3428
}
35-
36-
public void scheduleOnce(CustomResource customResource, long delay) {
37-
scheduleOnce(customResource, delay, null);
29+
EventProducerTimeTask task = new EventProducerTimeTask(resourceUid, true, null);
30+
timerTasks.put(resourceUid, task);
31+
timer.schedule(task, delay, period);
32+
}
33+
34+
public void scheduleOnce(CustomResource customResource, long delay) {
35+
scheduleOnce(customResource, delay, null);
36+
}
37+
38+
public void scheduleOnce(CustomResource customResource, long delay, List<Event> events) {
39+
String resourceUid = KubernetesResourceUtils.getUID(customResource);
40+
if (onceTasks.containsKey(resourceUid)) {
41+
cancelOnceSchedule(resourceUid);
3842
}
39-
40-
public void scheduleOnce(CustomResource customResource, long delay, List<Event> events) {
41-
String resourceUid = KubernetesResourceUtils.getUID(customResource);
42-
if (onceTasks.containsKey(resourceUid)) {
43-
cancelOnceSchedule(resourceUid);
44-
}
45-
EventProducerTimeTask task = new EventProducerTimeTask(resourceUid, false, events);
46-
onceTasks.put(resourceUid, task);
47-
timer.schedule(task, delay);
43+
EventProducerTimeTask task = new EventProducerTimeTask(resourceUid, false, events);
44+
onceTasks.put(resourceUid, task);
45+
timer.schedule(task, delay);
46+
}
47+
48+
@Override
49+
public void eventSourceDeRegisteredForResource(String customResourceUid) {
50+
cancelSchedule(customResourceUid);
51+
cancelOnceSchedule(customResourceUid);
52+
}
53+
54+
public void cancelSchedule(String customResourceUid) {
55+
TimerTask timerTask = timerTasks.remove(customResourceUid);
56+
if (timerTask != null) {
57+
timerTask.cancel();
4858
}
59+
}
4960

50-
@Override
51-
public void eventSourceDeRegisteredForResource(String customResourceUid) {
52-
cancelSchedule(customResourceUid);
53-
cancelOnceSchedule(customResourceUid);
61+
public void cancelOnceSchedule(String customResourceUid) {
62+
TimerTask timerTask = onceTasks.remove(customResourceUid);
63+
if (timerTask != null) {
64+
timerTask.cancel();
5465
}
66+
}
5567

56-
public void cancelSchedule(String customResourceUid) {
57-
TimerTask timerTask = timerTasks.remove(customResourceUid);
58-
if (timerTask != null) {
59-
timerTask.cancel();
60-
}
61-
}
62-
63-
public void cancelOnceSchedule(String customResourceUid) {
64-
TimerTask timerTask = onceTasks.remove(customResourceUid);
65-
if (timerTask != null) {
66-
timerTask.cancel();
67-
}
68-
}
68+
public class EventProducerTimeTask extends TimerTask {
6969

70-
public class EventProducerTimeTask extends TimerTask {
70+
protected final String customResourceUid;
71+
private final boolean repeated;
72+
private final List<Event> events;
7173

72-
protected final String customResourceUid;
73-
private final boolean repeated;
74-
private final List<Event> events;
75-
76-
private EventProducerTimeTask(String customResourceUid, boolean repeated, List<Event> events) {
77-
this.customResourceUid = customResourceUid;
78-
this.repeated = repeated;
79-
this.events = events;
80-
}
74+
private EventProducerTimeTask(String customResourceUid, boolean repeated, List<Event> events) {
75+
this.customResourceUid = customResourceUid;
76+
this.repeated = repeated;
77+
this.events = events;
78+
}
8179

82-
@Override
83-
public void run() {
84-
log.debug("Producing event for custom resource id: {}", customResourceUid);
85-
if (repeated) {
86-
eventHandler.handleEvent(new RepeatedTimerEvent(customResourceUid, TimerEventSource.this));
87-
} else {
88-
eventHandler.handleEvent(new OneTimerEvent(customResourceUid, TimerEventSource.this, events));
89-
}
90-
}
80+
@Override
81+
public void run() {
82+
log.debug("Producing event for custom resource id: {}", customResourceUid);
83+
if (repeated) {
84+
eventHandler.handleEvent(new RepeatedTimerEvent(customResourceUid, TimerEventSource.this));
85+
} else {
86+
eventHandler.handleEvent(
87+
new OneTimerEvent(customResourceUid, TimerEventSource.this, events));
88+
}
9189
}
90+
}
9291
}

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/EventListTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ public void returnsLatestOfEventType() {
1414
RepeatedTimerEvent event2 = new RepeatedTimerEvent("1", null);
1515
EventList eventList =
1616
new EventList(
17-
Arrays.asList(mock(Event.class), new RepeatedTimerEvent("2", null), event2, mock(Event.class)));
17+
Arrays.asList(
18+
mock(Event.class), new RepeatedTimerEvent("2", null), event2, mock(Event.class)));
1819

1920
assertThat(eventList.getLatestOfType(RepeatedTimerEvent.class).get()).isEqualTo(event2);
2021
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ public void producesEventsPeriodically() {
4242

4343
timerEventSource.schedule(customResource, INITIAL_DELAY, PERIOD);
4444

45-
ArgumentCaptor<RepeatedTimerEvent> argumentCaptor = ArgumentCaptor.forClass(RepeatedTimerEvent.class);
45+
ArgumentCaptor<RepeatedTimerEvent> argumentCaptor =
46+
ArgumentCaptor.forClass(RepeatedTimerEvent.class);
4647
verify(eventHandlerMock, timeout(INITIAL_DELAY + PERIOD + TESTING_TIME_SLACK).times(2))
4748
.handleEvent(argumentCaptor.capture());
4849
List<RepeatedTimerEvent> events = argumentCaptor.getAllValues();

0 commit comments

Comments
 (0)