This repository has been archived by the owner on Jan 8, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 128
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
TemplateDateFormat.isTimeZoneBound support + tests
- Loading branch information
Showing
8 changed files
with
209 additions
and
9 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
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
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
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
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
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
96 changes: 96 additions & 0 deletions
96
src/test/java/freemarker/core/LocAndTZSensitiveTemplateDateFormatFactory.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,96 @@ | ||
| /* | ||
| * Copyright 2014 Attila Szegedi, Daniel Dekany, Jonathan Revusky | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package freemarker.core; | ||
|
|
||
| import java.text.ParseException; | ||
| import java.util.Date; | ||
| import java.util.Locale; | ||
| import java.util.TimeZone; | ||
|
|
||
| import org.apache.commons.lang.NotImplementedException; | ||
|
|
||
| import freemarker.template.TemplateDateModel; | ||
| import freemarker.template.TemplateModelException; | ||
|
|
||
| public class LocAndTZSensitiveTemplateDateFormatFactory extends TemplateDateFormatFactory { | ||
|
|
||
| public static final LocAndTZSensitiveTemplateDateFormatFactory INSTANCE = new LocAndTZSensitiveTemplateDateFormatFactory(); | ||
|
|
||
| private LocAndTZSensitiveTemplateDateFormatFactory() { | ||
| // Defined to decrease visibility | ||
| } | ||
|
|
||
| @Override | ||
| public TemplateDateFormat get(int dateType, boolean zonelessInput, String params, Locale locale, TimeZone timeZone, | ||
| Environment env) throws TemplateModelException, UnknownDateTypeFormattingUnsupportedException, | ||
| InvalidFormatParametersException { | ||
| TemplateNumberFormatUtil.checkHasNoParameters(params); | ||
| return new LocAndTZSensitiveTemplateDateFormat(locale, timeZone); | ||
| } | ||
|
|
||
| private static class LocAndTZSensitiveTemplateDateFormat extends TemplateDateFormat { | ||
|
|
||
| private final Locale locale; | ||
| private final TimeZone timeZone; | ||
|
|
||
| public LocAndTZSensitiveTemplateDateFormat(Locale locale, TimeZone timeZone) { | ||
| this.locale = locale; | ||
| this.timeZone = timeZone; | ||
| } | ||
|
|
||
| @Override | ||
| public String format(TemplateDateModel dateModel) | ||
| throws UnformattableDateException, TemplateModelException { | ||
| return String.valueOf(getNonNullDate(dateModel).getTime() + "@" + locale + ":" + timeZone.getID()); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isLocaleBound() { | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isTimeZoneBound() { | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public <MO extends TemplateMarkupOutputModel> MO format(TemplateDateModel dateModel, | ||
| MarkupOutputFormat<MO> outputFormat) throws UnformattableNumberException, TemplateModelException { | ||
| throw new NotImplementedException(); | ||
| } | ||
|
|
||
| @Override | ||
| public Date parse(String s) throws ParseException { | ||
| try { | ||
| int atIdx = s.indexOf("@"); | ||
| if (atIdx == -1) { | ||
| throw new ParseException("Missing @", 0); | ||
| } | ||
| return new Date(Long.parseLong(s.substring(0, atIdx))); | ||
| } catch (NumberFormatException e) { | ||
| throw new ParseException("Malformed long", 0); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public String getDescription() { | ||
| return "millis since the epoch"; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| } |
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