Skip to content
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

fixing forms #7

Merged
merged 3 commits into from
Jun 27, 2024
Merged

fixing forms #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c29f14
fixing forms
alexsilaghi Jun 24, 2024
d1457bc
Merge branch 'main' into WHO-fix-forms
matthewhorridge Jun 27, 2024
1284b81
Added JsonAlias for descriptor
matthewhorridge Jun 27, 2024
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
4 changes: 3 additions & 1 deletion src/main/java/edu/stanford/protege/webprotege/forms/PropertyNames.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/
public interface PropertyNames {

// String DESCRIPTOR = "descriptor";
String DESCRIPTOR = "descriptor";

String CONTROL = "control";

Expand Down Expand Up @@ -131,6 +131,8 @@ public interface PropertyNames {

String FORM = "form";

String DATA = "data";

String CONTROL_DATA = "controlData";

String FIELD = "field";
Expand Down
7 changes: 2 additions & 5 deletions src/main/java/edu/stanford/protege/webprotege/forms/data/EntityNameControlData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package edu.stanford.protege.webprotege.forms.data;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.*;
import com.fasterxml.jackson.databind.PropertyName;
import com.google.auto.value.AutoValue;
import com.google.common.annotations.GwtCompatible;
Expand All @@ -25,7 +22,7 @@
public abstract class EntityNameControlData implements FormControlData {

@JsonCreator
public static EntityNameControlData get(@JsonProperty(PropertyNames.CONTROL) @Nonnull EntityNameControlDescriptor descriptor,
public static EntityNameControlData get(@JsonProperty(PropertyNames.CONTROL) @JsonAlias(PropertyNames.DESCRIPTOR) @Nonnull EntityNameControlDescriptor descriptor,
@JsonProperty(PropertyNames.ENTITY) @Nullable OWLEntity entity) {
return new AutoValue_EntityNameControlData(descriptor, entity);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/stanford/protege/webprotege/forms/data/GridControlData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public abstract class GridControlData implements ComplexFormControlValue {

@JsonCreator
@Nonnull
public static GridControlData get(@JsonProperty(PropertyNames.CONTROL) @Nonnull GridControlDescriptor descriptor,
public static GridControlData get(@JsonProperty(PropertyNames.CONTROL) @JsonAlias(PropertyNames.DESCRIPTOR) @Nonnull GridControlDescriptor descriptor,
@JsonProperty(PropertyNames.ROWS) @Nonnull Page<GridRowData> rows,
@JsonProperty(PropertyNames.ORDERING) @Nonnull ImmutableSet<FormRegionOrdering> ordering) {
return new AutoValue_GridControlData(descriptor, rows, ordering);
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/edu/stanford/protege/webprotege/forms/data/GridRowData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package edu.stanford.protege.webprotege.forms.data;

import com.fasterxml.jackson.annotation.*;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
import edu.stanford.protege.webprotege.forms.PropertyNames;
Expand All @@ -17,6 +19,7 @@
@AutoValue
public abstract class GridRowData implements Comparable<GridRowData> {

@JsonCreator
public static GridRowData get(@JsonProperty(PropertyNames.SUBJECT) @Nullable FormEntitySubject subject,
@JsonProperty(PropertyNames.CELLS) @Nonnull ImmutableList<GridCellData> cellData) {
return new AutoValue_GridRowData(subject, cellData);
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/edu/stanford/protege/webprotege/forms/data/MultiChoiceControlData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package edu.stanford.protege.webprotege.forms.data;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.google.auto.value.AutoValue;
Expand All @@ -19,6 +20,7 @@
@JsonTypeName("MultiChoiceControlData")
public abstract class MultiChoiceControlData implements FormControlData {

@JsonCreator
public static MultiChoiceControlData get(@JsonProperty(PropertyNames.CONTROL) @Nonnull MultiChoiceControlDescriptor descriptor,
@JsonProperty(PropertyNames.VALUES) @Nonnull ImmutableList<PrimitiveFormControlData> values) {
return new AutoValue_MultiChoiceControlData(descriptor, values);
Expand Down
7 changes: 2 additions & 5 deletions src/main/java/edu/stanford/protege/webprotege/forms/data/NumberControlData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package edu.stanford.protege.webprotege.forms.data;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.*;
import com.google.auto.value.AutoValue;
import edu.stanford.protege.webprotege.forms.PropertyNames;
import edu.stanford.protege.webprotege.forms.field.NumberControlDescriptor;
Expand All @@ -24,7 +21,7 @@
public abstract class NumberControlData implements FormControlData {

@JsonCreator
public static NumberControlData get(@JsonProperty(PropertyNames.CONTROL) @Nonnull NumberControlDescriptor descriptor,
public static NumberControlData get(@JsonProperty(PropertyNames.CONTROL) @JsonAlias(PropertyNames.DESCRIPTOR) @Nonnull NumberControlDescriptor descriptor,
@JsonProperty(PropertyNames.VALUE) @Nullable OWLLiteral value) {
return new AutoValue_NumberControlData(descriptor, value);
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/edu/stanford/protege/webprotege/forms/data/SingleChoiceControlData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
public abstract class SingleChoiceControlData implements FormControlData {

@JsonCreator
public static SingleChoiceControlData get(@JsonProperty(PropertyNames.CONTROL) @Nonnull SingleChoiceControlDescriptor descriptor,
public static SingleChoiceControlData get(@JsonProperty(PropertyNames.CONTROL) @JsonAlias(PropertyNames.DESCRIPTOR) @Nonnull SingleChoiceControlDescriptor descriptor,
@JsonProperty(PropertyNames.CHOICE) @Nullable PrimitiveFormControlData choice) {

return new AutoValue_SingleChoiceControlData(descriptor, choice);
Expand All @@ -38,6 +38,7 @@ public void accept(@Nonnull FormControlDataVisitor visitor) {

@JsonProperty(PropertyNames.CONTROL)
@Nonnull
@JsonAlias(PropertyNames.DESCRIPTOR)
public abstract SingleChoiceControlDescriptor getDescriptor();

@JsonProperty(PropertyNames.CHOICE)
Expand Down
Loading