Use tuning object instead of V1Probe in resource

Author: russgold

model/src/main/java/oracle/kubernetes/weblogic/domain/v1/ServerSpec.java

@@ -11,7 +11,6 @@
 import io.kubernetes.client.models.V1EnvVar;
 import io.kubernetes.client.models.V1LocalObjectReference;
 import io.kubernetes.client.models.V1PodSecurityContext;
-import io.kubernetes.client.models.V1Probe;
 import io.kubernetes.client.models.V1ResourceRequirements;
 import io.kubernetes.client.models.V1SecurityContext;
 import io.kubernetes.client.models.V1Volume;
@@ -23,6 +22,7 @@
 import java.util.Optional;
 import javax.annotation.Nonnull;
 import oracle.kubernetes.operator.KubernetesConstants;
+import oracle.kubernetes.weblogic.domain.v2.ProbeTuning;
 
 /** Represents the effective configuration for a server, as seen by the operator runtime. */
 @SuppressWarnings("WeakerAccess")
@@ -139,13 +139,13 @@ public List<V1Volume> getAdditionalVolumes() {
   }
 
   @Nonnull
-  public V1Probe getLivenessProbe() {
-    return new V1Probe();
+  public ProbeTuning getLivenessProbe() {
+    return new ProbeTuning();
   }
 
   @Nonnull
-  public V1Probe getReadinessProbe() {
-    return new V1Probe();
+  public ProbeTuning getReadinessProbe() {
+    return new ProbeTuning();
   }
 
   @Nonnull

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/BaseConfiguration.java

@@ -7,7 +7,6 @@
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 import io.kubernetes.client.models.V1EnvVar;
-import io.kubernetes.client.models.V1Probe;
 import java.util.List;
 import java.util.Objects;
 import javax.annotation.Nullable;
@@ -118,16 +117,16 @@ void setLivenessProbe(Integer initialDelay, Integer timeout, Integer period) {
     serverPod.setLivenessProbe(initialDelay, timeout, period);
   }
 
-  V1Probe getLivenessProbe() {
-    return serverPod.getLivenessProbe();
+  ProbeTuning getLivenessProbe() {
+    return serverPod.getLivenessProbeTuning();
   }
 
   void setReadinessProbe(Integer initialDelay, Integer timeout, Integer period) {
-    serverPod.setReadinessProbe(initialDelay, timeout, period);
+    serverPod.setReadinessProbeTuning(initialDelay, timeout, period);
   }
 
-  V1Probe getReadinessProbe() {
-    return serverPod.getReadinessProbe();
+  ProbeTuning getReadinessProbe() {
+    return serverPod.getReadinessProbeTuning();
   }
 
   @Override

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/ProbeTuning.java

@@ -0,0 +1,86 @@
+// Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Licensed under the Universal Permissive License v 1.0 as shown at
+// http://oss.oracle.com/licenses/upl.
+
+package oracle.kubernetes.weblogic.domain.v2;
+
+import com.google.gson.annotations.SerializedName;
+import oracle.kubernetes.json.Description;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+public class ProbeTuning {
+  @Description("The number of seconds before the first check is performed")
+  private Integer initialDelaySeconds = null;
+
+  @Description("The number of seconds between checks")
+  @SerializedName("periodSeconds")
+  private Integer periodSeconds = null;
+
+  @Description("The number of seconds with no response that indicates a failure")
+  @SerializedName("timeoutSeconds")
+  private Integer timeoutSeconds = null;
+
+  public ProbeTuning() {}
+
+  public Integer getInitialDelaySeconds() {
+    return initialDelaySeconds;
+  }
+
+  public ProbeTuning initialDelaySeconds(Integer initialDelaySeconds) {
+    this.initialDelaySeconds = initialDelaySeconds;
+    return this;
+  }
+
+  public Integer getPeriodSeconds() {
+    return periodSeconds;
+  }
+
+  public ProbeTuning periodSeconds(Integer periodSeconds) {
+    this.periodSeconds = periodSeconds;
+    return this;
+  }
+
+  public Integer getTimeoutSeconds() {
+    return timeoutSeconds;
+  }
+
+  public ProbeTuning timeoutSeconds(Integer timeoutSeconds) {
+    this.timeoutSeconds = timeoutSeconds;
+    return this;
+  }
+
+  @Override
+  public String toString() {
+    return new ToStringBuilder(this)
+        .append("initialDelaySeconds", initialDelaySeconds)
+        .append("periodSeconds", periodSeconds)
+        .append("timeoutSeconds", timeoutSeconds)
+        .toString();
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+
+    if (o == null || getClass() != o.getClass()) return false;
+
+    ProbeTuning that = (ProbeTuning) o;
+
+    return new EqualsBuilder()
+        .append(initialDelaySeconds, that.initialDelaySeconds)
+        .append(periodSeconds, that.periodSeconds)
+        .append(timeoutSeconds, that.timeoutSeconds)
+        .isEquals();
+  }
+
+  @Override
+  public int hashCode() {
+    return new HashCodeBuilder(17, 37)
+        .append(initialDelaySeconds)
+        .append(periodSeconds)
+        .append(timeoutSeconds)
+        .toHashCode();
+  }
+}

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/ServerPod.java

@@ -9,7 +9,6 @@
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 import io.kubernetes.client.models.V1EnvVar;
-import io.kubernetes.client.models.V1Probe;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -42,7 +41,7 @@ class ServerPod {
   @SerializedName("livenessProbe")
   @Expose
   @Description("Settings for the liveness probe associated with a server")
-  private V1Probe livenessProbe = new V1Probe();
+  private ProbeTuning livenessProbeTuning = new ProbeTuning();
 
   /**
    * Defines the settings for the readiness probe. Any that are not specified will default to the
@@ -53,14 +52,25 @@ class ServerPod {
   @SerializedName("readinessProbe")
   @Expose
   @Description("Settings for the readiness probe associated with a server")
-  private V1Probe readinessProbe = new V1Probe();
+  private ProbeTuning readinessProbeTuning = new ProbeTuning();
 
-  V1Probe getReadinessProbe() {
-    return this.readinessProbe;
+  ProbeTuning getReadinessProbeTuning() {
+    return this.readinessProbeTuning;
   }
 
-  void setReadinessProbe(Integer initialDelay, Integer timeout, Integer period) {
-    this.readinessProbe
+  void setReadinessProbeTuning(Integer initialDelay, Integer timeout, Integer period) {
+    this.readinessProbeTuning
+        .initialDelaySeconds(initialDelay)
+        .timeoutSeconds(timeout)
+        .periodSeconds(period);
+  }
+
+  ProbeTuning getLivenessProbeTuning() {
+    return this.livenessProbeTuning;
+  }
+
+  void setLivenessProbe(Integer initialDelay, Integer timeout, Integer period) {
+    this.livenessProbeTuning
         .initialDelaySeconds(initialDelay)
         .timeoutSeconds(timeout)
         .periodSeconds(period);
@@ -72,8 +82,8 @@ boolean hasV2Fields() {
 
   void fillInFrom(ServerPod serverPod1) {
     for (V1EnvVar var : serverPod1.getV1EnvVars()) addIfMissing(var);
-    copyValues(livenessProbe, serverPod1.livenessProbe);
-    copyValues(readinessProbe, serverPod1.readinessProbe);
+    copyValues(livenessProbeTuning, serverPod1.livenessProbeTuning);
+    copyValues(readinessProbeTuning, serverPod1.readinessProbeTuning);
   }
 
   private List<V1EnvVar> getV1EnvVars() {
@@ -92,12 +102,11 @@ private boolean hasEnvVar(String name) {
     return false;
   }
 
-  private static void copyValues(V1Probe toProbe, V1Probe fromProbe) {
+  private static void copyValues(ProbeTuning toProbe, ProbeTuning fromProbe) {
     if (toProbe.getInitialDelaySeconds() == null)
-      toProbe.setInitialDelaySeconds(fromProbe.getInitialDelaySeconds());
-    if (toProbe.getTimeoutSeconds() == null)
-      toProbe.setTimeoutSeconds(fromProbe.getTimeoutSeconds());
-    if (toProbe.getPeriodSeconds() == null) toProbe.setPeriodSeconds(fromProbe.getPeriodSeconds());
+      toProbe.initialDelaySeconds(fromProbe.getInitialDelaySeconds());
+    if (toProbe.getTimeoutSeconds() == null) toProbe.timeoutSeconds(fromProbe.getTimeoutSeconds());
+    if (toProbe.getPeriodSeconds() == null) toProbe.periodSeconds(fromProbe.getPeriodSeconds());
   }
 
   List<V1EnvVar> getEnv() {
@@ -113,27 +122,12 @@ void setEnv(@Nullable List<V1EnvVar> env) {
     this.env = env;
   }
 
-  V1Probe getLivenessProbe() {
-    return this.livenessProbe;
-  }
-
-  void setLivenessProbe(Integer initialDelay, Integer timeout, Integer period) {
-    this.livenessProbe
-        .initialDelaySeconds(initialDelay)
-        .timeoutSeconds(timeout)
-        .periodSeconds(period);
-  }
-
   @Override
   public String toString() {
     return new ToStringBuilder(this)
         .append("env", env)
-        .append("livenessProbe.initialDelaySeconds", livenessProbe.getInitialDelaySeconds())
-        .append("livenessProbe.timeoutSeconds", livenessProbe.getTimeoutSeconds())
-        .append("livenessProbe.periodSeconds", livenessProbe.getPeriodSeconds())
-        .append("readinessProbeProbe.initialDelaySeconds", readinessProbe.getInitialDelaySeconds())
-        .append("readinessProbe.timeoutSeconds", readinessProbe.getTimeoutSeconds())
-        .append("readinessProbe.periodSeconds", readinessProbe.getPeriodSeconds())
+        .append("livenessProbe", livenessProbeTuning)
+        .append("readinessProbe", readinessProbeTuning)
         .toString();
   }
 
@@ -147,17 +141,17 @@ public boolean equals(Object o) {
 
     return new EqualsBuilder()
         .append(env, that.env)
-        .append(livenessProbe, that.livenessProbe)
-        .append(readinessProbe, that.readinessProbe)
+        .append(livenessProbeTuning, that.livenessProbeTuning)
+        .append(readinessProbeTuning, that.readinessProbeTuning)
         .isEquals();
   }
 
   @Override
   public int hashCode() {
     return new HashCodeBuilder(17, 37)
         .append(env)
-        .append(livenessProbe)
-        .append(readinessProbe)
+        .append(livenessProbeTuning)
+        .append(readinessProbeTuning)
         .toHashCode();
   }
 }

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/ServerSpecV2Impl.java

@@ -9,7 +9,6 @@
 import static oracle.kubernetes.weblogic.domain.v2.ConfigurationConstants.START_NEVER;
 
 import io.kubernetes.client.models.V1EnvVar;
-import io.kubernetes.client.models.V1Probe;
 import java.util.List;
 import java.util.Optional;
 import javax.annotation.Nonnull;
@@ -85,13 +84,13 @@ private String getEffectiveServerStartPolicy() {
 
   @Nonnull
   @Override
-  public V1Probe getLivenessProbe() {
+  public ProbeTuning getLivenessProbe() {
     return server.getLivenessProbe();
   }
 
   @Nonnull
   @Override
-  public V1Probe getReadinessProbe() {
+  public ProbeTuning getReadinessProbe() {
     return server.getReadinessProbe();
   }
 }

model/src/test/java/oracle/kubernetes/weblogic/domain/v1/DomainV1Test.java

@@ -17,10 +17,10 @@
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertThat;
 
-import io.kubernetes.client.models.V1Probe;
 import oracle.kubernetes.weblogic.domain.AdminServerConfigurator;
 import oracle.kubernetes.weblogic.domain.DomainConfigurator;
 import oracle.kubernetes.weblogic.domain.DomainTestBase;
+import oracle.kubernetes.weblogic.domain.v2.ProbeTuning;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -235,20 +235,20 @@ public void domainV2Objects_areNull() {
   @Test
   public void livenessProbeSettings_returnsNullValues() {
     ServerSpec spec = domain.getServer(SERVER1, CLUSTER_NAME);
-    V1Probe probe = spec.getLivenessProbe();
+    ProbeTuning probe = spec.getLivenessProbe();
 
     assertThat(probe.getInitialDelaySeconds(), nullValue());
-    assertThat(probe.getFailureThreshold(), nullValue());
+    assertThat(probe.getTimeoutSeconds(), nullValue());
     assertThat(probe.getPeriodSeconds(), nullValue());
   }
 
   @Test
   public void readinessProbeSettings_returnsNullValues() {
     ServerSpec spec = domain.getServer(SERVER1, CLUSTER_NAME);
-    V1Probe probe = spec.getReadinessProbe();
+    ProbeTuning probe = spec.getReadinessProbe();
 
     assertThat(probe.getInitialDelaySeconds(), nullValue());
-    assertThat(probe.getFailureThreshold(), nullValue());
+    assertThat(probe.getTimeoutSeconds(), nullValue());
     assertThat(probe.getPeriodSeconds(), nullValue());
   }