Skip to content

Commit f3a3b05

Browse files
csviricsviri
committed
removed un used generics
1 parent e2e9cf8 commit f3a3b05

File tree

3 files changed

+21
-33
lines changed

3 files changed

+21
-33
lines changed

‎operator-framework/src/main/java/com/github/containersolutions/operator/Operator.java

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,14 @@
2020

2121
import static com.github.containersolutions.operator.ControllerUtils.*;
2222

23+
@SuppressWarnings("rawtypes")
2324
public class Operator {
2425

25-
private final KubernetesClient k8sClient;
26+
private final static Logger log = LoggerFactory.getLogger(Operator.class);
2627

27-
private Map<ResourceController, EventScheduler> controllers = new HashMap<>();
28+
private final KubernetesClient k8sClient;
2829
private Map<Class<? extends CustomResource>, CustomResourceOperationsImpl> customResourceClients = new HashMap<>();
2930

30-
private final static Logger log = LoggerFactory.getLogger(Operator.class);
31-
3231
public Operator(KubernetesClient k8sClient) {
3332
this.k8sClient = k8sClient;
3433
}
@@ -46,20 +45,15 @@ private <R extends CustomResource> void registerController(ResourceController<R>
4645
boolean watchAllNamespaces, String... targetNamespaces) throws OperatorException {
4746
Class<R> resClass = getCustomResourceClass(controller);
4847
CustomResourceDefinition crd = getCustomResourceDefinitionForController(controller);
49-
50-
String kind = getKind(crd);
51-
52-
KubernetesDeserializer.registerCustomKind(getApiVersion(crd), kind, resClass);
48+
KubernetesDeserializer.registerCustomKind(getApiVersion(crd), getKind(crd), resClass);
5349

5450
Class<? extends CustomResourceList<R>> list = getCustomResourceListClass(controller);
5551
Class<? extends CustomResourceDoneable<R>> doneable = getCustomResourceDonebaleClass(controller);
5652
MixedOperation client = k8sClient.customResources(crd, resClass, list, doneable);
5753

5854
EventDispatcher eventDispatcher = new EventDispatcher(controller, (CustomResourceOperationsImpl) client,
5955
getDefaultFinalizer(controller));
60-
6156
EventScheduler eventScheduler = new EventScheduler(eventDispatcher);
62-
6357
registerWatches(controller, client, resClass, watchAllNamespaces, targetNamespaces, eventScheduler);
6458
}
6559

@@ -69,7 +63,7 @@ private <R extends CustomResource> void registerWatches(ResourceController<R> co
6963

7064
CustomResourceOperationsImpl crClient = (CustomResourceOperationsImpl) client;
7165
if (watchAllNamespaces) {
72-
// todo check if this works
66+
// todo test this
7367
crClient.inAnyNamespace().watch(eventScheduler);
7468
} else if (targetNamespaces.length == 0) {
7569
client.watch(eventScheduler);
@@ -80,7 +74,6 @@ private <R extends CustomResource> void registerWatches(ResourceController<R> co
8074
}
8175
}
8276
customResourceClients.put(resClass, (CustomResourceOperationsImpl) client);
83-
controllers.put(controller, eventScheduler);
8477
log.info("Registered Controller: '{}' for CRD: '{}' for namespaces: {}", controller.getClass().getSimpleName(),
8578
resClass, targetNamespaces.length == 0 ? "[all/client namespace]" : Arrays.toString(targetNamespaces));
8679
}
@@ -113,5 +106,4 @@ private String getKind(CustomResourceDefinition crd) {
113106
private String getApiVersion(CustomResourceDefinition crd) {
114107
return crd.getSpec().getGroup() + "/" + crd.getSpec().getVersion();
115108
}
116-
117109
}

‎operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventDispatcher.java

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import com.github.containersolutions.operator.api.ResourceController;
44
import io.fabric8.kubernetes.client.CustomResource;
5-
import io.fabric8.kubernetes.client.CustomResourceDoneable;
6-
import io.fabric8.kubernetes.client.CustomResourceList;
75
import io.fabric8.kubernetes.client.Watcher;
86
import io.fabric8.kubernetes.client.dsl.internal.CustomResourceOperationsImpl;
97
import org.slf4j.Logger;
@@ -15,24 +13,24 @@
1513
/**
1614
* Dispatches events to the Controller and handles Finalizers for a single type of Custom Resource.
1715
*/
18-
public class EventDispatcher<R extends CustomResource> {
16+
public class EventDispatcher {
1917

2018
private final static Logger log = LoggerFactory.getLogger(EventDispatcher.class);
2119

22-
private final ResourceController<R> controller;
23-
private final CustomResourceOperationsImpl<R, CustomResourceList<R>, CustomResourceDoneable<R>> resourceOperation;
20+
private final ResourceController controller;
21+
private final CustomResourceOperationsImpl resourceOperation;
2422
private final String resourceDefaultFinalizer;
2523

26-
public EventDispatcher(ResourceController<R> controller,
27-
CustomResourceOperationsImpl<R, CustomResourceList<R>, CustomResourceDoneable<R>> resourceOperation,
24+
public EventDispatcher(ResourceController controller,
25+
CustomResourceOperationsImpl resourceOperation,
2826
String defaultFinalizer
2927
) {
3028
this.controller = controller;
3129
this.resourceOperation = resourceOperation;
3230
this.resourceDefaultFinalizer = defaultFinalizer;
3331
}
3432

35-
public void handleEvent(Watcher.Action action, R resource) {
33+
public void handleEvent(Watcher.Action action, CustomResource resource) {
3634
log.info("Handling event {} for resource {}", action, resource.getMetadata());
3735
if (action == Watcher.Action.MODIFIED || action == Watcher.Action.ADDED) {
3836
// Its interesting problem if we should call delete if received event after object is marked for deletion
@@ -47,12 +45,12 @@ public void handleEvent(Watcher.Action action, R resource) {
4745
removeDefaultFinalizer(resource);
4846
}
4947
} else {
50-
Optional<R> updateResult = controller.createOrUpdateResource(resource);
48+
Optional<CustomResource> updateResult = controller.createOrUpdateResource(resource);
5149
if (updateResult.isPresent()) {
5250
log.debug("Updating resource: {} with version: {}", resource.getMetadata().getName(),
5351
resource.getMetadata().getResourceVersion());
5452
log.trace("Resource before update: {}", resource);
55-
R updatedResource = updateResult.get();
53+
CustomResource updatedResource = updateResult.get();
5654
addFinalizerIfNotPresent(updatedResource);
5755
replace(updatedResource);
5856
log.trace("Resource after update: {}", resource);
@@ -75,25 +73,25 @@ public void handleEvent(Watcher.Action action, R resource) {
7573
}
7674
}
7775

78-
private boolean hasDefaultFinalizer(R resource) {
76+
private boolean hasDefaultFinalizer(CustomResource resource) {
7977
if (resource.getMetadata().getFinalizers() != null) {
8078
return resource.getMetadata().getFinalizers().contains(resourceDefaultFinalizer);
8179
}
8280
return false;
8381
}
8482

85-
private void removeDefaultFinalizer(R resource) {
83+
private void removeDefaultFinalizer(CustomResource resource) {
8684
resource.getMetadata().getFinalizers().remove(resourceDefaultFinalizer);
8785
log.debug("Removed finalizer. Trying to replace resource {}, version: {}", resource.getMetadata().getName(), resource.getMetadata().getResourceVersion());
8886
resourceOperation.lockResourceVersion(resource.getMetadata().getResourceVersion()).replace(resource);
8987
}
9088

91-
private void replace(R resource) {
89+
private void replace(CustomResource resource) {
9290
log.debug("Trying to replace resource {}, version: {}", resource.getMetadata().getName(), resource.getMetadata().getResourceVersion());
9391
resourceOperation.lockResourceVersion(resource.getMetadata().getResourceVersion()).replace(resource);
9492
}
9593

96-
private void addFinalizerIfNotPresent(R resource) {
94+
private void addFinalizerIfNotPresent(CustomResource resource) {
9795
if (!hasDefaultFinalizer(resource) && !markedForDeletion(resource)) {
9896
log.info("Adding default finalizer to {}", resource.getMetadata());
9997
if (resource.getMetadata().getFinalizers() == null) {
@@ -103,7 +101,7 @@ private void addFinalizerIfNotPresent(R resource) {
103101
}
104102
}
105103

106-
private boolean markedForDeletion(R resource) {
104+
private boolean markedForDeletion(CustomResource resource) {
107105
return resource.getMetadata().getDeletionTimestamp() != null && !resource.getMetadata().getDeletionTimestamp().isEmpty();
108106
}
109107
}

‎operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventScheduler.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,9 @@
4141
* </li>
4242
* <li>We don't react for delete event, since we always use finalizers and do delete on marked for deletion.</li>
4343
* </ul>
44-
*
45-
* @param <R>
4644
*/
4745

48-
public class EventScheduler<R extends CustomResource> implements Watcher<R> {
46+
public class EventScheduler implements Watcher<CustomResource> {
4947

5048
private final static Logger log = LoggerFactory.getLogger(EventScheduler.class);
5149

@@ -55,7 +53,7 @@ public class EventScheduler<R extends CustomResource> implements Watcher<R> {
5553

5654
private ReentrantLock lock = new ReentrantLock();
5755

58-
public EventScheduler(EventDispatcher<R> eventDispatcher) {
56+
public EventScheduler(EventDispatcher eventDispatcher) {
5957
this.eventDispatcher = eventDispatcher;
6058
ThreadFactory threadFactory = new ThreadFactoryBuilder()
6159
.setNameFormat("event-consumer-%d")
@@ -66,7 +64,7 @@ public EventScheduler(EventDispatcher<R> eventDispatcher) {
6664
}
6765

6866
@Override
69-
public void eventReceived(Watcher.Action action, R resource) {
67+
public void eventReceived(Watcher.Action action, CustomResource resource) {
7068
log.debug("Event received for action: {}, {}: {}", action.toString().toLowerCase(), resource.getClass().getSimpleName(),
7169
resource.getMetadata().getName());
7270
CustomResourceEvent event = new CustomResourceEvent(action, resource);

0 commit comments

Comments
 (0)