server: Sort samples in the same way for variants and samplesMetadata

j-coll · j-coll · commit 5c8af7bd72ce · 2016-04-15T14:00:52.000+01:00
diff --git a/opencga-server/src/main/java/org/opencb/opencga/server/utils/VariantFetcher.java b/opencga-server/src/main/java/org/opencb/opencga/server/utils/VariantFetcher.java
@@ -126,8 +126,9 @@ public QueryResult variantsStudy(int studyId, String regionStr, boolean histogra
                         new QueryOptions("exclude", Arrays.asList("projects.studies.samples.annotationSets",
                                 "projects.studies.samples.attributes"))
                         , sessionId);
+                samplesQueryResult.getResult().sort((o1, o2) -> Integer.compare(o1.getId(), o2.getId()));
                 samplesMap.put(study.getId(), samplesQueryResult.getResult());
-                samplesQueryResult.getResult().stream().map(Sample::getId).sorted().forEach(returnedSamples::add);
+                samplesQueryResult.getResult().stream().map(Sample::getId).forEach(returnedSamples::add);
             }
             query.append(VariantDBAdaptor.VariantQueryParams.RETURNED_SAMPLES.key(), returnedSamples);
         }

Original file line number	Diff line number	Diff line change
`@@ -126,8 +126,9 @@ public QueryResult variantsStudy(int studyId, String regionStr, boolean histogra`
`126`	`126`	`new QueryOptions("exclude", Arrays.asList("projects.studies.samples.annotationSets",`
`127`	`127`	`"projects.studies.samples.attributes"))`
`128`	`128`	`, sessionId);`
	`129`	`+ samplesQueryResult.getResult().sort((o1, o2) -> Integer.compare(o1.getId(), o2.getId()));`
`129`	`130`	`samplesMap.put(study.getId(), samplesQueryResult.getResult());`
`130`		`- samplesQueryResult.getResult().stream().map(Sample::getId).sorted().forEach(returnedSamples::add);`
	`131`	`+ samplesQueryResult.getResult().stream().map(Sample::getId).forEach(returnedSamples::add);`
`131`	`132`	`}`
`132`	`133`	`query.append(VariantDBAdaptor.VariantQueryParams.RETURNED_SAMPLES.key(), returnedSamples);`
`133`	`134`	`}`