From 4e329de5e51d3ab86aaf592609112e5e6e08a764 Mon Sep 17 00:00:00 2001 From: Bogdan Kostov Date: Tue, 14 May 2024 11:23:52 +0200 Subject: [PATCH] [Fix kbss-cvut/fta-fmea-ui#284] Set simpleLiteral annotation parameter to true on enum fields in JOPA model. --- src/main/java/cz/cvut/kbss/analysis/model/Behavior.java | 2 +- src/main/java/cz/cvut/kbss/analysis/model/DomainEntity.java | 2 +- src/main/java/cz/cvut/kbss/analysis/model/FailureMode.java | 2 +- src/main/java/cz/cvut/kbss/analysis/model/FaultEvent.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/cz/cvut/kbss/analysis/model/Behavior.java b/src/main/java/cz/cvut/kbss/analysis/model/Behavior.java index 7d90d4df..b6457785 100755 --- a/src/main/java/cz/cvut/kbss/analysis/model/Behavior.java +++ b/src/main/java/cz/cvut/kbss/analysis/model/Behavior.java @@ -17,7 +17,7 @@ public abstract class Behavior extends DomainEntity { @OWLObjectProperty(iri = Vocabulary.s_p_is_derived_from, fetch = FetchType.EAGER) protected Set supertypes; - @OWLDataProperty(iri = Vocabulary.s_p_behavior_type) + @OWLDataProperty(iri = Vocabulary.s_p_behavior_type, simpleLiteral = true) private BehaviorType behaviorType = BehaviorType.AtomicBehavior; @OWLObjectProperty(iri = Vocabulary.s_p_has_required, fetch = FetchType.EAGER) diff --git a/src/main/java/cz/cvut/kbss/analysis/model/DomainEntity.java b/src/main/java/cz/cvut/kbss/analysis/model/DomainEntity.java index 0d87de4c..cb94c24c 100644 --- a/src/main/java/cz/cvut/kbss/analysis/model/DomainEntity.java +++ b/src/main/java/cz/cvut/kbss/analysis/model/DomainEntity.java @@ -13,7 +13,7 @@ @Setter public abstract class DomainEntity extends ManagedEntity{ - @OWLDataProperty(iri = Vocabulary.s_p_has_type_category) + @OWLDataProperty(iri = Vocabulary.s_p_has_type_category, simpleLiteral = true) private TypeCategory typeCategory; public abstract Set getSupertypes(); diff --git a/src/main/java/cz/cvut/kbss/analysis/model/FailureMode.java b/src/main/java/cz/cvut/kbss/analysis/model/FailureMode.java index 034f7aba..4a58a264 100755 --- a/src/main/java/cz/cvut/kbss/analysis/model/FailureMode.java +++ b/src/main/java/cz/cvut/kbss/analysis/model/FailureMode.java @@ -10,7 +10,7 @@ @Setter public class FailureMode extends Behavior { - @OWLDataProperty(iri = Vocabulary.s_p_failure_mode_type) + @OWLDataProperty(iri = Vocabulary.s_p_failure_mode_type, simpleLiteral = true) private FailureModeType failureModeType = FailureModeType.FailureMode; @Override diff --git a/src/main/java/cz/cvut/kbss/analysis/model/FaultEvent.java b/src/main/java/cz/cvut/kbss/analysis/model/FaultEvent.java index e4a2f069..f8804907 100755 --- a/src/main/java/cz/cvut/kbss/analysis/model/FaultEvent.java +++ b/src/main/java/cz/cvut/kbss/analysis/model/FaultEvent.java @@ -39,10 +39,10 @@ public static FaultEvent create(){ @NotNull(message = "EventType must be defined") @ParticipationConstraints(nonEmpty = true) - @OWLDataProperty(iri = Vocabulary.s_p_fault_event_type) + @OWLDataProperty(iri = Vocabulary.s_p_fault_event_type, simpleLiteral = true) private FtaEventType eventType; - @OWLDataProperty(iri = Vocabulary.s_p_gate_type) + @OWLDataProperty(iri = Vocabulary.s_p_gate_type, simpleLiteral = true) private GateType gateType; @OWLObjectProperty(iri = Vocabulary.s_p_has_rectangle, fetch = FetchType.EAGER, cascade = CascadeType.ALL)