TypedEntitySchema

silk-core/src/main/scala/org/silkframework/config/SilkVocab.scala

@@ -22,28 +22,8 @@ object SilkVocab {
 
  val RestTaskResultResponseBody: String = RestTaskResult + "/responseBody"
 
- // Triple input/output schema vocabulary
-
- val TripleSchemaType: String = namespace + "TripleSchemaType"
- val QuadSchemaType: String = namespace + "QuadSchemaType"
-
  // Empty table
  val EmptySchemaType: String = namespace + "EmptySchemaType"
 
- val SparqlEndpointSchemaType: String = namespace + "SparqlEndpointSchemaType"
-
- val DatasetResourceSchemaType: String = namespace + "DatasetResourceSchemaType"
-
- val tripleSubject: String = namespace + "tripleSubject"
- val triplePredicate: String = namespace + "triplePredicate"
- val tripleObject: String = namespace + "tripleObject"
- val tripleObjectValueType: String = namespace + "tripleObjectValueType"
- val quadContext: String = namespace + "quadContext"
-
- // SPARQL Update query schema vocabulary
- val SparqlUpdateSchemaType: String = namespace + "SparqlUpdateSchemaType"
-
- val sparqlUpdateQuery: String = namespace + "sparqlUpdateQuery"
-
  val internalUser: String = namespace + "internalUser"
 }

silk-core/src/main/scala/org/silkframework/dataset/rdf/Quad.scala

@@ -1,9 +1,5 @@
 package org.silkframework.dataset.rdf
 
-import org.silkframework.entity.Entity
-import org.silkframework.execution.local.{QuadEntityTable, TripleEntityTable}
-import org.silkframework.util.Uri
-
 /**
  * Represents an RDF Quad
  * @param subject - subject (either Resource or BlankNode)
@@ -16,20 +12,7 @@ case class Quad (
  predicate: Resource,
  objectVal: RdfNode,
  context: Option[Resource] // note no blank nodes allowed as context
- ) {
-
- def toQuadEntity(uri: Option[Uri] = None): Entity = {
- val (value, typ) = TripleEntityTable.convertToEncodedType(this.objectVal)
- val values = IndexedSeq(
- Seq(this.subject.value),
- Seq(this.predicate.value),
- Seq(value),
- Seq(typ),
- this.context.map(_.value).toSeq
- )
- Entity(uri.getOrElse(Uri(values.head.head)), values, QuadEntityTable.schema)
- }
-}
+ )
 
 object Quad{
 

silk-core/src/main/scala/org/silkframework/dataset/rdf/QuadIterator.scala

@@ -1,6 +1,5 @@
 package org.silkframework.dataset.rdf
 
-import org.silkframework.dataset.DataSource
 import org.silkframework.entity.Entity
 import org.silkframework.runtime.iterator.CloseableIterator
 
@@ -22,15 +21,4 @@ trait QuadIterator extends CloseableIterator[Quad] {
  closeResources()
  }
  }
-
- /**
- * Will generate an Entity for each Quad (using the EntitySchema of [[org.silkframework.execution.local.QuadEntityTable]]
- */
- def asQuadEntities: CloseableIterator[Entity] = {
- var count = 0L
- this.map( quad => {
- count += 1
- quad.toQuadEntity(Some(DataSource.URN_NID_PREFIX + count))
- })
- }
 }

silk-core/src/main/scala/org/silkframework/dataset/rdf/Triple.scala

@@ -1,9 +1,5 @@
 package org.silkframework.dataset.rdf
 
-import org.silkframework.entity.Entity
-import org.silkframework.execution.local.TripleEntityTable
-import org.silkframework.util.Uri
-
 /**
  * Represents an RDF Triple
  *
@@ -15,19 +11,7 @@ class Triple(
  subj: ConcreteNode,
  pred: Resource,
  objVal: RdfNode
-) extends Quad(subj, pred, objVal, None) {
-
- def toTripleEntity(uri: Option[Uri] = None): Entity = {
- val (value, typ) = TripleEntityTable.convertToEncodedType(this.objectVal)
- val values = IndexedSeq(
- Seq(this.subject.value),
- Seq(this.predicate.value),
- Seq(value),
- Seq(typ)
- )
- Entity(uri.getOrElse(Uri(values.head.head)), values, TripleEntityTable.schema)
- }
-}
+) extends Quad(subj, pred, objVal, None)
 
 object Triple{
 

silk-core/src/main/scala/org/silkframework/dataset/rdf/TripleIterator.scala

@@ -1,15 +1,5 @@
 package org.silkframework.dataset.rdf
 
-import org.silkframework.dataset.DataSource
-import org.silkframework.entity.Entity
 import org.silkframework.runtime.iterator.CloseableIterator
 
-trait TripleIterator extends QuadIterator with CloseableIterator[Triple] {
- def asTripleEntities: CloseableIterator[Entity] = {
- var count = 0L
- this.map( triple => {
- count += 1
- triple.toTripleEntity(Some(DataSource.URN_NID_PREFIX + count))
- })
- }
-}
+trait TripleIterator extends QuadIterator with CloseableIterator[Triple]

silk-core/src/main/scala/org/silkframework/execution/DatasetExecutor.scala

@@ -24,10 +24,10 @@ trait DatasetExecutor[DatasetType <: Dataset, ExecType <: ExecutionType] extends
  }
 
  protected def read(task: Task[DatasetSpec[DatasetType]], schema: EntitySchema, execution: ExecType)
- (implicit userContext: UserContext, context: ActivityContext[ExecutionReport], prefixes: Prefixes): ExecType#DataType
+ (implicit pluginContext: PluginContext, context: ActivityContext[ExecutionReport]): ExecType#DataType
 
  protected def write(data: ExecType#DataType, task: Task[DatasetSpec[DatasetType]], execution: ExecType)
- (implicit userContext: UserContext, context: ActivityContext[ExecutionReport], prefixes: Prefixes): Unit
+ (implicit pluginContext: PluginContext, context: ActivityContext[ExecutionReport]): Unit
 
  /**
  * Writes all inputs into dataset first and then reads from it if an output schema is defined.
@@ -44,9 +44,7 @@ trait DatasetExecutor[DatasetType <: Dataset, ExecType <: ExecutionType] extends
  execution: ExecType,
  context: ActivityContext[ExecutionReport]
  )(implicit pluginContext: PluginContext): Option[ExecType#DataType] = {
- implicit val c = context
- implicit val prefixes: Prefixes = pluginContext.prefixes
- implicit val user: UserContext = pluginContext.user
+ implicit val c: ActivityContext[ExecutionReport] = context
  for (input <- inputs) {
  write(input, task, execution)
  }