From 91ce25aa34c116cf5dc22257044c9a11c0176c24 Mon Sep 17 00:00:00 2001 From: teijosol Date: Wed, 19 Jun 2024 08:38:40 +0300 Subject: [PATCH] DPO-2301review fixes --- .../converter/waze/WazeDatex2JsonConverter.java | 16 ---------------- .../tie/helper/WazeDatex2MessageConverter.java | 11 +++-------- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/src/main/java/fi/livi/digitraffic/tie/converter/waze/WazeDatex2JsonConverter.java b/src/main/java/fi/livi/digitraffic/tie/converter/waze/WazeDatex2JsonConverter.java index 5b0dd2089..42cb30cb3 100644 --- a/src/main/java/fi/livi/digitraffic/tie/converter/waze/WazeDatex2JsonConverter.java +++ b/src/main/java/fi/livi/digitraffic/tie/converter/waze/WazeDatex2JsonConverter.java @@ -84,22 +84,6 @@ public Optional convertToWazeFeedAnnouncementDto(final Waze new WazeFeedIncidentDto(situationId, street, description, direction, polyline, type, starttime, endtime)))); } - private Optional convertToWazeType(final TrafficAnnouncementType trafficAnnouncementType) { - if (trafficAnnouncementType == null) { - return Optional.empty(); - } - - switch (trafficAnnouncementType) { - case ACCIDENT_REPORT: - case PRELIMINARY_ACCIDENT_REPORT: - return Optional.of(WazeFeedIncidentDto.Type.ACCIDENT); - case GENERAL: - return Optional.of(WazeFeedIncidentDto.Type.HAZARD); - default: - return Optional.empty(); - } - } - private Optional convertDirection(final RoadAddressLocation.Direction direction, final Geometry geometry) { if (direction == null || geometry == null || geometry instanceof Point) { return Optional.empty(); diff --git a/src/main/java/fi/livi/digitraffic/tie/helper/WazeDatex2MessageConverter.java b/src/main/java/fi/livi/digitraffic/tie/helper/WazeDatex2MessageConverter.java index 0cbb5bcce..ab1b24156 100644 --- a/src/main/java/fi/livi/digitraffic/tie/helper/WazeDatex2MessageConverter.java +++ b/src/main/java/fi/livi/digitraffic/tie/helper/WazeDatex2MessageConverter.java @@ -233,7 +233,6 @@ import static fi.livi.digitraffic.tie.datex2.WeatherRelatedRoadConditionTypeEnum.SURFACE_WATER; import static fi.livi.digitraffic.tie.datex2.WeatherRelatedRoadConditionTypeEnum.WET_AND_ICY_ROAD; import static fi.livi.digitraffic.tie.datex2.WeatherRelatedRoadConditionTypeEnum.WET_ICY_PAVEMENT; -import static io.netty.util.internal.StringUtil.EMPTY_STRING; import java.util.Collection; import java.util.HashMap; @@ -261,7 +260,7 @@ public class WazeDatex2MessageConverter { private static final Logger logger = LoggerFactory.getLogger(WazeDatex2MessageConverter.class); // use this string, when you want to skip some type-enum without error - private static final String SKIP_SUBTYPE = ""; + private static final String SKIP_SUBTYPE = "SKIP_SUBTYPE-5O7jh8ytZjQLKCurmFwYowFBaghhMk3U-SKIP_SUBTYPE"; private final Datex2XmlStringToObjectMarshaller datex2XmlStringToObjectMarshaller; @@ -891,12 +890,8 @@ private Optional accept(final String situationId, final SituationRecord logger.error("method=accept unknown {} record in situation {}", situationRecordType, situationId); } - // EMPTY_STRING means, that we want to skip this event subtype, but it's ok and no need to log error + // SKIP_SUBTYPE means, that we want to skip this event subtype, but it's ok and no need to log error // (for example OTHER subtype for MaintenanceWorks) - if (result.get() == SKIP_SUBTYPE) { - return Optional.empty(); - } - - return result; + return result.filter(v -> v != SKIP_SUBTYPE); } } \ No newline at end of file