forked from jenkinsci/syslog-java-client
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
… of month instead of using `0`
- Loading branch information
1 parent
4c16653
commit d9cb442
Showing
4 changed files
with
188 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
104 changes: 104 additions & 0 deletions
104
src/main/java/com/cloudbees/syslog/util/ConcurrentRfc3164DateFormat.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| package com.cloudbees.syslog.util; | ||
|
|
||
| import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; | ||
|
|
||
| import javax.annotation.Nonnull; | ||
| import java.text.SimpleDateFormat; | ||
| import java.util.*; | ||
| import java.util.concurrent.BlockingQueue; | ||
| import java.util.concurrent.LinkedBlockingDeque; | ||
|
|
||
| /** | ||
| * https://tools.ietf.org/html/rfc3164#section-4.1.2 | ||
| * <pre> | ||
| * The TIMESTAMP field is the local time and is in the format of "Mmm dd | ||
| * hh:mm:ss" (without the quote marks) where: | ||
| * | ||
| * Mmm is the English language abbreviation for the month of the | ||
| * year with the first character in uppercase and the other two | ||
| * characters in lowercase. The following are the only acceptable | ||
| * values: | ||
| * | ||
| * Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec | ||
| * | ||
| * dd is the day of the month. If the day of the month is less | ||
| * than 10, then it MUST be represented as a space and then the | ||
| * number. For example, the 7th day of August would be | ||
| * represented as "Aug 7", with two spaces between the "g" and | ||
| * the "7". | ||
| * </pre> | ||
| */ | ||
| public class ConcurrentRfc3164DateFormat { | ||
| private final BlockingQueue<SimpleDateFormat> monthDateFormats; | ||
| private final BlockingQueue<SimpleDateFormat> timeDateFormats; | ||
| private final Locale locale; | ||
| private final TimeZone timeZone; | ||
|
|
||
| /** | ||
| * @param locale the locale whose date pattern symbols should be used | ||
| * @param timeZone the timezone used by the underlying calendar | ||
| * @param maxCacheSize | ||
| * @throws NullPointerException if the given pattern or locale is null | ||
| * @throws IllegalArgumentException if the given pattern is invalid | ||
| */ | ||
| public ConcurrentRfc3164DateFormat(Locale locale, TimeZone timeZone, int maxCacheSize) { | ||
| this.monthDateFormats = new LinkedBlockingDeque<SimpleDateFormat>(maxCacheSize); | ||
| this.timeDateFormats = new LinkedBlockingDeque<SimpleDateFormat>(maxCacheSize); | ||
| this.locale = locale; | ||
| this.timeZone = timeZone; | ||
| } | ||
|
|
||
| /** | ||
| * Formats a Date into a date/time string. | ||
| * | ||
| * @param date the time value to be formatted into a time string. | ||
| * @return the formatted time string. | ||
| */ | ||
| @Nonnull | ||
| @SuppressFBWarnings("RV_RETURN_VALUE_IGNORED_BAD_PRACTICE") | ||
| public String format(@Nonnull Date date) { | ||
|
|
||
|
|
||
| // MONTH | ||
| SimpleDateFormat monthDateFormat = monthDateFormats.poll(); | ||
| if (monthDateFormat == null) { | ||
| monthDateFormat = new SimpleDateFormat("MMM", locale); | ||
| monthDateFormat.setTimeZone(timeZone); | ||
| } | ||
| String month; | ||
| try { | ||
| month = monthDateFormat.format(date); | ||
| } finally { | ||
| monthDateFormats.offer(monthDateFormat); | ||
| } | ||
|
|
||
| // DAY OF MONTH | ||
| GregorianCalendar calendar = new GregorianCalendar(); | ||
| calendar.setTime(date); | ||
|
|
||
| int dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH); | ||
| String dayofMonthPadding = dayOfMonth < 10 ? " " : ""; | ||
|
|
||
| // TIME | ||
| SimpleDateFormat timeDateFormat = timeDateFormats.poll(); | ||
| if (timeDateFormat == null) { | ||
| timeDateFormat = new SimpleDateFormat("HH:mm:ss", locale); | ||
| timeDateFormat.setTimeZone(timeZone); | ||
| } | ||
| String time; | ||
| try { | ||
| time = timeDateFormat.format(date); | ||
| } finally { | ||
| timeDateFormats.offer(timeDateFormat); | ||
| } | ||
|
|
||
| String result = month + ' ' + dayofMonthPadding + dayOfMonth + ' ' + time; | ||
|
|
||
| return result; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "ConcurrentRfc3164DateFormat"; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
src/test/java/com/cloudbees/syslog/util/ConcurrentRfc3164DateFormatTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| package com.cloudbees.syslog.util; | ||
|
|
||
| import org.hamcrest.Matchers; | ||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
|
|
||
| import java.util.Calendar; | ||
| import java.util.Date; | ||
| import java.util.Locale; | ||
| import java.util.TimeZone; | ||
|
|
||
| public class ConcurrentRfc3164DateFormatTest { | ||
|
|
||
| @Test | ||
| public void test_format_date_with_single_digit_day_of_month(){ | ||
| TimeZone timeZone = TimeZone.getTimeZone("UTC"); | ||
| Calendar cal = Calendar.getInstance(); | ||
| cal.setTimeZone(timeZone); | ||
| cal.set(2013, Calendar.AUGUST, 7, 10, 30, 5); | ||
| cal.set(Calendar.MILLISECOND, 0); | ||
|
|
||
| Date singleDigitDayOfMonthDate = cal.getTime(); | ||
|
|
||
| ConcurrentRfc3164DateFormat rfc3164DateFormat = new ConcurrentRfc3164DateFormat(Locale.US, timeZone, 50); | ||
|
|
||
| String actual = rfc3164DateFormat.format(singleDigitDayOfMonthDate); | ||
|
|
||
| Assert.assertThat(actual, Matchers.is("Aug 7 10:30:05")); | ||
| } | ||
|
|
||
| @Test | ||
| public void test_format_date_with_double_digit_day_of_month(){ | ||
| TimeZone timeZone = TimeZone.getTimeZone("UTC"); | ||
| Calendar cal = Calendar.getInstance(); | ||
| cal.setTimeZone(timeZone); | ||
| cal.set(2013, Calendar.AUGUST, 17, 10, 30, 5); | ||
| cal.set(Calendar.MILLISECOND, 0); | ||
|
|
||
| Date singleDigitDayOfMonthDate = cal.getTime(); | ||
|
|
||
| ConcurrentRfc3164DateFormat rfc3164DateFormat = new ConcurrentRfc3164DateFormat(Locale.US, timeZone, 50); | ||
|
|
||
| String actual = rfc3164DateFormat.format(singleDigitDayOfMonthDate); | ||
|
|
||
| Assert.assertThat(actual, Matchers.is("Aug 17 10:30:05")); | ||
| } | ||
| } |