refactored attribute names for LinearizationDefinition

who-icatx · Dec 24, 2024 · fac1fa1 · fac1fa1
1 parent 1d11ab1
commit fac1fa1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/...a/edu/stanford/protege/webprotege/linearizationservice/model/LinearizationDefinition.java b/...a/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,25 +27,25 @@ public class LinearizationDefinition {
     @JsonProperty("sortingCode")
     private final String sortingCode;
 
-    @JsonProperty("DisplayLabel")
+    @JsonProperty("displayLabel")
     private final String displayLabel;
 
     @JsonProperty("oldId")
     private final String oldId;
 
 
     @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/...ebprotege/linearizationservice/uiHistoryConcern/diff/Revision2DiffElementsTranslator.java b/...ebprotege/linearizationservice/uiHistoryConcern/diff/Revision2DiffElementsTranslator.java
@@ -26,10 +26,10 @@ private DiffElement<LinearizationDocumentChange, LinearizationEventsForView> toE
                                                                                            List<LinearizationDefinition> 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");
         }