Merge pull request #26 from openworm/fix/invalid_id_fetch_request

tarelli · web-flow · commit 4e125b067ade · 2018-08-29T20:25:57.000+01:00
Fix/invalid id fetch request
diff --git a/src/main/java/org/geppetto/datasources/ADataSourceService.java b/src/main/java/org/geppetto/datasources/ADataSourceService.java
@@ -144,10 +144,12 @@ public void fetchVariable(String variableId) throws GeppettoDataSourceException
 	{
 		Variable fetchedVariable = VariablesFactory.eINSTANCE.createVariable();
 		fetchedVariable.setId(variableId);
-		getGeppettoModelAccess().addVariable(fetchedVariable);
 		Query fetchVariableQuery = getConfiguration().getFetchVariableQuery();
 		ExecuteQueryVisitor runQueryVisitor = new ExecuteQueryVisitor(fetchedVariable, getGeppettoModelAccess());
 		runQueryVisitor.doSwitch(fetchVariableQuery);
+		if( !(fetchedVariable.getAnonymousTypes().isEmpty()) || !(fetchedVariable.getTypes().isEmpty())) {
+			getGeppettoModelAccess().addVariable(fetchedVariable);
+		}
 	}
 
 	/*

Original file line number	Diff line number	Diff line change
`@@ -144,10 +144,12 @@ public void fetchVariable(String variableId) throws GeppettoDataSourceException`
`144`	`144`	`{`
`145`	`145`	`Variable fetchedVariable = VariablesFactory.eINSTANCE.createVariable();`
`146`	`146`	`fetchedVariable.setId(variableId);`
`147`		`- getGeppettoModelAccess().addVariable(fetchedVariable);`
`148`	`147`	`Query fetchVariableQuery = getConfiguration().getFetchVariableQuery();`
`149`	`148`	`ExecuteQueryVisitor runQueryVisitor = new ExecuteQueryVisitor(fetchedVariable, getGeppettoModelAccess());`
`150`	`149`	`runQueryVisitor.doSwitch(fetchVariableQuery);`
	`150`	`+ if( !(fetchedVariable.getAnonymousTypes().isEmpty()) \|\| !(fetchedVariable.getTypes().isEmpty())) {`
	`151`	`+ getGeppettoModelAccess().addVariable(fetchedVariable);`
	`152`	`+ }`
`151`	`153`	`}`
`152`	`154`
`153`	`155`	`/*`