Refactor

Author: blcham

src/main/java/og_spipes/service/util/TransformerImpl.java

@@ -215,7 +215,7 @@ public Map<String, Model> form2Script(Model inputScript, Question form, String m
 
                 if (s != null) {
                     final Model m = extractModel(s);
-                    final String uri = ((OntModel) inputScript).getBaseModel().listStatements(null, RDF.type, OWL.Ontology).next().getSubject().getURI();
+                    final String uri = getOntologyUri(inputScript);
                     if (!changed.containsKey(uri)) {
                         changed.put(uri, ModelFactory.createDefaultModel().add(m instanceof OntModel ? ((OntModel) m).getBaseModel() : m));
                     }
@@ -266,13 +266,13 @@ public Map<String, Model> form2Script(Model inputScript, Question form, String m
                 RDFNode answerNode = getAnswerNode(getAnswer(q).orElse(null));
                 handleFormUpdate(answerNode, m, q, newUri);
             });
-            changed.put(((OntModel) inputScript).getBaseModel().listStatements(null, RDF.type, OWL.Ontology).next().getSubject().getURI(), m);
+            changed.put(getOntologyUri(inputScript), m);
         }
 
         if (ttlChanged) {
             ttlModel.map(m ->
                     changed.put(
-                            m.listStatements(null, RDF.type, OWL.Ontology).next().getSubject().getURI(),
+                            getOntologyUri(m),
                             m
                     )
             );
@@ -494,7 +494,7 @@ private Map<String, Set<String>> extractQuestionMetadata(Statement st) {
         if (st.getPredicate().hasProperty(RDFS.range))
             p.put(Vocabulary.s_p_has_answer_value_type, Collections.singleton(st.getPredicate().getProperty(RDFS.range).getObject().asResource().getURI()));
         Model m = extractModel(st);
-        p.put(Vocabulary.s_p_has_origin_context, Collections.singleton(m.listStatements(null, RDF.type, OWL.Ontology).next().getSubject().getURI()));
+        p.put(Vocabulary.s_p_has_origin_context, Collections.singleton(getOntologyUri(m)));
         return p;
     }
 
@@ -559,4 +559,9 @@ private Optional<Model> find(Statement st, Model m, Optional<Model> res) {
             return Optional.of(m);
         return Optional.empty();
     }
+
+    private String getOntologyUri(Model model) {
+        Model queriedModel = model instanceof OntModel ? ((OntModel) model).getBaseModel() : model;
+        return queriedModel.listStatements(null, RDF.type, OWL.Ontology).next().getSubject().getURI();
+    }
 }