[#18] Migration to new versions of tabula, scarph and typesets

Author: alberskib

src/main/scala/com/bio4j/dynamograph/AnyDynamoVertex.scala

@@ -9,14 +9,11 @@ import ohnosequences.tabula.AnyItem._
 import ohnosequences.typesets._
 
 
-trait AnyDynamoVertex extends AnyVertex { dynamoVertex =>
-
-  type Tpe <: DynamoVertexType
-  type Raw <: Tpe#VertexRecord#Values
+trait AnyDynamoVertex extends AnySealedVertex { dynamoVertex =>
 
   val dao: AnyDynamoDbDao = ServiceProvider.dao
 
-  implicit def unsafeGetProperty[P <: AnyProperty: Property.Of[this.Tpe]#is](p: P) =
+  implicit def unsafeGetProperty[P <: Singleton with AnyProperty: Property.Of[this.Tpe]#is](p: P) =
     new PropertyGetter[P](p) {
       def apply(rep: dynamoVertex.Rep): p.Raw = rep.get(p)
     }
@@ -59,13 +56,12 @@ trait AnyDynamoVertex extends AnyVertex { dynamoVertex =>
   }
 }
 
-class DynamoVertex[VT <: Singleton with DynamoVertexType](val tpe: VT) extends AnyDynamoVertex {
+class DynamoVertex[VT <: Singleton with AnySealedVertexType](val tpe: VT) extends AnyDynamoVertex {
   type Tpe = VT
-  final type Raw = VT#VertexRecord#Values
 }
 
 object AnyDynamoVertex{
-  type ofType[VT <: DynamoVertexType] = AnyDynamoVertex { type Tpe = VT }
+  type ofType[VT <: Singleton with AnySealedVertexType] = AnyDynamoVertex { type Tpe = VT }
 }
 
 

src/main/scala/com/bio4j/dynamograph/DynamoVertexType.scala

@@ -4,25 +4,19 @@ import ohnosequences.scarph._
 import com.bio4j.dynamograph.model.GeneralSchema._
 import ohnosequences.typesets._
 import ohnosequences.typesets.Represented._
-import com.bio4j.dynamograph.DynamoVertexType
 
 object GoSchema {
 
-
-
+  val goTermAttributes = id :~: name :~: comment :~: definition :~: ∅
+  case object GoTermRecord extends Record(goTermAttributes)
   // Vertex Type
-  object GoTermType       extends DynamoVertexType("GoTerm"){
-    val attributes = id :~: name :~: comment :~: definition :~: ∅
-    case object record extends Record(attributes)
-  }
-  implicit val GoTermType_properties = GoTermType has GoTermType.attributes
-
-
-  object GoNamespacesType extends DynamoVertexType("GoNamespace"){
-    val attributes = id :~: ∅
-    case object record extends Record(attributes)
-  }
-  implicit val GoNamespacesType_properties = GoNamespacesType has GoNamespacesType.attributes
+  object GoTermType       extends SealedVertexType("GoTerm",GoTermRecord)
+  implicit val GoTermType_properties = GoTermType has goTermAttributes
+
+  val goNamespacesAttributes = id :~: ∅
+  case object GoNamespacesRecord extends Record(goNamespacesAttributes)
+  object GoNamespacesType extends SealedVertexType("GoNamespace", GoNamespacesRecord)
+  implicit val GoNamespacesType_properties = GoNamespacesType has goNamespacesAttributes
 
   // Edge Types
   case object HasPartType             extends ManyToMany (GoTermType, "hasPart", GoTermType)

src/main/scala/com/bio4j/dynamograph/model/go/GoSchema.scala

@@ -1,21 +1,22 @@
 package com.bio4j.dynamograph.model.go
 
 import ohnosequences.tabula._
-import com.bio4j.dynamograph.{DynamoVertexType, AnyDynamoVertex, AnyDynamoEdge}
+import com.bio4j.dynamograph.{AnyDynamoVertex, AnyDynamoEdge}
 import com.bio4j.dynamograph.model.GeneralSchema._
 import ohnosequences.typesets._
 import shapeless._
 import ohnosequences.tabula.impl.ImplicitConversions.{fromSDKRep, toSDKRep}
 import toSDKRep._
 import fromSDKRep._
 import com.amazonaws.services.dynamodbv2.model.AttributeValue
+import ohnosequences.scarph.AnySealedVertexType
 
 
 object TableGoSchema {
 
 
   class VertexTable[
-    VT <: DynamoVertexType,
+    VT <: AnySealedVertexType,
     R <: AnyRegion
   ](
     val vt : VT,
@@ -24,7 +25,7 @@ object TableGoSchema {
   ){
     case object table extends HashKeyTable(tableName, id, region)
     type VertexTpe = VT
-    case object vertexItem    extends Item[table.type, vt.VertexRecord](table, vt.record)
+    case object vertexItem    extends Item(table, vt.record)
   }
 
 

src/main/scala/com/bio4j/dynamograph/model/go/TableGoSchema.scala

@@ -3,14 +3,15 @@ package com.bio4j.dynamograph.reader
 import com.amazonaws.services.dynamodbv2.model.{AttributeValue, GetItemRequest}
 import com.bio4j.dynamograph.model.go.TableGoSchema.VertexTable
 import ohnosequences.tabula.AnyRegion
-import com.bio4j.dynamograph.{DynamoVertexType, AnyDynamoVertex}
+import com.bio4j.dynamograph.{AnyDynamoVertex}
 import com.bio4j.dynamograph.model.GeneralSchema.id
 import scala.collection.JavaConversions._
 import com.bio4j.dynamograph.dynamodb.AnyDynamoDbExecutor
 import ohnosequences.typesets.TypeSet
+import ohnosequences.scarph.AnySealedVertexType
 
 
-class VertexReader[VT <: DynamoVertexType](val vertexType : VT ,val vertexTable : VertexTable[VT, _], val dbExecutor : AnyDynamoDbExecutor) extends AnyVertexReader{
+class VertexReader[VT <: AnySealedVertexType](val vertexType : VT ,val vertexTable : VertexTable[VT, _], val dbExecutor : AnyDynamoDbExecutor) extends AnyVertexReader{
   type VertexType = VT
 
   def read(identifier : id.Raw) : ReturnType = {

src/main/scala/com/bio4j/dynamograph/reader/VertexReader.scala

@@ -2,7 +2,7 @@ package com.bio4j.dynamograph.writer
 
 import com.bio4j.dynamograph.model.go.TableGoSchema.VertexTable
 import ohnosequences.tabula.AnyRegion
-import com.bio4j.dynamograph.{DynamoVertexType, ServiceProvider, AnyDynamoVertex}
+import com.bio4j.dynamograph.{ServiceProvider, AnyDynamoVertex}
 import ohnosequences.typesets.TypeSet
 import ohnosequences.tabula.impl.ImplicitConversions._
 import toSDKRep._
@@ -11,18 +11,19 @@ import shapeless.Poly1
 import ohnosequences.tabula.impl.actions.InHashKeyTable
 import ohnosequences.tabula.Active
 import ohnosequences.tabula.ThroughputStatus
+import ohnosequences.scarph.{AnySealedVertexType, AnySealedVertex}
 
 trait AnyVertexWriter extends AnyWriter{
   type Element <: AnyDynamoVertex
 }
 
-class VertexWriter[V <: DynamoVertexType, R <: AnyRegion]
+class VertexWriter[V <: AnySealedVertexType, R <: AnyRegion]
   (val element: V, val vertexTable : VertexTable[V, R]) extends AnyVertexWriter {
 
   type Element = V
 
-  def write(rep: element.record.Raw): List[WriteType] = {
+  def write(rep: element.Record#Raw): List[WriteType] = {
     List(InHashKeyTable(vertexTable.table, Active(vertexTable.table, ServiceProvider.service.account,
-      ThroughputStatus(1, 1))) putItem vertexTable.vertexItem withValue (element.record ->> rep))
+      ThroughputStatus(1, 1))) putItem vertexTable.vertexItem withValue rep)
   }
 }