From d545fc4b44766e23551fd78f8c0aff9c8f919298 Mon Sep 17 00:00:00 2001
From: = <=>
Date: Mon, 1 Dec 2014 13:36:32 +0100
Subject: [PATCH] renamed GetType() to Type(), fixed iterator tests

---
 graph/bolt/quadstore.go         | 2 +-
 graph/gaedatastore/quadstore.go | 2 +-
 graph/iterator/mock_ts_test.go  | 2 ++
 graph/leveldb/quadstore.go      | 2 +-
 graph/memstore/quadstore.go     | 2 +-
 graph/mongo/quadstore.go        | 2 +-
 graph/quadstore.go              | 4 ++--
 7 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/graph/bolt/quadstore.go b/graph/bolt/quadstore.go
index 761cd5b..e593b17 100644
--- a/graph/bolt/quadstore.go
+++ b/graph/bolt/quadstore.go
@@ -520,6 +520,6 @@ func (qs *QuadStore) FixedIterator() graph.FixedIterator {
 	return iterator.NewFixed(compareTokens)
 }
 
-func (qs *QuadStore) GetType() string {
+func (qs *QuadStore) Type() string {
 	return QuadStoreType
 }
diff --git a/graph/gaedatastore/quadstore.go b/graph/gaedatastore/quadstore.go
index 7984a2c..69952e8 100644
--- a/graph/gaedatastore/quadstore.go
+++ b/graph/gaedatastore/quadstore.go
@@ -548,6 +548,6 @@ func (qs *QuadStore) hashOf(s string, hasher hash.Hash) string {
 	return hex.EncodeToString(key)
 }
 
-func (qs *QuadStore) GetType() string {
+func (qs *QuadStore) Type() string {
 	return QuadStoreType
 }
diff --git a/graph/iterator/mock_ts_test.go b/graph/iterator/mock_ts_test.go
index 59e3bdf..f62a66f 100644
--- a/graph/iterator/mock_ts_test.go
+++ b/graph/iterator/mock_ts_test.go
@@ -73,3 +73,5 @@ func (qs *store) Close() {}
 func (qs *store) QuadDirection(graph.Value, quad.Direction) graph.Value { return 0 }
 
 func (qs *store) RemoveQuad(t quad.Quad) {}
+
+func (qs *store) Type() string { return "mockstore" }
diff --git a/graph/leveldb/quadstore.go b/graph/leveldb/quadstore.go
index aca9833..799688d 100644
--- a/graph/leveldb/quadstore.go
+++ b/graph/leveldb/quadstore.go
@@ -497,6 +497,6 @@ func (qs *QuadStore) FixedIterator() graph.FixedIterator {
 	return iterator.NewFixed(compareBytes)
 }
 
-func (qs *QuadStore) GetType() string {
+func (qs *QuadStore) Type() string {
 	return QuadStoreType
 }
diff --git a/graph/memstore/quadstore.go b/graph/memstore/quadstore.go
index d9203e5..9807c6e 100644
--- a/graph/memstore/quadstore.go
+++ b/graph/memstore/quadstore.go
@@ -273,6 +273,6 @@ func (qs *QuadStore) NodesAllIterator() graph.Iterator {
 
 func (qs *QuadStore) Close() {}
 
-func (qs *QuadStore) GetType() string {
+func (qs *QuadStore) Type() string {
 	return QuadStoreType
 }
diff --git a/graph/mongo/quadstore.go b/graph/mongo/quadstore.go
index 36458f1..ce05efe 100644
--- a/graph/mongo/quadstore.go
+++ b/graph/mongo/quadstore.go
@@ -368,6 +368,6 @@ func (qs *QuadStore) QuadDirection(in graph.Value, d quad.Direction) graph.Value
 
 // TODO(barakmich): Rewrite bulk loader. For now, iterating around blocks is the way we'll go about it.
 
-func (qs *QuadStore) GetType() string {
+func (qs *QuadStore) Type() string {
 	return QuadStoreType
 }
diff --git a/graph/quadstore.go b/graph/quadstore.go
index 7a7f2b6..e9a1a4f 100644
--- a/graph/quadstore.go
+++ b/graph/quadstore.go
@@ -98,7 +98,7 @@ type QuadStore interface {
 
 	// Get the type of QuadStore
 	//TODO replace this using reflection
-	GetType() string
+	Type() string
 }
 
 type Options map[string]interface{}
@@ -190,7 +190,7 @@ func InitQuadStore(name, dbpath string, opts Options) error {
 }
 
 func NewQuadStoreForRequest(qs QuadStore, opts Options) (QuadStore, error) {
-	r, registered := storeRegistry[qs.GetType()]
+	r, registered := storeRegistry[qs.Type()]
 	if registered {
 		return r.newForRequestFunc(qs, opts)
 	}