Skip to content

Commit

Permalink
8303440: The "ZonedDateTime.parse" may not accept the "UTC+XX" zone id
Browse files Browse the repository at this point in the history
Reviewed-by: iris, jpai, rriggs, lancea
  • Loading branch information
naotoj committed Mar 6, 2023
1 parent a97271e commit cfb0a25
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4666,8 +4666,10 @@ public int parse(DateTimeParseContext context, CharSequence text, int position)
if (length >= position + 3 && context.charEquals(text.charAt(position + 2), 'C')) {
// There are localized zone texts that start with "UTC", e.g.
// "UTC\u221210:00" (MINUS SIGN instead of HYPHEN-MINUS) in French.
// Exclude those ZoneText cases.
if (!(this instanceof ZoneTextPrinterParser)) {
// Exclude those cases.
if (length == position + 3 ||
context.charEquals(text.charAt(position + 3), '+') ||
context.charEquals(text.charAt(position + 3), '-')) {
return parseOffsetBased(context, text, position, position + 3, OffsetIdPrinterParser.INSTANCE_ID_ZERO);
}
} else {
Expand Down
77 changes: 77 additions & 0 deletions test/jdk/java/time/test/java/time/format/TestUTCParse.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
/*
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @modules jdk.localedata
* @bug 8303440
* @summary Test parsing "UTC-XX:XX" text works correctly
*/
package test.java.time.format;

import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;
import java.time.format.TextStyle;
import java.time.temporal.TemporalQueries;
import java.util.Locale;

import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import static org.testng.Assert.assertEquals;

public class TestUTCParse {

static {
// Assuming CLDR's SHORT name for "America/Los_Angeles"
// produces "UTC\u212208:00"
System.setProperty("java.locale.providers", "CLDR");
}

@DataProvider
public Object[][] utcZoneIdStrings() {
return new Object[][] {
{"UTC"},
{"UTC+01:30"},
{"UTC-01:30"},
};
}

@Test
public void testUTCShortNameRoundTrip() {
var fmt = DateTimeFormatter.ofPattern("z", Locale.FRANCE);
var zdt = ZonedDateTime.of(2023, 3, 3, 0, 0, 0, 0, ZoneId.of("America/Los_Angeles"));
var formatted = fmt.format(zdt);
assertEquals(formatted, "UTC\u221208:00");
assertEquals(fmt.parse(formatted).query(TemporalQueries.zoneId()), zdt.getZone());
}

@Test(dataProvider = "utcZoneIdStrings")
public void testUTCOffsetRoundTrip(String zidString) {
var fmt = new DateTimeFormatterBuilder()
.appendZoneText(TextStyle.NARROW)
.toFormatter();
var zid = ZoneId.of(zidString);
assertEquals(fmt.parse(zidString).query(TemporalQueries.zoneId()), zid);
}
}

9 comments on commit cfb0a25

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mrserb
Copy link
Member

@mrserb mrserb commented on cfb0a25 Mar 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport 17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on cfb0a25 Mar 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mrserb The target repository 17u-dev is not a valid target for backports.
List of valid target repositories: openjdk/jdk, openjdk/jdk11u, openjdk/jdk11u-dev, openjdk/jdk17u, openjdk/jdk17u-dev, openjdk/jdk19u, openjdk/jdk20, openjdk/jdk20u, openjdk/jdk7u, openjdk/jdk8u, openjdk/jdk8u-dev, openjdk/shenandoah-jdk8u, openjdk/shenandoah-jdk8u-dev.
Supplying the organization/group prefix is optional.

@mrserb
Copy link
Member

@mrserb mrserb commented on cfb0a25 Mar 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on cfb0a25 Mar 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mrserb the backport was successfully created on the branch mrserb-backport-cfb0a25a in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit cfb0a25a from the openjdk/jdk repository.

The commit being backported was authored by Naoto Sato on 6 Mar 2023 and was reviewed by Iris Clark, Jaikiran Pai, Roger Riggs and Lance Andersen.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev mrserb-backport-cfb0a25a:mrserb-backport-cfb0a25a
$ git checkout mrserb-backport-cfb0a25a
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev mrserb-backport-cfb0a25a

@mrserb
Copy link
Member

@mrserb mrserb commented on cfb0a25 Mar 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on cfb0a25 Mar 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mrserb the backport was successfully created on the branch mrserb-backport-cfb0a25a in my personal fork of openjdk/jdk11u-dev. To create a pull request with this backport targeting openjdk/jdk11u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit cfb0a25a from the openjdk/jdk repository.

The commit being backported was authored by Naoto Sato on 6 Mar 2023 and was reviewed by Iris Clark, Jaikiran Pai, Roger Riggs and Lance Andersen.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk11u-dev:

$ git fetch https://github.com/openjdk-bots/jdk11u-dev mrserb-backport-cfb0a25a:mrserb-backport-cfb0a25a
$ git checkout mrserb-backport-cfb0a25a
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk11u-dev mrserb-backport-cfb0a25a

@mrserb
Copy link
Member

@mrserb mrserb commented on cfb0a25 Mar 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk20u

@openjdk
Copy link

@openjdk openjdk bot commented on cfb0a25 Mar 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mrserb the backport was successfully created on the branch mrserb-backport-cfb0a25a in my personal fork of openjdk/jdk20u. To create a pull request with this backport targeting openjdk/jdk20u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit cfb0a25a from the openjdk/jdk repository.

The commit being backported was authored by Naoto Sato on 6 Mar 2023 and was reviewed by Iris Clark, Jaikiran Pai, Roger Riggs and Lance Andersen.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk20u:

$ git fetch https://github.com/openjdk-bots/jdk20u mrserb-backport-cfb0a25a:mrserb-backport-cfb0a25a
$ git checkout mrserb-backport-cfb0a25a
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk20u mrserb-backport-cfb0a25a

Please sign in to comment.