dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17435
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-11-11 14:24:20 +0100
message:
  Replaced deprecation with TODOs.
modified:
  dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MenuController.java


--
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-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java	2014-11-11 12:24:42 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java	2014-11-11 13:24:20 +0000
@@ -109,7 +109,9 @@
         viewClasses.put( "withoutOrganisationUnits", WithoutOrganisationUnitsView.class );
     }
 
-    @Deprecated
+    /**
+     * TODO remove
+     */
     public static Class<?> getViewClass( Object viewName )
     {
         if ( viewName == null || !(viewName instanceof String && ((String) viewName).length() != 0) )
@@ -148,13 +150,17 @@
         return jsonMapper.writeValueAsString( value );
     }
 
-    @Deprecated
+    /**
+     * TODO remove
+     */
     public static void toJsonWithView( OutputStream output, Object value, Class<?> viewClass ) throws IOException
     {
         jsonMapper.writerWithView( viewClass ).writeValue( output, value );
     }
 
-    @Deprecated
+    /**
+     * TODO remove
+     */
     public static String toJsonWithViewAsString( Object value, Class<?> viewClass ) throws IOException
     {
         return jsonMapper.writerWithView( viewClass ).writeValueAsString( value );
@@ -186,13 +192,17 @@
         return xmlMapper.writeValueAsString( value );
     }
 
-    @Deprecated
+    /**
+     * TODO remove
+     */
     public static void toXmlWithView( OutputStream output, Object value, Class<?> viewClass ) throws IOException
     {
         xmlMapper.writerWithView( viewClass ).writeValue( output, value );
     }
 
-    @Deprecated
+    /**
+     * TODO remove
+     */
     public static String toXmlWithViewAsString( Object value, Class<?> viewClass ) throws IOException
     {
         return xmlMapper.writerWithView( viewClass ).writeValueAsString( value );

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MenuController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MenuController.java	2014-11-11 12:51:06 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MenuController.java	2014-11-11 13:24:20 +0000
@@ -55,6 +55,7 @@
     @Autowired
     private RenderService renderService;
 
+    @SuppressWarnings("unchecked")
     @RequestMapping( method = RequestMethod.POST, consumes = "application/json" )
     public void saveMenuOrder( InputStream input )
         throws Exception