Fixed query template

src/main/resources/query-template/01-get-calls-for-query-template.json

@@ -1,29 +1,27 @@
 {
-	"@class" : "QueryTemplate",
+	"type" : "QueryTemplate",
 	"name" : "GCat-Get-CallsFor-to-VirtualService",
 	"description" : "The following query return all CallsFor relation from the EService of gcat identified by the UUID provided as parameter to the Virtual Service with name 'catalogue-virtual-service'. The content of the request to run this query template will be something like {\"$uuid\": \"335580b6-c164-4506-980a-21e5bcf8dbcf\"}",
 	"template" : {
-		"@class" : "CallsFor",
+		"type" : "CallsFor",
 		"source" : {
-			"@class" : "EService",
-			"header" : {
-				"uuid" : "$uuid"
-			},
+			"type" : "EService",
+			"id" : "$uuid",
 			"consistsOf" : [ {
-				"@class" : "IsIdentifiedBy",
+				"type" : "IsIdentifiedBy",
 				"target" : {
-					"@class" : "SoftwareFacet",
+					"type" : "SoftwareFacet",
 					"group" : "org.gcube.data-catalogue",
 					"name" : "gcat"
 				}
 			} ]
 		},
 		"target" : {
-			"@class" : "VirtualService",
+			"type" : "VirtualService",
 			"consistsOf" : [ {
-				"@class" : "IsIdentifiedBy",
+				"type" : "IsIdentifiedBy",
 				"target" : {
-					"@class" : "SoftwareFacet",
+					"type" : "SoftwareFacet",
 					"group" : "org.gcube.data-catalogue",
 					"name" : "catalogue-virtual-service"
 				}
@@ -32,7 +30,7 @@
 	},
 	"templateVariables" : {
 		"$uuid" : {
-			"@class": "TemplateVariable",
+			"type": "TemplateVariable",
 			"name": "$uuid",
 			"description": "The uuid of the gCat EService, e.g. 335580b6-c164-4506-980a-21e5bcf8dbcf. Please note that the default value has no meaning but we need a valid value so that the query can be tested by the resource-registry service.",
 			"defaultValue": "335580b6-c164-4506-980a-21e5bcf8dbcf"