------------------------------------------------------------
revno: 5676
committer: mobilars <[email protected]>
branch nick: dhis2
timestamp: Fri 2012-01-06 13:12:16 +0100
message:
Update due to Spring 3.0. Stating custom HttpMessageConverter and accepting
null MediaType
modified:
dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/support/DataStreamSerializableMessageConverter.java
dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/META-INF/dhis/servlet.xml
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/support/DataStreamSerializableMessageConverter.java'
--- dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/support/DataStreamSerializableMessageConverter.java 2011-11-29 12:06:35 +0000
+++ dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/support/DataStreamSerializableMessageConverter.java 2012-01-06 12:12:16 +0000
@@ -18,14 +18,24 @@
@Override
public boolean canRead( Class<?> clazz, MediaType mediaType )
{
- return MediaTypes.MEDIA_TYPES.contains( mediaType) && DataStreamSerializable.class.isAssignableFrom( clazz );
+ if (mediaType == null){
+ return DataStreamSerializable.class.isAssignableFrom( clazz );
+ }
+ else {
+ return MediaTypes.MEDIA_TYPES.contains( mediaType) && DataStreamSerializable.class.isAssignableFrom( clazz );
+ }
}
@Override
public boolean canWrite( Class<?> clazz, MediaType mediaType )
{
- return MediaTypes.MEDIA_TYPES.contains( mediaType) && DataStreamSerializable.class.isAssignableFrom( clazz );
+ if (mediaType == null){
+ return DataStreamSerializable.class.isAssignableFrom( clazz );
+ }
+ else {
+ return MediaTypes.MEDIA_TYPES.contains( mediaType) && DataStreamSerializable.class.isAssignableFrom( clazz );
+ }
}
@Override
=== modified file 'dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/META-INF/dhis/servlet.xml'
--- dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/META-INF/dhis/servlet.xml 2012-01-05 20:39:23 +0000
+++ dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/META-INF/dhis/servlet.xml 2012-01-06 12:12:16 +0000
@@ -10,7 +10,11 @@
<!-- DispatcherServlet Context: defines this servlet's request-processing infrastructure -->
<!-- Enables the Spring MVC @Controller programming model -->
- <annotation-driven />
+ <annotation-driven>
+ <message-converters>
+ <beans:bean class="org.hisp.dhis.api.mobile.support.DataStreamSerializableMessageConverter"/>
+ </message-converters>
+ </annotation-driven>
<context:component-scan base-package="org.hisp.dhis.api.mobile" />
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
