trace-server: Support markerSetId for annotation categories

[Added] markerSetId query parameter in GET annotations endpoint Change-Id: Ia8c16ce1be8ad24a74d1d282dfeac12330709692 Signed-off-by: Patrick Tasse <[email protected]> Reviewed-on: https://git.eclipse.org/r/c/tracecompass.incubator/org.eclipse.tracecompass.incubator/+/182766 Tested-by: Trace Compass Bot <[email protected]> Tested-by: Matthew Khouzam <[email protected]> Reviewed-by: Matthew Khouzam <[email protected]>
tracecompass · Jul 9, 2021 · cf50709 · cf50709
1 parent 7d36f02
commit cf50709
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/...ompass/incubator/internal/trace/server/jersey/rest/core/services/DataProviderService.java b/...ompass/incubator/internal/trace/server/jersey/rest/core/services/DataProviderService.java
@@ -86,6 +86,7 @@
 import org.eclipse.tracecompass.tmf.core.trace.experiment.TmfExperiment;
 import org.w3c.dom.Element;
 
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 
 /**
@@ -373,13 +374,16 @@ public Response getArrows(@PathParam("expUUID") UUID expUUID,
      *            desired experiment UUID
      * @param outputId
      *            Eclipse extension point ID for the data provider to query
+     * @param markerSetId
+     *            marker set ID
      * @return {@link TmfModelResponse} containing {@link AnnotationCategoriesModel}
      */
     @GET
     @Path("/{outputId}/annotations")
     @Produces(MediaType.APPLICATION_JSON)
     public Response getAnnotationCategories(@PathParam("expUUID") UUID expUUID,
-            @PathParam("outputId") String outputId) {
+            @PathParam("outputId") String outputId,
+            @QueryParam("markerSetId") String markerSetId) {
 
         if (outputId == null) {
             return Response.status(Status.PRECONDITION_FAILED).entity(MISSING_OUTPUTID).build();
@@ -403,8 +407,11 @@ public Response getAnnotationCategories(@PathParam("expUUID") UUID expUUID,
             AnnotationCategoriesModel model = null;
             // Fetch trace annotation categories
             TraceAnnotationProvider traceAnnotationProvider = ExperimentManagerService.getTraceAnnotationProvider(expUUID);
-            @NonNull Map<@NonNull String, @NonNull Object> params = Collections.emptyMap();
             if (traceAnnotationProvider != null) {
+                // Parameter is only applicable for trace annotation provider
+                @NonNull Map<@NonNull String, @NonNull Object> params =
+                        (markerSetId == null) ? Collections.emptyMap() :
+                            ImmutableMap.of(DataProviderParameterUtils.REQUESTED_MARKER_SET_KEY, markerSetId);
                 TmfModelResponse<@NonNull AnnotationCategoriesModel> traceAnnotations = traceAnnotationProvider.fetchAnnotationCategories(params, null);
                 if (traceAnnotations.getStatus() == ITmfResponse.Status.CANCELLED || traceAnnotations.getStatus() == ITmfResponse.Status.FAILED) {
                     return Response.ok(new TmfModelResponse<>(new AnnotationCategoriesModel(Collections.emptyList()), traceAnnotations.getStatus(), traceAnnotations.getStatusMessage())).build();
@@ -414,7 +421,7 @@ public Response getAnnotationCategories(@PathParam("expUUID") UUID expUUID,
             }
             // Fetch data provider annotation categories
             if (provider instanceof IOutputAnnotationProvider) {
-                TmfModelResponse<@NonNull AnnotationCategoriesModel> annotations = ((IOutputAnnotationProvider) provider).fetchAnnotationCategories(params, null);
+                TmfModelResponse<@NonNull AnnotationCategoriesModel> annotations = ((IOutputAnnotationProvider) provider).fetchAnnotationCategories(Collections.emptyMap(), null);
                 if (annotations.getStatus() == ITmfResponse.Status.CANCELLED || annotations.getStatus() == ITmfResponse.Status.FAILED) {
                     return Response.ok(new TmfModelResponse<>(new AnnotationCategoriesModel(Collections.emptyList()), annotations.getStatus(), annotations.getStatusMessage())).build();
                 }