diff --git a/snd/src/org/labkey/snd/PropertyDescriptorMixin.java b/snd/src/org/labkey/snd/PropertyDescriptorMixin.java index 8efa931e3..42ab0ad05 100644 --- a/snd/src/org/labkey/snd/PropertyDescriptorMixin.java +++ b/snd/src/org/labkey/snd/PropertyDescriptorMixin.java @@ -17,7 +17,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import org.labkey.api.gwt.client.util.StringProperty; /** * Configures the fields that are not returned when serializing a GWTPropertyDescriptor. @@ -44,7 +43,7 @@ }) public abstract class PropertyDescriptorMixin { - PropertyDescriptorMixin(@JsonProperty("URL") StringProperty url) + PropertyDescriptorMixin(@JsonProperty("URL") String url) { } @JsonProperty("URL") abstract void setURL(String url); // rename property on deserialize diff --git a/snd/src/org/labkey/snd/PropertyValidatorMixin.java b/snd/src/org/labkey/snd/PropertyValidatorMixin.java index f7890a5fd..46af07b56 100644 --- a/snd/src/org/labkey/snd/PropertyValidatorMixin.java +++ b/snd/src/org/labkey/snd/PropertyValidatorMixin.java @@ -19,9 +19,7 @@ /** * Configures the fields that are not returned when serializing a GWTPropertyValidator. - * Ideally we would just add the @JsonIgnore annotations to GWTPropertyValidator directly, - * but the GWT compiler would need to have jackson on the classpath which isn't - * necessary. + * Ideally we would just add the @JsonIgnore annotations to GWTPropertyValidator directly. */ @JsonIgnoreProperties({ "type" // Done outside jackson diff --git a/snprc_scheduler/src/org/labkey/snprc_scheduler/SNPRC_schedulerManager.java b/snprc_scheduler/src/org/labkey/snprc_scheduler/SNPRC_schedulerManager.java index 57ae4a741..0143ff089 100644 --- a/snprc_scheduler/src/org/labkey/snprc_scheduler/SNPRC_schedulerManager.java +++ b/snprc_scheduler/src/org/labkey/snprc_scheduler/SNPRC_schedulerManager.java @@ -1,6 +1,6 @@ package org.labkey.snprc_scheduler; -import jakarta.validation.constraints.NotNull; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.labkey.api.action.ApiUsageException; import org.labkey.api.data.CompareType; @@ -43,7 +43,7 @@ import java.util.Map; import java.util.Set; -import static org.labkey.api.exp.api.ExperimentService.asInteger; +import static org.labkey.api.util.IntegerUtils.asInteger; public class SNPRC_schedulerManager {