Merge pull request #27 from simonoakesepimorphics/tech/11.1.1-refactor

Tech/11.1.1 refactor

Author: mo-marqh

binary-array-ld-cli/src/main/kotlin/net/bald/BinaryArrayConvertCli.kt

@@ -1,7 +1,6 @@
 package net.bald
 
-import net.bald.alias.AliasBinaryArray
-import net.bald.context.ContextBinaryArray
+import net.bald.context.ModelContext
 import net.bald.model.ModelAliasDefinition
 import net.bald.model.ModelBinaryArrayConverter
 import net.bald.netcdf.NetCdfBinaryArray
@@ -39,10 +38,9 @@ class BinaryArrayConvertCli {
     }
 
     private fun doRun(opts: CommandLineOptions) {
+        val context = context(opts.contextLocs, opts.aliasLocs)
         val inputLoc = opts.inputLoc ?: throw IllegalArgumentException("First argument is required: NetCDF file to convert.")
-        val ba = NetCdfBinaryArray.create(inputLoc, opts.uri)
-            .withContext(opts.contextLocs)
-            .withAlias(opts.aliasLocs)
+        val ba = NetCdfBinaryArray.create(inputLoc, opts.uri, context)
         val model = ba.use(ModelBinaryArrayConverter::convert)
         val outputFormat = opts.outputFormat ?: "ttl"
 
@@ -51,22 +49,15 @@ class BinaryArrayConvertCli {
         }
     }
 
-    private fun BinaryArray.withContext(contextLocs: List<String>): BinaryArray {
-        val contexts = contextLocs.map { contextLoc ->
+    private fun context(contextLocs: List<String>, aliasLocs: List<String>): ModelContext {
+        val prefixes = contextLocs.map { contextLoc ->
             ModelFactory.createDefaultModel().read(contextLoc, "json-ld")
         }
-        return ContextBinaryArray.create(this, contexts)
-    }
+        val alias = ModelFactory.createDefaultModel().apply {
+            aliasLocs.forEach(::read)
+        }.let(ModelAliasDefinition::create)
 
-    private fun BinaryArray.withAlias(aliasLocs: List<String>): BinaryArray {
-        return if (aliasLocs.isEmpty()) {
-            this
-        } else {
-            val alias = ModelFactory.createDefaultModel().apply {
-                aliasLocs.forEach(::read)
-            }.let(ModelAliasDefinition::create)
-            AliasBinaryArray.create(this, alias)
-        }
+        return ModelContext.create(prefixes, alias)
     }
 
     private fun options(opts: Options, vararg args: String): CommandLineOptions {
@@ -93,4 +84,4 @@ fun main(args: Array<String>) {
         println("Conversion failed due to error: ${e.message}")
         exitProcess(1)
     }
-}
+}

binary-array-ld-demo/src/main/java/net/bald/NetCdfConvertJava.java

@@ -1,7 +1,7 @@
 package net.bald;
 
-import net.bald.alias.AliasBinaryArray;
-import net.bald.alias.AliasDefinition;
+import net.bald.context.AliasDefinition;
+import net.bald.context.ModelContext;
 import net.bald.model.ModelAliasDefinition;
 import net.bald.context.ContextBinaryArray;
 import net.bald.model.ModelBinaryArrayConverter;
@@ -26,23 +26,25 @@ public static void convert() throws Exception {
     }
 
     public static void convertWithExternalPrefixes() throws Exception {
-        BinaryArray ba = NetCdfBinaryArray.create("/path/to/input.nc", "http://test.binary-array-ld.net/example");
-        PrefixMapping context = ModelFactory.createDefaultModel().read("/path/to/context.json", "json-ld");
-        BinaryArray contextBa = ContextBinaryArray.create(ba, context);
-        Model model = ModelBinaryArrayConverter.convert(contextBa);
+        PrefixMapping prefix = ModelFactory.createDefaultModel().read("/path/to/context.json", "json-ld");
+        ModelContext context = ModelContext.create(prefix, null);
+        BinaryArray ba = NetCdfBinaryArray.create("/path/to/input.nc", "http://test.binary-array-ld.net/example", context);
+        Model model = ModelBinaryArrayConverter.convert(ba);
 
         try (OutputStream output = new FileOutputStream("/path/to/output.ttl")) {
             model.write(output, "ttl");
         }
     }
 
     public static void convertWithAliases() throws Exception {
-        BinaryArray ba = NetCdfBinaryArray.create("/path/to/input.nc", "http://test.binary-array-ld.net/example");
+        PrefixMapping prefix = PrefixMapping.Factory.create();
         Model aliasModel = ModelFactory.createDefaultModel().read("/path/to/alias.ttl", "ttl");
         AliasDefinition alias = ModelAliasDefinition.create(aliasModel);
-        BinaryArray aliasBa = AliasBinaryArray.create(ba, alias);
+        ModelContext context = ModelContext.create(prefix, alias);
 
-        Model model = ModelBinaryArrayConverter.convert(aliasBa);
+        BinaryArray ba = NetCdfBinaryArray.create("/path/to/input.nc", "http://test.binary-array-ld.net/example", context);
+
+        Model model = ModelBinaryArrayConverter.convert(ba);
 
         try (OutputStream output = new FileOutputStream("/path/to/output.ttl")) {
             model.write(output, "ttl");

binary-array-ld-lib/src/main/kotlin/net/bald/Attribute.kt

@@ -9,12 +9,7 @@ interface Attribute {
     /**
      * The URI which identifies the attribute, if it has one. Otherwise, null.
      */
-    val uri: String?
-
-    /**
-     * The local name of the attribute.
-     */
-    val name: String
+    val uri: String
 
     /**
      * The values of the attribute, expressed as RDF resource or literal nodes.

binary-array-ld-lib/src/main/kotlin/net/bald/AttributeSource.kt

@@ -6,8 +6,7 @@ package net.bald
 interface AttributeSource {
     /**
      * Obtain the list of attributes that describe this entity.
-     * @param prefixMapping The prefix mapping to use to expand compact URIs.
      * @return The list of attributes.
      */
-    fun attributes(prefixMapping: org.apache.jena.shared.PrefixMapping): List<Attribute>
+    fun attributes(): List<Attribute>
 }

binary-array-ld-lib/src/main/kotlin/net/bald/Container.kt

@@ -6,10 +6,9 @@ package net.bald
  */
 interface Container: AttributeSource {
     /**
-     * The local name of the container, if it has one.
-     * The root container may have no name or an empty name.
+     * The URI of the container.
      */
-    val name: String?
+    val uri: String
 
     /**
      * Obtain the variables associates with this container.

binary-array-ld-lib/src/main/kotlin/net/bald/Var.kt

@@ -5,7 +5,7 @@ package net.bald
  */
 interface Var: AttributeSource {
     /**
-     * The local name of the variable.
+     * The URI of the variable.
      */
-    val name: String
+    val uri: String
 }