Fixed some small errors after the merge

cmd/query-service/main.go

@@ -22,8 +22,8 @@ import (
 	"git.science.uu.nl/graphpolaris/query-conversion/aql"
 	"git.science.uu.nl/graphpolaris/query-conversion/sparql"
 	queryexecution "git.science.uu.nl/graphpolaris/query-execution"
-	"git.science.uu.nl/graphpolaris/query-execution/arangodb"
-	"git.science.uu.nl/graphpolaris/query-execution/neo4j"
+	"git.science.uu.nl/graphpolaris/query-execution/usecases/arangodb"
+	"git.science.uu.nl/graphpolaris/query-execution/usecases/neo4j"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/thijsheijden/alice"
 )
@@ -39,7 +39,7 @@ func main() {
 	keyValueStore := keyvaluestore.NewDriver()
 
 	objectStore := objectstore.NewDriver()
-	err := objectStore.Connect()
+	err := objectStore.Connect(os.Getenv("MINIO_ADDRESS"), os.Getenv("MINIO_ACCESSKEYID"), os.Getenv("MINIO_ACCESSKEY"))
 	if err != nil {
 		logger.Log(err.Error())
 	}

go.mod

@@ -5,9 +5,9 @@ go 1.16
 require (
 	git.science.uu.nl/graphpolaris/broker v0.0.0-20210913145737-76d174f4367a
 	git.science.uu.nl/graphpolaris/keyvaluestore v0.0.0-20210913145832-4c76e9e5f5bd
-	git.science.uu.nl/graphpolaris/objectstore v0.0.0-20210913150113-977062fb8a3c
-	git.science.uu.nl/graphpolaris/query-conversion v0.0.0-20220117134611-44f0e50da45e
-	git.science.uu.nl/graphpolaris/query-execution v0.0.0-20220115131713-a3beba20d6f9
+	git.science.uu.nl/graphpolaris/objectstore v0.0.0-20211017103314-2e7b22682187
+	git.science.uu.nl/graphpolaris/query-conversion v0.0.0-20220201085331-82d6956b25f2
+	git.science.uu.nl/graphpolaris/query-execution v0.0.0-20220201080925-4a0571a10501
 	github.com/prometheus/client_golang v1.11.0
 	github.com/rs/xid v1.2.1
 	github.com/stretchr/testify v1.7.0

go.sum

@@ -10,6 +10,8 @@ git.science.uu.nl/graphpolaris/keyvaluestore v0.0.0-20210913145832-4c76e9e5f5bd
 git.science.uu.nl/graphpolaris/keyvaluestore v0.0.0-20210913145832-4c76e9e5f5bd/go.mod h1:r62eFpVrFJldxyr0AC2ww7pDcEVUpdAh4X9YdsGEzss=
 git.science.uu.nl/graphpolaris/objectstore v0.0.0-20210913150113-977062fb8a3c h1:yJKWwDCVbdh0GrQf8Ggenf/aFbJxc6u4m3Cb34s7uKw=
 git.science.uu.nl/graphpolaris/objectstore v0.0.0-20210913150113-977062fb8a3c/go.mod h1:JTrEtLWqP0uUvOdS8l5+nINwHSoY1KwRYL1i86D/WCU=
+git.science.uu.nl/graphpolaris/objectstore v0.0.0-20211017103314-2e7b22682187 h1:DBFHZfvPqbRcLeiEMOoRXYpR0xsdT9JtRZITNCZl734=
+git.science.uu.nl/graphpolaris/objectstore v0.0.0-20211017103314-2e7b22682187/go.mod h1:JTrEtLWqP0uUvOdS8l5+nINwHSoY1KwRYL1i86D/WCU=
 git.science.uu.nl/graphpolaris/query-conversion v0.0.0-20211129100604-fb336095d328 h1:Sb+EoApuS5/ou0X90NN6uGWPm07YmPpHuo6dzbX6MDQ=
 git.science.uu.nl/graphpolaris/query-conversion v0.0.0-20211129100604-fb336095d328/go.mod h1:F7yfopMAjVkG1k4mcaweSwr8p0ZbVlRRdPGAHqIm9UU=
 git.science.uu.nl/graphpolaris/query-conversion v0.0.0-20211129104724-8e0b2530433b h1:mJ5krJRmw0sNdHGy4oEuEBo3H54i9ek1l6KiOMMT9sU=
@@ -22,12 +24,16 @@ git.science.uu.nl/graphpolaris/query-conversion v0.0.0-20220117132337-8ac74cc58e
 git.science.uu.nl/graphpolaris/query-conversion v0.0.0-20220117132337-8ac74cc58e8b/go.mod h1:F7yfopMAjVkG1k4mcaweSwr8p0ZbVlRRdPGAHqIm9UU=
 git.science.uu.nl/graphpolaris/query-conversion v0.0.0-20220117134611-44f0e50da45e h1:2j2O+DcpqW0eeXaWqvVWSXhk4qUp1/plSeJ1HiBPzog=
 git.science.uu.nl/graphpolaris/query-conversion v0.0.0-20220117134611-44f0e50da45e/go.mod h1:F7yfopMAjVkG1k4mcaweSwr8p0ZbVlRRdPGAHqIm9UU=
+git.science.uu.nl/graphpolaris/query-conversion v0.0.0-20220201085331-82d6956b25f2 h1:a9QxqH82HlS5vdgaZA47oAIJn66ITOjCBrwVLdGhXsU=
+git.science.uu.nl/graphpolaris/query-conversion v0.0.0-20220201085331-82d6956b25f2/go.mod h1:qGFnGO3e5UnbVN2rkIfvUWN1GyjI5Z1YkIoeGLUiZEg=
 git.science.uu.nl/graphpolaris/query-execution v0.0.0-20210913150324-faf925ebb2fb h1:3Toe4KBd6wH0cN4e1YHCwcUbgdK+JcE0fAe6lpmF0UU=
 git.science.uu.nl/graphpolaris/query-execution v0.0.0-20210913150324-faf925ebb2fb/go.mod h1:skX+b/aXHjJCha9KV/7EAwrlQO5ZYIGrSPp7Tk9I4BI=
 git.science.uu.nl/graphpolaris/query-execution v0.0.0-20211124105805-5c913fec56f2 h1:Wbe6OrveS6xV6UfFit1tx3M3qdHYoZmzoYFwXBI52UM=
 git.science.uu.nl/graphpolaris/query-execution v0.0.0-20211124105805-5c913fec56f2/go.mod h1:skX+b/aXHjJCha9KV/7EAwrlQO5ZYIGrSPp7Tk9I4BI=
 git.science.uu.nl/graphpolaris/query-execution v0.0.0-20220115131713-a3beba20d6f9 h1:piQF5TeWnh8RT/dMP4jpITHhT68+Kzuu8+hxQZNUTZg=
 git.science.uu.nl/graphpolaris/query-execution v0.0.0-20220115131713-a3beba20d6f9/go.mod h1:skX+b/aXHjJCha9KV/7EAwrlQO5ZYIGrSPp7Tk9I4BI=
+git.science.uu.nl/graphpolaris/query-execution v0.0.0-20220201080925-4a0571a10501 h1:JB7O9buJGoa8htX1hI7fkrXMx7fVwsCjWzPCVkL8rx8=
+git.science.uu.nl/graphpolaris/query-execution v0.0.0-20220201080925-4a0571a10501/go.mod h1:skX+b/aXHjJCha9KV/7EAwrlQO5ZYIGrSPp7Tk9I4BI=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=

internal/usecases/consume/handlemessage.go

@@ -25,6 +25,13 @@ import (
 HandleMessage is the tracking wrapper for handleMessageHelper
 */
 func (s *Service) HandleMessage(msg *broker.Message) {
+	// Grab the headers from the message
+	sessionID, clientID, queryID, err := getHeaders(&msg.Headers)
+	if err != nil {
+		log.Println("no headers in message")
+		return
+	}
+
 	// Defer a panic intercepting function
 	defer func(sessionID, queryID *string) {
 		if err := recover(); err != nil {
@@ -34,16 +41,8 @@ func (s *Service) HandleMessage(msg *broker.Message) {
 		}
 	}(sessionID, queryID)
 
-	// Grab the headers from the message
-	sessionID, clientID, queryID, err := getHeaders(&msg.Headers)
-	if err != nil {
-		log.Println("no headers in message")
-		return
-	}
-
 	s.publishStatus("Received", sessionID, queryID)
 
-
 	var tracker trackerproducer.UseCase
 	tracker = trackerproducer.NewService(s.brokerDriver, "query-handling", *sessionID, *clientID, *queryID)
 	println("start tracking in QS")