Skip to content

Commit d4ca4f4

Browse files
committed
fix: sonar issues
1 parent e20dd64 commit d4ca4f4

File tree

10 files changed

+24
-17
lines changed

10 files changed

+24
-17
lines changed

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ public class DefaultControllerConfiguration<R extends HasMetadata>
2121
private final String labelSelector;
2222
private final ResourceEventFilter<R> resourceEventFilter;
2323
private final Class<R> resourceClass;
24-
private final List<? extends DependentResource> dependents;
24+
private final List<DependentResource> dependents;
2525
private ConfigurationService service;
2626

27+
// NOSONAR constructor is meant to provide all information
2728
public DefaultControllerConfiguration(
2829
String associatedControllerClassName,
2930
String name,
@@ -36,7 +37,7 @@ public DefaultControllerConfiguration(
3637
ResourceEventFilter<R> resourceEventFilter,
3738
Class<R> resourceClass,
3839
ConfigurationService service,
39-
List<? extends DependentResource> dependents) {
40+
List<DependentResource> dependents) {
4041
this.associatedControllerClassName = associatedControllerClassName;
4142
this.name = name;
4243
this.crdName = crdName;
@@ -106,7 +107,7 @@ public ConfigurationService getConfigurationService() {
106107
@Override
107108
public void setConfigurationService(ConfigurationService service) {
108109
if (this.service != null) {
109-
throw new RuntimeException("A ConfigurationService is already associated with '" + name
110+
throw new IllegalStateException("A ConfigurationService is already associated with '" + name
110111
+ "' ControllerConfiguration. Cannot change it once set!");
111112
}
112113
this.service = service;
@@ -128,7 +129,7 @@ public ResourceEventFilter<R> getEventFilter() {
128129
}
129130

130131
@Override
131-
public List<? extends DependentResource> getDependentResources() {
132+
public List<DependentResource> getDependentResources() {
132133
return dependents;
133134
}
134135
}

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

+3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ public class DependentResourceController<R, P extends HasMetadata>
1616
private final Persister<R, P> persister;
1717
private final DependentResource<R, P> delegate;
1818

19+
@SuppressWarnings("unchecked")
1920
public DependentResourceController(DependentResource<R, P> delegate) {
2021
this.delegate = delegate;
2122
builder = (delegate instanceof Builder) ? (Builder<R, P>) delegate : null;
@@ -24,6 +25,7 @@ public DependentResourceController(DependentResource<R, P> delegate) {
2425
persister = initPersister(delegate);
2526
}
2627

28+
@SuppressWarnings("unchecked")
2729
protected Persister<R, P> initPersister(DependentResource<R, P> delegate) {
2830
if (delegate instanceof Persister) {
2931
return (Persister<R, P>) delegate;
@@ -56,6 +58,7 @@ public Class<R> getResourceType() {
5658
return delegate.resourceType();
5759
}
5860

61+
@Override
5962
public EventSource initEventSource(EventSourceContext<P> context) {
6063
return delegate.initEventSource(context);
6164
}

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import io.javaoperatorsdk.operator.processing.event.EventSourceManager;
4040
import io.javaoperatorsdk.operator.processing.event.source.EventSource;
4141

42+
@SuppressWarnings({"rawtypes", "unchecked"})
4243
public class Controller<R extends HasMetadata> implements Reconciler<R>,
4344
LifecycleAware, EventSourceInitializer<R> {
4445

@@ -49,8 +50,8 @@ public class Controller<R extends HasMetadata> implements Reconciler<R>,
4950
private final KubernetesClient kubernetesClient;
5051
private final AtomicBoolean started = new AtomicBoolean(false);
5152
private List<DependentResourceController> dependents;
52-
private EventSourceManager<R> eventSourceManager;
53-
private volatile ConfigurationService configurationService;
53+
private final EventSourceManager<R> eventSourceManager;
54+
private ConfigurationService configurationService;
5455

5556
public Controller(Reconciler<R> reconciler,
5657
ControllerConfiguration<R> configuration,
@@ -220,7 +221,7 @@ private Metrics metrics() {
220221

221222
@Override
222223
public List<EventSource> prepareEventSources(EventSourceContext<R> context) {
223-
final List<? extends DependentResource> configured = configuration.getDependentResources();
224+
final List<DependentResource> configured = configuration.getDependentResources();
224225
dependents = new ArrayList<>(configured.size());
225226

226227
List<EventSource> sources = new ArrayList<>(configured.size() + 5);

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

+6-4
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,15 @@ public void start() {
8686
}
8787
}
8888

89+
@SuppressWarnings("rawtypes")
8990
private void logEventSourceEvent(EventSource eventSource, String event) {
9091
if (log.isDebugEnabled()) {
9192
if (eventSource instanceof ResourceEventSource) {
9293
ResourceEventSource source = (ResourceEventSource) eventSource;
93-
log.debug(event + " event source {} for {}", eventSource.name(), source.getResourceClass());
94+
log.debug("{} event source {} for {}", event, eventSource.name(),
95+
source.getResourceClass());
9496
} else {
95-
log.debug(event + " event source {}", eventSource.name());
97+
log.debug("{} event source {}", event, eventSource.name());
9698
}
9799
}
98100
}
@@ -126,7 +128,7 @@ public final void registerEventSource(EventSource eventSource)
126128
eventSource.setEventHandler(eventProcessor);
127129
} catch (IllegalStateException | MissingCRDException e) {
128130
throw e; // leave untouched
129-
} catch (Throwable e) {
131+
} catch (Exception e) {
130132
throw new OperatorException("Couldn't register event source: " + eventSource.name(), e);
131133
} finally {
132134
lock.unlock();
@@ -234,7 +236,7 @@ public void add(EventSource eventSource) {
234236
sources.computeIfAbsent(keyFor(eventSource), k -> new ArrayList<>()).add(eventSource);
235237
}
236238

237-
private Class getDependentType(EventSource source) {
239+
private Class<?> getDependentType(EventSource source) {
238240
return source instanceof ResourceEventSource
239241
? ((ResourceEventSource) source).getResourceClass()
240242
: source.getClass();

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
public abstract class AbstractEventSource implements EventSource {
77

8-
private volatile EventHandler handler;
8+
private EventHandler handler;
99
private volatile boolean running = false;
1010

1111
protected EventHandler getEventHandler() {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public abstract class CachingEventSource<T, P extends HasMetadata>
2727

2828
protected UpdatableCache<T> cache;
2929

30-
public CachingEventSource(Class<T> resourceClass) {
30+
protected CachingEventSource(Class<T> resourceClass) {
3131
super(resourceClass);
3232
cache = initCache();
3333
}

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

+1
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ public void stop() {
9797
* @param resource the primary resource we want to retrieve the associated resource for
9898
* @return the informed resource associated with the specified primary resource
9999
*/
100+
@Override
100101
public Optional<T> getAssociated(P resource) {
101102
final var id = configuration.getAssociatedResourceIdentifier().associatedSecondaryID(resource);
102103
return get(id);

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import io.javaoperatorsdk.operator.api.config.ResourceConfiguration;
2222
import io.javaoperatorsdk.operator.processing.LifecycleAware;
2323
import io.javaoperatorsdk.operator.processing.event.ResourceID;
24-
import io.javaoperatorsdk.operator.processing.event.source.AbstractResourceEventSource;
2524
import io.javaoperatorsdk.operator.processing.event.source.Cache;
2625
import io.javaoperatorsdk.operator.processing.event.source.ResourceCache;
2726
import io.javaoperatorsdk.operator.processing.event.source.UpdatableCache;
@@ -30,7 +29,7 @@ public class InformerManager<T extends HasMetadata, C extends ResourceConfigurat
3029
implements LifecycleAware, ResourceCache<T>, UpdatableCache<T> {
3130

3231
private static final String ANY_NAMESPACE_MAP_KEY = "anyNamespace";
33-
private static final Logger log = LoggerFactory.getLogger(AbstractResourceEventSource.class);
32+
private static final Logger log = LoggerFactory.getLogger(InformerManager.class);
3433

3534
private final Map<String, InformerWrapper<T>> sources = new ConcurrentHashMap<>();
3635
private Cloner cloner;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public abstract class ManagedInformerEventSource<R extends HasMetadata, P extend
1313
extends CachingEventSource<R, P>
1414
implements ResourceEventHandler<R> {
1515

16-
public ManagedInformerEventSource(
16+
protected ManagedInformerEventSource(
1717
MixedOperation<R, KubernetesResourceList<R>, Resource<R>> client, C configuration) {
1818
super(configuration.getResourceClass());
1919
manager().initSources(client, configuration, this);

operator-framework/src/main/java/io/javaoperatorsdk/operator/config/runtime/AnnotationConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public ResourceEventFilter<R> getEventFilter() {
121121
}
122122

123123
@Override
124-
public List<? extends DependentResource> getDependentResources() {
124+
public List<DependentResource> getDependentResources() {
125125
if (dependents == null) {
126126
final var dependentConfigs = valueOrDefault(annotation,
127127
ControllerConfiguration::dependents, new Dependent[] {});

0 commit comments

Comments
 (0)