=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/PreheatService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/PreheatService.java 2016-02-08 08:21:50 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/PreheatService.java 2016-02-08 08:44:43 +0000 @@ -67,7 +67,7 @@ * @param objects Objects to scan * @return Maps classes to collections of identifiers */ - Map, Set>> collectReferences( Collection objects ); + Map, Set>> collectReferences( Collection objects ); /** * Connects id object references on a given object using a given identifier + a preheated Preheat cache. === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java 2016-02-08 08:21:50 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java 2016-02-08 08:44:43 +0000 @@ -152,7 +152,7 @@ @Override @SuppressWarnings( "unchecked" ) - public Map, Set>> collectReferences( Collection objects ) + public Map, Set>> collectReferences( Collection objects ) { Map, Set>> map = new HashMap<>(); === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/DefaultObjectBundleService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/DefaultObjectBundleService.java 2016-02-08 08:21:50 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/DefaultObjectBundleService.java 2016-02-08 08:44:43 +0000 @@ -35,8 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.ArrayList; - /** * @author Morten Olav Hansen */ @@ -59,7 +57,7 @@ if ( PreheatMode.REFERENCE == preheatParams.getPreheatMode() ) { - preheatParams.setReferences( preheatService.collectReferences( new ArrayList<>( params.getObjects() ) ) ); + preheatParams.setReferences( preheatService.collectReferences( params.getObjects() ) ); } bundle.setPreheat( preheatService.preheat( preheatParams ) );