From 7a7df10957d966e6412d0da6f7330a3396d0f543 Mon Sep 17 00:00:00 2001 From: Hantsy Bai Date: Sat, 20 Feb 2021 15:35:38 +0800 Subject: [PATCH] restore bv messages in the HandlingReport --- docker-compose.yml | 1 + .../handling/rest/HandlingReport.java | 28 ++++++++++++------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7c6f38bd3..de2fa87da 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,6 +10,7 @@ services: POSTGRES_PASSWORD: password POSTGRES_DB: cargotracker POSTGRES_USER: user + command: "--max_prepared_transactions=110" volumes: - ./data:/var/lib/postgresql # - ./pg-initdb.d:/docker-entrypoint-initdb.d diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/handling/rest/HandlingReport.java b/src/main/java/org/eclipse/cargotracker/interfaces/handling/rest/HandlingReport.java index 1cb31521a..9b300a40e 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/handling/rest/HandlingReport.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/handling/rest/HandlingReport.java @@ -1,28 +1,36 @@ package org.eclipse.cargotracker.interfaces.handling.rest; -import javax.validation.constraints.NotNull; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; /** Transfer object for handling reports. */ public class HandlingReport { - @NotNull - @Size(min = 16, max = 16) + @NotBlank(message = "Missing completion time.") + @Size(min = 16, max = 16, message = "Completion time value must be sixteen characters long.") + // TODO [DDD] Apply regular expression validation. private String completionTime; - @NotNull - @Size(min = 4) + @NotBlank(message = "Missing tracking ID.") + @Size(min = 4, message = "Tracking ID must be at least four characters.") private String trackingId; - @NotNull - @Size(min = 4, max = 7) + @NotBlank(message = "Missing event type.") + @Size( + min = 4, + max = 7, + message = "Event type value must be one of: RECEIVE, LOAD, UNLOAD, CUSTOMS, CLAIM") + // TODO [DDD] Apply regular expression validation. private String eventType; - @NotNull - @Size(min = 5, max = 5) + @NotBlank(message = "UN location code missing.") + @Size(min = 5, max = 5, message = "UN location code must be five characters long.") private String unLocode; - @Size(min = 4, max = 5) + @Size( + min = 4, + max = 5, + message = "Voyage number value must be between four and five characters long.") private String voyageNumber; public String getCompletionTime() {