fixes after rebase

Author: csviri

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

@@ -196,8 +196,8 @@ public boolean isLastAttempt() {
     throw e;
   }
 
-  private Optional<R> updateForErrorHandling(R originalResource, R updatedResource,
-      ErrorStatusUpdateControl<R> errorStatusUpdateControl) {
+  private Optional<P> updateForErrorHandling(P originalResource, P updatedResource,
+      ErrorStatusUpdateControl<P> errorStatusUpdateControl) {
     if (errorStatusUpdateControl.isOnlyOnChange()
         && statusEqual(originalResource, updatedResource)) {
       return Optional.empty();
@@ -212,7 +212,8 @@ private boolean isErrorStatusHandlerPresent() {
     return controller.getReconciler() instanceof ErrorStatusHandler;
   }
 
-  private R updateStatusGenerationAware(R resource, R originalResource, boolean patch) {
+  private Optional<P> updateStatusGenerationAware(P resource, P originalResource, boolean patch,
+      boolean onlyIfChanged) {
     updateStatusObservedGenerationIfRequired(resource);
     if (onlyIfChanged && statusEqual(resource, originalResource)) {
       return Optional.empty();
@@ -359,7 +360,7 @@ public P removeFinalizer(P resource, String finalizer) {
   }
 
   @SuppressWarnings("rawtypes")
-  private boolean statusEqual(R resource, R originalResource) {
+  private boolean statusEqual(P resource, P originalResource) {
     if (!(resource instanceof CustomResource)) {
       return false;
     }
@@ -368,7 +369,7 @@ private boolean statusEqual(R resource, R originalResource) {
   }
 
   @SuppressWarnings("rawtypes")
-  private boolean specAndMetaEqual(R resource, R originalResource) {
+  private boolean specAndMetaEqual(P resource, P originalResource) {
     if (!(resource instanceof CustomResource)) {
       return false;
     }