bug5241: added priority to DeviceConfiguration

This commit is contained in:
Axel Uhl committed 2020-12-10 14:30:32 +01:00
1 parent 6930e92d84
commit e40b457545
15 files changed
+126 -11

No files matched your search

@@ -62,6 +62,9 @@ public class DeviceConfigurationJsonDeserializer implements JsonDeserializer<Dev
if (object.containsKey(DeviceConfigurationJsonSerializer.FIELD_COURSE_AREA_ID)) {
configuration.setCourseAreaId(UUID.fromString((String) object.get(DeviceConfigurationJsonSerializer.FIELD_COURSE_AREA_ID)));
}
if (object.containsKey(DeviceConfigurationJsonSerializer.FIELD_PRIORITY)) {
configuration.setPriority(((Number) object.get(DeviceConfigurationJsonSerializer.FIELD_PRIORITY)).intValue());
}
return configuration;
}
@@ -16,6 +16,7 @@ public class DeviceConfigurationJsonSerializer implements JsonSerializer<DeviceC
public static final String FIELD_REGATTA_CONFIGURATION = "procedures";
public static final String FIELD_EVENT_ID = "eventId";
public static final String FIELD_COURSE_AREA_ID = "courseAreaId";
public static final String FIELD_PRIORITY = "priority";
public static DeviceConfigurationJsonSerializer create() {
return new DeviceConfigurationJsonSerializer(RegattaConfigurationJsonSerializer.create());
@@ -51,6 +52,7 @@ public class DeviceConfigurationJsonSerializer implements JsonSerializer<DeviceC
}
object.getEventId().ifPresent(eventId->result.put(FIELD_EVENT_ID, eventId.toString()));
object.getCourseAreaId().ifPresent(courseAreaId->result.put(FIELD_COURSE_AREA_ID, courseAreaId.toString()));
object.getPriority().ifPresent(priority->result.put(FIELD_PRIORITY, priority));
return result;
}