diff --git a/SingularityExecutor/src/main/java/com/hubspot/singularity/executor/models/LogrotateCompressionSettings.java b/SingularityExecutor/src/main/java/com/hubspot/singularity/executor/config/LogrotateCompressionSettings.java similarity index 75% rename from SingularityExecutor/src/main/java/com/hubspot/singularity/executor/models/LogrotateCompressionSettings.java rename to SingularityExecutor/src/main/java/com/hubspot/singularity/executor/config/LogrotateCompressionSettings.java index 960c59e8de..4ce57ccd55 100644 --- a/SingularityExecutor/src/main/java/com/hubspot/singularity/executor/models/LogrotateCompressionSettings.java +++ b/SingularityExecutor/src/main/java/com/hubspot/singularity/executor/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 compressOptions = Optional.absent(); private Optional compressExt = Optional.absent(); - public LogrotateCompressionSettings(Optional compressCmd, Optional uncompressCmd, Optional compressOptions, Optional compressExt) { + @JsonCreator + public LogrotateCompressionSettings(@JsonProperty("compressCmd") Optional compressCmd, + @JsonProperty("uncompressCmd") Optional uncompressCmd, + @JsonProperty("compressOptions") Optional compressOptions, + @JsonProperty("compressExt") Optional compressExt) { this.compressCmd = compressCmd; this.uncompressCmd = uncompressCmd; this.compressOptions = compressOptions; diff --git a/SingularityExecutor/src/main/java/com/hubspot/singularity/executor/config/SingularityExecutorConfiguration.java b/SingularityExecutor/src/main/java/com/hubspot/singularity/executor/config/SingularityExecutorConfiguration.java index 67a914f06b..418de82843 100644 --- a/SingularityExecutor/src/main/java/com/hubspot/singularity/executor/config/SingularityExecutorConfiguration.java +++ b/SingularityExecutor/src/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/SingularityExecutor/src/main/java/com/hubspot/singularity/executor/models/LogrotateTemplateContext.java b/SingularityExecutor/src/main/java/com/hubspot/singularity/executor/models/LogrotateTemplateContext.java index 36ab519f40..87fb5244fe 100644 --- a/SingularityExecutor/src/main/java/com/hubspot/singularity/executor/models/LogrotateTemplateContext.java +++ b/SingularityExecutor/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;