home/pinpoint
2
0
Fork 0
mirror of https://github.com/wahyd4/pinpoint.git synced 2026-08-17 16:56:15 +10:00
Code Issues Packages Projects Releases Wiki Activity

[강운덕] [WEB-95] 오타 수정. MappingJackson2JsonpView의 CONTENT_TYPE 을 application/jsonp로 수정. spring의 xml 정리.

Browse Source 
git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-web/trunk@3565 84d0f5b1-2673-498c-a247-62c4ff18d310
This commit is contained in:
Woonduk Kang
2014-03-28 02:07:50 +00:00
parent 1c6357402f
commit 7f8ecf7dc3
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/nhn/pinpoint/web/controller/ScatterChartController.java
+3 -3
View File
@@ -134,7 +134,7 @@ public class ScatterChartController {
} else {
resultRange = new Range(limitedScanResult.getLimitedTime(), range.getTo());
}
return createModelAndVeiw(resultRange, jsonpCallback, scatterData);
return createModelAndView(resultRange, jsonpCallback, scatterData);
}
private ModelAndView selectScatterData(String applicationName, Range range, int limit, String jsonpCallback) {
@@ -146,10 +146,10 @@ public class ScatterChartController {
} else {
resultRange = new Range(scatterData.get(scatterData.size() - 1).getAcceptedTime(), range.getTo());
}
return createModelAndVeiw(resultRange, jsonpCallback, scatterData);
return createModelAndView(resultRange, jsonpCallback, scatterData);
}
private ModelAndView createModelAndVeiw(Range range, String jsonpCallback, List<Dot> scatterData) {
private ModelAndView createModelAndView(Range range, String jsonpCallback, List<Dot> scatterData) {
ModelAndView mv = new ModelAndView();
mv.addObject("resultFrom", range.getFrom());
mv.addObject("resultTo", range.getTo());
src/main/java/com/nhn/pinpoint/web/util/MappingJackson2JsonpView.java
+1 -1
View File
@@ -32,7 +32,7 @@ public class MappingJackson2JsonpView extends MappingJackson2JsonView {
/**
* Default content type. Overridable as bean property.
*/
public static final String DEFAULT_CONTENT_TYPE = "application/json";
public static final String DEFAULT_CONTENT_TYPE = "application/jsonp";
private ObjectMapper objectMapper = new ObjectMapper();
src/main/resources/servlet-context.xml
+6 -8
View File
@@ -42,18 +42,16 @@
<property name="suffix" value=".jsp" />
</bean>
<bean id="unwrapRootJsonObjectMapper" class="com.nhn.pinpoint.web.util.UnwrapRootJackson2ObjectMapper"/>
<bean class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping" />
<bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter" />
<mvc:interceptors>
<bean id="webContentInterceptor" class="org.springframework.web.servlet.mvc.WebContentInterceptor">
<property name="cacheSeconds" value="0"/>
<property name="useExpiresHeader" value="true"/>
<property name="useCacheControlHeader" value="true"/>
<property name="useCacheControlNoStore" value="true"/>
</bean>
<bean id="webContentInterceptor" class="org.springframework.web.servlet.mvc.WebContentInterceptor">
<property name="cacheSeconds" value="0"/>
<property name="useExpiresHeader" value="true"/>
<property name="useCacheControlHeader" value="true"/>
<property name="useCacheControlNoStore" value="true"/>
</bean>
</mvc:interceptors>
</beans>