diff --git a/epcis/src/main/java/io/openepcis/model/dto/GS1VerifiedIDES.java b/epcis/src/main/java/io/openepcis/model/dto/GS1VerifiedIDES.java new file mode 100644 index 0000000..f915d31 --- /dev/null +++ b/epcis/src/main/java/io/openepcis/model/dto/GS1VerifiedIDES.java @@ -0,0 +1,44 @@ +/* + * + * * Copyright (c) 2022-2024 benelog GmbH & Co. KG + * * All rights reserved. + * * + * * Unauthorized copying, modification, distribution, + * * or use of this work, via any medium, is strictly prohibited. + * * + * * benelog GmbH & Co. KG reserves all rights not expressly granted herein, + * * including the right to sell licenses for using this work. + * + */ +package io.openepcis.model.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import io.openepcis.model.epcis.modifier.OffsetDateTimeSerializer; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.OffsetDateTime; + +import static com.fasterxml.jackson.annotation.JsonFormat.Feature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE; +import static com.fasterxml.jackson.annotation.JsonFormat.Feature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class GS1VerifiedIDES { + + private String type; + private String identifier; + private String licenseeName; + private String licenceKey; + private String licenceType; + private String licenseeGLN; + private String licensingMOName; + @JsonSerialize(using = OffsetDateTimeSerializer.class) + @JsonFormat(without = {ADJUST_DATES_TO_CONTEXT_TIME_ZONE, WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS}) + private OffsetDateTime createdAt; +} diff --git a/rest/src/main/java/io/openepcis/model/rest/exception/RESTExceptionMapper.java b/rest/src/main/java/io/openepcis/model/rest/exception/RESTExceptionMapper.java index e47d1e1..4aeba52 100644 --- a/rest/src/main/java/io/openepcis/model/rest/exception/RESTExceptionMapper.java +++ b/rest/src/main/java/io/openepcis/model/rest/exception/RESTExceptionMapper.java @@ -26,6 +26,8 @@ import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; + +import static io.openepcis.model.rest.exception.RESTExceptionMessages.*; @Slf4j public class RESTExceptionMapper { @@ -147,4 +149,5 @@ public final RestResponse mapException( responseBody.setDetail(exception.getMessage()); return RestResponse.status(RestResponse.Status.CONFLICT, responseBody); } + } diff --git a/rest/src/main/java/io/openepcis/model/rest/exception/RESTExceptionMessages.java b/rest/src/main/java/io/openepcis/model/rest/exception/RESTExceptionMessages.java index ceaccfd..3c923ef 100644 --- a/rest/src/main/java/io/openepcis/model/rest/exception/RESTExceptionMessages.java +++ b/rest/src/main/java/io/openepcis/model/rest/exception/RESTExceptionMessages.java @@ -16,12 +16,13 @@ package io.openepcis.model.rest.exception; public class RESTExceptionMessages { - public static final String EPCIS_EXCEPTIONS = "epcisExceptions:"; - public static final String INVALID_URI = "Invalid URI"; - public static final String ACCESS_DENIED = "Access denied."; - public static final String RESOURCE_DOES_NOT_EXIST = "Resource does not exist."; - public static final String SERVER_SIDE_ERROR_OCCURRED = "A server-side error occurred: "; - public static final String ERROR_IN_DATA_FORMAT = "Error in data format."; - public static final String VALIDATION_FAILED = "Validation failed"; - public static final String RESOURCE_ALREADY_EXISTS = "Resource already exists"; + public static final String EPCIS_EXCEPTIONS = "epcisExceptions:"; + public static final String INVALID_URI = "Invalid URI"; + public static final String ACCESS_DENIED = "Access denied."; + public static final String RESOURCE_DOES_NOT_EXIST = "Resource does not exist."; + public static final String SERVER_SIDE_ERROR_OCCURRED = "A server-side error occurred: "; + public static final String ERROR_IN_DATA_FORMAT = "Error in data format."; + public static final String VALIDATION_FAILED = "Validation failed"; + public static final String RESOURCE_ALREADY_EXISTS = "Resource already exists"; + public static final String BAD_REQUEST = "Bad request"; }