Moved back the query operators here

src/main/java/org/gcube/informationsystem/resourceregistry/contexts/entities/ContextManagement.java

@@ -18,8 +18,6 @@ import org.gcube.informationsystem.contexts.reference.entities.Context;
 import org.gcube.informationsystem.contexts.reference.relations.IsParentOf;
 import org.gcube.informationsystem.model.reference.properties.Header;
 import org.gcube.informationsystem.model.reference.relations.Relation;
-import org.gcube.informationsystem.queries.operators.QueryConditionalOperator;
-import org.gcube.informationsystem.queries.operators.QueryLogicalOperator;
 import org.gcube.informationsystem.resourceregistry.api.contexts.ContextCache;
 import org.gcube.informationsystem.resourceregistry.api.contexts.ContextCacheRenewal;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.AlreadyPresentException;
@@ -35,6 +33,8 @@ import org.gcube.informationsystem.resourceregistry.contexts.relations.IsParentO
 import org.gcube.informationsystem.resourceregistry.contexts.security.ContextSecurityContext;
 import org.gcube.informationsystem.resourceregistry.contexts.security.SecurityContext;
 import org.gcube.informationsystem.resourceregistry.instances.base.entities.EntityElementManagement;
+import org.gcube.informationsystem.resourceregistry.queries.operators.QueryConditionalOperator;
+import org.gcube.informationsystem.resourceregistry.queries.operators.QueryLogicalOperator;
 import org.gcube.informationsystem.resourceregistry.utils.Utility;
 import org.gcube.informationsystem.types.reference.entities.EntityType;
 import org.gcube.informationsystem.utils.ElementMapper;

src/main/java/org/gcube/informationsystem/resourceregistry/queries/json/base/JsonQueryERElement.java

@@ -11,12 +11,12 @@ import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode;
 import org.gcube.informationsystem.base.reference.AccessType;
 import org.gcube.informationsystem.base.reference.Direction;
 import org.gcube.informationsystem.base.reference.Element;
-import org.gcube.informationsystem.queries.operators.QueryConditionalOperator;
-import org.gcube.informationsystem.queries.operators.QueryLogicalOperator;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.queries.InvalidQueryException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.types.SchemaException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.types.SchemaNotFoundException;
+import org.gcube.informationsystem.resourceregistry.queries.operators.QueryConditionalOperator;
+import org.gcube.informationsystem.resourceregistry.queries.operators.QueryLogicalOperator;
 import org.gcube.informationsystem.resourceregistry.types.TypesCache;
 
 public abstract class JsonQueryERElement {

src/main/java/org/gcube/informationsystem/resourceregistry/queries/operators/QueryConditionalOperator.java

@@ -0,0 +1,64 @@
+package org.gcube.informationsystem.resourceregistry.queries.operators;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
+public enum QueryConditionalOperator {
+
+	EQ("$eq", " = ", "Matches values that are equal to a specified value."),
+	GT("$gt", " > ", "Matches values that are greater than a specified value."),
+	GTE("$gte", " >= ", "Matches values that are greater than or equal to a specified value."),
+	LT("$lt", " < ", "Matches values that are less than a specified value."),
+	LTE("$lte", " <= ", "Matches values that are less than or equal to a specified value."),
+	NE("$ne", " <> ", "Matches all values that are not equal to a specified value."),
+	
+	IN("$in", " IN ", "Matches any of the values specified in an array.");
+	
+	protected final String operator;
+	protected final String conditionalOperator;
+	protected final String description;
+	
+	private QueryConditionalOperator(String operator, String conditionalOperator, String description) {
+		this.operator = operator;
+		this.conditionalOperator = conditionalOperator;
+		this.description = description;
+	}
+	
+	public String getOperator() {
+		return operator;
+	}
+	
+	public String getConditionalOperator() {
+		return conditionalOperator;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+	
+	private static Set<String> operators;
+	private static Map<String,QueryConditionalOperator> operatorByKey;
+	
+	static {
+		QueryConditionalOperator.operators = new HashSet<>();
+		QueryConditionalOperator.operatorByKey = new HashMap<>();
+		
+		for(QueryConditionalOperator queryComparisonOperator : QueryConditionalOperator.values()) {
+			QueryConditionalOperator.operators.add(queryComparisonOperator.getOperator());
+			QueryConditionalOperator.operatorByKey.put(queryComparisonOperator.getOperator(), queryComparisonOperator);
+		}
+	}
+	
+	public static Set<String> getOperators() {
+		return QueryConditionalOperator.operators;
+	}
+	
+	public static QueryConditionalOperator getQueryComparisonOperator(String key) {
+		return operatorByKey.get(key);
+	}
+}

src/main/java/org/gcube/informationsystem/resourceregistry/queries/operators/QueryLogicalOperator.java

@@ -0,0 +1,59 @@
+package org.gcube.informationsystem.resourceregistry.queries.operators;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
+public enum QueryLogicalOperator {
+
+	AND("$and", " AND ", "true if both the conditions are true"),
+	OR("$or", " OR ", "true if at least one of the condition is true"),
+	NOT("$not", " NOT ", "true if the condition is false.");
+	
+	protected final String operator;
+	protected final String logicalOperator;
+	protected final String description;
+	
+	private QueryLogicalOperator(String operator, String logicalOperator, String description) {
+		this.operator = operator;
+		this.logicalOperator = logicalOperator;
+		this.description = description;
+	}
+	
+	public String getOperator() {
+		return operator;
+	}
+	
+	public String getLogicalOperator() {
+		return logicalOperator;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	private static Set<String> operators;
+	private static Map<String,QueryLogicalOperator> operatorByKey;
+	
+	static {
+		QueryLogicalOperator.operators = new HashSet<>();
+		QueryLogicalOperator.operatorByKey = new HashMap<>();
+		
+		for(QueryLogicalOperator queryLogicalOperator : QueryLogicalOperator.values()) {
+			QueryLogicalOperator.operators.add(queryLogicalOperator.getOperator());
+			QueryLogicalOperator.operatorByKey.put(queryLogicalOperator.getOperator(), queryLogicalOperator);
+		}
+	}
+	
+	public static Set<String> getOperators() {
+		return QueryLogicalOperator.operators;
+	}
+	
+	public static QueryLogicalOperator getQueryLogicalOperator(String key) {
+		return operatorByKey.get(key);
+	}
+}