formatting changes only

Change-Id: I5a4deba0ed30071b30a69707ecadc4de10b9c37b
This commit is contained in:
Axel Uhl committed 2016-06-13 10:38:32 +02:00
1 parent 0cd82fb9f3
commit 2645c552a2
1 file changed
+1 -10
@@ -38,36 +38,29 @@ public class MasterDataImporter {
.createObjectInputStreamResolvingAgainstThisFactory(inputStream);
racingEventService.createOrUpdateDataImportProgressWithReplication(importOperationId, 0.03,
DataImportSubProgress.TRANSFER_STARTED, 0.5);
RaceLogStore raceLogStore = MongoRaceLogStoreFactory.INSTANCE.getMongoRaceLogStore(
racingEventService.getMongoObjectFactory(), racingEventService.getDomainObjectFactory());
RegattaImpl.setOngoingMasterDataImport(new MasterDataImportInformation(raceLogStore));
ClassLoader oldContextClassLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(racingEventService.getCombinedMasterDataClassLoader());
@SuppressWarnings("unchecked")
final List<Serializable> competitorIds = (List<Serializable>) objectInputStream.readObject();
if (override) {
setAllowCompetitorsDataToBeReset(competitorIds);
}
// Deserialize Regattas to make sure that Regattas are deserialized before Series
objectInputStream.readObject();
TopLevelMasterData topLevelMasterData = (TopLevelMasterData) objectInputStream.readObject();
RegattaImpl.setOngoingMasterDataImport(null);
Thread.currentThread().setContextClassLoader(oldContextClassLoader);
// in order to restore all listeners we need to initialize the regatta
// after the whole object graph has been restored
for (Regatta regatta : topLevelMasterData.getAllRegattas()) {
RegattaImpl regattaImpl = (RegattaImpl)regatta;
regattaImpl.initializeSeriesAfterDeserialize();
}
racingEventService.createOrUpdateDataImportProgressWithReplication(importOperationId, 0.3,
DataImportSubProgress.TRANSFER_COMPLETED, 0.5);
applyMasterDataImportOperation(topLevelMasterData, importOperationId, override);
}
@@ -84,10 +77,8 @@ public class MasterDataImporter {
private MasterDataImportObjectCreationCount applyMasterDataImportOperation(TopLevelMasterData topLevelMasterData,
UUID importOperationId, boolean override) {
MasterDataImportObjectCreationCountImpl creationCount = new MasterDataImportObjectCreationCountImpl();
ImportMasterDataOperation op = new ImportMasterDataOperation(topLevelMasterData, importOperationId, override,
creationCount);
ImportMasterDataOperation op = new ImportMasterDataOperation(topLevelMasterData, importOperationId, override, creationCount);
creationCount = racingEventService.apply(op);
racingEventService.mediaTracksImported(topLevelMasterData.getFilteredMediaTracks(), override);
return creationCount;
}