=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata2/MetadataExportServiceTest.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata2/MetadataExportServiceTest.java 2016-01-27 03:37:57 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata2/MetadataExportServiceTest.java 2016-02-04 21:23:13 +0000 @@ -69,7 +69,6 @@ } @Test - @SuppressWarnings( "unchecked" ) public void testMetadataExport() { DataElementGroup deg1 = createDataElementGroup( 'A' ); @@ -100,7 +99,6 @@ } @Test - @SuppressWarnings( "unchecked" ) public void testMetadataExportWithCustomClasses() { DataElementGroup deg1 = createDataElementGroup( 'A' ); @@ -135,7 +133,6 @@ } @Test - @SuppressWarnings( "unchecked" ) public void testMetadataExportWithCustomQueries() { DataElementGroup deg1 = createDataElementGroup( 'A' ); === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataApprovalController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataApprovalController.java 2016-02-04 02:25:03 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataApprovalController.java 2016-02-04 21:23:13 +0000 @@ -710,7 +710,7 @@ User user = currentUserService.getCurrentUser(); Date date = new Date(); - Set set = new HashSet<>(); // Avoid duplicates when different datasets have the same workflow + Set set = new HashSet<>(); // Avoid duplicates when different data sets have the same work flow for ( DataSet dataSet : dataSets ) {