revworked resource operations

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

@@ -20,6 +20,14 @@
 
 public class JsonMergePatchMatcher implements Matcher {
 
+  private static final JsonMergePatchMatcher INSTANCE = new JsonMergePatchMatcher();
+
+  public static JsonMergePatchMatcher getInstance() {
+    return INSTANCE;
+  }
+
+  private JsonMergePatchMatcher() {}
+
   @Override
   public boolean matches(HasMetadata desired, HasMetadata actual, Context<?> context) {
     return MatcherUtils.mergePatchMatches(

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

@@ -20,6 +20,14 @@
 
 public class JsonMergePatchStatusMatcher implements Matcher {
 
+  private static final JsonMergePatchStatusMatcher INSTANCE = new JsonMergePatchStatusMatcher();
+
+  public static JsonMergePatchStatusMatcher getInstance() {
+    return INSTANCE;
+  }
+
+  private JsonMergePatchStatusMatcher() {}
+
   @Override
   public boolean matches(HasMetadata desired, HasMetadata actual, Context<?> context) {
     return MatcherUtils.mergePatchMatches(

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

@@ -20,6 +20,14 @@
 
 public class JsonPatchMacher implements Matcher {
 
+  private static final JsonPatchMacher INSTANCE = new JsonPatchMacher();
+
+  public static JsonPatchMacher getInstance() {
+    return INSTANCE;
+  }
+
+  private JsonPatchMacher() {}
+
   @Override
   public boolean matches(HasMetadata desired, HasMetadata actual, Context<?> context) {
     return MatcherUtils.jsonPatchMatches(

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

@@ -20,6 +20,14 @@
 
 public class JsonPatchStatusMacher implements Matcher {
 
+  private static final JsonPatchStatusMacher INSTANCE = new JsonPatchStatusMacher();
+
+  public static JsonPatchStatusMacher getInstance() {
+    return INSTANCE;
+  }
+
+  private JsonPatchStatusMacher() {}
+
   @Override
   public boolean matches(HasMetadata desired, HasMetadata actual, Context<?> context) {
     return MatcherUtils.jsonPatchMatches(

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

@@ -21,6 +21,14 @@
 
 public class SSAMatcher implements Matcher {
 
+  private static final SSAMatcher INSTANCE = new SSAMatcher();
+
+  public static SSAMatcher getInstance() {
+    return INSTANCE;
+  }
+
+  private SSAMatcher() {}
+
   @Override
   public boolean matches(HasMetadata desired, HasMetadata actual, Context<?> context) {
     return SSABasedGenericKubernetesResourceMatcher.getInstance().matches(actual, desired, context);

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

@@ -21,6 +21,14 @@
 
 public class SSAStatusMatcher implements Matcher {
 
+  private static final SSAStatusMatcher INSTANCE = new SSAStatusMatcher();
+
+  public static SSAStatusMatcher getInstance() {
+    return INSTANCE;
+  }
+
+  private SSAStatusMatcher() {}
+
   @Override
   public boolean matches(HasMetadata desired, HasMetadata actual, Context<?> context) {
     return GenericKubernetesResourceMatcher.matchStatus(desired, actual, context).matched();

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

@@ -21,6 +21,14 @@
 
 public class UpdateMatcher implements Matcher {
 
+  private static final UpdateMatcher INSTANCE = new UpdateMatcher();
+
+  public static UpdateMatcher getInstance() {
+    return INSTANCE;
+  }
+
+  private UpdateMatcher() {}
+
   @Override
   public boolean matches(HasMetadata desired, HasMetadata actual, Context<?> context) {
     return GenericKubernetesResourceMatcher.match(desired, actual, context).matched();

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

@@ -21,6 +21,14 @@
 
 public class UpdateStatusMatcher implements Matcher {
 
+  private static final UpdateStatusMatcher INSTANCE = new UpdateStatusMatcher();
+
+  public static UpdateStatusMatcher getInstance() {
+    return INSTANCE;
+  }
+
+  private UpdateStatusMatcher() {}
+
   @Override
   public boolean matches(HasMetadata desired, HasMetadata actual, Context<?> context) {
     return GenericKubernetesResourceMatcher.matchStatus(desired, actual, context).matched();

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

@@ -0,0 +1,37 @@
+/*
+ * Copyright Java Operator SDK Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.javaoperatorsdk.operator.api.reconciler.matcher;
+
+public enum UpdateType {
+  UPDATE(UpdateMatcher.getInstance()),
+  UPDATE_STATUS(UpdateStatusMatcher.getInstance()),
+  SSA(SSAMatcher.getInstance()),
+  SSA_STATUS(SSAStatusMatcher.getInstance()),
+  JSON_PATCH(JsonPatchMacher.getInstance()),
+  JSON_PATCH_STATUS(JsonPatchStatusMacher.getInstance()),
+  JSON_MERGE_PATCH(JsonMergePatchMatcher.getInstance()),
+  JSON_MERGE_PATCH_STATUS(JsonMergePatchStatusMatcher.getInstance());
+
+  private final Matcher defaultMatcher;
+
+  UpdateType(Matcher defaultMatcher) {
+    this.defaultMatcher = defaultMatcher;
+  }
+
+  public Matcher getMatcher() {
+    return defaultMatcher;
+  }
+}