wip

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

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

@@ -37,11 +37,9 @@ public class MDCUtils {
 
   private static final String EVENT_RESOURCE_NAME = "eventsource.event.resource.name";
   private static final String EVENT_RESOURCE_UID = "eventsource.event.resource.uid";
-  private static final String EVENT_RESOURCE_NAMESPACE =
-      "eventsource.event.resource.namespace";
+  private static final String EVENT_RESOURCE_NAMESPACE = "eventsource.event.resource.namespace";
   private static final String EVENT_RESOURCE_KIND = "eventsource.event.resource.kind";
-  private static final String EVENT_RESOURCE_VERSION =
-      "eventsource.event.resource.resourceVersion";
+  private static final String EVENT_RESOURCE_VERSION = "eventsource.event.resource.resourceVersion";
   private static final String EVENT_ACTION = "eventsource.event.action";
   private static final String EVENT_SOURCE_NAME = "eventsource.name";
 
@@ -70,11 +68,13 @@ public static void removeInformerEventInfo() {
     }
   }
 
-  public static void withMDCForEvent(HasMetadata resource, Runnable runnable, String nameSourceName) {
-     withMDCForEvent(resource,null,runnable,nameSourceName);
+  public static void withMDCForEvent(
+      HasMetadata resource, Runnable runnable, String nameSourceName) {
+    withMDCForEvent(resource, null, runnable, nameSourceName);
   }
 
-  public static void withMDCForEvent(HasMetadata resource, ResourceAction action, Runnable runnable, String nameSourceName) {
+  public static void withMDCForEvent(
+      HasMetadata resource, ResourceAction action, Runnable runnable, String nameSourceName) {
     try {
       MDCUtils.addInformerEventInfo(resource, action, nameSourceName);
       runnable.run();
@@ -83,7 +83,7 @@ public static void withMDCForEvent(HasMetadata resource, ResourceAction action,
     }
   }
 
-  public static void withMDCForResourceID(ResourceID resourceID,Runnable runnable) {
+  public static void withMDCForResourceID(ResourceID resourceID, Runnable runnable) {
     try {
       MDCUtils.addResourceIDInfo(resourceID);
       runnable.run();
@@ -92,7 +92,7 @@ public static void withMDCForResourceID(ResourceID resourceID,Runnable runnable)
     }
   }
 
-  public static void withMDCForPrimary(HasMetadata primary,Runnable runnable) {
+  public static void withMDCForPrimary(HasMetadata primary, Runnable runnable) {
     try {
       MDCUtils.addResourceInfo(primary);
       runnable.run();
@@ -101,7 +101,6 @@ public static void withMDCForPrimary(HasMetadata primary,Runnable runnable) {
     }
   }
 
-
   public static void addResourceIDInfo(ResourceID resourceID) {
     if (enabled) {
       MDC.put(NAME, resourceID.getName());

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

@@ -42,14 +42,14 @@ public class ControllerEventSource<T extends HasMetadata>
     implements ResourceEventHandler<T> {
 
   private static final Logger log = LoggerFactory.getLogger(ControllerEventSource.class);
-  public static final String ControllerResourceEventSource = "ControllerResourceEventSource";
+  public static final String CONTROLLER_RESOURCE_EVENT_SOURCE = "ControllerResourceEventSource";
 
   private final Controller<T> controller;
 
   @SuppressWarnings({"unchecked", "rawtypes"})
   public ControllerEventSource(Controller<T> controller) {
     super(
-            ControllerResourceEventSource,
+        CONTROLLER_RESOURCE_EVENT_SOURCE,
         controller.getCRClient(),
         controller.getConfiguration(),
         controller.getConfiguration().getInformerConfig().isComparableResourceVersions());
@@ -186,6 +186,6 @@ public void setOnDeleteFilter(OnDeleteFilter<? super T> onDeleteFilter) {
 
   @Override
   public String name() {
-    return ControllerResourceEventSource;
+    return CONTROLLER_RESOURCE_EVENT_SOURCE;
   }
 }

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

@@ -269,6 +269,6 @@ public void setControllerConfiguration(ControllerConfiguration<R> controllerConf
   }
 
   protected void withMDC(R resource, ResourceAction action, Runnable runnable) {
-    MDCUtils.withMDCForEvent(resource,action,runnable, name());
+    MDCUtils.withMDCForEvent(resource, action, runnable, name());
   }
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/informerrelatedbehavior/InformerRelatedBehaviorITS.java

@@ -158,7 +158,7 @@ private void assertInformerNotWatchingForAdditionalNamespace(Operator operator)
     InformerHealthIndicator controllerHealthIndicator =
         (InformerHealthIndicator)
             unhealthyEventSources
-                .get(ControllerEventSource.ControllerResourceEventSource)
+                .get(ControllerEventSource.CONTROLLER_RESOURCE_EVENT_SOURCE)
                 .informerHealthIndicators()
                 .get(additionalNamespace);
     assertThat(controllerHealthIndicator).isNotNull();
@@ -306,14 +306,18 @@ private void assertRuntimeInfoNoCRPermission(Operator operator) {
             .unhealthyEventSources()
             .get(INFORMER_RELATED_BEHAVIOR_TEST_RECONCILER);
     assertThat(unhealthyEventSources).isNotEmpty();
-    assertThat(unhealthyEventSources.get(ControllerEventSource.ControllerResourceEventSource)).isNotNull();
+    assertThat(unhealthyEventSources.get(ControllerEventSource.CONTROLLER_RESOURCE_EVENT_SOURCE))
+        .isNotNull();
     var informerHealthIndicators =
         operator
             .getRuntimeInfo()
             .unhealthyInformerWrappingEventSourceHealthIndicator()
             .get(INFORMER_RELATED_BEHAVIOR_TEST_RECONCILER);
     assertThat(informerHealthIndicators).isNotEmpty();
-    assertThat(informerHealthIndicators.get(ControllerEventSource.ControllerResourceEventSource).informerHealthIndicators())
+    assertThat(
+            informerHealthIndicators
+                .get(ControllerEventSource.CONTROLLER_RESOURCE_EVENT_SOURCE)
+                .informerHealthIndicators())
         .hasSize(1);
   }