Skip to content

Commit 2124e48

Browse files
committed
Fix naming
Signed-off-by: 10000-ki <[email protected]>
1 parent 78ec026 commit 2124e48

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

docs/content/en/docs/patterns-and-best-practices/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ The second method is to specify the timeout value by overriding the `Configurati
138138

139139
```java
140140
final var overridden = new ConfigurationServiceOverrider(config)
141-
.withReconcileTerminationTimeout(Duration.ofSeconds(5));
141+
.withReconciliationTerminationTimeout(Duration.ofSeconds(5));
142142

143143
final var operator = new Operator(overridden);
144144
```

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ public void stop(Duration gracefulShutdownTimeout) throws OperatorException {
164164

165165
@Override
166166
public void stop() throws OperatorException {
167-
Duration reconcileTerminationTimeout = configurationService.reconcileTerminationTimeout();
168-
stop(reconcileTerminationTimeout);
167+
Duration reconciliationTerminationTimeout = configurationService.reconciliationTerminationTimeout();
168+
stop(reconciliationTerminationTimeout);
169169
}
170170

171171
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ default Duration cacheSyncTimeout() {
305305
*
306306
* @return The duration of time to wait before terminating the reconciliation threads
307307
*/
308-
default Duration reconcileTerminationTimeout() {
308+
default Duration reconciliationTerminationTimeout() {
309309
return Duration.ZERO;
310310
}
311311

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class ConfigurationServiceOverrider {
3232
private InformerStoppedHandler informerStoppedHandler;
3333
private Boolean stopOnInformerErrorDuringStartup;
3434
private Duration cacheSyncTimeout;
35-
private Duration reconcileTerminationTimeout;
35+
private Duration reconciliationTerminationTimeout;
3636
private Boolean ssaBasedCreateUpdateMatchForDependentResources;
3737
private Set<Class<? extends HasMetadata>> defaultNonSSAResource;
3838
private Boolean previousAnnotationForDependentResources;
@@ -128,9 +128,9 @@ public ConfigurationServiceOverrider withCacheSyncTimeout(Duration cacheSyncTime
128128
return this;
129129
}
130130

131-
public ConfigurationServiceOverrider withReconcileTerminationTimeout(
132-
Duration reconcileTerminationTimeout) {
133-
this.reconcileTerminationTimeout = reconcileTerminationTimeout;
131+
public ConfigurationServiceOverrider withReconciliationTerminationTimeout(
132+
Duration reconciliationTerminationTimeout) {
133+
this.reconciliationTerminationTimeout = reconciliationTerminationTimeout;
134134
return this;
135135
}
136136

@@ -259,9 +259,9 @@ public Duration cacheSyncTimeout() {
259259
}
260260

261261
@Override
262-
public Duration reconcileTerminationTimeout() {
263-
return overriddenValueOrDefault(reconcileTerminationTimeout,
264-
ConfigurationService::reconcileTerminationTimeout);
262+
public Duration reconciliationTerminationTimeout() {
263+
return overriddenValueOrDefault(reconciliationTerminationTimeout,
264+
ConfigurationService::reconciliationTerminationTimeout);
265265
}
266266

267267
@Override

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ConfigurationServiceOverriderTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public <R extends HasMetadata> R clone(R object) {
6464
.withLeaderElectionConfiguration(new LeaderElectionConfiguration("newLease", "newLeaseNS"))
6565
.withInformerStoppedHandler((informer, ex) -> {
6666
})
67-
.withReconcileTerminationTimeout(Duration.ofSeconds(30))
67+
.withReconciliationTerminationTimeout(Duration.ofSeconds(30))
6868
.build();
6969

7070
assertNotEquals(config.closeClientOnStop(), overridden.closeClientOnStop());
@@ -79,7 +79,7 @@ public <R extends HasMetadata> R clone(R object) {
7979
overridden.getLeaderElectionConfiguration());
8080
assertNotEquals(config.getInformerStoppedHandler(),
8181
overridden.getLeaderElectionConfiguration());
82-
assertNotEquals(config.reconcileTerminationTimeout(), overridden.reconcileTerminationTimeout());
82+
assertNotEquals(config.reconciliationTerminationTimeout(), overridden.reconciliationTerminationTimeout());
8383
}
8484

8585
}

operator-framework/src/test/java/io/javaoperatorsdk/operator/GracefulStopWithConfigurationIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class GracefulStopWithConfigurationIT {
2323
LocallyRunOperatorExtension operator =
2424
LocallyRunOperatorExtension.builder()
2525
.withConfigurationService(o -> o.withCloseClientOnStop(false)
26-
.withReconcileTerminationTimeout(Duration.ofSeconds(RECONCILER_SLEEP)))
26+
.withReconciliationTerminationTimeout(Duration.ofSeconds(RECONCILER_SLEEP)))
2727
.withReconciler(new GracefulStopTestReconciler())
2828
.build();
2929

0 commit comments

Comments
 (0)