Loading vessels-lib/src/main/java/es/redmic/vesselslib/events/vessel/VesselEventTypes.java +11 −2 Original line number Diff line number Diff line Loading @@ -4,10 +4,19 @@ import es.redmic.brokerlib.avro.common.EventTypes; public abstract class VesselEventTypes extends EventTypes { // public static String public static String // @formatter:off //UPDATE UPDATE_VESSELTYPE = "UPDATE_VESSELTYPE", UPDATE_VESSELTYPE_CONFIRMED = "UPDATE_VESSELTYPE_CONFIRMED", VESSELTYPE_UPDATED = "VESSELTYPE_UPDATED", UPDATE_VESSELTYPE_FAILED = "UPDATE_VESSELTYPE_FAILED", UPDATE_VESSELTYPE_CANCELLED = "UPDATE_VESSELTYPE_CANCELLED"; //@formatter:on public static boolean isLocked(String eventType) { return EventTypes.isLocked(eventType); return (!(eventType.equals(VESSELTYPE_UPDATED.toString()) || eventType.equals(UPDATE_VESSELTYPE_CANCELLED.toString())) && EventTypes.isLocked(eventType)); } } vessels-lib/src/main/java/es/redmic/vesselslib/events/vesseltype/VesselTypeEventTypes.java +1 −12 Original line number Diff line number Diff line Loading @@ -4,19 +4,8 @@ import es.redmic.brokerlib.avro.common.EventTypes; public abstract class VesselTypeEventTypes extends EventTypes { public static String // @formatter:off //UPDATE UPDATE_VESSELTYPE = "UPDATE_VESSELTYPE", UPDATE_VESSELTYPE_CONFIRMED = "UPDATE_VESSELTYPE_CONFIRMED", VESSELTYPE_UPDATED = "VESSELTYPE_UPDATED", UPDATE_VESSELTYPE_FAILED = "UPDATE_VESSELTYPE_FAILED", UPDATE_VESSELTYPE_CANCELLED = "UPDATE_VESSELTYPE_CANCELLED"; //@formatter:on public static boolean isLocked(String eventType) { return (!(eventType.equals(VESSELTYPE_UPDATED.toString()) || eventType.equals(UPDATE_VESSELTYPE_CANCELLED.toString())) && EventTypes.isLocked(eventType)); return EventTypes.isLocked(eventType); } } vessels-lib/src/test/java/es/redmic/vesselslib/unit/utils/VesselTypeDataUtil.java +1 −1 Original line number Diff line number Diff line Loading @@ -93,7 +93,7 @@ public abstract class VesselTypeDataUtil { public static VesselTypeUpdatedEvent getVesselTypeUpdatedEvent() { VesselTypeUpdatedEvent event = new VesselTypeUpdatedEvent().buildFrom(getUpdateEvent()); event.setType(VesselTypeEventTypes.VESSELTYPE_UPDATED); event.setType(VesselTypeEventTypes.UPDATED); event.setVesselType(getVesselType()); return event; } Loading Loading
vessels-lib/src/main/java/es/redmic/vesselslib/events/vessel/VesselEventTypes.java +11 −2 Original line number Diff line number Diff line Loading @@ -4,10 +4,19 @@ import es.redmic.brokerlib.avro.common.EventTypes; public abstract class VesselEventTypes extends EventTypes { // public static String public static String // @formatter:off //UPDATE UPDATE_VESSELTYPE = "UPDATE_VESSELTYPE", UPDATE_VESSELTYPE_CONFIRMED = "UPDATE_VESSELTYPE_CONFIRMED", VESSELTYPE_UPDATED = "VESSELTYPE_UPDATED", UPDATE_VESSELTYPE_FAILED = "UPDATE_VESSELTYPE_FAILED", UPDATE_VESSELTYPE_CANCELLED = "UPDATE_VESSELTYPE_CANCELLED"; //@formatter:on public static boolean isLocked(String eventType) { return EventTypes.isLocked(eventType); return (!(eventType.equals(VESSELTYPE_UPDATED.toString()) || eventType.equals(UPDATE_VESSELTYPE_CANCELLED.toString())) && EventTypes.isLocked(eventType)); } }
vessels-lib/src/main/java/es/redmic/vesselslib/events/vesseltype/VesselTypeEventTypes.java +1 −12 Original line number Diff line number Diff line Loading @@ -4,19 +4,8 @@ import es.redmic.brokerlib.avro.common.EventTypes; public abstract class VesselTypeEventTypes extends EventTypes { public static String // @formatter:off //UPDATE UPDATE_VESSELTYPE = "UPDATE_VESSELTYPE", UPDATE_VESSELTYPE_CONFIRMED = "UPDATE_VESSELTYPE_CONFIRMED", VESSELTYPE_UPDATED = "VESSELTYPE_UPDATED", UPDATE_VESSELTYPE_FAILED = "UPDATE_VESSELTYPE_FAILED", UPDATE_VESSELTYPE_CANCELLED = "UPDATE_VESSELTYPE_CANCELLED"; //@formatter:on public static boolean isLocked(String eventType) { return (!(eventType.equals(VESSELTYPE_UPDATED.toString()) || eventType.equals(UPDATE_VESSELTYPE_CANCELLED.toString())) && EventTypes.isLocked(eventType)); return EventTypes.isLocked(eventType); } }
vessels-lib/src/test/java/es/redmic/vesselslib/unit/utils/VesselTypeDataUtil.java +1 −1 Original line number Diff line number Diff line Loading @@ -93,7 +93,7 @@ public abstract class VesselTypeDataUtil { public static VesselTypeUpdatedEvent getVesselTypeUpdatedEvent() { VesselTypeUpdatedEvent event = new VesselTypeUpdatedEvent().buildFrom(getUpdateEvent()); event.setType(VesselTypeEventTypes.VESSELTYPE_UPDATED); event.setType(VesselTypeEventTypes.UPDATED); event.setVesselType(getVesselType()); return event; } Loading