linkedql: Replace AbsoluteIRI with iri.FullWith(ns)

Author: iddan

query/linkedql/entity_identfier.go

@@ -14,7 +14,7 @@ type EntityIRI quad.IRI
 
 // BuildIdentifier implements EntityIdentifier
 func (i EntityIRI) BuildIdentifier(ns *voc.Namespaces) (quad.Value, error) {
-	return AbsoluteIRI(quad.IRI(i), ns), nil
+	return quad.IRI(i).FullWith(ns), nil
 }
 
 // EntityBNode is an entity BNode.

query/linkedql/property_path.go

@@ -90,7 +90,7 @@ func (p PropertyIRIStrings) BuildPath(qs graph.QuadStore, ns *voc.Namespaces) (*
 type PropertyIRI quad.IRI
 
 func (p PropertyIRI) full(ns *voc.Namespaces) quad.IRI {
-	return AbsoluteIRI(quad.IRI(p), ns)
+	return quad.IRI(p).FullWith(ns)
 }
 
 // BuildPath implements PropertyPath

query/linkedql/steps/properties.go

@@ -43,7 +43,7 @@ func (s *Properties) BuildPath(qs graph.QuadStore, ns *voc.Namespaces) (*path.Pa
 	p := fromPath
 	if s.Names != nil {
 		for _, name := range s.Names {
-			name = linkedql.AbsoluteIRI(name, ns)
+			name = name.FullWith(ns)
 			tag := string(name)
 			p = p.Save(name, tag)
 		}

query/linkedql/steps/reverse_properties.go

@@ -41,7 +41,7 @@ func (s *ReverseProperties) BuildPath(qs graph.QuadStore, ns *voc.Namespaces) (*
 	}
 	p := fromPath
 	for _, name := range s.Names {
-		name = linkedql.AbsoluteIRI(name, ns)
+		name = name.FullWith(ns)
 		tag := string(name)
 		p = fromPath.SaveReverse(name, tag)
 	}

query/linkedql/voc_util.go

@@ -5,18 +5,13 @@ import (
 	"github.com/cayleygraph/quad/voc"
 )
 
-// AbsoluteIRI uses given ns to resolve short IRIs to their full form
-func AbsoluteIRI(iri quad.IRI, ns *voc.Namespaces) quad.IRI {
-	return quad.IRI(ns.FullIRI(string(iri)))
-}
-
 // AbsoluteValue uses given ns to resolve short IRIs and types in typed strings to their full form
 func AbsoluteValue(value quad.Value, ns *voc.Namespaces) quad.Value {
 	switch v := value.(type) {
 	case quad.IRI:
-		return AbsoluteIRI(v, ns)
+		return v.FullWith(ns)
 	case quad.TypedString:
-		return quad.TypedString{Value: v.Value, Type: AbsoluteIRI(v.Type, ns)}
+		return quad.TypedString{Value: v.Value, Type: v.Type.FullWith(ns)}
 	default:
 		return v
 	}