diff --git a/readme.md b/readme.md index 057af061..433aab6c 100644 --- a/readme.md +++ b/readme.md @@ -239,6 +239,7 @@ Details about a pickup notice |thePackage|[Package](#pickupnoticepackage)|no|package information| |cost|[Cost](#pickupnoticecost)|no|Information about value, mva, customs processing and more| |status|[Status](#pickupnoticestatus)|no|The state the package is at present time| +|tags|Set|no|Tags to describe the document| ### PickupNotice.Barcode @@ -378,6 +379,7 @@ Valid values: 0 READY_FOR_PICKUP + POSTEN ``` diff --git a/src/main/java/no/digipost/api/datatypes/types/Tag.java b/src/main/java/no/digipost/api/datatypes/types/Tag.java new file mode 100644 index 00000000..d8d4f8bd --- /dev/null +++ b/src/main/java/no/digipost/api/datatypes/types/Tag.java @@ -0,0 +1,7 @@ +package no.digipost.api.datatypes.types; + +public enum Tag { + VARSEL1 + , VARSEL2 + , POSTEN +} diff --git a/src/main/java/no/digipost/api/datatypes/types/pickup/PickupNotice.java b/src/main/java/no/digipost/api/datatypes/types/pickup/PickupNotice.java index fe63a42a..6797083c 100644 --- a/src/main/java/no/digipost/api/datatypes/types/pickup/PickupNotice.java +++ b/src/main/java/no/digipost/api/datatypes/types/pickup/PickupNotice.java @@ -5,10 +5,11 @@ import lombok.NoArgsConstructor; import lombok.Value; import lombok.experimental.Wither; +import no.digipost.api.datatypes.ComplementedBy; import no.digipost.api.datatypes.DataType; import no.digipost.api.datatypes.documentation.Description; +import no.digipost.api.datatypes.types.Tag; import no.digipost.api.datatypes.types.receipt.Barcode; -import no.digipost.api.datatypes.ComplementedBy; import javax.validation.Valid; import javax.validation.constraints.NotNull; @@ -16,6 +17,8 @@ import javax.xml.bind.annotation.XmlRootElement; import java.time.ZoneId; import java.time.ZonedDateTime; +import java.util.Collections; +import java.util.Set; @XmlRootElement(name = "pickup-notice") @Value @@ -83,6 +86,10 @@ public class PickupNotice implements DataType { @Description("The state the package is at present time") Status status; + @XmlElement(name = "tags") + @Description("Tags to describe the document") + Set tags; + @Override public PickupNotice withDefaultsForMissingOptionalValues() { if (status == null) { @@ -105,7 +112,8 @@ public PickupNotice withDefaultsForMissingOptionalValues() { , PickupPlace.EXAMPLE , Package.EXAMPLE , Cost.EXAMPLE - , Status.READY_FOR_PICKUP + , Status.READY_FOR_PICKUP, + Collections.singleton(Tag.POSTEN) ); } diff --git a/src/main/java/no/digipost/api/datatypes/types/pickup/Status.java b/src/main/java/no/digipost/api/datatypes/types/pickup/Status.java index 225a29e1..d185f84b 100644 --- a/src/main/java/no/digipost/api/datatypes/types/pickup/Status.java +++ b/src/main/java/no/digipost/api/datatypes/types/pickup/Status.java @@ -1,3 +1,9 @@ package no.digipost.api.datatypes.types.pickup; -public enum Status {READY_FOR_PICKUP, PICKED_UP, RETURNED, UNKNOWN, DEVIATION} +public enum Status { + READY_FOR_PICKUP + , PICKED_UP + , RETURNED + , UNKNOWN + , DEVIATION +}