Merge pull request #516 from oracle/remove_workaround_282

remove workaround

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/Workarounds.java

@@ -15,5 +15,5 @@ public class Workarounds {
   // This breaks some K8s model comparisons.
 
   // Reported to https://github.com/kubernetes-client/java as issue #282
-  public static final boolean INTORSTRING_BAD_EQUALS = true;
+  public static final boolean INTORSTRING_BAD_EQUALS = false;
 }

operator/src/main/java/oracle/kubernetes/operator/helpers/IngressHelper.java

@@ -12,7 +12,6 @@
 import static oracle.kubernetes.operator.LabelConstants.DOMAINUID_LABEL;
 import static oracle.kubernetes.operator.LabelConstants.RESOURCE_VERSION_LABEL;
 import static oracle.kubernetes.operator.VersionConstants.DEFAULT_DOMAIN_VERSION;
-import static oracle.kubernetes.operator.Workarounds.INTORSTRING_BAD_EQUALS;
 
 import io.kubernetes.client.custom.IntOrString;
 import io.kubernetes.client.models.V1ObjectMeta;
@@ -31,7 +30,6 @@
 import oracle.kubernetes.operator.work.NextAction;
 import oracle.kubernetes.operator.work.Packet;
 import oracle.kubernetes.operator.work.Step;
-import org.yaml.snakeyaml.Yaml;
 
 /** Helper class to add/remove server from Ingress. */
 public class IngressHelper {
@@ -123,21 +121,7 @@ Step replaceIngressStep(Step next) {
 
       private boolean isCompatible(V1beta1Ingress result) {
         return VersionHelper.matchesResourceVersion(result.getMetadata(), DEFAULT_DOMAIN_VERSION)
-            && equalObjects(result.getSpec(), createIngressSpec());
-      }
-
-      private boolean equalObjects(V1beta1IngressSpec object1, V1beta1IngressSpec object2) {
-        return INTORSTRING_BAD_EQUALS
-            ? yamlEquals(object1, object2)
-            : Objects.equals(object1, object2);
-      }
-
-      private boolean yamlEquals(Object actual, Object expected) {
-        return Objects.equals(objectToYaml(actual), objectToYaml(expected));
-      }
-
-      private String objectToYaml(Object object) {
-        return new Yaml().dump(object);
+            && Objects.equals(result.getSpec(), createIngressSpec());
       }
     }
 

operator/src/test/java/oracle/kubernetes/operator/helpers/CallTestSupport.java

@@ -4,13 +4,10 @@
 
 package oracle.kubernetes.operator.helpers;
 
-import static oracle.kubernetes.operator.Workarounds.INTORSTRING_BAD_EQUALS;
-
 import com.meterware.simplestub.Memento;
 import com.meterware.simplestub.StaticStubSupport;
 import io.kubernetes.client.ApiClient;
 import io.kubernetes.client.ApiException;
-import io.kubernetes.client.models.V1beta1Ingress;
 import java.net.HttpURLConnection;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -24,7 +21,6 @@
 import oracle.kubernetes.operator.calls.RequestParams;
 import oracle.kubernetes.operator.calls.SynchronousCallDispatcher;
 import oracle.kubernetes.operator.calls.SynchronousCallFactory;
-import oracle.kubernetes.operator.utils.YamlUtils;
 
 /**
  * Support for writing unit tests that use CallBuilder to send requests that expect responses.
@@ -163,31 +159,10 @@ private boolean matches(RequestParams requestParams) {
 
     private boolean matchesBody(Object actualBody, Object expectedBody) {
       return expectedBody instanceof BodyMatcher && ((BodyMatcher) expectedBody).matches(actualBody)
-          || equalBodies(actualBody, expectedBody)
+          || Objects.equals(actualBody, expectedBody)
           || function != null;
     }
 
-    private static boolean equalBodies(Object actual, Object expected) {
-      return useYamlComparison(actual)
-          ? yamlEquals(actual, expected)
-          : Objects.equals(actual, expected);
-    }
-
-    // This is a hack to get around a bug in the 1.0 K8s client code:
-    //    the IntOrString class does not define equals(), meaning that any classes which depend on
-    //    it require special handling.
-    private static boolean useYamlComparison(Object actual) {
-      return INTORSTRING_BAD_EQUALS && actual instanceof V1beta1Ingress;
-    }
-
-    private static boolean yamlEquals(Object actual, Object expected) {
-      return Objects.equals(objectToYaml(actual), objectToYaml(expected));
-    }
-
-    private static String objectToYaml(Object object) {
-      return YamlUtils.newYaml().dump(object);
-    }
-
     private boolean matches(AdditionalParams params) {
       return Objects.equals(params.fieldSelector, requestParamExpectations.get(FIELD_SELECTOR))
           && Objects.equals(params.labelSelector, requestParamExpectations.get(LABEL_SELECTOR));