eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-15 16:51:07 +00:00
Code Activity

bug4371 Added additional fields to ExpeditionAllInOneImporter import

Browse Source 
result objects
This commit is contained in:
Benjamin Barth committed 2017-12-19 10:29:05 +01:00
1 parent 6b2877ce88
commit 446304d3c1
1 file changed
+15 -3
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionAllInOneImporter.java
+15 -3
View File
@@ -69,12 +69,20 @@ public class ExpeditionAllInOneImporter {
final String leaderboardName;
final String regattaName;
final String raceName;
final List<TrackImportDTO> importGpsFixData;
final List<TrackImportDTO> importSensorFixData;
final String sensorFixImporterType;
public ImporterResult(final UUID eventId, final String leaderboardName, final RegattaAndRaceIdentifier regattaAndRaceIdentifier) {
private ImporterResult(final UUID eventId, final String leaderboardName,
final RegattaAndRaceIdentifier regattaAndRaceIdentifier, final List<TrackImportDTO> importGpsFixData,
final List<TrackImportDTO> importSensorFixData, final String sensorFixImporterType) {
this.eventId = eventId;
this.leaderboardName = leaderboardName;
this.regattaName = regattaAndRaceIdentifier.getRegattaName();
this.raceName = regattaAndRaceIdentifier.getRaceName();
this.importGpsFixData = importGpsFixData;
this.importSensorFixData = importSensorFixData;
this.sensorFixImporterType = sensorFixImporterType;
}
}
@@ -126,7 +134,9 @@ public class ExpeditionAllInOneImporter {
}
final ImportResultDTO jsonHolderForSensorFixImport = new ImportResultDTO(logger);
final Iterable<Pair<String, FileItem>> importerNamesAndFilesForSensorFixImport = Arrays.asList(new Pair<>(DoubleVectorFixImporter.EXPEDITION_EXTENDED_TYPE, fileItem));
final String sensorFixImporterType = DoubleVectorFixImporter.EXPEDITION_EXTENDED_TYPE;
final Iterable<Pair<String, FileItem>> importerNamesAndFilesForSensorFixImport = Arrays
.asList(new Pair<>(sensorFixImporterType, fileItem));
try {
new SensorDataImporter(service, context).importFiles(false, jsonHolderForSensorFixImport, importerNamesAndFilesForSensorFixImport);
} catch (IOException e1) {
@@ -206,7 +216,9 @@ public class ExpeditionAllInOneImporter {
streamsWithFilenames.put(fileItem.getInputStream(), filename);
new WindImporter().importWindToWindSourceAndTrackedRaces(service, windImportResult, windSource, Arrays.asList(trackedRace), streamsWithFilenames);
return new ImporterResult(event.getId(), regattaNameAndleaderboardName, trackedRace.getRaceIdentifier());
return new ImporterResult(event.getId(), regattaNameAndleaderboardName, trackedRace.getRaceIdentifier(),
jsonHolderForGpsFixImport.getImportResult(), jsonHolderForSensorFixImport.getImportResult(),
sensorFixImporterType);
} catch (Exception e) {
throw new RuntimeException(e);
}