[#1601] Convert datetime functionalities to java.time package

docs/dg/learningBasics.md

@@ -146,7 +146,8 @@ Here are some small tasks for you to gain some basic knowledge of the code relat
 
   ```
   GsonBuilder gsonBuilder = new GsonBuilder()
-          .setDateFormat(GITHUB_API_DATE_FORMAT)
+          .registerTypeAdapter(LocalDateTime.class, (JsonSerializer<LocalDateTime>) (date, typeOfSrc, context)
+                        -> new JsonPrimitive(date.format(DateTimeFormatter.ofPattern(GITHUB_API_DATE_FORMAT))))
           .registerTypeAdapter(FileType.class, new FileType.FileTypeSerializer());
   Gson gson;
   if (isPrettyPrintingUsed) {

src/main/java/reposense/authorship/FileInfoAnalyzer.java

@@ -3,8 +3,9 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.time.Instant;
+import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.util.Date;
 import java.util.HashMap;
 
 import java.util.HashSet;
@@ -22,7 +23,6 @@
 import reposense.model.RepoConfiguration;
 import reposense.system.LogsManager;
 import reposense.util.FileUtil;
-import reposense.util.TimeUtil;
 
 /**
  * Analyzes the target and information given in the {@code FileInfo}.
@@ -148,21 +148,22 @@ private static void aggregateBlameAuthorModifiedAndDateInfo(RepoConfiguration co
 
         String[] blameResultLines = blameResults.split("\n");
         Path filePath = Paths.get(fileInfo.getPath());
-        Long sinceDateInMs = config.getSinceDate().getTime();
-        Long untilDateInMs = config.getUntilDate().getTime();
+        LocalDateTime sinceDate = config.getSinceDate();
+        LocalDateTime untilDate = config.getUntilDate();
 
         for (int lineCount = 0; lineCount < blameResultLines.length; lineCount += 5) {
             String commitHash = blameResultLines[lineCount].substring(0, FULL_COMMIT_HASH_LENGTH);
             String authorName = blameResultLines[lineCount + 1].substring(AUTHOR_NAME_OFFSET);
             String authorEmail = blameResultLines[lineCount + 2]
                     .substring(AUTHOR_EMAIL_OFFSET).replaceAll("<|>", "");
             Long commitDateInMs = Long.parseLong(blameResultLines[lineCount + 3].substring(AUTHOR_TIME_OFFSET)) * 1000;
-            String authorTimeZone = blameResultLines[lineCount + 4].substring(AUTHOR_TIMEZONE_OFFSET);
+            LocalDateTime commitDate = LocalDateTime.ofInstant(Instant.ofEpochMilli(commitDateInMs),
+                    ZoneId.of(config.getZoneId()));
             Author author = config.getAuthor(authorName, authorEmail);
 
             if (!fileInfo.isFileLineTracked(lineCount / 5) || author.isIgnoringFile(filePath)
                     || CommitHash.isInsideCommitList(commitHash, config.getIgnoreCommitList())
-                    || commitDateInMs < sinceDateInMs || commitDateInMs > untilDateInMs) {
+                    || commitDate.compareTo(sinceDate) < 0 || commitDate.compareTo(untilDate) > 0) {
                 author = Author.UNKNOWN_AUTHOR;
             }
 
@@ -171,11 +172,8 @@ private static void aggregateBlameAuthorModifiedAndDateInfo(RepoConfiguration co
                     logger.warning(String.format(
                             MESSAGE_SHALLOW_CLONING_LAST_MODIFIED_DATE_CONFLICT, config.getRepoName()));
                 }
-                // convert the commit date from the system default time zone to cli-specified timezone
-                Date convertedCommitDate = TimeUtil.getZonedDateFromSystemDate(new Date(commitDateInMs),
-                        ZoneId.of(config.getZoneId()));
 
-                fileInfo.setLineLastModifiedDate(lineCount / 5, convertedCommitDate);
+                fileInfo.setLineLastModifiedDate(lineCount / 5, commitDate);
             }
             fileInfo.setLineAuthor(lineCount / 5, author);
         }

src/main/java/reposense/authorship/FileInfoExtractor.java

@@ -6,6 +6,7 @@
 import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashSet;
@@ -62,12 +63,13 @@ public static List<FileInfo> extractTextFileInfos(RepoConfiguration config) {
         // checks out to the latest commit of the date range to ensure the FileInfo generated correspond to the
         // git blame file analyze output
         try {
-            GitCheckout.checkoutDate(config.getRepoRoot(), config.getBranch(), config.getUntilDate());
+            GitCheckout.checkoutDate(config.getRepoRoot(), config.getBranch(), config.getUntilDate(),
+                    ZoneId.of(config.getZoneId()));
         } catch (CommitNotFoundException cnfe) {
             return fileInfos;
         }
         String lastCommitHash = GitRevList.getCommitHashBeforeDate(
-                config.getRepoRoot(), config.getBranch(), config.getSinceDate());
+                config.getRepoRoot(), config.getBranch(), config.getSinceDate(), ZoneId.of(config.getZoneId()));
 
         fileInfos = (lastCommitHash.isEmpty())
                 ? getAllFileInfo(config, false)

src/main/java/reposense/authorship/model/FileInfo.java

@@ -1,7 +1,7 @@
 package reposense.authorship.model;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 import reposense.model.Author;
@@ -72,7 +72,7 @@ public void setLineAuthor(int lineNumber, Author author) {
     /**
      * Sets the {@code lastModifiedDate} of the {@code LineInfo} in {@code lineNumber} for this {@code FileInfo}.
      */
-    public void setLineLastModifiedDate(int lineNumber, Date lastModifiedDate) {
+    public void setLineLastModifiedDate(int lineNumber, LocalDateTime lastModifiedDate) {
         lines.get(lineNumber).setLastModifiedDate(lastModifiedDate);
     }
 

src/main/java/reposense/authorship/model/LineInfo.java

@@ -1,6 +1,6 @@
 package reposense.authorship.model;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.Objects;
 
 import reposense.model.Author;
@@ -12,7 +12,7 @@ public class LineInfo {
     private int lineNumber;
     private Author author;
     private String content;
-    private Date lastModifiedDate;
+    private LocalDateTime lastModifiedDate;
 
     private transient boolean isTracked;
 
@@ -43,11 +43,11 @@ public void setTracked(boolean isTracked) {
         this.isTracked = isTracked;
     }
 
-    public Date getLastModifiedDate() {
+    public LocalDateTime getLastModifiedDate() {
         return lastModifiedDate;
     }
 
-    public void setLastModifiedDate(Date lastModifiedDate) {
+    public void setLastModifiedDate(LocalDateTime lastModifiedDate) {
         this.lastModifiedDate = lastModifiedDate;
     }
 

src/main/java/reposense/commits/CommitInfoAnalyzer.java

@@ -2,12 +2,13 @@
 
 import static reposense.util.StringsUtil.removeQuote;
 
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 import java.util.Arrays;
 import java.util.Comparator;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -30,7 +31,8 @@
  * Analyzes commit information found in the git log.
  */
 public class CommitInfoAnalyzer {
-    public static final DateFormat GIT_STRICT_ISO_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+    public static final DateTimeFormatter GIT_STRICT_ISO_DATE_FORMAT =
+            DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssz");
 
     private static final String TAB_SPLITTER = "\t";
     private static final String MOVED_FILE_INDICATION = "=> ";
@@ -87,13 +89,16 @@ public static CommitResult analyzeCommit(CommitInfo commitInfo, RepoConfiguratio
         String hash = elements[COMMIT_HASH_INDEX];
         Author author = config.getAuthor(elements[AUTHOR_INDEX], elements[EMAIL_INDEX]);
 
-        Date date = null;
+        ZonedDateTime date = null;
         try {
-            date = GIT_STRICT_ISO_DATE_FORMAT.parse(elements[DATE_INDEX]);
-        } catch (ParseException pe) {
+            date = ZonedDateTime.parse(elements[DATE_INDEX], GIT_STRICT_ISO_DATE_FORMAT);
+        } catch (DateTimeParseException pe) {
             logger.log(Level.WARNING, "Unable to parse the date from git log result for commit.", pe);
         }
 
+        // Commit date may be in a timezone different from the one given in the config.
+        LocalDateTime adjustedDate = date.withZoneSameInstant(ZoneId.of(config.getZoneId())).toLocalDateTime();
+
         String messageTitle = (elements.length > MESSAGE_TITLE_INDEX) ? elements[MESSAGE_TITLE_INDEX] : "";
         String messageBody = (elements.length > MESSAGE_BODY_INDEX)
                 ? getCommitMessageBody(elements[MESSAGE_BODY_INDEX]) : "";
@@ -109,15 +114,16 @@ public static CommitResult analyzeCommit(CommitInfo commitInfo, RepoConfiguratio
         }
 
         if (statLine.isEmpty()) { // empty commit, no files changed
-            return new CommitResult(author, hash, date, messageTitle, messageBody, tags);
+            return new CommitResult(author, hash, adjustedDate, messageTitle, messageBody, tags);
         }
 
         String[] statInfos = statLine.split(NEW_LINE_SPLITTER);
         String[] fileTypeContributions = Arrays.copyOfRange(statInfos, 0, statInfos.length - 1);
         Map<FileType, ContributionPair> fileTypeAndContributionMap =
                 getFileTypesAndContribution(fileTypeContributions, config);
 
-        return new CommitResult(author, hash, date, messageTitle, messageBody, tags, fileTypeAndContributionMap);
+        return new CommitResult(author, hash, adjustedDate, messageTitle, messageBody, tags,
+                fileTypeAndContributionMap);
     }
 
     /**