=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/DataSetsResourceP.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/DataSetsResourceP.java 2011-09-15 13:33:15 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/DataSetsResourceP.java 2011-09-15 13:36:33 +0000 @@ -75,19 +75,19 @@ } @GET - @Path("dataSets/{id}") + @Path("dataSets/{uuid}") @Produces( { "application/x-javascript" } ) - public JSONWithPadding getDataSet( @PathParam("id") Integer id, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) + public JSONWithPadding getDataSet( @PathParam("uuid") String uuid, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) { - DataSet dataSet = dataSetService.getDataSet( id ); + DataSet dataSet = dataSetService.getDataSet( uuid ); if ( dataSet == null ) { - throw new IllegalArgumentException( "No dataset with id " + id ); + throw new IllegalArgumentException( "No dataset with uuid " + uuid ); } Map dataSetMap = new HashMap(); - dataSetMap.put( "id", dataSet.getId() ); + dataSetMap.put( "uuid", dataSet.getUuid() ); dataSetMap.put( "name", dataSet.getName() ); return new JSONWithPadding( dataSetMap, callback );