[kbss-cvut/termit-ui#553] Add language to File.

kbss-cvut · Nov 7, 2024 · 4d9c4e8 · 4d9c4e8
1 parent 7833816
commit 4d9c4e8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/src/main/java/cz/cvut/kbss/termit/model/resource/File.java b/src/main/java/cz/cvut/kbss/termit/model/resource/File.java
@@ -21,16 +21,16 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import cz.cvut.kbss.jopa.model.annotations.FetchType;
 import cz.cvut.kbss.jopa.model.annotations.Inferred;
+import cz.cvut.kbss.jopa.model.annotations.OWLAnnotationProperty;
 import cz.cvut.kbss.jopa.model.annotations.OWLClass;
 import cz.cvut.kbss.jopa.model.annotations.OWLObjectProperty;
 import cz.cvut.kbss.jopa.model.annotations.Types;
+import cz.cvut.kbss.jopa.vocabulary.DC;
 import cz.cvut.kbss.jsonld.annotation.JsonLdAttributeOrder;
-import cz.cvut.kbss.termit.exception.TermItException;
 import cz.cvut.kbss.termit.model.util.SupportsStorage;
 import cz.cvut.kbss.termit.service.IdentifierResolver;
 import cz.cvut.kbss.termit.util.Vocabulary;
 
-import java.lang.reflect.Field;
 import java.util.Objects;
 import java.util.Set;
 
@@ -43,6 +43,9 @@ public class File extends Resource implements SupportsStorage {
     @OWLObjectProperty(iri = Vocabulary.s_p_je_casti_dokumentu, fetch = FetchType.EAGER)
     private Document document;
 
+    @OWLAnnotationProperty(iri = DC.Terms.LANGUAGE, simpleLiteral = true)
+    private String language;
+
     @Types
     private Set<String> types;
 
@@ -54,6 +57,14 @@ public void setDocument(Document document) {
         this.document = document;
     }
 
+    public String getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+
     public Set<String> getTypes() {
         return types;
     }
@@ -73,15 +84,11 @@ public boolean equals(Object o) {
         return Objects.equals(getUri(), file.getUri());
     }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(getUri());
-    }
-
     @Override
     public String toString() {
         return "File{" +
-                super.toString() + (document != null ? "document=<" + document.getUri() + ">" : "") + '}';
+                super.toString() + (language != null ? "@" + language : "") +
+                (document != null ? "document=<" + document.getUri() + ">" : "") + '}';
     }
 
     /**
@@ -109,12 +116,4 @@ public String getDirectoryName() {
             return IdentifierResolver.normalizeToAscii(labelPart) + '_' + getUri().hashCode();
         }
     }
-
-    public static Field getDocumentField() {
-        try {
-            return File.class.getDeclaredField("document");
-        } catch (NoSuchFieldException e) {
-            throw new TermItException("Fatal error! Unable to retrieve \"document\" field.", e);
-        }
-    }
 }
diff --git a/src/test/java/cz/cvut/kbss/termit/persistence/context/DescriptorFactoryTest.java b/src/test/java/cz/cvut/kbss/termit/persistence/context/DescriptorFactoryTest.java
@@ -98,15 +98,15 @@ void termDescriptorCreatesDescriptorWithExactMatchesContextSetToDefaultToAllowEx
     }
 
     @Test
-    void fileDescriptorContainsAlsoDescriptorForDocument() {
+    void fileDescriptorContainsAlsoDescriptorForDocument() throws Exception {
         final File file = Generator.generateFileWithId("test.html");
         final Document doc = Generator.generateDocumentWithId();
         doc.addFile(file);
         file.setDocument(doc);
         doc.setVocabulary(Generator.generateUri());
         final Descriptor result = sut.fileDescriptor(doc.getVocabulary());
         final FieldSpecification<?, ?> docFieldSpec = mock(FieldSpecification.class);
-        when(docFieldSpec.getJavaField()).thenReturn(File.getDocumentField());
+        when(docFieldSpec.getJavaField()).thenReturn(File.class.getDeclaredField("document"));
         final Descriptor docDescriptor = result.getAttributeDescriptor(docFieldSpec);
         assertNotNull(docDescriptor);
     }