Commit 34462c09 authored by Noel Alonso's avatar Noel Alonso
Browse files

Hace uso del esquema definido en el DTO 

Para no repetir la definición del esquema, hace uso de la definición ubicada en el DTO
parent 60591d18

vessels-lib/src/main/java/es/redmic/vesselslib/events/vessel/common/VesselCancelledEvent.java

+2 −17
Original line number Diff line number Diff line
@@ -95,22 +95,7 @@ public abstract class VesselCancelledEvent extends EventError { 


	@JsonIgnore

	public static String getVesselEventSchema() {

		// @formatter:off

		return "{\"name\":\"vessel\",\"type\":{\"type\":\"record\",\"name\":\"VesselDTO\","

				+ "\"namespace\":\"es.redmic.vesselslib.dto\",\"fields\":["

					+ "{\"name\":\"mmsi\",\"type\":\"int\"},"

					+ "{\"name\":\"imo\",\"type\":[\"int\", \"null\"]},"

					+ "{\"name\":\"type\",\"type\":[{ \"name\":\"VesselTypeDTO\", \"type\":\"record\","

							+ "\"namespace\":\"es.redmic.vesselslib.dto\",\"fields\":["

						+ "{\"name\":\"code\",\"type\":\"string\"},"

						+ "{\"name\":\"name\",\"type\":\"string\"},"

						+ "{\"name\":\"name_en\",\"type\":\"string\"},"

						+ "{\"name\":\"id\",\"type\":\"string\"}]}, \"null\"]},"

					+ "{\"name\":\"name\",\"type\":[\"string\", \"null\"]},"

					+ "{\"name\":\"callSign\",\"type\":[\"string\", \"null\"]},"

					+ "{\"name\":\"length\",\"type\":[\"double\", \"null\"]},"

					+ "{\"name\":\"beam\",\"type\":[\"double\", \"null\"]},"

					+ "{\"name\":\"id\",\"type\":\"string\"}]}}";

		// @formatter:on



		return "{\"name\":\"vessel\", \"type\":" + VesselDTO.SCHEMA$.toString() + "}";

	}

}

vessels-lib/src/main/java/es/redmic/vesselslib/events/vessel/common/VesselEvent.java

+2 −17
Original line number Diff line number Diff line
@@ -82,22 +82,7 @@ public abstract class VesselEvent extends Event { 


	@JsonIgnore

	public static String getVesselEventSchema() {

		// @formatter:off

		return "{\"name\":\"vessel\",\"type\":{\"type\":\"record\",\"name\":\"VesselDTO\","

				+ "\"namespace\":\"es.redmic.vesselslib.dto\",\"fields\":["

					+ "{\"name\":\"mmsi\",\"type\":\"int\"},"

					+ "{\"name\":\"imo\",\"type\":[\"int\", \"null\"]},"

					+ "{\"name\":\"type\",\"type\":[{ \"name\":\"VesselTypeDTO\", \"type\":\"record\","

							+ "\"namespace\":\"es.redmic.vesselslib.dto\",\"fields\":["

						+ "{\"name\":\"code\",\"type\":\"string\"},"

						+ "{\"name\":\"name\",\"type\":\"string\"},"

						+ "{\"name\":\"name_en\",\"type\":\"string\"},"

						+ "{\"name\":\"id\",\"type\":\"string\"}]}, \"null\"]},"

					+ "{\"name\":\"name\",\"type\":[\"string\", \"null\"]},"

					+ "{\"name\":\"callSign\",\"type\":[\"string\", \"null\"]},"

					+ "{\"name\":\"length\",\"type\":[\"double\", \"null\"]},"

					+ "{\"name\":\"beam\",\"type\":[\"double\", \"null\"]},"

					+ "{\"name\":\"id\",\"type\":\"string\"}]}}";

		// @formatter:on



		return "{\"name\":\"vessel\", \"type\": " + VesselDTO.SCHEMA$.toString() + "}";

	}

}

vessels-lib/src/main/java/es/redmic/vesselslib/events/vesseltype/common/VesselTypeCancelledEvent.java

+2 −8
Original line number Diff line number Diff line
@@ -96,13 +96,7 @@ public abstract class VesselTypeCancelledEvent extends EventError { 


	@JsonIgnore

	public static String getVesselTypeEventSchema() {

		// @formatter:off

		return "{\"name\":\"vesselType\",\"type\":{ \"type\":\"record\",\"name\":\"VesselTypeDTO\","

				+ "\"namespace\":\"es.redmic.vesselslib.dto\",\"fields\":["

				+ "{\"name\":\"code\",\"type\":\"string\"},"

				+ "{\"name\":\"name\",\"type\":\"string\"},"

				+ "{\"name\":\"name_en\",\"type\":\"string\"},"

				+ "{\"name\":\"id\",\"type\":\"string\"}]}}";

		// @formatter:on



		return "{\"name\":\"vesselType\", \"type\": " + VesselTypeDTO.SCHEMA$.toString() + "}";

	}

}

vessels-lib/src/main/java/es/redmic/vesselslib/events/vesseltype/common/VesselTypeEvent.java

+2 −8
Original line number Diff line number Diff line
@@ -83,13 +83,7 @@ public abstract class VesselTypeEvent extends Event { 


	@JsonIgnore

	public static String getVesselTypeEventSchema() {

		// @formatter:off

		return "{\"name\":\"vesselType\",\"type\":{ \"type\":\"record\",\"name\":\"VesselTypeDTO\","

				+ "\"namespace\":\"es.redmic.vesselslib.dto\",\"fields\":["

				+ "{\"name\":\"code\",\"type\":\"string\"},"

				+ "{\"name\":\"name\",\"type\":\"string\"},"

				+ "{\"name\":\"name_en\",\"type\":\"string\"},"

				+ "{\"name\":\"id\",\"type\":\"string\"}]}}";

		// @formatter:on



		return "{\"name\":\"vesselType\", \"type\": " + VesselTypeDTO.SCHEMA$.toString() + "}";

	}

}