diff --git a/quickstart/testapp/src/main/java/com/navercorp/pinpoint/testapp/controller/HttpClient4Controller.java b/quickstart/testapp/src/main/java/com/navercorp/pinpoint/testapp/controller/HttpClient4Controller.java index df827002e..2ac323b6b 100644 --- a/quickstart/testapp/src/main/java/com/navercorp/pinpoint/testapp/controller/HttpClient4Controller.java +++ b/quickstart/testapp/src/main/java/com/navercorp/pinpoint/testapp/controller/HttpClient4Controller.java @@ -1,7 +1,7 @@ package com.navercorp.pinpoint.testapp.controller; -import java.util.Map; - +import com.navercorp.pinpoint.testapp.service.remote.RemoteService; +import com.navercorp.pinpoint.testapp.util.Description; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; @@ -10,9 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import com.navercorp.pinpoint.testapp.service.remote.HttpRemoteService; -import com.navercorp.pinpoint.testapp.service.remote.RemoteService; -import com.navercorp.pinpoint.testapp.util.Description; +import java.util.Map; /** * @author koo.taejin @@ -22,10 +20,9 @@ import com.navercorp.pinpoint.testapp.util.Description; public class HttpClient4Controller { private static final String GOOGLE_GEOCODE_URL = "http://maps.googleapis.com/maps/api/geocode/json"; - private static final String TWITTER_URL_COUNT_URL = "http://urls.api.twitter.com/1/urls/count.json"; + private static final String EPL_LEAGUE_TABLE_URL = "http://api.football-data.org/v1/soccerseasons/398/leagueTable"; private static final String DEFAULT_GET_GEOCODE_ADDRESS = "Gyeonggi-do, Seongnam-si, Bundang-gu, Jeongja-dong, 178-1"; - private static final String DEFAULT_GET_TWITTER_URL_COUNT_URL = "http://www.naver.com"; @Autowired @Qualifier("httpRemoteService") @@ -42,24 +39,11 @@ public class HttpClient4Controller { return remoteService.get(GOOGLE_GEOCODE_URL, params, Map.class); } - @RequestMapping("/getTwitterUrlCount") + @RequestMapping("/getEPLLeagueTable") @ResponseBody - @Description("HTTP GET to " + TWITTER_URL_COUNT_URL) - public Map getTwitterUrlCount(@RequestParam(defaultValue = DEFAULT_GET_TWITTER_URL_COUNT_URL, required = false) String url) throws Exception { - LinkedMultiValueMap params = new LinkedMultiValueMap(); - params.add("url", url); - - return remoteService.get(TWITTER_URL_COUNT_URL, params, Map.class); - } - - @RequestMapping("/getTwitterUrlCountByPost") - @ResponseBody - @Description("HTTP POST to " + TWITTER_URL_COUNT_URL) - public Map getTwitterUrlCountByPost(@RequestParam(defaultValue = DEFAULT_GET_TWITTER_URL_COUNT_URL, required = false) String url) throws Exception { - LinkedMultiValueMap params = new LinkedMultiValueMap(); - params.add("url", url); - - return remoteService.post(TWITTER_URL_COUNT_URL, params, Map.class); + @Description("HTTP GET to " + EPL_LEAGUE_TABLE_URL) + public Map getEplLeagueTable() throws Exception { + return remoteService.get(EPL_LEAGUE_TABLE_URL, Map.class); } }