Merge branch 'master' into bug5174

This commit is contained in:
Steffen Schaefer committed 2020-01-22 10:28:05 +01:00
commit e592780078
2 files changed
+3 -3

No files matched your search

@@ -152,7 +152,7 @@ import com.sap.sse.shared.media.VideoDescriptor;
public class MongoObjectFactoryImpl implements MongoObjectFactory {
private static Logger logger = Logger.getLogger(MongoObjectFactoryImpl.class.getName());
private final MongoDatabase database;
private final CompetitorWithBoatRefJsonSerializer competitorWithBoatRefSerializer = CompetitorWithBoatRefJsonSerializer.create();
private final CompetitorWithBoatRefJsonSerializer competitorWithBoatRefSerializer = CompetitorWithBoatRefJsonSerializer.create(/* serializeNonPublicCompetitorFields */ true);
private final CompetitorJsonSerializer competitorSerializer = CompetitorJsonSerializer.create(
/* serialize boat */ true, /* serializeNonPublicCompetitorFields */ true, /* verboseBoatClassSerializer */ false);
private final BoatJsonSerializer boatSerializer = new BoatJsonSerializer(new BoatClassJsonSerializer(/* verbose */ false));
@@ -11,8 +11,8 @@ import com.sap.sailing.server.gateway.serialization.JsonSerializer;
public class CompetitorWithBoatRefJsonSerializer implements JsonSerializer<CompetitorWithBoat> {
private final JsonSerializer<Competitor> competitorJsonSerializer;
public static CompetitorWithBoatRefJsonSerializer create() {
return new CompetitorWithBoatRefJsonSerializer(CompetitorJsonSerializer.create(/* serialize boat */ false));
public static CompetitorWithBoatRefJsonSerializer create(boolean serializeNonPublicCompetitorFields) {
return new CompetitorWithBoatRefJsonSerializer(CompetitorJsonSerializer.create(/* serialize boat */ false, serializeNonPublicCompetitorFields));
}
public CompetitorWithBoatRefJsonSerializer(JsonSerializer<Competitor> competitorJsonSerializer) {