chore: adapt after rebase

Signed-off-by: Chris Laprun <[email protected]>

Author: metacosm

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

@@ -391,7 +391,7 @@ default <R extends HasMetadata, P extends HasMetadata> boolean shouldUseSSA(
       return false;
     }
     Optional<Boolean> useSSAConfig = dependentResource.configuration()
-        .flatMap(KubernetesDependentResourceConfig::useSSA);
+        .map(KubernetesDependentResourceConfig::useSSA);
     // don't use SSA for certain resources by default, only if explicitly overriden
     if (useSSAConfig.isEmpty()
         && defaultNonSSAResource().contains(dependentResource.resourceType())) {

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/dynamicgenericeventsourceregistration/DynamicGenericEventSourceRegistrationReconciler.java

@@ -72,7 +72,8 @@ private InformerEventSource<GenericKubernetesResource, DynamicGenericEventSource
 
     return new InformerEventSource<>(
         InformerEventSourceConfiguration
-            .from(GroupVersionKind.gvkFor(clazz), DynamicGenericEventSourceRegistrationCustomResource.class)
+            .from(GroupVersionKind.gvkFor(clazz),
+                DynamicGenericEventSourceRegistrationCustomResource.class)
             .withName(clazz.getSimpleName())
             .build(),
         context.eventSourceRetriever().eventSourceContextForDynamicRegistration());