Skip to content

Commit a9082e2

Browse files
authored
fix: avoid computing alternate value if not needed in Optionals (#1537)
Fixes #1535
1 parent dfa7977 commit a9082e2

File tree

6 files changed

+8
-10
lines changed

6 files changed

+8
-10
lines changed

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,7 @@ private LeaderCallbacks leaderCallbacks() {
6464
return new LeaderCallbacks(
6565
this::startLeading,
6666
this::stopLeading,
67-
leader -> {
68-
log.info("New leader with identity: {}", leader);
69-
});
67+
leader -> log.info("New leader with identity: {}", leader));
7068
}
7169

7270
private void startLeading() {
@@ -82,7 +80,7 @@ private void stopLeading() {
8280
}
8381

8482
private String identity(LeaderElectionConfiguration config) {
85-
var id = config.getIdentity().orElse(System.getenv("HOSTNAME"));
83+
var id = config.getIdentity().orElseGet(() -> System.getenv("HOSTNAME"));
8684
if (id == null || id.isBlank()) {
8785
id = UUID.randomUUID().toString();
8886
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public ReconcileResult<R> reconcile(P primary, Context<P> context) {
4444
if (updatable) {
4545
final var match = updater.match(actual, primary, context);
4646
if (!match.matched()) {
47-
final var desired = match.computedDesired().orElse(desired(primary, context));
47+
final var desired = match.computedDesired().orElseGet(() -> desired(primary, context));
4848
throwIfNull(desired, primary, "Desired");
4949
logForOperation("Updating", primary, desired);
5050
var updatedResource = handleUpdate(actual, desired, primary, context);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ private PostExecutionControl<P> handleErrorStatusHandler(P resource, P originalR
165165
Exception e) throws Exception {
166166
if (isErrorStatusHandlerPresent()) {
167167
try {
168-
RetryInfo retryInfo = context.getRetryInfo().orElse(new RetryInfo() {
168+
RetryInfo retryInfo = context.getRetryInfo().orElseGet(() -> new RetryInfo() {
169169
@Override
170170
public int getAttemptCount() {
171171
return 0;

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerManager.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,11 @@ public Stream<T> list(String namespace, Predicate<T> predicate) {
127127
if (isWatchingAllNamespaces()) {
128128
return getSource(ALL_NAMESPACES_MAP_KEY)
129129
.map(source -> source.list(namespace, predicate))
130-
.orElse(Stream.empty());
130+
.orElseGet(Stream::empty);
131131
} else {
132132
return getSource(namespace)
133133
.map(source -> source.list(predicate))
134-
.orElse(Stream.empty());
134+
.orElseGet(Stream::empty);
135135
}
136136
}
137137

sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaReconciler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public UpdateControl<MySQLSchema> reconcile(MySQLSchema schema, Context<MySQLSch
4444
decode(secret.getData().get(MYSQL_SECRET_USERNAME)));
4545
log.info("Schema {} created - updating CR status", s.getName());
4646
return UpdateControl.patchStatus(schema);
47-
}).orElse(UpdateControl.noUpdate());
47+
}).orElseGet(UpdateControl::noUpdate);
4848
}
4949

5050
@Override

sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/TomcatReconciler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public UpdateControl<Tomcat> reconcile(Tomcat tomcat, Context<Tomcat> context) {
3636
tomcat.getMetadata().getNamespace(),
3737
tomcat.getStatus().getReadyReplicas());
3838
return UpdateControl.patchStatus(updatedTomcat);
39-
}).orElse(UpdateControl.noUpdate());
39+
}).orElseGet(UpdateControl::noUpdate);
4040
}
4141

4242
private Tomcat updateTomcatStatus(Tomcat tomcat, Deployment deployment) {

0 commit comments

Comments
 (0)