Skip to content

Persist timeZone as ZoneId directly #435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Persist timeZone as ZoneId directly #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/main/java/org/jenkinsci/plugins/schedulebuild/ScheduleBuildGlobalConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public static ScheduleBuildGlobalConfiguration get() {
// time portion (hours, minutes, seconds, etc.) while the date
// portion is ignored.
private transient Date defaultScheduleTime;
private String timeZone;
private ZoneId timeZone;

private String defaultStartTime;

Expand All @@ -61,7 +61,7 @@ public static ScheduleBuildGlobalConfiguration get() {

@DataBoundConstructor
public ScheduleBuildGlobalConfiguration() {
this.timeZone = TimeZone.getDefault().getID();
this.timeZone = ZoneId.systemDefault();
defaultStartTime = "22:00:00";
load();
defaultScheduleLocalTime = LocalTime.parse(defaultStartTime, getTimeFormatter());
Expand Down Expand Up @@ -116,21 +116,21 @@ private LocalTime parseTime(String time) {
}

public String getTimeZone() {
return timeZone;
return timeZone.toString();
}

@DataBoundSetter
public void setTimeZone(String timeZone) {
this.timeZone = timeZone;
try {
this.timeZone = ZoneId.of(timeZone);
} catch (DateTimeException e) {
this.timeZone = ZoneId.systemDefault();
}
save();
}

public ZoneId getZoneId() {
try {
return ZoneId.of(timeZone);
} catch (DateTimeException dte) {
return ZoneId.systemDefault();
}
return timeZone;
}

private DateTimeFormatter getTimeFormatter() {
Expand Down Expand Up @@ -178,7 +178,7 @@ public ListBoxModel doFillTimeZoneItems() {
ListBoxModel items = new ListBoxModel();
Set<String> zoneIds = new TreeSet<>(ZoneId.getAvailableZoneIds());
for (String id : zoneIds) {
if (id.equalsIgnoreCase(timeZone)) {
if (id.equalsIgnoreCase(timeZone.toString())) {
items.add(new ListBoxModel.Option(id, id, true));
} else {
items.add(id);
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/META-INF/hudson.remoting.ClassFilter
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
java.time.ZoneRegion
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Both classes are needed. The first during saving and the second when loading

java.time.ZoneId