From 551a5a2a6726c2b458d045bd0ac45c8a297cb717 Mon Sep 17 00:00:00 2001 From: Bogdan Kostov Date: Tue, 14 May 2024 11:09:44 +0200 Subject: [PATCH] [Fix kbss-cvut/fta-fmea-ui#284] Set simpleLiteral annotation parameter to to true to specify non language strings in JOPA model. --- src/main/java/cz/cvut/kbss/analysis/model/User.java | 4 ++-- src/main/java/cz/cvut/kbss/analysis/model/ava/ATASystem.java | 4 +--- .../java/cz/cvut/kbss/analysis/model/ava/FHAEventType.java | 2 +- .../cz/cvut/kbss/analysis/model/ava/IndependentSNSItem.java | 4 ++-- .../java/cz/cvut/kbss/analysis/model/ava/SNSComponent.java | 2 +- .../cz/cvut/kbss/analysis/model/method/EstimationMethod.java | 2 +- .../cvut/kbss/analysis/model/method/VerificationMethod.java | 2 +- 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/main/java/cz/cvut/kbss/analysis/model/User.java b/src/main/java/cz/cvut/kbss/analysis/model/User.java index 23d1dde0..1ddd1a96 100755 --- a/src/main/java/cz/cvut/kbss/analysis/model/User.java +++ b/src/main/java/cz/cvut/kbss/analysis/model/User.java @@ -26,13 +26,13 @@ public class User extends AbstractEntity implements UserDetails { @NotEmpty(message = "Username must not be empty") @ParticipationConstraints(nonEmpty = true) - @OWLDataProperty(iri = Vocabulary.s_p_username) + @OWLDataProperty(iri = Vocabulary.s_p_username, simpleLiteral = true) private String username; @NotEmpty(message = "Password must not be empty") @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) @ParticipationConstraints(nonEmpty = true) - @OWLDataProperty(iri = Vocabulary.s_p_password) + @OWLDataProperty(iri = Vocabulary.s_p_password, simpleLiteral = true) private String password; @Transient diff --git a/src/main/java/cz/cvut/kbss/analysis/model/ava/ATASystem.java b/src/main/java/cz/cvut/kbss/analysis/model/ava/ATASystem.java index a18d5d5a..b8c5604d 100644 --- a/src/main/java/cz/cvut/kbss/analysis/model/ava/ATASystem.java +++ b/src/main/java/cz/cvut/kbss/analysis/model/ava/ATASystem.java @@ -1,8 +1,6 @@ package cz.cvut.kbss.analysis.model.ava; import cz.cvut.kbss.analysis.model.Component; -import cz.cvut.kbss.analysis.model.Item; -import cz.cvut.kbss.analysis.model.System; import cz.cvut.kbss.analysis.util.Vocabulary; import cz.cvut.kbss.jopa.model.annotations.OWLClass; import cz.cvut.kbss.jopa.model.annotations.OWLDataProperty; @@ -17,7 +15,7 @@ @Setter public class ATASystem extends Component { - @OWLDataProperty(iri = Vocabulary.s_p_ata_code) + @OWLDataProperty(iri = Vocabulary.s_p_ata_code, simpleLiteral = true) private String ataCode; } diff --git a/src/main/java/cz/cvut/kbss/analysis/model/ava/FHAEventType.java b/src/main/java/cz/cvut/kbss/analysis/model/ava/FHAEventType.java index e5a95a4a..a4282e88 100644 --- a/src/main/java/cz/cvut/kbss/analysis/model/ava/FHAEventType.java +++ b/src/main/java/cz/cvut/kbss/analysis/model/ava/FHAEventType.java @@ -22,6 +22,6 @@ public class FHAEventType extends FaultEventType { @OWLObjectProperty(iri = Vocabulary.s_c_verification_method) private Set verificationMethods; - @OWLDataProperty(iri = Vocabulary.s_p_material_reference) + @OWLDataProperty(iri = Vocabulary.s_p_material_reference, simpleLiteral = true) private Set referencedMaterials; } diff --git a/src/main/java/cz/cvut/kbss/analysis/model/ava/IndependentSNSItem.java b/src/main/java/cz/cvut/kbss/analysis/model/ava/IndependentSNSItem.java index 57956ba1..d61732c6 100644 --- a/src/main/java/cz/cvut/kbss/analysis/model/ava/IndependentSNSItem.java +++ b/src/main/java/cz/cvut/kbss/analysis/model/ava/IndependentSNSItem.java @@ -17,9 +17,9 @@ @Getter @Setter public class IndependentSNSItem extends Item { - @OWLDataProperty(iri = Vocabulary.s_p_part_number) + @OWLDataProperty(iri = Vocabulary.s_p_part_number, simpleLiteral = true) private String partNumber; - @OWLDataProperty(iri = Vocabulary.s_p_stock) + @OWLDataProperty(iri = Vocabulary.s_p_stock, simpleLiteral = true) private String stock; } diff --git a/src/main/java/cz/cvut/kbss/analysis/model/ava/SNSComponent.java b/src/main/java/cz/cvut/kbss/analysis/model/ava/SNSComponent.java index 56ce1f1f..aacff6d6 100644 --- a/src/main/java/cz/cvut/kbss/analysis/model/ava/SNSComponent.java +++ b/src/main/java/cz/cvut/kbss/analysis/model/ava/SNSComponent.java @@ -21,7 +21,7 @@ public class SNSComponent extends Component { @OWLDataProperty(iri = Vocabulary.s_p_quantity) private Integer quantity; - @OWLDataProperty(iri = Vocabulary.s_p_schematic_designation) + @OWLDataProperty(iri = Vocabulary.s_p_schematic_designation, simpleLiteral = true) private Set schematicDescription; } diff --git a/src/main/java/cz/cvut/kbss/analysis/model/method/EstimationMethod.java b/src/main/java/cz/cvut/kbss/analysis/model/method/EstimationMethod.java index a895a004..e6e0be25 100644 --- a/src/main/java/cz/cvut/kbss/analysis/model/method/EstimationMethod.java +++ b/src/main/java/cz/cvut/kbss/analysis/model/method/EstimationMethod.java @@ -7,6 +7,6 @@ @OWLClass(iri = Vocabulary.s_c_failure_rate_general_estimation_method) public class EstimationMethod extends NamedEntity { - @OWLDataProperty(iri = Vocabulary.s_p_code) + @OWLDataProperty(iri = Vocabulary.s_p_code, simpleLiteral = true) public String code; } diff --git a/src/main/java/cz/cvut/kbss/analysis/model/method/VerificationMethod.java b/src/main/java/cz/cvut/kbss/analysis/model/method/VerificationMethod.java index 442bc6b8..0d4494c3 100644 --- a/src/main/java/cz/cvut/kbss/analysis/model/method/VerificationMethod.java +++ b/src/main/java/cz/cvut/kbss/analysis/model/method/VerificationMethod.java @@ -11,6 +11,6 @@ @Getter @Setter public class VerificationMethod extends NamedEntity { - @OWLDataProperty(iri = Vocabulary.s_p_code) + @OWLDataProperty(iri = Vocabulary.s_p_code, simpleLiteral = true) public String code; }