Skip to content

Commit fa7404e

Browse files
committed
refactor: move default value to new annotation and use it
1 parent 1b6e9e7 commit fa7404e

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ControllerConfiguration.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import io.fabric8.kubernetes.api.model.HasMetadata;
99
import io.javaoperatorsdk.operator.ReconcilerUtils;
1010
import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceSpec;
11+
import io.javaoperatorsdk.operator.api.reconciler.MaxReconciliationInterval;
1112
import io.javaoperatorsdk.operator.processing.event.rate.LinearRateLimiter;
1213
import io.javaoperatorsdk.operator.processing.event.rate.RateLimiter;
1314
import io.javaoperatorsdk.operator.processing.event.source.controller.ResourceEventFilter;
@@ -53,6 +54,7 @@ default RetryConfiguration getRetryConfiguration() {
5354
return RetryConfiguration.DEFAULT;
5455
}
5556

57+
@SuppressWarnings("rawtypes")
5658
default RateLimiter getRateLimiter() {
5759
return DEFAULT_RATE_LIMITER;
5860
}
@@ -78,7 +80,7 @@ default List<DependentResourceSpec> getDependentResources() {
7880
}
7981

8082
default Optional<Duration> maxReconciliationInterval() {
81-
return Optional.of(Duration.ofHours(10L));
83+
return Optional.of(Duration.ofHours(MaxReconciliationInterval.DEFAULT_INTERVAL));
8284
}
8385

8486
/**
@@ -87,7 +89,7 @@ default Optional<Duration> maxReconciliationInterval() {
8789
*/
8890
@Deprecated(forRemoval = true)
8991
default Optional<Duration> reconciliationMaxInterval() {
90-
return Optional.of(Duration.ofHours(10L));
92+
return Optional.of(Duration.ofHours(MaxReconciliationInterval.DEFAULT_INTERVAL));
9193
}
9294

9395
@SuppressWarnings("unused")

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ControllerConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
*/
9797
@Deprecated(forRemoval = true)
9898
ReconciliationMaxInterval reconciliationMaxInterval() default @ReconciliationMaxInterval(
99-
interval = ReconciliationMaxInterval.DEFAULT_INTERVAL);
99+
interval = MaxReconciliationInterval.DEFAULT_INTERVAL);
100100

101101
/**
102102
* Optional configuration of the maximal interval the SDK will wait for a reconciliation request
@@ -105,7 +105,7 @@ ReconciliationMaxInterval reconciliationMaxInterval() default @ReconciliationMax
105105
* @return the maximal reconciliation interval configuration
106106
*/
107107
MaxReconciliationInterval maxReconciliationInterval() default @MaxReconciliationInterval(
108-
interval = 10);
108+
interval = MaxReconciliationInterval.DEFAULT_INTERVAL);
109109

110110

111111
/**

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/MaxReconciliationInterval.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
@Target({ElementType.TYPE})
1111
public @interface MaxReconciliationInterval {
1212

13+
long DEFAULT_INTERVAL = 10;
14+
1315
/**
1416
* A max delay between two reconciliations. Having this value larger than zero, will ensure that a
1517
* reconciliation is scheduled with a target interval after the last reconciliation. Note that

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ReconciliationMaxInterval.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
@Target({ElementType.TYPE})
1414
@Deprecated(forRemoval = true)
1515
public @interface ReconciliationMaxInterval {
16-
long DEFAULT_INTERVAL = 10;
17-
1816
/**
1917
* A max delay between two reconciliations. Having this value larger than zero, will ensure that a
2018
* reconciliation is scheduled with a target interval after the last reconciliation. Note that

0 commit comments

Comments
 (0)