Rename PrintIfNotRegistered resources to RequestForRegistration

src/main/java/no/digipost/api/client/representations/Message.java

@@ -56,7 +56,7 @@
         "primaryDocument",
         "attachments",
         "printIfUnread", 
-        "printIfNotRegistered",
+        "requestForRegistration",
         "batch"})
 @XmlRootElement(name = "message")
 public class Message implements MayHaveSender {
@@ -90,8 +90,8 @@ public static MessageBuilder newMessage(String messageId, Document primaryDocume
     public final List<Document> attachments;
     @XmlElement(name = "print-if-unread")
     public final PrintIfUnread printIfUnread;
-    @XmlElement(name = "print-if-not-registered")
-    public final PrintIfNotRegistered printIfNotRegistered;
+    @XmlElement(name = "request-for-registration")
+    public final RequestForRegistration requestForRegistration;
     @XmlElement(name="batch")
     public final Batch batch;
 
@@ -109,7 +109,7 @@ public static class MessageBuilder {
         private final List<Document> attachments = new ArrayList<>();
         private String invoiceReference;
         private PrintIfUnread printIfUnread;
-        private PrintIfNotRegistered printIfNotRegistered;
+        private RequestForRegistration requestForRegistration;
         private Batch batch;
 
         private MessageBuilder(String messageId, Document primaryDocument) {
@@ -185,8 +185,8 @@ public MessageBuilder printIfUnread(PrintIfUnread printIfUnread) {
             return this;
         }
 
-        public MessageBuilder printIfNotRegistered(PrintIfNotRegistered printIfNotRegistered) {
-            this.printIfNotRegistered = printIfNotRegistered;
+        public MessageBuilder requestForRegistration(RequestForRegistration requestForRegistration) {
+            this.requestForRegistration = requestForRegistration;
             return this;
         }
 
@@ -211,14 +211,14 @@ public Message build() {
             if (senderId != null && senderOrganization != null) {
                 throw new IllegalStateException("You can't set both senderId *and* senderOrganization.");
             }
-            return new Message(messageId, senderId, senderOrganization, recipient, primaryDocument, attachments, deliveryTime, invoiceReference, printIfUnread, printIfNotRegistered, batch);
+            return new Message(messageId, senderId, senderOrganization, recipient, primaryDocument, attachments, deliveryTime, invoiceReference, printIfUnread, requestForRegistration, batch);
         }
 
     }
 
     private Message(String messageId, Long senderId, SenderOrganization senderOrganization, MessageRecipient recipient,
                     Document primaryDocument, Iterable<? extends Document> attachments, ZonedDateTime deliveryTime,
-                    String invoiceReference, PrintIfUnread printIfUnread, PrintIfNotRegistered printIfNotRegistered, Batch batch) {
+                    String invoiceReference, PrintIfUnread printIfUnread, RequestForRegistration requestForRegistration, Batch batch) {
         this.messageId = messageId;
         this.senderId = senderId;
         this.senderOrganization = senderOrganization;
@@ -231,7 +231,7 @@ private Message(String messageId, Long senderId, SenderOrganization senderOrgani
             this.attachments.add(attachment);
         }
         this.printIfUnread = printIfUnread;
-        this.printIfNotRegistered = printIfNotRegistered;
+        this.requestForRegistration = requestForRegistration;
         this.batch = batch;
     }
 
@@ -264,7 +264,7 @@ private static Message copyMessage(Message messageToCopy, Document newPrimaryDoc
                 messageToCopy.deliveryTime, messageToCopy.invoiceReference,
                 newPrimaryDocument, newAttachments,
                 newPrintDetails, messageToCopy.recipient.bankAccountNumber,
-                messageToCopy.printIfUnread, messageToCopy.printIfNotRegistered,
+                messageToCopy.printIfUnread, messageToCopy.requestForRegistration,
                 messageToCopy.recipient.peppolAddresses, messageToCopy.recipient.emailDetails, messageToCopy.batch
         );
     }
@@ -273,7 +273,7 @@ private Message(final String messageId, final Long senderId, final SenderOrganiz
                     final NameAndAddress nameAndAddress, final String digipostAddress, String personalIdentificationNumber,
                     final String organisationNumber, final ZonedDateTime deliveryTime, final String invoiceReference,
                     final Document primaryDocument, final List<Document> attachments, final PrintDetails printDetails, final String bankAccountNumber,
-                    final PrintIfUnread printIfUnread, final PrintIfNotRegistered printIfNotRegistered, final PeppolAddresses peppolAddresses, final EmailDetails emailDetails,
+                    final PrintIfUnread printIfUnread, final RequestForRegistration requestForRegistration, final PeppolAddresses peppolAddresses, final EmailDetails emailDetails,
                     final Batch batch
     ){
         this.messageId = messageId;
@@ -287,7 +287,7 @@ private Message(final String messageId, final Long senderId, final SenderOrganiz
         this.primaryDocument = primaryDocument;
         this.attachments = attachments;
         this.printIfUnread = printIfUnread;
-        this.printIfNotRegistered = printIfNotRegistered;
+        this.requestForRegistration = requestForRegistration;
         this.batch = batch;
     }
 

src/main/java/no/digipost/api/client/representations/PrintIfNotRegistered.java → src/main/java/no/digipost/api/client/representations/RequestForRegistration.java

@@ -23,35 +23,34 @@
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import no.digipost.api.client.representations.accounts.EmailAddress;
-import no.digipost.api.client.representations.accounts.NationalIdentityNumber;
 import no.digipost.api.client.representations.accounts.PhoneNumber;
 import no.digipost.api.client.representations.xml.DateTimeXmlAdapter;
 
 
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "print-if-not-registered", propOrder = {
-        "printIfUnreadAfter",
+@XmlType(name = "request-for-registration", propOrder = {
+        "registrationDeadline",
         "phoneNumber",
         "emailAddress",
         "printDetails"
 })
-public class PrintIfNotRegistered {
+public class RequestForRegistration {
 
-    @XmlElement(name = "print-if-not-registered-after", type = String.class)
+    @XmlElement(name = "registration-deadline", type = String.class)
     @XmlJavaTypeAdapter(DateTimeXmlAdapter.class)
     @XmlSchemaType(name = "dateTime")
-    protected ZonedDateTime printIfUnreadAfter;
+    protected ZonedDateTime registrationDeadline;
     @XmlElement(name = "phone-number")
     protected PhoneNumber phoneNumber;
     @XmlElement(name = "email-address")
     protected EmailAddress emailAddress;
-    @XmlElement(name = "print-details", required = true)
+    @XmlElement(name = "print-details")
     protected PrintDetails printDetails;
 
-    PrintIfNotRegistered() {}
+    RequestForRegistration() {}
 
-    public PrintIfNotRegistered(ZonedDateTime printIfUnreadAfter, PhoneNumber phoneNumber, EmailAddress emailAddress, PrintDetails printDetails) {
-        this.printIfUnreadAfter = printIfUnreadAfter;
+    public RequestForRegistration(ZonedDateTime registrationDeadline, PhoneNumber phoneNumber, EmailAddress emailAddress, PrintDetails printDetails) {
+        this.registrationDeadline = registrationDeadline;
         this.phoneNumber = phoneNumber;
         this.emailAddress = emailAddress;
         this.printDetails = printDetails;

src/test/java/no/digipost/api/client/internal/delivery/MessageDelivererTest.java

@@ -379,7 +379,7 @@ private static void assertMessagesAreEqual(Message message, Message result) {
         assertEquals(message.primaryDocument.uuid, result.primaryDocument.uuid);
         assertEquals(message.primaryDocument.subject, result.primaryDocument.subject);
         assertEquals(message.primaryDocument.getDigipostFileType(), result.primaryDocument.getDigipostFileType());
-        assertEquals(message.printIfNotRegistered, result.printIfNotRegistered);
+        assertEquals(message.requestForRegistration, result.requestForRegistration);
         assertEquals(message.printIfUnread, result.printIfUnread);
         assertTrue(
                 EqualsBuilder.reflectionEquals(message.recipient, result.recipient),

src/test/java/no/digipost/api/client/representations/MessageTest.java

@@ -69,7 +69,7 @@ public void assertThatClassesHaveNotBeenChangedWithoutChangingMessageCopyMethod(
 
         String[] allFieldsThatAreUsedForCopyInMessage = new String[]{
                 "messageId", "senderId", "senderOrganization", "recipient", "deliveryTime", "invoiceReference",
-                "primaryDocument", "attachments", "printIfUnread", "printIfNotRegistered", "batch"
+                "primaryDocument", "attachments", "printIfUnread", "requestForRegistration", "batch"
         };
 
         for (Field messageField : messageFields) {