add missing @JSON* annotations

HubSpot · Aug 31, 2016 · 8a21a44 · 8a21a44 · tpetr · Sep 19, 2016
1 parent a4116f7
commit 8a21a44
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.../models/LogrotateCompressionSettings.java → .../config/LogrotateCompressionSettings.java b/.../models/LogrotateCompressionSettings.java → .../config/LogrotateCompressionSettings.java
@@ -1,5 +1,7 @@
-package com.hubspot.singularity.executor.models;
+package com.hubspot.singularity.executor.config;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Objects;
 import com.google.common.base.Optional;
 
@@ -9,7 +11,11 @@ public class LogrotateCompressionSettings {
   private Optional<String> compressOptions = Optional.absent();
   private Optional<String> compressExt = Optional.absent();
 
-  public LogrotateCompressionSettings(Optional<String> compressCmd, Optional<String> uncompressCmd, Optional<String> compressOptions, Optional<String> compressExt) {
+  @JsonCreator
+  public LogrotateCompressionSettings(@JsonProperty("compressCmd") Optional<String> compressCmd,
+                                      @JsonProperty("uncompressCmd") Optional<String> uncompressCmd,
+                                      @JsonProperty("compressOptions") Optional<String> compressOptions,
+                                      @JsonProperty("compressExt") Optional<String> compressExt) {
     this.compressCmd = compressCmd;
     this.uncompressCmd = uncompressCmd;
     this.compressOptions = compressOptions;

diff --git a/...c/main/java/com/hubspot/singularity/executor/config/SingularityExecutorConfiguration.java b/...c/main/java/com/hubspot/singularity/executor/config/SingularityExecutorConfiguration.java
@@ -17,7 +17,6 @@
 import com.google.common.base.Optional;
 import com.hubspot.mesos.MesosUtils;
 import com.hubspot.singularity.executor.SingularityExecutorLogrotateFrequency;
-import com.hubspot.singularity.executor.models.LogrotateCompressionSettings;
 import com.hubspot.singularity.executor.models.ThreadCheckerType;
 import com.hubspot.singularity.executor.shells.SingularityExecutorShellCommandDescriptor;
 import com.hubspot.singularity.runner.base.configuration.BaseRunnerConfiguration;

diff --git a/...cutor/src/main/java/com/hubspot/singularity/executor/models/LogrotateTemplateContext.java b/...cutor/src/main/java/com/hubspot/singularity/executor/models/LogrotateTemplateContext.java
@@ -6,6 +6,7 @@
 import com.google.common.base.Optional;
 import com.google.common.base.Strings;
 import com.google.common.io.Files;
+import com.hubspot.singularity.executor.config.LogrotateCompressionSettings;
 import com.hubspot.singularity.executor.config.SingularityExecutorConfiguration;
 import com.hubspot.singularity.executor.config.SingularityExecutorLogrotateAdditionalFile;
 import com.hubspot.singularity.executor.task.SingularityExecutorTaskDefinition;