From f474ad4cb9e066517d3c45f16daa3c01864821bb Mon Sep 17 00:00:00 2001 From: Emily Burns Date: Mon, 9 Sep 2019 16:49:04 -0700 Subject: [PATCH] chore(history): maps not typed (#896) --- .../netflix/spinnaker/gate/services/internal/KeelService.java | 4 ++-- .../netflix/spinnaker/gate/controllers/HistoryController.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gate-core/src/main/groovy/com/netflix/spinnaker/gate/services/internal/KeelService.java b/gate-core/src/main/groovy/com/netflix/spinnaker/gate/services/internal/KeelService.java index e1449568ba..49f985abbf 100644 --- a/gate-core/src/main/groovy/com/netflix/spinnaker/gate/services/internal/KeelService.java +++ b/gate-core/src/main/groovy/com/netflix/spinnaker/gate/services/internal/KeelService.java @@ -19,7 +19,6 @@ import com.netflix.spinnaker.kork.manageddelivery.model.DeliveryConfig; import com.netflix.spinnaker.kork.manageddelivery.model.Resource; -import com.netflix.spinnaker.kork.manageddelivery.model.ResourceEvent; import java.util.List; import java.util.Map; import retrofit.http.Body; @@ -32,7 +31,8 @@ public interface KeelService { @GET("/resources/events/{name}") - List getResourceEvents(@Path("name") String name, @Query("limit") Integer limit); + List> getResourceEvents( + @Path("name") String name, @Query("limit") Integer limit); @GET("/resources/{name}") Resource getResource(@Path("name") String name); diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/HistoryController.java b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/HistoryController.java index 69419d1d39..bfd7ba5d18 100644 --- a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/HistoryController.java +++ b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/HistoryController.java @@ -1,10 +1,10 @@ package com.netflix.spinnaker.gate.controllers; import com.netflix.spinnaker.gate.services.internal.KeelService; -import com.netflix.spinnaker.kork.manageddelivery.model.ResourceEvent; import groovy.util.logging.Slf4j; import io.swagger.annotations.ApiOperation; import java.util.List; +import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -31,7 +31,7 @@ public HistoryController(KeelService keelService) { @ApiOperation(value = "Get history for a resource", response = List.class) @RequestMapping(value = "/{name}", method = RequestMethod.GET) - List getHistory( + List> getHistory( @PathVariable("name") String name, @RequestParam(value = "limit", required = false) Integer limit) { return keelService.getResourceEvents(name, limit);