data: removed Singleton from Dictionary and made it a member of SearchIndex

Dictionary never had a good reason of being a Singleton in the first place so this will avoid concurrency and
structural issues in the future.

src/lib/data/graph/StorageGraph.cpp

@@ -1,7 +1,6 @@
 #include "data/graph/StorageGraph.h"
 
 #include "data/graph/token_component/TokenComponentName.h"
-#include "data/graph/token_component/TokenComponentSignature.h"
 #include "utility/logging/logging.h"
 #include "utility/utilityString.h"
 
@@ -30,11 +29,9 @@ Node* StorageGraph::createNodeHierarchy(Node::NodeType type, SearchIndex::Search
 }
 
 Node* StorageGraph::createNodeHierarchyWithDistinctSignature(
-	Node::NodeType type, SearchIndex::SearchNode* searchNode, const std::string& signature
+	Node::NodeType type, SearchIndex::SearchNode* searchNode, std::shared_ptr<TokenComponentSignature> signature
 ){
 	Node* node = getNodeById(searchNode->getFirstTokenId());
-	std::shared_ptr<TokenComponentSignature> sigPtr = TokenComponentSignature::create(signature);
-
 	if (!node)
 	{
 		node = insertNodeHierarchy(type, searchNode);
@@ -42,10 +39,10 @@ Node* StorageGraph::createNodeHierarchyWithDistinctSignature(
 	else
 	{
 		std::function<bool(Node*)> findSignature =
-			[sigPtr](Node* n)
+			[signature](Node* n)
 			{
-				TokenComponentSignature* c = n->getComponent<TokenComponentSignature>();
-				return c && *c == *sigPtr.get();
+				TokenComponentSignature* sig = n->getComponent<TokenComponentSignature>();
+				return sig && *sig == *signature.get();
 			};
 
 		Node* parentNode = node->getParentNode();
@@ -72,7 +69,7 @@ Node* StorageGraph::createNodeHierarchyWithDistinctSignature(
 		}
 	}
 
-	node->addComponentSignature(sigPtr);
+	node->addComponentSignature(signature);
 	return node;
 }
 

src/lib/data/graph/StorageGraph.h

@@ -2,6 +2,7 @@
 #define STORAGE_GRAPH_H
 
 #include "data/graph/Graph.h"
+#include "data/graph/token_component/TokenComponentSignature.h"
 #include "data/SearchIndex.h"
 
 class StorageGraph
@@ -13,7 +14,7 @@ public:
 
 	Node* createNodeHierarchy(Node::NodeType type, SearchIndex::SearchNode* searchNode);
 	Node* createNodeHierarchyWithDistinctSignature(
-		Node::NodeType type, SearchIndex::SearchNode* searchNode, const std::string& signature);
+		Node::NodeType type, SearchIndex::SearchNode* searchNode, std::shared_ptr<TokenComponentSignature> signature);
 	Edge* createEdge(Edge::EdgeType type, Node* from, Node* to);
 
 private:

src/lib/data/graph/token_component/TokenComponentSignature.cpp

@@ -1,11 +1,8 @@
 #include "data/graph/token_component/TokenComponentSignature.h"
 
-#include "utility/text/Dictionary.h"
-
-std::shared_ptr<TokenComponentSignature> TokenComponentSignature::create(const std::string& signature)
+TokenComponentSignature::TokenComponentSignature(Id wordId)
+	: m_wordId(wordId)
 {
-	return std::shared_ptr<TokenComponentSignature>(
-		new TokenComponentSignature(Dictionary::getInstance()->getWordId(signature)));
 }
 
 TokenComponentSignature::~TokenComponentSignature()
@@ -17,17 +14,12 @@ std::shared_ptr<TokenComponent> TokenComponentSignature::copy() const
 	return std::make_shared<TokenComponentSignature>(*this);
 }
 
-const std::string& TokenComponentSignature::getSignature() const
+Id TokenComponentSignature::getWordId() const
 {
-	return Dictionary::getInstance()->getWord(m_wordId);
+	return m_wordId;
 }
 
 bool TokenComponentSignature::operator==(const TokenComponentSignature& other) const
 {
 	return m_wordId == other.m_wordId;
 }
-
-TokenComponentSignature::TokenComponentSignature(Id wordId)
-	: m_wordId(wordId)
-{
-}

src/lib/data/graph/token_component/TokenComponentSignature.h

@@ -1,9 +1,6 @@
 #ifndef TOKEN_COMPONENT_SIGNATURE_H
 #define TOKEN_COMPONENT_SIGNATURE_H
 
-#include <memory>
-#include <string>
-
 #include "data/graph/token_component/TokenComponent.h"
 #include "utility/types.h"
 
@@ -11,19 +8,16 @@ class TokenComponentSignature
 	: public TokenComponent
 {
 public:
-	static std::shared_ptr<TokenComponentSignature> create(const std::string& signature);
-
+	TokenComponentSignature(Id wordId);
 	virtual ~TokenComponentSignature();
 
 	virtual std::shared_ptr<TokenComponent> copy() const;
 
-	const std::string& getSignature() const;
+	Id getWordId() const;
 
 	bool operator==(const TokenComponentSignature& other) const;
 
 private:
-	TokenComponentSignature(Id wordId);
-
 	const Id m_wordId;
 };