change to healthcheckProtocol, use enum for protocol

HubSpot · Jun 16, 2015 · 90ed855 · 90ed855
1 parent ae31a40
commit 90ed855
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 15 deletions.
diff --git a/SingularityBase/src/main/java/com/hubspot/singularity/HealthcheckProtocol.java b/SingularityBase/src/main/java/com/hubspot/singularity/HealthcheckProtocol.java
@@ -0,0 +1,7 @@
+package com.hubspot.singularity;
+
+public enum HealthcheckProtocol {
+
+  http, https;
+
+}
diff --git a/SingularityBase/src/main/java/com/hubspot/singularity/SingularityDeploy.java b/SingularityBase/src/main/java/com/hubspot/singularity/SingularityDeploy.java
@@ -43,7 +43,7 @@ public class SingularityDeploy {
   private final Optional<Long> healthcheckIntervalSeconds;
   private final Optional<Long> healthcheckTimeoutSeconds;
   private final Optional<Boolean> skipHealthchecksOnDeploy;
-  private final Optional<String> healthcheckScheme;
+  private final Optional<HealthcheckProtocol> healthcheckProtocol;
 
   private final Optional<Long> deployHealthTimeoutSeconds;
 
@@ -83,7 +83,7 @@ public SingularityDeploy(@JsonProperty("requestId") String requestId,
       @JsonProperty("considerHealthyAfterRunningForSeconds") Optional<Long> considerHealthyAfterRunningForSeconds,
       @JsonProperty("loadBalancerOptions") Optional<Map<String, Object>> loadBalancerOptions,
       @JsonProperty("skipHealthchecksOnDeploy") Optional<Boolean> skipHealthchecksOnDeploy,
-      @JsonProperty("healthCheckScheme") Optional<String> healthcheckScheme) {
+      @JsonProperty("healthCheckScheme") Optional<HealthcheckProtocol> healthcheckProtocol) {
     this.requestId = requestId;
 
     this.command = command;
@@ -109,7 +109,7 @@ public SingularityDeploy(@JsonProperty("requestId") String requestId,
     this.healthcheckIntervalSeconds = healthcheckIntervalSeconds;
     this.healthcheckTimeoutSeconds = healthcheckTimeoutSeconds;
     this.skipHealthchecksOnDeploy = skipHealthchecksOnDeploy;
-    this.healthcheckScheme = healthcheckScheme;
+    this.healthcheckProtocol = healthcheckProtocol;
 
     this.considerHealthyAfterRunningForSeconds = considerHealthyAfterRunningForSeconds;
 
@@ -134,7 +134,7 @@ public SingularityDeployBuilder toBuilder() {
     .setHealthcheckIntervalSeconds(healthcheckIntervalSeconds)
     .setHealthcheckTimeoutSeconds(healthcheckTimeoutSeconds)
     .setSkipHealthchecksOnDeploy(skipHealthchecksOnDeploy)
-    .setHealthcheckScheme(healthcheckScheme)
+    .setHealthcheckProtocol(healthcheckProtocol)
 
     .setConsiderHealthyAfterRunningForSeconds(considerHealthyAfterRunningForSeconds)
     .setDeployHealthTimeoutSeconds(deployHealthTimeoutSeconds)
@@ -239,8 +239,8 @@ public Optional<String> getHealthcheckUri() {
   }
 
   @ApiModelProperty(required=false, value="Healthcheck scheme")
-  public Optional<String> getHealthcheckScheme() {
-    return healthcheckScheme;
+  public Optional<HealthcheckProtocol> getHealthcheckProtocol() {
+    return healthcheckProtocol;
   }
 
   @ApiModelProperty(required=false, value="Health check interval in seconds.")
@@ -303,7 +303,7 @@ public String toString() {
         ", skipHealthchecksOnDeploy=" + skipHealthchecksOnDeploy +
         ", deployHealthTimeoutSeconds=" + deployHealthTimeoutSeconds +
         ", considerHealthyAfterRunningForSeconds=" + considerHealthyAfterRunningForSeconds +
-        ", healthcheckScheme=" + healthcheckScheme +
+        ", healthcheckProtocol=" + healthcheckProtocol +
         ", serviceBasePath=" + serviceBasePath +
         ", loadBalancerGroups=" + loadBalancerGroups +
         ", loadBalancerOptions=" + loadBalancerOptions +

diff --git a/SingularityBase/src/main/java/com/hubspot/singularity/SingularityDeployBuilder.java b/SingularityBase/src/main/java/com/hubspot/singularity/SingularityDeployBuilder.java
@@ -37,7 +37,7 @@ public class SingularityDeployBuilder {
   private Optional<Long> healthcheckIntervalSeconds;
   private Optional<Long> healthcheckTimeoutSeconds;
   private Optional<Boolean> skipHealthchecksOnDeploy;
-  private Optional<String> healthcheckScheme;
+  private Optional<HealthcheckProtocol> healthcheckProtocol;
 
   private Optional<Long> deployHealthTimeoutSeconds;
 
@@ -69,7 +69,7 @@ public SingularityDeployBuilder(String requestId, String id) {
     this.healthcheckTimeoutSeconds = Optional.absent();
     this.skipHealthchecksOnDeploy = Optional.absent();
     this.deployHealthTimeoutSeconds = Optional.absent();
-    this.healthcheckScheme = Optional.absent();
+    this.healthcheckProtocol = Optional.absent();
     this.considerHealthyAfterRunningForSeconds = Optional.absent();
     this.serviceBasePath = Optional.absent();
     this.loadBalancerGroups = Optional.absent();
@@ -78,7 +78,7 @@ public SingularityDeployBuilder(String requestId, String id) {
 
   public SingularityDeploy build() {
     return new SingularityDeploy(requestId, id, command, arguments, containerInfo, customExecutorCmd, customExecutorId, customExecutorSource, customExecutorResources, resources, env, uris, metadata, executorData, version, timestamp, deployHealthTimeoutSeconds, healthcheckUri, healthcheckIntervalSeconds,
-        healthcheckTimeoutSeconds, serviceBasePath, loadBalancerGroups, considerHealthyAfterRunningForSeconds, loadBalancerOptions, skipHealthchecksOnDeploy, healthcheckScheme);
+        healthcheckTimeoutSeconds, serviceBasePath, loadBalancerGroups, considerHealthyAfterRunningForSeconds, loadBalancerOptions, skipHealthchecksOnDeploy, healthcheckProtocol);
   }
 
   public String getRequestId() {
@@ -301,12 +301,12 @@ public SingularityDeployBuilder setSkipHealthchecksOnDeploy(Optional<Boolean> sk
     return this;
   }
 
-  public Optional<String> getHealthcheckScheme() {
-    return healthcheckScheme;
+  public Optional<HealthcheckProtocol> getHealthcheckProtocol() {
+    return healthcheckProtocol;
   }
 
-  public SingularityDeployBuilder setHealthcheckScheme(Optional<String> healthcheckScheme) {
-    this.healthcheckScheme = healthcheckScheme;
+  public SingularityDeployBuilder setHealthcheckProtocol(Optional<HealthcheckProtocol> healthcheckProtocol) {
+    this.healthcheckProtocol = healthcheckProtocol;
     return this;
   }
 
@@ -335,7 +335,7 @@ public String toString() {
         ", skipHealthchecksOnDeploy=" + skipHealthchecksOnDeploy +
         ", deployHealthTimeoutSeconds=" + deployHealthTimeoutSeconds +
         ", considerHealthyAfterRunningForSeconds=" + considerHealthyAfterRunningForSeconds +
-        ", healthcheckScheme=" + healthcheckScheme +
+        ", healthcheckProtocol=" + healthcheckProtocol +
         ", serviceBasePath=" + serviceBasePath +
         ", loadBalancerGroups=" + loadBalancerGroups +
         ", loadBalancerOptions=" + loadBalancerOptions +