eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-22 21:55:39 +00:00
Code Activity

bug5681: fixed serializability of DataImportProgress implementation classes

Browse Source
This commit is contained in:
Axel Uhl
2022-02-18 17:29:46 +01:00
parent 514a76c86a
commit 199b77df09
6 changed files with 146 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/DataImportProgressJsonDeserializer.java
+9 -38
View File
@@ -8,6 +8,7 @@ import org.json.simple.JSONObject;
import com.sap.sailing.domain.common.DataImportProgress;
import com.sap.sailing.domain.common.DataImportSubProgress;
import com.sap.sailing.domain.common.MasterDataImportObjectCreationCount;
import com.sap.sailing.domain.common.impl.BaseMasterDataImportObjectCreationCountImpl;
import com.sap.sailing.domain.common.impl.DataImportProgressImpl;
import com.sap.sailing.server.gateway.serialization.impl.DataImportProgressJsonSerializer;
import com.sap.sse.common.Util;
@@ -30,44 +31,14 @@ public class DataImportProgressJsonDeserializer implements JsonDeserializer<Data
}
final JSONObject objectCountsJson = (JSONObject) object.get(DataImportProgressJsonSerializer.RESULT);
if (objectCountsJson != null) {
final MasterDataImportObjectCreationCount objectCounts = new MasterDataImportObjectCreationCount() {
private static final long serialVersionUID = 4004959619812197098L;
@Override
public int getLeaderboardCount() {
return ((Number) objectCountsJson.get(DataImportProgressJsonSerializer.LEADERBOARD_COUNT)).intValue();
}
@Override
public int getLeaderboardGroupCount() {
return ((Number) objectCountsJson.get(DataImportProgressJsonSerializer.LEADERBOARD_GROUP_COUNT)).intValue();
}
@Override
public int getEventCount() {
return ((Number) objectCountsJson.get(DataImportProgressJsonSerializer.EVENT_COUNT)).intValue();
}
@Override
public int getRegattaCount() {
return ((Number) objectCountsJson.get(DataImportProgressJsonSerializer.REGATTA_COUNT)).intValue();
}
@Override
public int getMediaTrackCount() {
return ((Number) objectCountsJson.get(DataImportProgressJsonSerializer.MEDIA_TRACK_COUNT)).intValue();
}
@Override
public Iterable<String> getOverwrittenRegattaNames() {
return Util.map(((JSONArray) objectCountsJson.get(DataImportProgressJsonSerializer.OVERWRITTEN_REGATTA_NAMES)), o->o.toString());
}
@Override
public int getTrackedRacesCount() {
return ((Number) objectCountsJson.get(DataImportProgressJsonSerializer.TRACKED_RACES_COUNT)).intValue();
}
};
final MasterDataImportObjectCreationCount objectCounts = new BaseMasterDataImportObjectCreationCountImpl(
((Number) objectCountsJson.get(DataImportProgressJsonSerializer.LEADERBOARD_COUNT)).intValue(),
((Number) objectCountsJson.get(DataImportProgressJsonSerializer.LEADERBOARD_GROUP_COUNT)).intValue(),
((Number) objectCountsJson.get(DataImportProgressJsonSerializer.EVENT_COUNT)).intValue(),
((Number) objectCountsJson.get(DataImportProgressJsonSerializer.REGATTA_COUNT)).intValue(),
((Number) objectCountsJson.get(DataImportProgressJsonSerializer.MEDIA_TRACK_COUNT)).intValue(),
((Number) objectCountsJson.get(DataImportProgressJsonSerializer.TRACKED_RACES_COUNT)).intValue(),
Util.map(((JSONArray) objectCountsJson.get(DataImportProgressJsonSerializer.OVERWRITTEN_REGATTA_NAMES)), o->o.toString()));
result.setResult(objectCounts);
}
return result;
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/DataImportProgressJsonSerializer.java
+2 -2
View File
@@ -37,8 +37,8 @@ public class DataImportProgressJsonSerializer implements JsonSerializer<DataImpo
counts.put(REGATTA_COUNT, object.getResult().getRegattaCount());
counts.put(MEDIA_TRACK_COUNT, object.getResult().getMediaTrackCount());
final JSONArray overwrittenRegattaNames = new JSONArray();
if (object.getResult().getOverwrittenRegattaNames() != null) {
for (final String overwrittenRegattaName : object.getResult().getOverwrittenRegattaNames()) {
if (object.getResult().getNamesOfOverwrittenRegattaNames() != null) {
for (final String overwrittenRegattaName : object.getResult().getNamesOfOverwrittenRegattaNames()) {
overwrittenRegattaNames.add(overwrittenRegattaName);
}
counts.put(OVERWRITTEN_REGATTA_NAMES, overwrittenRegattaNames);