Skip to content

Commit d136495

Browse files
committed
Owlery returning all keys as per PR suggestion, nblast cosmetic comments on json manipulation
1 parent 9e33a1c commit d136495

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

src/main/java/org/geppetto/datasources/ExecuteQueryVisitor.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,10 @@ private void processResponse(String response, ADataSourceService dataSourceServi
218218
try{
219219
String customJson = "";
220220
if(response.startsWith("[")) {
221+
/* Checking if the server returns an array and if that's the case adding a dummy response
222+
* object to fit the JSON into our standard Map<String, Object> representation.
223+
* Regarding the String manipulation although ugly this is the most performant way of performing
224+
* this task. */
221225
customJson = "{\"response\":"+response+"}";
222226
response = customJson;
223227
}

src/main/java/org/geppetto/datasources/owlery/OWLeryResponseProcessor.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,12 @@ public class OWLeryResponseProcessor implements IQueryResponseProcessor
2828
*/
2929
@Override
3030
public QueryResults processResponse(Map<String, Object> response)
31-
{
32-
List<String> validKeys = Arrays.asList("hasInstance", "equivalentClass", "subClassOf", "superClassOf", "isSatisfiable", "value");
33-
31+
{
3432
QueryResults results = DatasourcesFactory.eINSTANCE.createQueryResults();
3533
List<String> headers = new ArrayList<String>();
3634

3735
for(String keyExtracted : response.keySet()) {
38-
if(validKeys.contains((String)keyExtracted) && !headers.contains(keyExtracted)) {
36+
if(!headers.contains(keyExtracted)) {
3937
headers.add(keyExtracted);
4038
}
4139
}

0 commit comments

Comments
 (0)