From 4085be6cd436ac40358b51d9a42b370e847d6723 Mon Sep 17 00:00:00 2001 From: Automated Version Bump Date: Mon, 17 Jun 2024 11:23:23 +0000 Subject: [PATCH 1/3] ci: version bump 1.0.22 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 13de60c..9926150 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ edu.stanford.protege webprotege-backend-api - 1.0.21 + 1.0.22 UTF-8 From ce3e479b90a3be4f8075e69930fe99247fdbd8fb Mon Sep 17 00:00:00 2001 From: soimugeoWB <149394944+soimugeoWB@users.noreply.github.com> Date: Tue, 18 Jun 2024 13:15:24 +0300 Subject: [PATCH 2/3] Support retirement of classes #7 (#14) Co-authored-by: Gheorghe Soimu --- .../webprotege/bulkop/ChangeEntityParentsResult.java | 3 ++- .../protege/webprotege/entity/EntityStatus.java | 10 ++++++---- .../entity/EntityNode_Serialization_TestCase.java | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/edu/stanford/protege/webprotege/bulkop/ChangeEntityParentsResult.java b/src/main/java/edu/stanford/protege/webprotege/bulkop/ChangeEntityParentsResult.java index fcd9954..2568f71 100644 --- a/src/main/java/edu/stanford/protege/webprotege/bulkop/ChangeEntityParentsResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/bulkop/ChangeEntityParentsResult.java @@ -16,6 +16,7 @@ @JsonTypeName("webprotege.entities.ChangeEntityParents") -public record ChangeEntityParentsResult(@JsonProperty("classesWithCycle") @Nonnull Set classesWithCycle) implements Result { +public record ChangeEntityParentsResult(@JsonProperty("classesWithCycle") @Nonnull Set classesWithCycle, + @JsonProperty("classesWithRetiredParents") @Nonnull Set classesWithRetiredParents) implements Result { } diff --git a/src/main/java/edu/stanford/protege/webprotege/entity/EntityStatus.java b/src/main/java/edu/stanford/protege/webprotege/entity/EntityStatus.java index 46f3ff7..57708cb 100644 --- a/src/main/java/edu/stanford/protege/webprotege/entity/EntityStatus.java +++ b/src/main/java/edu/stanford/protege/webprotege/entity/EntityStatus.java @@ -1,6 +1,7 @@ package edu.stanford.protege.webprotege.entity; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import com.google.auto.value.AutoValue; import javax.annotation.Nonnull; @@ -9,17 +10,18 @@ @AutoValue public abstract class EntityStatus implements Serializable, Comparable { + public static final String STATUS = "status"; + @JsonCreator - public static EntityStatus get(@Nonnull @JsonProperty("status") String status) { + public static EntityStatus get(@Nonnull @JsonProperty(STATUS) String status) { return new AutoValue_EntityStatus(status); } - @JsonProperty("status") + @JsonProperty(STATUS) @Nonnull public abstract String getStatus(); - @Override public int compareTo(EntityStatus o) { return this.getStatus().compareToIgnoreCase(o.getStatus()); diff --git a/src/test/java/edu/stanford/protege/webprotege/entity/EntityNode_Serialization_TestCase.java b/src/test/java/edu/stanford/protege/webprotege/entity/EntityNode_Serialization_TestCase.java index 33fd951..8c00564 100644 --- a/src/test/java/edu/stanford/protege/webprotege/entity/EntityNode_Serialization_TestCase.java +++ b/src/test/java/edu/stanford/protege/webprotege/entity/EntityNode_Serialization_TestCase.java @@ -36,7 +36,7 @@ public void shouldSerializeNode() throws IOException { "The tag description", Color.getWhite(), Color.getWhite(), ImmutableList.of())), - ImmutableSet.of()); + ImmutableSet.of(EntityStatus.get("status"))); } } From 43ca4923339c262a4660c1c9c2320ad5a72abe38 Mon Sep 17 00:00:00 2001 From: Automated Version Bump Date: Tue, 18 Jun 2024 10:15:50 +0000 Subject: [PATCH 3/3] ci: version bump 1.0.23 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9926150..50aeede 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ edu.stanford.protege webprotege-backend-api - 1.0.22 + 1.0.23 UTF-8