Skip to content

Update JSON serialization for GWT removal #930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
labkey-jeckels wants to merge 4 commits into
base: develop
Choose a base branch
from
+4 −7
Open

Update JSON serialization for GWT removal #930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7fce16
Delete GWT
labkey-jeckels Apr 30, 2026
7aedaa3
Merge branch 'develop' into fb_gwtDelete
labkey-jeckels May 8, 2026
70186fd
Delete GWT
labkey-jeckels May 8, 2026
2a7a52a
Update comment
labkey-jeckels May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions snd/src/org/labkey/snd/PropertyDescriptorMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
4 changes: 1 addition & 3 deletions snd/src/org/labkey/snd/PropertyValidatorMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions snprc_scheduler/src/org/labkey/snprc_scheduler/SNPRC_schedulerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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
{
Expand Down
Loading