Moved entity package up one layer so it can be shared

aql/convertQuery.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"git.science.uu.nl/datastrophe/query-conversion/aql/entity"
+	"git.science.uu.nl/datastrophe/query-conversion/entity"
 )
 
 /*

aql/convertQueryBenchmark_test.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"git.science.uu.nl/datastrophe/query-conversion/aql/entity"
+	"git.science.uu.nl/datastrophe/query-conversion/entity"
 )
 
 func BenchmarkConvertEmptyQuery(b *testing.B) {

aql/convertQuery_test.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"git.science.uu.nl/datastrophe/query-conversion/aql/entity"
+	"git.science.uu.nl/datastrophe/query-conversion/entity"
 	"github.com/stretchr/testify/assert"
 )
 

aql/createConstraints.go

@@ -3,7 +3,7 @@ package aql
 import (
 	"fmt"
 
-	"git.science.uu.nl/datastrophe/query-conversion/aql/entity"
+	"git.science.uu.nl/datastrophe/query-conversion/entity"
 )
 
 /* createConstraintStatements generates the appropriate amount of constraint lines calling createConstraingBoolExpression

interface.go

 package query
 
-import "git.science.uu.nl/datastrophe/query-conversion/aql/entity"
+import "git.science.uu.nl/datastrophe/query-conversion/entity"
 
 // A Converter converts an incoming message in our JSON format to a format like AQL or Cypher
 type Converter interface {