replace joda.time classes with java.time equivalents

Author: nwoodward

src/main/java/org/dspace/pack/bagit/BagItAipWriter.java

@@ -21,6 +21,8 @@
 import java.security.DigestOutputStream;
 import java.security.MessageDigest;
 import java.sql.SQLException;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -35,7 +37,6 @@
 import org.apache.commons.io.FileUtils;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Bitstream;
-import org.dspace.content.Item;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.BitstreamService;
 import org.dspace.core.Context;
@@ -52,9 +53,6 @@
 import org.duraspace.bagit.profile.BagProfileConstants;
 import org.duraspace.bagit.serialize.BagSerializer;
 import org.duraspace.bagit.serialize.SerializationSupport;
-import org.joda.time.LocalDate;
-import org.joda.time.format.ISODateTimeFormat;
-
 
 /**
  * The BagItAipWriter handles the packaging of DSpaceObjects into their respective bags. It processes the metadata and
@@ -399,7 +397,7 @@ private Map<String, String> generateBagInfo(final BagProfile profile) {
         bagInfo.put(BagProfileConstants.BAGIT_PROFILE_IDENTIFIER, identifier);
         bagInfo.put(BagConfig.BAG_SIZE_KEY, FileUtils.byteCountToDisplaySize(successBytes.get()));
         bagInfo.put(BagConfig.PAYLOAD_OXUM_KEY, successBytes.toString() + "." + successFiles.toString());
-        bagInfo.put(BagConfig.BAGGING_DATE_KEY, ISODateTimeFormat.date().print(LocalDate.now()));
+        bagInfo.put(BagConfig.BAGGING_DATE_KEY, LocalDate.now().format(DateTimeFormatter.ISO_LOCAL_DATE));
         return bagInfo;
     }
 

src/test/java/org/dspace/pack/bagit/BagItPolicyUtilTest.java

@@ -24,6 +24,9 @@
 import java.sql.SQLException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.Date;
 import java.util.List;
 
 import org.dspace.authorize.ResourcePolicy;
@@ -40,7 +43,6 @@
 import org.dspace.eperson.service.GroupService;
 import org.dspace.pack.bagit.xml.policy.Policies;
 import org.dspace.pack.bagit.xml.policy.Policy;
-import org.joda.time.DateTime;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -78,11 +80,11 @@ public void getPolicyForAdmin() throws Exception {
         when(adminGroup.getName()).thenReturn(Group.ADMIN);
 
         // set up an admin ResourcePolicy for the Community
-        final DateTime groupDateTime = DateTime.now().minusDays(1);
+        final Date groupDate = Date.from(Instant.now().minus(1, ChronoUnit.DAYS));
         final ResourcePolicy adminGroupPolicy = initReloadable(ResourcePolicy.class);
         adminGroupPolicy.setGroup(adminGroup);
         adminGroupPolicy.setRpType(TYPE_CUSTOM);
-        adminGroupPolicy.setStartDate(groupDateTime.toDate());
+        adminGroupPolicy.setStartDate(groupDate);
         community.getResourcePolicies().add(adminGroupPolicy);
 
         // now test that the Policy pojo we get back is correct
@@ -100,7 +102,7 @@ public void getPolicyForAdmin() throws Exception {
         assertThat(child.getAction()).isEqualTo("READ");
         assertThat(child.getType()).isEqualTo(TYPE_CUSTOM);
         assertThat(child.getGroup()).isEqualTo(Group.ADMIN);
-        assertThat(child.getStartDate()).isEqualTo(dateFormat.format(groupDateTime.toDate()));
+        assertThat(child.getStartDate()).isEqualTo(dateFormat.format(groupDate));
 
         assertThat(child.getName()).isNull();
         assertThat(child.getEndDate()).isNull();
@@ -119,11 +121,11 @@ public void getPolicyForAnonymous() throws Exception {
         when(anonGroup.getName()).thenReturn(Group.ANONYMOUS);
 
         // set up the ResourcePolicy
-        final DateTime groupDateTime = DateTime.now().minusDays(1);
+        final Date groupDate = Date.from(Instant.now().minus(1, ChronoUnit.DAYS));
         final ResourcePolicy anonGroupPolicy = initReloadable(ResourcePolicy.class);
         anonGroupPolicy.setGroup(anonGroup);
         anonGroupPolicy.setRpType(TYPE_CUSTOM);
-        anonGroupPolicy.setEndDate(groupDateTime.toDate());
+        anonGroupPolicy.setEndDate(groupDate);
 
         community.getResourcePolicies().add(anonGroupPolicy);
 
@@ -140,7 +142,7 @@ public void getPolicyForAnonymous() throws Exception {
         assertThat(child.getAction()).isEqualTo("READ");
         assertThat(child.getType()).isEqualTo(TYPE_CUSTOM);
         assertThat(child.getGroup()).isEqualTo(Group.ANONYMOUS);
-        assertThat(child.getEndDate()).isEqualTo(dateFormat.format(groupDateTime.toDate()));
+        assertThat(child.getEndDate()).isEqualTo(dateFormat.format(groupDate));
 
         assertThat(child.getName()).isNull();
         assertThat(child.getEperson()).isNull();
@@ -160,11 +162,11 @@ public void getPolicyForEPerson() throws Exception {
         when(ePerson.getEmail()).thenReturn(epersonEmail);
 
         // Create the ePerson policy
-        final DateTime ePersonDateTime = DateTime.now().plusDays(1);
+        final Date ePersonDate = Date.from(Instant.now().plus(1, ChronoUnit.DAYS));
         final ResourcePolicy ePersonPolicy = initReloadable(ResourcePolicy.class);
         ePersonPolicy.setEPerson(ePerson);
         ePersonPolicy.setRpType(TYPE_CUSTOM);
-        ePersonPolicy.setStartDate(ePersonDateTime.toDate());
+        ePersonPolicy.setStartDate(ePersonDate);
 
         community.getResourcePolicies().add(ePersonPolicy);
 
@@ -181,7 +183,7 @@ public void getPolicyForEPerson() throws Exception {
         assertThat(child.getAction()).isEqualTo("READ");
         assertThat(child.getType()).isEqualTo(TYPE_CUSTOM);
         assertThat(child.getEperson()).isEqualTo(epersonEmail);
-        assertThat(child.getStartDate()).isEqualTo(dateFormat.format(ePersonDateTime.toDate()));
+        assertThat(child.getStartDate()).isEqualTo(dateFormat.format(ePersonDate));
 
         assertThat(child.getName()).isNull();
         assertThat(child.getGroup()).isNull();