Merge pull request #1336 from tulinkry/dedup

deduplication of date formats in repositories

Author: Vladimir Kotal

src/org/opensolaris/opengrok/history/AccuRevRepository.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opensolaris.opengrok.history;
 
@@ -83,7 +83,9 @@ public class AccuRevRepository extends Repository {
 
     public AccuRevRepository() {
         type = "AccuRev";
-        datePattern = "yyyy/MM/dd hh:mm:ss";
+        datePatterns = new String[]{
+            "yyyy/MM/dd hh:mm:ss"
+        };
         ensureCommand(CMD_PROPERTY_KEY, CMD_FALLBACK);
     }
 

src/org/opensolaris/opengrok/history/BazaarRepository.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opensolaris.opengrok.history;
 
@@ -62,7 +62,9 @@ public class BazaarRepository extends Repository {
 
     public BazaarRepository() {
         type = "Bazaar";
-        datePattern = "EEE yyyy-MM-dd hh:mm:ss ZZZZ";
+        datePatterns = new String[]{
+            "EEE yyyy-MM-dd hh:mm:ss ZZZZ"
+        };
     }
 
     /**

src/org/opensolaris/opengrok/history/CVSRepository.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opensolaris.opengrok.history;
 
@@ -69,7 +69,9 @@ public class CVSRepository extends RCSRepository {
     public CVSRepository() {
         working = Boolean.FALSE;
         setType("CVS");
-        setDatePattern("yyyy-MM-dd hh:mm:ss");
+        datePatterns = new String[]{
+            "yyyy-MM-dd hh:mm:ss"
+        };
     }
 
     @Override

src/org/opensolaris/opengrok/history/ClearCaseRepository.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opensolaris.opengrok.history;
 
@@ -35,7 +35,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
-
 import org.opensolaris.opengrok.logger.LoggerFactory;
 import org.opensolaris.opengrok.util.Executor;
 import org.opensolaris.opengrok.util.IOUtils;
@@ -63,7 +62,9 @@ public class ClearCaseRepository extends Repository {
 
     public ClearCaseRepository() {
         type = "ClearCase";
-        datePattern = "yyyyMMdd.HHmmss";
+        datePatterns = new String[]{
+            "yyyyMMdd.HHmmss"
+        };
     }
 
     /**

src/org/opensolaris/opengrok/history/GitRepository.java

@@ -30,16 +30,12 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
-import java.text.DateFormat;
-import java.text.FieldPosition;
 import java.text.ParseException;
-import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Locale;
 import java.util.TreeSet;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -81,8 +77,6 @@ public class GitRepository extends Repository {
     private static final String ABBREV_LOG = "--abbrev=" + CSET_LEN;
     private static final String ABBREV_BLAME = "--abbrev=" + (CSET_LEN - 1);
 
-    private static final String[] backupDatePatterns = new String[]{"d MMM yyyy HH:mm:ss Z"};
-
     /**
      * Pattern used to extract author/revision from git blame.
      */
@@ -91,7 +85,16 @@ public class GitRepository extends Repository {
 
     public GitRepository() {
         type = "git";
-        datePattern = "EE, d MMM yyyy HH:mm:ss Z";
+        /*
+         * Formatter which allows the optional day at the beginning as per
+         * RFC 2822 , section 3.3. Date and Time Specification:
+         *
+         * date-time = [ day-of-week "," ] date FWS time [CFWS]
+         */
+        datePatterns = new String[]{
+            "EE, d MMM yyyy HH:mm:ss Z",
+            "d MMM yyyy HH:mm:ss Z"
+        };
     }
 
     /**
@@ -178,54 +181,6 @@ Executor getHistoryLogExecutor(final File file, String sinceRevision)
         return new Executor(cmd, new File(getDirectoryName()), sinceRevision != null);
     }
 
-    /**
-     * Formatter for which allows the optional day at the beginning as per
-     * RFC 2822 , section 3.3. Date and Time Specification:
-     *
-     * date-time       =       [ day-of-week "," ] date FWS time [CFWS]
-     *
-     * @return DateFormat which accepts the optional day format
-     */
-    @Override
-    public DateFormat getDateFormat() {
-        return new DateFormat() {
-
-            private DateFormat formatter = new SimpleDateFormat(datePattern, Locale.getDefault());
-            private DateFormat[] backupFormatters = new DateFormat[backupDatePatterns.length];
-
-            {
-                for (int i = 0; i < backupDatePatterns.length; i++) {
-                    backupFormatters[i] = new SimpleDateFormat(backupDatePatterns[i], Locale.getDefault());
-                }
-            }
-
-            @Override
-            public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
-                return formatter.format(date, toAppendTo, fieldPosition);
-            }
-
-            @Override
-            public Date parse(String source) throws ParseException {
-                try {
-                    return formatter.parse(source);
-                } catch (ParseException ex) {
-                    for (int i = 0; i < backupFormatters.length; i++) {
-                        try {
-                            return backupFormatters[i].parse(source);
-                        } catch (ParseException ex1) {
-                        }
-                    }
-                    throw ex;
-                }
-            }
-
-            @Override
-            public Date parse(String source, ParsePosition pos) {
-                return formatter.parse(source, pos);
-            }
-        };
-    }
-
     /**
      * Create a {@code Reader} that reads an {@code InputStream} using the
      * correct character encoding.

src/org/opensolaris/opengrok/history/MercurialRepository.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opensolaris.opengrok.history;
 
@@ -114,7 +114,9 @@ public class MercurialRepository extends Repository {
 
     public MercurialRepository() {
         type = "Mercurial";
-        datePattern = "yyyy-MM-dd hh:mm ZZZZ";
+        datePatterns = new String[]{
+            "yyyy-MM-dd hh:mm ZZZZ"
+        };
     }
 
     /**

src/org/opensolaris/opengrok/history/MonotoneRepository.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opensolaris.opengrok.history;
 
@@ -61,7 +61,9 @@ public class MonotoneRepository extends Repository {
 
     public MonotoneRepository() {
         type = "Monotone";
-        datePattern = "yyyy-MM-dd'T'hh:mm:ss";
+        datePatterns = new String[]{
+            "yyyy-MM-dd'T'hh:mm:ss"
+        };
     }
 
     @Override

src/org/opensolaris/opengrok/history/RazorRepository.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
  */
 /* Portions Copyright 2008 Peter Bray */
 package org.opensolaris.opengrok.history;
@@ -31,7 +31,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.zip.GZIPInputStream;
-
 import org.opensolaris.opengrok.logger.LoggerFactory;
 
 /**
@@ -148,7 +147,9 @@ public class RazorRepository extends Repository {
     public RazorRepository() {
         type = "Razor";
         working = Boolean.TRUE;
-        datePattern = "yyyy/MM/dd,hh:mm:ss";
+        datePatterns = new String[]{
+            "yyyy/MM/dd,hh:mm:ss"
+        };
     }
 
     @Override

src/org/opensolaris/opengrok/history/Repository.java

@@ -18,16 +18,20 @@
  */
 
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opensolaris.opengrok.history;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.text.DateFormat;
+import java.text.FieldPosition;
+import java.text.ParseException;
+import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
@@ -388,7 +392,69 @@ boolean supportsSubRepositories() {
     }
 
     public DateFormat getDateFormat() {
-        return new SimpleDateFormat(datePattern, Locale.US);
+        return new DateFormat() {
+            private final SimpleDateFormat[] formatters = new SimpleDateFormat[datePatterns.length];
+
+            {
+                // initialize date formatters
+                for (int i = 0; i < datePatterns.length; i++) {
+                    formatters[i] = new SimpleDateFormat(datePatterns[i]);
+                    /*
+                     * TODO: the following would be nice - but currently it
+                     * could break the compatibility with some repository dates
+                     */
+                    // formatters[i].setLenient(false);
+                }
+            }
+
+            @Override
+            public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
+                for (DateFormat formatter : formatters) {
+                    return formatter.format(date, toAppendTo, fieldPosition);
+                }
+                return toAppendTo.append("(date null)");
+            }
+
+            @Override
+            public Date parse(String source) throws ParseException {
+                ParseException head = null, tail = null;
+                for (SimpleDateFormat formatter : formatters) {
+                    try {
+                        return formatter.parse(source);
+                    } catch (ParseException ex1) {
+                        /*
+                         * Adding all exceptions together to get some info in
+                         * the logs.
+                         */
+                        ex1 = new ParseException(
+                                String.format("%s with format \"%s\" and locale \"%s\"",
+                                        ex1.getMessage(),
+                                        formatter.toPattern(),
+                                        Locale.getDefault().toString()),
+                                ex1.getErrorOffset()
+                        );
+                        if (head == null || tail == null) {
+                            head = tail = ex1;
+                        } else {
+                            tail.initCause(ex1);
+                            tail = ex1;
+                        }
+                    }
+                }
+                throw head != null ? head : new ParseException(String.format("Unparseable date: \"%s\"", source), 0);
+            }
+
+            @Override
+            public Date parse(String source, ParsePosition pos) {
+                Date d = null;
+                for (DateFormat formatter : formatters) {
+                    if ((d = formatter.parse(source, pos)) != null) {
+                        return d;
+                    }
+                }
+                return d;
+            }
+        };
     }
 
     static Boolean checkCmd(String... args) {

src/org/opensolaris/opengrok/history/RepositoryInfo.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opensolaris.opengrok.history;
 
@@ -39,7 +39,7 @@ public class RepositoryInfo implements Serializable {
     protected Boolean working;
     protected String type;
     protected boolean remote;
-    protected String datePattern;
+    protected String[] datePatterns = new String[0];
     protected String parent;
     protected String branch;
     protected String currentVersion;
@@ -56,7 +56,7 @@ public RepositoryInfo(RepositoryInfo orig) {
         this.type = orig.type;
         this.working = orig.isWorking();
         this.remote = orig.isRemote();
-        this.datePattern = orig.datePattern;
+        this.datePatterns = orig.datePatterns;
         this.parent = orig.parent;
         this.branch = orig.branch;
         this.currentVersion = orig.currentVersion;
@@ -154,12 +154,12 @@ public void setParent(String parent) {
         this.parent = parent;
     }
 
-    public void setDatePattern(String datePattern) {
-        this.datePattern = datePattern;
+    public void setDatePatterns(String[] datePatterns) {
+        this.datePatterns = datePatterns;
     }
 
-    public String getDatePattern() {
-        return datePattern;
+    public String[] getDatePatterns() {
+        return datePatterns;
     }
 
     public String getBranch() {