Replace deprecated ObjectUtils.defaultIfNull

Author: runeflobakk

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

@@ -42,7 +42,7 @@
 import static no.digipost.api.client.representations.Channel.PRINT;
 import static org.apache.commons.lang3.ArrayUtils.INDEX_NOT_FOUND;
 import static org.apache.commons.lang3.ArrayUtils.indexOf;
-import static org.apache.commons.lang3.ObjectUtils.defaultIfNull;
+import static org.apache.commons.lang3.ObjectUtils.getIfNull;
 import static org.apache.commons.lang3.StringUtils.join;
 
 @XmlAccessorType(XmlAccessType.FIELD)
@@ -55,7 +55,7 @@
         "invoiceReference",
         "primaryDocument",
         "attachments",
-        "printIfUnread", 
+        "printIfUnread",
         "requestForRegistration",
         "batch"})
 @XmlRootElement(name = "message")
@@ -195,15 +195,15 @@ public MessageBuilder attachments(Document ... attachments) {
         }
 
         public MessageBuilder attachments(Iterable<? extends Document> attachments) {
-            defaultIfNull(attachments, Collections.<Document>emptyList()).forEach(this.attachments::add);
+            getIfNull(attachments, Collections.<Document>emptyList()).forEach(this.attachments::add);
             return this;
         }
 
         public MessageBuilder batch(UUID batchUUID) {
             this.batch = new Batch(batchUUID.toString());
             return this;
         }
-        
+
         public Message build() {
             if (recipient == null) {
                 throw new IllegalStateException("You must specify a recipient.");
@@ -227,7 +227,7 @@ private Message(String messageId, Long senderId, SenderOrganization senderOrgani
         this.invoiceReference = invoiceReference;
         this.deliveryTime = deliveryTime;
         this.attachments = new ArrayList<>();
-        for (Document attachment : defaultIfNull(attachments, Collections.<Document>emptyList())) {
+        for (Document attachment : getIfNull(attachments, Collections.<Document>emptyList())) {
             this.attachments.add(attachment);
         }
         this.printIfUnread = printIfUnread;

src/main/java/no/digipost/api/client/representations/archive/Archive.java

@@ -41,7 +41,7 @@
 
 import static java.util.Arrays.asList;
 import static no.digipost.api.client.representations.Relation.NEXT_DOCUMENTS;
-import static org.apache.commons.lang3.ObjectUtils.defaultIfNull;
+import static org.apache.commons.lang3.ObjectUtils.getIfNull;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "archive", propOrder = {
@@ -134,7 +134,7 @@ public Optional<URI> getNextDocumentsWithAttributes(Map<String, String> attribut
 
     public Optional<URI> getNextDocumentsWithAttributesByDate(Map<String, String> attributes, OffsetDateTime from, OffsetDateTime to) {
         final String attributesCommaSeparated = attributes.entrySet().stream().flatMap(en -> Stream.of(en.getKey(), en.getValue())).collect(Collectors.joining(","));
-        
+
         return Optional.ofNullable(getLinkByRelationName(NEXT_DOCUMENTS)).map(Link::getUri)
                 .map(uri -> {
                     try {
@@ -150,7 +150,7 @@ public Optional<URI> getNextDocumentsWithAttributesByDate(Map<String, String> at
     }
 
     public Optional<URI> getNextDocumentsByDate(OffsetDateTime from, OffsetDateTime to) {
-        
+
         return Optional.ofNullable(getLinkByRelationName(NEXT_DOCUMENTS)).map(Link::getUri)
                 .map(uri -> {
                     try {
@@ -202,7 +202,7 @@ public ArchiveBuilder documents(ArchiveDocument... documents) {
         }
 
         public ArchiveBuilder documents(Iterable<ArchiveDocument> documents) {
-            defaultIfNull(documents, Collections.<ArchiveDocument>emptyList()).forEach(this.documents::add);
+            getIfNull(documents, Collections.<ArchiveDocument>emptyList()).forEach(this.documents::add);
             return this;
         }
 
@@ -218,5 +218,5 @@ public Archive build() {
     private static String base64(String param){
         return Base64.getEncoder().encodeToString(param.getBytes(StandardCharsets.UTF_8));
     }
-    
+
 }