wip

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

Author: csviri

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

@@ -61,7 +61,6 @@ public ResourceOperations(Context<P> context) {
    */
   public <R extends HasMetadata> R serverSideApply(R resource) {
     return resourcePatch(
-        context,
         resource,
         r ->
             context
@@ -92,7 +91,6 @@ public <R extends HasMetadata> R serverSideApply(R resource) {
    */
   public <R extends HasMetadata> R serverSideApplyStatus(R resource) {
     return resourcePatch(
-        context,
         resource,
         r ->
             context
@@ -184,7 +182,7 @@ public <P extends HasMetadata> P serverSideApplyPrimaryStatus(P resource) {
    * @param <R> resource type
    */
   public <R extends HasMetadata> R update(R resource) {
-    return resourcePatch(context, resource, r -> context.getClient().resource(r).update());
+    return resourcePatch(resource, r -> context.getClient().resource(r).update());
   }
 
   /**
@@ -203,7 +201,7 @@ public <R extends HasMetadata> R update(R resource) {
    * @param <R> resource type
    */
   public <R extends HasMetadata> R updateStatus(R resource) {
-    return resourcePatch(context, resource, r -> context.getClient().resource(r).updateStatus());
+    return resourcePatch(resource, r -> context.getClient().resource(r).updateStatus());
   }
 
   /**
@@ -268,8 +266,7 @@ public <R extends HasMetadata> R updatePrimaryStatus(R resource) {
    * @param <R> resource type
    */
   public <R extends HasMetadata> R jsonPatch(R resource, UnaryOperator<R> unaryOperator) {
-    return resourcePatch(
-        context, resource, r -> context.getClient().resource(r).edit(unaryOperator));
+    return resourcePatch(resource, r -> context.getClient().resource(r).edit(unaryOperator));
   }
 
   /**
@@ -290,8 +287,7 @@ public <R extends HasMetadata> R jsonPatch(R resource, UnaryOperator<R> unaryOpe
    * @param <R> resource type
    */
   public <R extends HasMetadata> R jsonPatchStatus(R resource, UnaryOperator<R> unaryOperator) {
-    return resourcePatch(
-        context, resource, r -> context.getClient().resource(r).editStatus(unaryOperator));
+    return resourcePatch(resource, r -> context.getClient().resource(r).editStatus(unaryOperator));
   }
 
   /**
@@ -358,7 +354,7 @@ public <R extends HasMetadata> R jsonPatchPrimaryStatus(
    * @param <R> resource type
    */
   public <R extends HasMetadata> R jsonMergePatch(R resource) {
-    return resourcePatch(context, resource, r -> context.getClient().resource(r).patch());
+    return resourcePatch(resource, r -> context.getClient().resource(r).patch());
   }
 
   /**
@@ -377,7 +373,7 @@ public <R extends HasMetadata> R jsonMergePatch(R resource) {
    * @param <R> resource type
    */
   public <R extends HasMetadata> R jsonMergePatchStatus(R resource) {
-    return resourcePatch(context, resource, r -> context.getClient().resource(r).patchStatus());
+    return resourcePatch(resource, r -> context.getClient().resource(r).patchStatus());
   }
 
   /**
@@ -431,15 +427,13 @@ public <R extends HasMetadata> R jsonMergePatchPrimaryStatus(R resource) {
    * source for the resource type and delegates to {@link #resourcePatch(HasMetadata, UnaryOperator,
    * ManagedInformerEventSource)}.
    *
-   * @param context of reconciler
    * @param resource resource to patch
    * @param updateOperation operation to perform (update, patch, edit, etc.)
    * @return updated resource
    * @param <R> resource type
    * @throws IllegalStateException if no event source or multiple event sources are found
    */
-  public <R extends HasMetadata> R resourcePatch(
-      Context<?> context, R resource, UnaryOperator<R> updateOperation) {
+  public <R extends HasMetadata> R resourcePatch(R resource, UnaryOperator<R> updateOperation) {
 
     var esList = context.eventSourceRetriever().getEventSourcesFor(resource.getClass());
     if (esList.isEmpty()) {

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/reconciler/ResourceOperationsTest.java

@@ -264,7 +264,7 @@ void resourcePatchWithSingleEventSource() {
     when(managedEventSource.eventFilteringUpdateAndCacheResource(any(), any(UnaryOperator.class)))
         .thenReturn(updatedResource);
 
-    var result = resourceOperations.resourcePatch(context, resource, UnaryOperator.identity());
+    var result = resourceOperations.resourcePatch(resource, UnaryOperator.identity());
 
     assertThat(result).isNotNull();
     assertThat(result.getMetadata().getResourceVersion()).isEqualTo("2");
@@ -284,7 +284,7 @@ void resourcePatchThrowsWhenNoEventSourceFound() {
     var exception =
         assertThrows(
             IllegalStateException.class,
-            () -> resourceOperations.resourcePatch(context, resource, UnaryOperator.identity()));
+            () -> resourceOperations.resourcePatch(resource, UnaryOperator.identity()));
 
     assertThat(exception.getMessage()).contains("No event source found for type");
   }
@@ -303,7 +303,7 @@ void resourcePatchThrowsWhenMultipleEventSourcesFound() {
     var exception =
         assertThrows(
             IllegalStateException.class,
-            () -> resourceOperations.resourcePatch(context, resource, UnaryOperator.identity()));
+            () -> resourceOperations.resourcePatch(resource, UnaryOperator.identity()));
 
     assertThat(exception.getMessage()).contains("Multiple event sources found for");
     assertThat(exception.getMessage()).contains("please provide the target event source");
@@ -322,7 +322,7 @@ void resourcePatchThrowsWhenEventSourceIsNotManagedInformer() {
     var exception =
         assertThrows(
             IllegalStateException.class,
-            () -> resourceOperations.resourcePatch(context, resource, UnaryOperator.identity()));
+            () -> resourceOperations.resourcePatch(resource, UnaryOperator.identity()));
 
     assertThat(exception.getMessage()).contains("Target event source must be a subclass off");
     assertThat(exception.getMessage()).contains("ManagedInformerEventSource");