From a18c493491f9ef3f14933d8ee9d01049c003feec Mon Sep 17 00:00:00 2001
From: thijsheijden <hi@thijsheijden.nl>
Date: Tue, 18 May 2021 11:34:39 +0200
Subject: [PATCH] Moved entity package up one layer so it can be shared
---
aql/convertQuery.go | 2 +-
aql/convertQueryBenchmark_test.go | 2 +-
aql/convertQuery_test.go | 2 +-
aql/createConstraints.go | 2 +-
{aql/entity => entity}/queryStruct.go | 0
interface.go | 2 +-
6 files changed, 5 insertions(+), 5 deletions(-)
rename {aql/entity => entity}/queryStruct.go (100%)
diff --git a/aql/convertQuery.go b/aql/convertQuery.go
index 0fe8f74..1e6c635 100644
--- a/aql/convertQuery.go
+++ b/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"
)
/*
diff --git a/aql/convertQueryBenchmark_test.go b/aql/convertQueryBenchmark_test.go
index ed4aef1..b1ba7b7 100644
--- a/aql/convertQueryBenchmark_test.go
+++ b/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) {
diff --git a/aql/convertQuery_test.go b/aql/convertQuery_test.go
index bf8dcbe..6d5a72a 100644
--- a/aql/convertQuery_test.go
+++ 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"
)
diff --git a/aql/createConstraints.go b/aql/createConstraints.go
index 74511d5..cdc9891 100644
--- a/aql/createConstraints.go
+++ b/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
diff --git a/aql/entity/queryStruct.go b/entity/queryStruct.go
similarity index 100%
rename from aql/entity/queryStruct.go
rename to entity/queryStruct.go
diff --git a/interface.go b/interface.go
index 5818f30..3010a43 100644
--- a/interface.go
+++ b/interface.go
@@ -1,6 +1,6 @@
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 {
--
GitLab