Skip to content

Commit af6fcbf

Browse files
kagkarlssonkagkarlsson
committed
spotless
1 parent 087425a commit af6fcbf

File tree

13 files changed

+52
-66
lines changed

13 files changed

+52
-66
lines changed

‎db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/ExecutePicked.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@
1515

1616
import static com.github.kagkarlsson.scheduler.ExceptionUtils.describe;
1717

18-
import com.github.kagkarlsson.scheduler.event.SchedulerListeners;
19-
import com.github.kagkarlsson.scheduler.logging.ConfigurableLogger;
20-
import com.github.kagkarlsson.scheduler.event.SchedulerListener;
2118
import com.github.kagkarlsson.scheduler.event.SchedulerListener.CandidateEventType;
2219
import com.github.kagkarlsson.scheduler.event.SchedulerListener.SchedulerEventType;
20+
import com.github.kagkarlsson.scheduler.event.SchedulerListeners;
21+
import com.github.kagkarlsson.scheduler.logging.ConfigurableLogger;
2322
import com.github.kagkarlsson.scheduler.task.CompletionHandler;
2423
import com.github.kagkarlsson.scheduler.task.Execution;
2524
import com.github.kagkarlsson.scheduler.task.ExecutionComplete;
@@ -122,8 +121,7 @@ private void complete(
122121
ExecutionComplete.success(execution, executionStarted, clock.now());
123122
try {
124123
completion.complete(
125-
completeEvent,
126-
new ExecutionOperations(taskRepository, schedulerListeners, execution));
124+
completeEvent, new ExecutionOperations(taskRepository, schedulerListeners, execution));
127125
} catch (Throwable e) {
128126
schedulerListeners.onSchedulerEvent(SchedulerEventType.COMPLETIONHANDLER_ERROR);
129127
schedulerListeners.onSchedulerEvent(SchedulerEventType.UNEXPECTED_ERROR);

‎db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/FetchCandidates.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@
1313
*/
1414
package com.github.kagkarlsson.scheduler;
1515

16-
import com.github.kagkarlsson.scheduler.event.SchedulerListeners;
17-
import com.github.kagkarlsson.scheduler.logging.ConfigurableLogger;
18-
import com.github.kagkarlsson.scheduler.event.SchedulerListener;
1916
import com.github.kagkarlsson.scheduler.event.SchedulerListener.CandidateEventType;
2017
import com.github.kagkarlsson.scheduler.event.SchedulerListener.SchedulerEventType;
18+
import com.github.kagkarlsson.scheduler.event.SchedulerListeners;
19+
import com.github.kagkarlsson.scheduler.logging.ConfigurableLogger;
2120
import com.github.kagkarlsson.scheduler.task.Execution;
2221
import java.time.Instant;
2322
import java.util.List;

‎db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/ImmediateCheckForDueExecutions.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ class ImmediateCheckForDueExecutions extends AbstractSchedulerListener {
2424
private final Scheduler scheduler;
2525
private Clock clock;
2626

27-
public ImmediateCheckForDueExecutions(
28-
Scheduler scheduler, Clock clock) {
27+
public ImmediateCheckForDueExecutions(Scheduler scheduler, Clock clock) {
2928
this.scheduler = scheduler;
3029
this.clock = clock;
3130
}

‎db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/LockAndFetchCandidates.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@
1313
*/
1414
package com.github.kagkarlsson.scheduler;
1515

16+
import com.github.kagkarlsson.scheduler.event.SchedulerListener.SchedulerEventType;
1617
import com.github.kagkarlsson.scheduler.event.SchedulerListeners;
1718
import com.github.kagkarlsson.scheduler.logging.ConfigurableLogger;
18-
import com.github.kagkarlsson.scheduler.event.SchedulerListener;
19-
import com.github.kagkarlsson.scheduler.event.SchedulerListener.SchedulerEventType;
2019
import com.github.kagkarlsson.scheduler.task.Execution;
2120
import java.time.Instant;
2221
import java.util.List;

‎db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/RunUntilShutdown.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
*/
1414
package com.github.kagkarlsson.scheduler;
1515

16-
import com.github.kagkarlsson.scheduler.event.SchedulerListener;
1716
import com.github.kagkarlsson.scheduler.event.SchedulerListener.SchedulerEventType;
1817
import com.github.kagkarlsson.scheduler.event.SchedulerListeners;
1918
import org.slf4j.Logger;

‎db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/Scheduler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
import static java.util.stream.Collectors.toList;
1818

1919
import com.github.kagkarlsson.scheduler.SchedulerState.SettableSchedulerState;
20+
import com.github.kagkarlsson.scheduler.event.SchedulerListener;
21+
import com.github.kagkarlsson.scheduler.event.SchedulerListener.SchedulerEventType;
2022
import com.github.kagkarlsson.scheduler.event.SchedulerListeners;
2123
import com.github.kagkarlsson.scheduler.logging.ConfigurableLogger;
2224
import com.github.kagkarlsson.scheduler.logging.LogLevel;
23-
import com.github.kagkarlsson.scheduler.event.SchedulerListener;
24-
import com.github.kagkarlsson.scheduler.event.SchedulerListener.SchedulerEventType;
2525
import com.github.kagkarlsson.scheduler.task.Execution;
2626
import com.github.kagkarlsson.scheduler.task.ExecutionComplete;
2727
import com.github.kagkarlsson.scheduler.task.ExecutionOperations;
@@ -80,7 +80,7 @@ protected Scheduler(
8080
Waiter executeDueWaiter,
8181
Duration heartbeatInterval,
8282
int numberOfMissedHeartbeatsBeforeDead,
83-
List<SchedulerListener> schedulerListeners,
83+
List<SchedulerListener> schedulerListeners,
8484
PollingStrategyConfig pollingStrategyConfig,
8585
Duration deleteUnresolvedAfter,
8686
Duration shutdownMaxWait,

‎db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/SchedulerBuilder.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
import static com.github.kagkarlsson.scheduler.Scheduler.THREAD_PREFIX;
1818
import static java.util.Optional.ofNullable;
1919

20+
import com.github.kagkarlsson.scheduler.event.SchedulerListener;
2021
import com.github.kagkarlsson.scheduler.jdbc.AutodetectJdbcCustomization;
2122
import com.github.kagkarlsson.scheduler.jdbc.JdbcCustomization;
2223
import com.github.kagkarlsson.scheduler.jdbc.JdbcTaskRepository;
2324
import com.github.kagkarlsson.scheduler.logging.LogLevel;
2425
import com.github.kagkarlsson.scheduler.serializer.Serializer;
25-
import com.github.kagkarlsson.scheduler.event.SchedulerListener;
2626
import com.github.kagkarlsson.scheduler.stats.StatsRegistry;
2727
import com.github.kagkarlsson.scheduler.stats.StatsRegistryAdapter;
2828
import com.github.kagkarlsson.scheduler.task.OnStartup;
@@ -132,9 +132,7 @@ public SchedulerBuilder housekeeperExecutor(ScheduledExecutorService housekeeper
132132
return this;
133133
}
134134

135-
/**
136-
* Deprecated, use addSchedulerListener instead
137-
*/
135+
/** Deprecated, use addSchedulerListener instead */
138136
@Deprecated
139137
public SchedulerBuilder statsRegistry(StatsRegistry statsRegistry) {
140138
this.statsRegistry = statsRegistry;
@@ -302,7 +300,7 @@ public Scheduler build() {
302300
waiter,
303301
heartbeatInterval,
304302
numberOfMissedHeartbeatsBeforeDead,
305-
schedulerListeners,
303+
schedulerListeners,
306304
pollingStrategyConfig,
307305
deleteUnresolvedAfter,
308306
shutdownMaxWait,

‎db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/SchedulerClient.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,7 @@ class StandardSchedulerClient implements SchedulerClient {
247247
}
248248

249249
StandardSchedulerClient(
250-
TaskRepository taskRepository,
251-
SchedulerListeners schedulerListeners,
252-
Clock clock) {
250+
TaskRepository taskRepository, SchedulerListeners schedulerListeners, Clock clock) {
253251
this.taskRepository = taskRepository;
254252
this.schedulerListeners = schedulerListeners;
255253
this.clock = clock;
@@ -364,7 +362,6 @@ public Optional<ScheduledExecution<Object>> getScheduledExecution(
364362
taskRepository.getExecution(taskInstanceId.getTaskName(), taskInstanceId.getId());
365363
return e.map(oe -> new ScheduledExecution<>(Object.class, oe));
366364
}
367-
368365
}
369366

370367
class SchedulerClientName implements SchedulerName {

‎db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/event/SchedulerListener.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,30 @@
2525
* The method-parameters might be subject to change. For instance, Event-types might be introduced
2626
* to hold the data relevant to the event.
2727
*
28-
* Will typically run in the same Thread as the execution, so must not do IO or similar slow operations.
28+
* <p>Will typically run in the same Thread as the execution, so must not do IO or similar slow
29+
* operations.
2930
*/
3031
public interface SchedulerListener {
3132

3233
/**
33-
* Execution scheduled either by the <code>SchedulerClient</code> or by a <code>CompletionHandler</code>
34+
* Execution scheduled either by the <code>SchedulerClient</code> or by a <code>CompletionHandler
35+
* </code>
36+
*
3437
* @param taskInstanceId
3538
* @param executionTime
3639
*/
3740
void onExecutionScheduled(TaskInstanceId taskInstanceId, Instant executionTime);
3841

3942
/**
4043
* Will typically run in the same thread as <code>onExecutionComplete</code>
44+
*
4145
* @param currentlyExecuting
4246
*/
4347
void onExecutionStart(CurrentlyExecuting currentlyExecuting);
4448

4549
/**
4650
* Will typically run in the same thread as <code>onExecutionStart</code>
51+
*
4752
* @param executionComplete
4853
*/
4954
void onExecutionComplete(ExecutionComplete executionComplete);

‎db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/event/SchedulerListeners.java

Lines changed: 28 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,10 @@
1616
import com.github.kagkarlsson.scheduler.CurrentlyExecuting;
1717
import com.github.kagkarlsson.scheduler.event.SchedulerListener.CandidateEventType;
1818
import com.github.kagkarlsson.scheduler.event.SchedulerListener.SchedulerEventType;
19-
import com.github.kagkarlsson.scheduler.stats.StatsRegistry.CandidateStatsEvent;
20-
import com.github.kagkarlsson.scheduler.stats.StatsRegistry.SchedulerStatsEvent;
2119
import com.github.kagkarlsson.scheduler.task.Execution;
2220
import com.github.kagkarlsson.scheduler.task.ExecutionComplete;
2321
import com.github.kagkarlsson.scheduler.task.TaskInstanceId;
2422
import java.time.Instant;
25-
import java.util.ArrayList;
26-
import java.util.Collections;
2723
import java.util.List;
2824
import org.slf4j.Logger;
2925
import org.slf4j.LoggerFactory;
@@ -56,67 +52,66 @@ public void onExecutionScheduled(TaskInstanceId taskInstanceId, Instant executio
5652
@Override
5753
public void onExecutionStart(CurrentlyExecuting currentlyExecuting) {
5854
schedulerListeners.forEach(
59-
listener -> {
60-
fireAndLogErrors(
61-
listener, "onExecutionStart", () -> listener.onExecutionStart(currentlyExecuting));
62-
});
55+
listener -> {
56+
fireAndLogErrors(
57+
listener, "onExecutionStart", () -> listener.onExecutionStart(currentlyExecuting));
58+
});
6359
}
6460

6561
@Override
6662
public void onExecutionComplete(ExecutionComplete executionComplete) {
6763
schedulerListeners.forEach(
68-
listener -> {
69-
fireAndLogErrors(
70-
listener,
71-
"onExecutionComplete",
72-
() -> listener.onExecutionComplete(executionComplete));
73-
});
64+
listener -> {
65+
fireAndLogErrors(
66+
listener,
67+
"onExecutionComplete",
68+
() -> listener.onExecutionComplete(executionComplete));
69+
});
7470
}
7571

7672
@Override
7773
public void onExecutionDead(Execution execution) {
7874
schedulerListeners.forEach(
79-
listener -> {
80-
fireAndLogErrors(listener, "onExecutionDead", () -> listener.onExecutionDead(execution));
81-
});
75+
listener -> {
76+
fireAndLogErrors(listener, "onExecutionDead", () -> listener.onExecutionDead(execution));
77+
});
8278
}
8379

8480
@Override
8581
public void onExecutionFailedHeartbeat(CurrentlyExecuting currentlyExecuting) {
8682
schedulerListeners.forEach(
87-
listener -> {
88-
fireAndLogErrors(
89-
listener,
90-
"onExecutionFailedHeartbeat",
91-
() -> listener.onExecutionFailedHeartbeat(currentlyExecuting));
92-
});
83+
listener -> {
84+
fireAndLogErrors(
85+
listener,
86+
"onExecutionFailedHeartbeat",
87+
() -> listener.onExecutionFailedHeartbeat(currentlyExecuting));
88+
});
9389
}
9490

9591
@Override
9692
public void onSchedulerEvent(SchedulerEventType type) {
9793
schedulerListeners.forEach(
98-
listener -> {
99-
fireAndLogErrors(listener, "onSchedulerEvent", () -> listener.onSchedulerEvent(type));
100-
});
94+
listener -> {
95+
fireAndLogErrors(listener, "onSchedulerEvent", () -> listener.onSchedulerEvent(type));
96+
});
10197
}
10298

10399
@Override
104100
public void onCandidateEvent(CandidateEventType type) {
105101
schedulerListeners.forEach(
106-
listener -> {
107-
fireAndLogErrors(listener, "onCandidateEvent", () -> listener.onCandidateEvent(type));
108-
});
102+
listener -> {
103+
fireAndLogErrors(listener, "onCandidateEvent", () -> listener.onCandidateEvent(type));
104+
});
109105
}
110106

111107
public void fireAndLogErrors(SchedulerListener listener, String method, Runnable r) {
112108
try {
113109
r.run();
114110
} catch (RuntimeException e) {
115111
LOG.warn(
116-
"Listener '{}' method '{}' threw an unexpected Exception",
117-
listener.getClass().getName(),
118-
method);
112+
"Listener '{}' method '{}' threw an unexpected Exception",
113+
listener.getClass().getName(),
114+
method);
119115
}
120116
}
121-
122117
}

‎db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/task/ExecutionOperations.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ public class ExecutionOperations<T> {
2424
private final Execution execution;
2525

2626
public ExecutionOperations(
27-
TaskRepository taskRepository,
28-
SchedulerListeners schedulerListeners,
29-
Execution execution) {
27+
TaskRepository taskRepository, SchedulerListeners schedulerListeners, Execution execution) {
3028
this.taskRepository = taskRepository;
3129
this.schedulerListeners = schedulerListeners;
3230
this.execution = execution;

‎db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/testhelper/ManualScheduler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
package com.github.kagkarlsson.scheduler.testhelper;
1515

1616
import com.github.kagkarlsson.scheduler.*;
17-
import com.github.kagkarlsson.scheduler.logging.LogLevel;
1817
import com.github.kagkarlsson.scheduler.event.SchedulerListener;
18+
import com.github.kagkarlsson.scheduler.logging.LogLevel;
1919
import com.github.kagkarlsson.scheduler.task.OnStartup;
2020
import java.time.Duration;
2121
import java.time.Instant;
@@ -59,7 +59,7 @@ public class ManualScheduler extends Scheduler {
5959
waiter,
6060
heartbeatInterval,
6161
SchedulerBuilder.DEFAULT_MISSED_HEARTBEATS_LIMIT,
62-
schedulerListeners,
62+
schedulerListeners,
6363
pollingStrategyConfig,
6464
deleteUnresolvedAfter,
6565
Duration.ZERO,

‎db-scheduler/src/test/java/com/github/kagkarlsson/scheduler/RunUntilShutdownTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import static org.hamcrest.MatcherAssert.assertThat;
44
import static org.hamcrest.core.Is.is;
55

6-
import com.github.kagkarlsson.scheduler.event.SchedulerListener;
76
import com.github.kagkarlsson.scheduler.event.SchedulerListeners;
87
import java.time.Duration;
98
import org.junit.jupiter.api.Assertions;

0 commit comments

Comments
 (0)