← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7435: Removed mapping to application/dhis+xml content type in datavalue web-api controller

 

------------------------------------------------------------
revno: 7435
committer: Bob Jolliffe <bobjolliffe@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-06-27 16:14:04 +0100
message:
  Removed mapping to application/dhis+xml content type in datavalue web-api controller
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataValueSetController.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-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataValueSetController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataValueSetController.java	2012-06-14 17:36:08 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataValueSetController.java	2012-06-27 15:14:04 +0000
@@ -119,21 +119,6 @@
         response.setContentType( CONTENT_TYPE_XML );        
         JacksonUtils.toXml( response.getOutputStream(), summary );
     }
-
-    @RequestMapping( method = RequestMethod.POST, consumes = "application/dhis+xml" )
-    @PreAuthorize( "hasRole('ALL') or hasRole('F_DATAVALUE_ADD')" )
-    public void postDataValueSet( ImportOptions importOptions,
-                                  HttpServletResponse response, 
-                                  InputStream in,
-                                  Model model ) throws IOException
-    {
-        ImportSummary summary = integrationService.importXMLDataValueSet( in, importOptions );
-
-        log.info( "Data values set saved " + importOptions );    
-
-        response.setContentType( CONTENT_TYPE_XML );        
-        JacksonUtils.toXml( response.getOutputStream(), summary );
-    }
     
     @ExceptionHandler(IllegalArgumentException.class)
     public void handleError( IllegalArgumentException ex, HttpServletResponse response )