diff --git a/src/main/java/edu/stanford/protege/webprotege/linearizationservice/model/LinearizationDefinition.java b/src/main/java/edu/stanford/protege/webprotege/linearizationservice/model/LinearizationDefinition.java index 3b0ccb9..db26075 100644 --- a/src/main/java/edu/stanford/protege/webprotege/linearizationservice/model/LinearizationDefinition.java +++ b/src/main/java/edu/stanford/protege/webprotege/linearizationservice/model/LinearizationDefinition.java @@ -6,13 +6,13 @@ public class LinearizationDefinition { - @JsonProperty("Id") - private final String id; + @JsonProperty("linearizationId") + private final String linearizationId; - @JsonProperty("whoficEntityIri") - private final String whoficEntityIri; + @JsonProperty("linearizationUri") + private final String linearizationUri; - @JsonProperty("Description") + @JsonProperty("description") private final String description; @JsonProperty("linearizationMode") @@ -27,7 +27,7 @@ public class LinearizationDefinition { @JsonProperty("sortingCode") private final String sortingCode; - @JsonProperty("DisplayLabel") + @JsonProperty("displayLabel") private final String displayLabel; @JsonProperty("oldId") @@ -35,17 +35,17 @@ public class LinearizationDefinition { @JsonCreator - public LinearizationDefinition(@JsonProperty("Id") String id, - @JsonProperty("whoficEntityIri") String whoficEntityIri, + public LinearizationDefinition(@JsonProperty("linearizationId") String linearizationId, + @JsonProperty("linearizationUri") String linearizationUri, @JsonProperty("oldId") String oldId, - @JsonProperty("Description")String description, - @JsonProperty("LinearizationMode") String linearizationMode, - @JsonProperty("DisplayLabel") String displayLabel, + @JsonProperty("description")String description, + @JsonProperty("linearizationMode") String linearizationMode, + @JsonProperty("displayLabel") String displayLabel, @JsonProperty("rootId") String rootId, @JsonProperty("CoreLinId") String coreLinId, @JsonProperty("sortingCode") String sortingCode) { - this.id = id; - this.whoficEntityIri = whoficEntityIri; + this.linearizationId = linearizationId; + this.linearizationUri = linearizationUri; this.description = description; this.linearizationMode = linearizationMode; this.rootId = rootId; @@ -55,12 +55,12 @@ public LinearizationDefinition(@JsonProperty("Id") String id, this.displayLabel = displayLabel; } - public String getId() { - return id; + public String getLinearizationId() { + return linearizationId; } - public String getWhoficEntityIri() { - return whoficEntityIri; + public String getLinearizationUri() { + return linearizationUri; } public String getLinearizationMode() { diff --git a/src/main/java/edu/stanford/protege/webprotege/linearizationservice/uiHistoryConcern/diff/Revision2DiffElementsTranslator.java b/src/main/java/edu/stanford/protege/webprotege/linearizationservice/uiHistoryConcern/diff/Revision2DiffElementsTranslator.java index d087f89..6aee3eb 100644 --- a/src/main/java/edu/stanford/protege/webprotege/linearizationservice/uiHistoryConcern/diff/Revision2DiffElementsTranslator.java +++ b/src/main/java/edu/stanford/protege/webprotege/linearizationservice/uiHistoryConcern/diff/Revision2DiffElementsTranslator.java @@ -26,10 +26,10 @@ private DiffElement toE List linearizationDefinitions) { var lineElement = LinearizationEventsForView.create(viewName, linearizationEvents); LinearizationDocumentChange sourceDocument; - var optionalDefView = linearizationDefinitions.stream().filter(definition -> definition.getWhoficEntityIri().equals(viewName)).findFirst(); + var optionalDefView = linearizationDefinitions.stream().filter(definition -> definition.getLinearizationUri().equals(viewName)).findFirst(); if (optionalDefView.isPresent()) { var defView = optionalDefView.get(); - sourceDocument = LinearizationDocumentChange.create(defView.getWhoficEntityIri(), defView.getDisplayLabel(), defView.getId(), defView.getSortingCode()); + sourceDocument = LinearizationDocumentChange.create(defView.getLinearizationUri(), defView.getDisplayLabel(), defView.getLinearizationId(), defView.getSortingCode()); } else { sourceDocument = LinearizationDocumentChange.create(null, "Residuals", null, "ZZZZZZZZZZ"); }