Rename `RDFoxHelpers` to `RDFoxUtil`

For a more consistent naming.

5 files changed, 20 insertions, 20 deletions

diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/FilteringProgram.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/FilteringProgram.scala
index b70de66..b07ba92 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/FilteringProgram.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/FilteringProgram.scala
@@ -12,7 +12,7 @@ import tech.oxfordsemantic.jrdfox.logic.expression.{Term, Variable}
 import uk.ac.ox.cs.rsacomb.implicits.RSAAtom
 import uk.ac.ox.cs.rsacomb.sparql.ConjunctiveQuery
 import uk.ac.ox.cs.rsacomb.suffix.{Forward, Backward}
-import uk.ac.ox.cs.rsacomb.util.{RSA, RDFoxHelpers}
+import uk.ac.ox.cs.rsacomb.util.{RSA, RDFoxUtil}
 
 /** Factory for [[uk.ac.ox.cs.rsacomb.FilteringProgram FilteringProgram]] */
 object FilteringProgram {
@@ -310,7 +310,7 @@ class FilteringProgram(query: ConjunctiveQuery, constants: List[Term])
         r5a ::: r5b ::: r5c :::
         r6 ::: r7b ::: r7a :::
         r8a ::: r8b :: r8c :::
-        r9 :: List()) map RDFoxHelpers.reify
+        r9 :: List()) map RDFoxUtil.reify
     }
 
   /** Pretty-print filtering rule */
diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala
index 678a5fa..016bb86 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala
@@ -10,7 +10,7 @@ import tech.oxfordsemantic.jrdfox.logic.sparql.statement.SelectQuery
 import tech.oxfordsemantic.jrdfox.logic.expression.{IRI, Term}
 
 /* Local imports */
-import util.{RDFoxHelpers, RSA}
+import util.{RDFoxUtil, RSA}
 import sparql.ConjunctiveQuery
 
 object RSAComb extends App {
diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala
index 24045de..19a6280 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala
@@ -52,7 +52,7 @@ import uk.ac.ox.cs.rsacomb.converter.{RDFoxAxiomConverter, SkolemStrategy}
 import uk.ac.ox.cs.rsacomb.implicits.RSAAxiom
 import uk.ac.ox.cs.rsacomb.suffix._
 import uk.ac.ox.cs.rsacomb.sparql._
-import uk.ac.ox.cs.rsacomb.util.{RDFoxHelpers, RSA}
+import uk.ac.ox.cs.rsacomb.util.{RDFoxUtil, RSA}
 
 object RSAOntology {
 
@@ -166,7 +166,7 @@ class RSAOntology(val ontology: OWLOntology) extends RSAAxiom {
     //datalog.foreach(println)
 
     // Open connection with RDFox
-    val (server, data) = RDFoxHelpers.openConnection("RSACheck")
+    val (server, data) = RDFoxUtil.openConnection("RSACheck")
     // Add Data (hardcoded for now)
     //data.importData(UpdateType.ADDITION, RSA.Prefixes, ":a a :A .")
 
@@ -196,7 +196,7 @@ class RSAOntology(val ontology: OWLOntology) extends RSAAxiom {
     //println(graph)
 
     // Close connection to RDFox
-    RDFoxHelpers.closeConnection(server, data)
+    RDFoxUtil.closeConnection(server, data)
 
     /* To check if the graph is tree-like we check for acyclicity in a
      * undirected graph.
@@ -263,7 +263,7 @@ class RSAOntology(val ontology: OWLOntology) extends RSAAxiom {
       data: DataStoreConnection
   ): Graph[Resource, UnDiEdge] = {
     val query = "SELECT ?X ?Y WHERE { ?X rsa:E ?Y }"
-    val answers = RDFoxHelpers.submitQuery(data, query, RSA.Prefixes).get
+    val answers = RDFoxUtil.submitQuery(data, query, RSA.Prefixes).get
     var edges: Seq[UnDiEdge[Resource]] = answers.map {
       case Seq(n1, n2) => UnDiEdge(n1, n2)
     }
@@ -306,20 +306,20 @@ class RSAOntology(val ontology: OWLOntology) extends RSAAxiom {
     */
   def ask(query: ConjunctiveQuery): ConjunctiveQueryAnswers = {
     import implicits.JavaCollections._
-    val (server, data) = RDFoxHelpers.openConnection(RSAOntology.DataStore)
+    val (server, data) = RDFoxUtil.openConnection(RSAOntology.DataStore)
     data.addRules(this.canonicalModel.rules)
     data.addRules(this.filteringProgram(query).rules)
-    val answers = RDFoxHelpers
+    val answers = RDFoxUtil
       .submitQuery(
         data,
-        RDFoxHelpers.buildDescriptionQuery("Ans", query.answer.size),
+        RDFoxUtil.buildDescriptionQuery("Ans", query.answer.size),
         RSA.Prefixes
       )
       .map(
         new ConjunctiveQueryAnswers(query.bcq, _)
       )
       .get
-    RDFoxHelpers.closeConnection(server, data)
+    RDFoxUtil.closeConnection(server, data)
     answers
   }
 
@@ -343,9 +343,9 @@ class RSAOntology(val ontology: OWLOntology) extends RSAAxiom {
       prefixes: Prefixes = new Prefixes(),
       opts: ju.Map[String, String] = new ju.HashMap[String, String]()
   ): Option[Seq[Seq[Resource]]] = {
-    val (server, data) = RDFoxHelpers.openConnection(RSAOntology.DataStore)
-    val answers = RDFoxHelpers.submitQuery(data, query, prefixes, opts)
-    RDFoxHelpers.closeConnection(server, data)
+    val (server, data) = RDFoxUtil.openConnection(RSAOntology.DataStore)
+    val answers = RDFoxUtil.submitQuery(data, query, prefixes, opts)
+    RDFoxUtil.closeConnection(server, data)
     answers
   }
 
diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/sparql/ConjunctiveQuery.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/sparql/ConjunctiveQuery.scala
index 59eb626..bc90c86 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/sparql/ConjunctiveQuery.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/sparql/ConjunctiveQuery.scala
@@ -11,7 +11,7 @@ import tech.oxfordsemantic.jrdfox.logic.sparql.pattern.{
   TriplePattern
 }
 import tech.oxfordsemantic.jrdfox.logic.sparql.statement.SelectQuery
-import uk.ac.ox.cs.rsacomb.util.RDFoxHelpers
+import uk.ac.ox.cs.rsacomb.util.RDFoxUtil
 
 /** Factory for [[uk.ac.ox.cs.rsacomb.sparql.ConjunctiveQuery]]. */
 object ConjunctiveQuery {
@@ -35,7 +35,7 @@ object ConjunctiveQuery {
       query: String,
       prefixes: Prefixes = new Prefixes()
   ): Option[ConjunctiveQuery] =
-    RDFoxHelpers.parseSelectQuery(query, prefixes).map(ConjunctiveQuery(_))
+    RDFoxUtil.parseSelectQuery(query, prefixes).map(ConjunctiveQuery(_))
 
 }
 
diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/util/RDFoxHelpers.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/util/RDFoxUtil.scala
index a05e416..99a9614 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/util/RDFoxHelpers.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/util/RDFoxUtil.scala
@@ -21,7 +21,7 @@ import uk.ac.ox.cs.rsacomb.suffix.Nth
 import uk.ac.ox.cs.rsacomb.implicits.RSAAtom
 
 /** A collection of helper methods for RDFox */
-object RDFoxHelpers extends RSAAtom {
+object RDFoxUtil extends RSAAtom {
 
   /** Simplify conversion between Java and Scala `List`s */
   import uk.ac.ox.cs.rsacomb.implicits.JavaCollections._
@@ -48,8 +48,8 @@ object RDFoxHelpers extends RSAAtom {
     * @return a tuple with the newly opened server and data store
     * connections.
     *
-    * @see [[uk.ac.ox.cs.rsacomb.util.RDFoxHelpers.closeConnection
-    * RDFoxHelpers.closeConnection]] for
+    * @see [[uk.ac.ox.cs.rsacomb.util.RDFoxUtil.closeConnection
+    * RDFoxUtil.closeConnection]] for
     * details on how to close an open connection.
     */
   def openConnection(
@@ -205,7 +205,7 @@ object RDFoxHelpers extends RSAAtom {
     * @param server server connection
     * @param data data store connections
     *
-    * @see [[uk.ac.ox.cs.rsacomb.util.RDFoxHelpers.openConnection RDFoxHelpers.openConnection]]
+    * @see [[uk.ac.ox.cs.rsacomb.util.RDFoxUtil.openConnection RDFoxUtil.openConnection]]
     * for details on how to create a new connection with RDFox.
     */
   def closeConnection(