Work in progress

tarelli · tarelli · commit 6fb4616b902e · 2016-09-13T12:28:30.000+01:00
diff --git a/src/main/java/org/geppetto/datasources/ADataSourceService.java b/src/main/java/org/geppetto/datasources/ADataSourceService.java
@@ -39,8 +39,8 @@
 import org.geppetto.core.datasources.QueryChecker;
 import org.geppetto.core.model.GeppettoModelAccess;
 import org.geppetto.core.services.AService;
-import org.geppetto.model.DataSource;
-import org.geppetto.model.Query;
+import org.geppetto.model.datasources.DataSource;
+import org.geppetto.model.datasources.Query;
 import org.geppetto.model.variables.Variable;
 
 /**
diff --git a/src/main/java/org/geppetto/datasources/AQueryProcessor.java b/src/main/java/org/geppetto/datasources/AQueryProcessor.java
@@ -0,0 +1,53 @@
+/**
+ * 
+ */
+package org.geppetto.datasources;
+
+import java.util.Map;
+
+import org.geppetto.core.datasources.IQueryProcessor;
+import org.geppetto.core.features.IFeature;
+import org.geppetto.core.services.GeppettoFeature;
+import org.geppetto.core.services.registry.ServicesRegistry;
+
+/**
+ * @author matteocantarelli
+ *
+ */
+public abstract class AQueryProcessor implements IQueryProcessor
+{
+
+	@Override
+	public void registerGeppettoService() throws Exception
+	{
+		ServicesRegistry.registerQueryProcessorService(this);
+	}
+
+	@Override
+	public boolean isSupported(GeppettoFeature feature)
+	{
+		return false;
+	}
+
+	@Override
+	public IFeature getFeature(GeppettoFeature feature)
+	{
+		return null;
+	}
+
+	@Override
+	public void addFeature(IFeature feature)
+	{
+
+	}
+
+	/* (non-Javadoc)
+	 * @see org.geppetto.core.datasources.IQueryProcessor#getProcessingOutputMap()
+	 */
+	@Override
+	public Map<String, Object> getProcessingOutputMap()
+	{
+		return null;
+	}
+
+}
diff --git a/src/main/java/org/geppetto/datasources/DummyDataSourceService.java b/src/main/java/org/geppetto/datasources/DummyDataSourceService.java
@@ -35,11 +35,11 @@
 import org.geppetto.core.datasources.GeppettoDataSourceException;
 import org.geppetto.core.datasources.IDataSourceService;
 import org.geppetto.core.datasources.IQueryListener;
-import org.geppetto.model.DataSource;
-import org.geppetto.model.DataSourceLibraryConfiguration;
 import org.geppetto.model.GeppettoLibrary;
-import org.geppetto.model.Query;
-import org.geppetto.model.QueryResults;
+import org.geppetto.model.datasources.DataSource;
+import org.geppetto.model.datasources.DataSourceLibraryConfiguration;
+import org.geppetto.model.datasources.Query;
+import org.geppetto.model.datasources.QueryResults;
 import org.geppetto.model.types.ImportType;
 import org.geppetto.model.types.TypesFactory;
 import org.geppetto.model.variables.Variable;
diff --git a/src/main/java/org/geppetto/datasources/ExecuteQueryVisitor.java b/src/main/java/org/geppetto/datasources/ExecuteQueryVisitor.java
@@ -32,7 +32,9 @@
  *******************************************************************************/
 package org.geppetto.datasources;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.eclipse.emf.ecore.EObject;
@@ -46,20 +48,24 @@
 import org.geppetto.core.model.GeppettoModelAccess;
 import org.geppetto.core.services.ServiceCreator;
 import org.geppetto.datasources.ADataSourceService.ConnectionType;
-import org.geppetto.model.DataSource;
-import org.geppetto.model.GeppettoFactory;
-import org.geppetto.model.ProcessQuery;
-import org.geppetto.model.Query;
-import org.geppetto.model.QueryResults;
-import org.geppetto.model.SimpleQuery;
-import org.geppetto.model.util.GeppettoSwitch;
+import org.geppetto.model.datasources.AQueryResult;
+import org.geppetto.model.datasources.CompoundRefQuery;
+import org.geppetto.model.datasources.DataSource;
+import org.geppetto.model.datasources.DatasourcesFactory;
+import org.geppetto.model.datasources.ProcessQuery;
+import org.geppetto.model.datasources.Query;
+import org.geppetto.model.datasources.QueryResult;
+import org.geppetto.model.datasources.QueryResults;
+import org.geppetto.model.datasources.SerializableQueryResult;
+import org.geppetto.model.datasources.SimpleQuery;
+import org.geppetto.model.datasources.util.DatasourcesSwitch;
 import org.geppetto.model.util.GeppettoVisitingException;
 import org.geppetto.model.variables.Variable;
 
 /**
  * @author matteocantarelli Matteo TODO: I really want to move this to the datasource bundle...
  */
-public class ExecuteQueryVisitor extends GeppettoSwitch<Object>
+public class ExecuteQueryVisitor extends DatasourcesSwitch<Object>
 {
 
 	private DataSource dataSource = null;
@@ -78,6 +84,8 @@ public class ExecuteQueryVisitor extends GeppettoSwitch<Object>
 
 	private IQueryResponseProcessor queryResponseProcessor;
 
+	private Map<String, Object> processingOutputMap = new HashMap<String, Object>();
+
 	/**
 	 * 
 	 */
@@ -104,7 +112,7 @@ public ExecuteQueryVisitor(DataSource dataSource, String dataSourceTemplate, Var
 		this.count = count;
 		this.connectionType = connectionType;
 		this.queryResponseProcessor = queryResponseProcessor;
-		results = GeppettoFactory.eINSTANCE.createQueryResults();
+		results = DatasourcesFactory.eINSTANCE.createQueryResults();
 	}
 
 	/*
@@ -121,6 +129,7 @@ public Object caseProcessQuery(ProcessQuery query)
 			{
 				IQueryProcessor queryProcessor = (IQueryProcessor) ServiceCreator.getNewServiceInstance(query.getQueryProcessorId());
 				this.results = queryProcessor.process(query, dataSource, getVariable(), getResults(), geppettoModelAccess);
+				this.processingOutputMap = queryProcessor.getProcessingOutputMap();
 			}
 			catch(GeppettoInitializationException e)
 			{
@@ -134,6 +143,21 @@ public Object caseProcessQuery(ProcessQuery query)
 		return super.caseProcessQuery(query);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.geppetto.model.datasources.util.DatasourcesSwitch#caseCompoundRefQuery(org.geppetto.model.datasources.CompoundRefQuery)
+	 */
+	@Override
+	public Object caseCompoundRefQuery(CompoundRefQuery object)
+	{
+		for(Query query : object.getQueryChain())
+		{
+			this.doSwitch(query);
+		}
+		return super.caseCompoundRefQuery(object);
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * 
@@ -154,6 +178,11 @@ public Object caseSimpleQuery(SimpleQuery query)
 				properties.put("ID", getVariable().getId());
 				properties.put("QUERY", queryString);
 
+				if(processingOutputMap != null)
+				{
+					properties.putAll(processingOutputMap);
+				}
+
 				String processedQueryString = VelocityUtils.processTemplate(dataSourceTemplate, properties);
 
 				String response = null;
@@ -190,11 +219,46 @@ private void processResponse(String response)
 		else
 		{
 			Map<String, Object> responseMap = JSONUtility.getAsMap(response);
-			results = queryResponseProcessor.processResponse(responseMap);
+			mergeResults(queryResponseProcessor.processResponse(responseMap));
 		}
 
 	}
 
+	/**
+	 * @param processResponse
+	 */
+	private void mergeResults(QueryResults processResponse)
+	{
+		results = processResponse;
+//		if(results != null)
+//		{
+//			
+//
+//			processedResults.getHeader().add("ID");
+//			processedResults.getHeader().add("Name");
+//			processedResults.getHeader().add("Definition");
+//
+//			List<String> ids=new ArrayList<String>();
+//			for(AQueryResult result : results.getResults())
+//			{
+//				SerializableQueryResult processedResult = DatasourcesFactory.eINSTANCE.createSerializableQueryResult();
+//				processedResult.getValues().add(((QueryResult) result).getValues().get(idIndex).toString());
+//				String id=((List<String>) ((QueryResult) result).getValues().get(nameIndex)).get(0);
+//				processedResult.getValues().add(id);
+//				ids.add(id);
+//				processedResult.getValues().add(((QueryResult) result).getValues().get(descirptionIndex).toString());
+//				processedResults.getResults().add(processedResult);
+//			}
+//			
+//			processingOutputMap.put("ARRAY_ID_RESULTS",ids);
+//		}
+//		else
+//		{
+//			results = processResponse;
+//		}
+
+	}
+
 	/**
 	 * @param query
 	 * @return
diff --git a/src/main/java/org/geppetto/datasources/IQueryResponseProcessor.java b/src/main/java/org/geppetto/datasources/IQueryResponseProcessor.java
@@ -34,7 +34,9 @@
 
 import java.util.Map;
 
-import org.geppetto.model.QueryResults;
+import org.geppetto.model.datasources.QueryResults;
+
+
 
 /**
  * @author matteocantarelli
diff --git a/src/main/java/org/geppetto/datasources/aberowl/AberOWLDataSourceService.java b/src/main/java/org/geppetto/datasources/aberowl/AberOWLDataSourceService.java
@@ -37,9 +37,8 @@
 import org.geppetto.core.datasources.IQueryListener;
 import org.geppetto.datasources.ADataSourceService;
 import org.geppetto.datasources.ExecuteQueryVisitor;
-import org.geppetto.datasources.ADataSourceService.ConnectionType;
-import org.geppetto.model.Query;
-import org.geppetto.model.QueryResults;
+import org.geppetto.model.datasources.Query;
+import org.geppetto.model.datasources.QueryResults;
 import org.geppetto.model.util.GeppettoModelTraversal;
 import org.geppetto.model.util.GeppettoVisitingException;
 import org.geppetto.model.variables.Variable;
diff --git a/src/main/java/org/geppetto/datasources/aberowl/AberOWLResponseProcessor.java b/src/main/java/org/geppetto/datasources/aberowl/AberOWLResponseProcessor.java
@@ -8,9 +8,10 @@
 import java.util.Map;
 
 import org.geppetto.datasources.IQueryResponseProcessor;
-import org.geppetto.model.GeppettoFactory;
-import org.geppetto.model.QueryResult;
-import org.geppetto.model.QueryResults;
+import org.geppetto.model.datasources.DatasourcesFactory;
+import org.geppetto.model.datasources.QueryResult;
+import org.geppetto.model.datasources.QueryResults;
+
 
 /**
  * @author matteocantarelli
@@ -27,7 +28,7 @@ public class AberOWLResponseProcessor implements IQueryResponseProcessor
 	@Override
 	public QueryResults processResponse(Map<String, Object> response)
 	{
-		QueryResults results = GeppettoFactory.eINSTANCE.createQueryResults();
+		QueryResults results = DatasourcesFactory.eINSTANCE.createQueryResults();
 		List<String> headers = new ArrayList<String>();
 
 		List<Map<String, Object>> data = (List<Map<String, Object>>) response.get("result");
@@ -49,7 +50,7 @@ public QueryResults processResponse(Map<String, Object> response)
 		//STEP 2 - Add all the values at the right place
 		for(Map<String, Object> rowObject : data)
 		{
-			QueryResult resultRow = GeppettoFactory.eINSTANCE.createQueryResult();
+			QueryResult resultRow = DatasourcesFactory.eINSTANCE.createQueryResult();
 			for(String column : headers)
 			{
 				if(rowObject.containsKey(column))
diff --git a/src/main/java/org/geppetto/datasources/neo4j/Neo4jDataSourceService.java b/src/main/java/org/geppetto/datasources/neo4j/Neo4jDataSourceService.java
@@ -37,8 +37,8 @@
 import org.geppetto.core.datasources.IQueryListener;
 import org.geppetto.datasources.ADataSourceService;
 import org.geppetto.datasources.ExecuteQueryVisitor;
-import org.geppetto.model.Query;
-import org.geppetto.model.QueryResults;
+import org.geppetto.model.datasources.Query;
+import org.geppetto.model.datasources.QueryResults;
 import org.geppetto.model.util.GeppettoModelTraversal;
 import org.geppetto.model.util.GeppettoVisitingException;
 import org.geppetto.model.variables.Variable;
diff --git a/src/main/java/org/geppetto/datasources/neo4j/Neo4jResponseProcessor.java b/src/main/java/org/geppetto/datasources/neo4j/Neo4jResponseProcessor.java
@@ -7,9 +7,10 @@
 import java.util.Map;
 
 import org.geppetto.datasources.IQueryResponseProcessor;
-import org.geppetto.model.GeppettoFactory;
-import org.geppetto.model.QueryResult;
-import org.geppetto.model.QueryResults;
+import org.geppetto.model.datasources.DatasourcesFactory;
+import org.geppetto.model.datasources.QueryResult;
+import org.geppetto.model.datasources.QueryResults;
+
 
 /**
  * @author matteocantarelli
@@ -26,7 +27,7 @@ public class Neo4jResponseProcessor implements IQueryResponseProcessor
 	@Override
 	public QueryResults processResponse(Map<String, Object> response)
 	{
-		QueryResults results = GeppettoFactory.eINSTANCE.createQueryResults();
+		QueryResults results = DatasourcesFactory.eINSTANCE.createQueryResults();
 		List<String> headers = (List<String>) ((List) ((Map<String, Object>) ((List) response.get("results")).get(0)).get("columns"));
 
 		results.getHeader().addAll(headers);
@@ -35,7 +36,7 @@ public QueryResults processResponse(Map<String, Object> response)
 		List<Map<String, Object>> data = (List<Map<String, Object>>) ((List) ((Map<String, Object>) ((List) response.get("results")).get(0)).get("data"));
 		for(Map<String, Object> rowObject : data)
 		{
-			QueryResult resultRow = GeppettoFactory.eINSTANCE.createQueryResult();
+			QueryResult resultRow = DatasourcesFactory.eINSTANCE.createQueryResult();
 			List<Object> row = (List<Object>) rowObject.get("row");
 			for(Object value : row)
 			{
diff --git a/src/test/java/org/geppetto/datasources/TestDataSourceService.java b/src/test/java/org/geppetto/datasources/TestDataSourceService.java
@@ -35,11 +35,9 @@
 import org.geppetto.core.datasources.GeppettoDataSourceException;
 import org.geppetto.core.datasources.IDataSourceService;
 import org.geppetto.core.datasources.IQueryListener;
-import org.geppetto.datasources.ADataSourceService;
-import org.geppetto.datasources.ExecuteQueryVisitor;
 import org.geppetto.datasources.neo4j.Neo4jResponseProcessor;
-import org.geppetto.model.Query;
-import org.geppetto.model.QueryResults;
+import org.geppetto.model.datasources.Query;
+import org.geppetto.model.datasources.QueryResults;
 import org.geppetto.model.util.GeppettoModelTraversal;
 import org.geppetto.model.util.GeppettoVisitingException;
 import org.geppetto.model.variables.Variable;
diff --git a/src/test/java/org/geppetto/datasources/TestQueryProcessor.java b/src/test/java/org/geppetto/datasources/TestQueryProcessor.java
@@ -34,14 +34,13 @@
 
 
 import org.geppetto.core.datasources.GeppettoDataSourceException;
-import org.geppetto.core.datasources.IQueryProcessor;
 import org.geppetto.core.features.IFeature;
 import org.geppetto.core.model.GeppettoModelAccess;
 import org.geppetto.core.services.GeppettoFeature;
 import org.geppetto.core.services.registry.ServicesRegistry;
-import org.geppetto.model.DataSource;
-import org.geppetto.model.ProcessQuery;
-import org.geppetto.model.QueryResults;
+import org.geppetto.model.datasources.DataSource;
+import org.geppetto.model.datasources.ProcessQuery;
+import org.geppetto.model.datasources.QueryResults;
 import org.geppetto.model.types.CompositeType;
 import org.geppetto.model.types.ImportType;
 import org.geppetto.model.types.TypesFactory;
@@ -52,7 +51,7 @@
  * @author matteocantarelli
  *
  */
-public class TestQueryProcessor implements IQueryProcessor
+public class TestQueryProcessor extends AQueryProcessor
 {
 
 	/*
diff --git a/src/test/resources/test/GeppettoModelDSTest.xmi b/src/test/resources/test/GeppettoModelDSTest.xmi
@@ -3,7 +3,8 @@
     xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:gep="https://raw.githubusercontent.com/openworm/org.geppetto.model/development/src/main/resources/geppettoModel.ecore">
+    xmlns:gep="https://raw.githubusercontent.com/openworm/org.geppetto.model/query/src/main/resources/geppettoModel.ecore"
+    xmlns:gep_1="https://raw.githubusercontent.com/openworm/org.geppetto.model/query/src/main/resources/geppettoModel.ecore#//datasources">
   <libraries
       id="testLibrary"
       name="testLibrary"/>
@@ -19,10 +20,10 @@
         modelInterpreterId="testModelInterpreterService"
         format="test"/>
     <fetchVariableQuery
-        xsi:type="gep:CompoundQuery"
+        xsi:type="gep_1:CompoundQuery"
         description="">
       <queryChain
-          xsi:type="gep:ProcessQuery"
+          xsi:type="gep_1:ProcessQuery"
           name=""
           queryProcessorId="testQueryProcessorService"/>
     </fetchVariableQuery>
