Skip to content

Commit 061db9c

Browse files
committed
chore: address some sonar-reported issues (#1662)
1 parent 952a26b commit 061db9c

File tree

6 files changed

+36
-27
lines changed

6 files changed

+36
-27
lines changed

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,11 @@ public Operator(KubernetesClient kubernetesClient, ConfigurationService configur
7676
.ifPresent(c -> leaderElectionManager.init(c, this.kubernetesClient));
7777
}
7878

79-
/** Adds a shutdown hook that automatically calls {@link #stop()} when the app shuts down. */
79+
/**
80+
* Adds a shutdown hook that automatically calls {@link #stop()} when the app shuts down.
81+
*
82+
* @deprecated This feature should not be used anymore
83+
*/
8084
@Deprecated(forRemoval = true)
8185
public void installShutdownHook() {
8286
if (!leaderElectionManager.isLeaderElectionEnabled()) {

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

+1
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ default Optional<InformerStoppedHandler> getInformerStoppedHandler() {
195195
});
196196
}
197197

198+
@SuppressWarnings("rawtypes")
198199
default ManagedWorkflowFactory getWorkflowFactory() {
199200
return ManagedWorkflowFactory.DEFAULT;
200201
}

Diff for: operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/DefaultWorkflow.java

+18-17
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
import java.util.List;
77
import java.util.Map;
88
import java.util.Set;
9-
import java.util.function.Function;
10-
import java.util.stream.Collectors;
119

1210
import io.fabric8.kubernetes.api.model.HasMetadata;
1311
import io.javaoperatorsdk.operator.api.reconciler.Context;
@@ -65,21 +63,24 @@ protected DefaultWorkflow(Map<String, DependentResourceNode> dependentResourceNo
6563
}
6664

6765
@SuppressWarnings("unchecked")
68-
private Map<String, DependentResourceNode> toMap(
69-
Set<DependentResourceNode> dependentResourceNodes) {
70-
return dependentResourceNodes.stream()
71-
.peek(drn -> {
72-
// add cycle detection?
73-
if (drn.getDependsOn().isEmpty()) {
74-
topLevelResources.add(drn);
75-
} else {
76-
for (DependentResourceNode dependsOn : (List<DependentResourceNode>) drn
77-
.getDependsOn()) {
78-
bottomLevelResource.remove(dependsOn);
79-
}
80-
}
81-
})
82-
.collect(Collectors.toMap(DependentResourceNode::getName, Function.identity()));
66+
private Map<String, DependentResourceNode> toMap(Set<DependentResourceNode> nodes) {
67+
if (nodes == null || nodes.isEmpty()) {
68+
return Collections.emptyMap();
69+
}
70+
71+
final var map = new HashMap<String, DependentResourceNode>(nodes.size());
72+
for (DependentResourceNode node : nodes) {
73+
// add cycle detection?
74+
if (node.getDependsOn().isEmpty()) {
75+
topLevelResources.add(node);
76+
} else {
77+
for (DependentResourceNode dependsOn : (List<DependentResourceNode>) node.getDependsOn()) {
78+
bottomLevelResource.remove(dependsOn);
79+
}
80+
}
81+
map.put(node.getName(), node);
82+
}
83+
return map;
8384
}
8485

8586
@Override

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

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
package io.javaoperatorsdk.operator.processing.event.source.informer;
22

3-
import java.util.*;
3+
import java.util.Collections;
4+
import java.util.HashMap;
5+
import java.util.List;
6+
import java.util.Map;
7+
import java.util.Optional;
8+
import java.util.Set;
49
import java.util.concurrent.ConcurrentHashMap;
510
import java.util.function.Function;
611
import java.util.function.Predicate;
@@ -55,8 +60,6 @@ void initSources(MixedOperation<T, KubernetesResourceList<T>, Resource<T>> clien
5560
this.eventHandler = eventHandler;
5661

5762
final var targetNamespaces = configuration.getEffectiveNamespaces();
58-
final var labelSelector = configuration.getLabelSelector();
59-
6063
if (ResourceConfiguration.allNamespacesWatched(targetNamespaces)) {
6164
var source = createEventSourceForNamespace(WATCH_ALL_NAMESPACES);
6265
log.debug("Registered {} -> {} for any namespace", this, source);

Diff for: operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerWrapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void start() throws OperatorException {
8686
log.warn("Informer startup error. Will periodically retry. Informer: {}", informer, e);
8787
}
8888
} catch (InterruptedException e) {
89-
Thread.currentThread().interrupt();
89+
thread.interrupt();
9090
throw new IllegalStateException(e);
9191
} finally {
9292
// restore original name

Diff for: operator-framework/src/test/java/io/javaoperatorsdk/operator/config/BaseConfigurationServiceTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ void getDependentResources() {
126126

127127
@Test
128128
void missingAnnotationThrowsException() {
129-
Assertions.assertThrows(OperatorException.class,
130-
() -> configFor(new MissingAnnotationReconciler()));
129+
final var reconciler = new MissingAnnotationReconciler();
130+
Assertions.assertThrows(OperatorException.class, () -> configFor(reconciler));
131131
}
132132

133133
@SuppressWarnings("rawtypes")
@@ -145,7 +145,8 @@ private Optional<DependentResourceSpec> findByNameOptional(
145145

146146
@Test
147147
void tryingToAddDuplicatedDependentsWithoutNameShouldFail() {
148-
assertThrows(IllegalArgumentException.class, () -> configFor(new DuplicatedDepReconciler()));
148+
final var reconciler = new DuplicatedDepReconciler();
149+
assertThrows(IllegalArgumentException.class, () -> configFor(reconciler));
149150
}
150151

151152
@Test
@@ -179,8 +180,7 @@ void checkDefaultRateAndRetryConfigurations() {
179180

180181
@Test
181182
void configuringRateAndRetryViaAnnotationsShouldWork() {
182-
var config =
183-
configFor(new ConfigurableRateLimitAndRetryReconciler());
183+
var config = configFor(new ConfigurableRateLimitAndRetryReconciler());
184184
final var retry = config.getRetry();
185185
final var testRetry = assertInstanceOf(TestRetry.class, retry);
186186
assertEquals(12, testRetry.getValue());

0 commit comments

Comments
 (0)