demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-25 11:45:49 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Use 'ZoneId.systemDefault()' instead of 'TimeZone.getDefault().toZoneId()' (#1527)

Browse Source 
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
This commit is contained in:
Christoph Weitkamp 2020-06-21 14:34:40 +02:00 committed by GitHub
parent 6deb3255ea
commit 115b3e22f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/FilterCriteria.java
View File

@ -12,9 +12,9 @@
*/
package org.openhab.core.persistence;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.Date;
import java.util.TimeZone;
import org.openhab.core.types.State;
@ -178,7 +178,7 @@ public class FilterCriteria {
@Deprecated
public FilterCriteria setBeginDate(Date beginDate) {
if (beginDate != null) {
this.beginDate = ZonedDateTime.ofInstant(beginDate.toInstant(), TimeZone.getDefault().toZoneId());
this.beginDate = ZonedDateTime.ofInstant(beginDate.toInstant(), ZoneId.systemDefault());
} else {
this.beginDate = null;
}
@ -205,7 +205,7 @@ public class FilterCriteria {
@Deprecated
public FilterCriteria setEndDate(Date endDate) {
if (endDate != null) {
this.endDate = ZonedDateTime.ofInstant(endDate.toInstant(), TimeZone.getDefault().toZoneId());
this.endDate = ZonedDateTime.ofInstant(endDate.toInstant(), ZoneId.systemDefault());
} else {
this.endDate = null;
}

3
bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/I18nProviderImpl.java
View File

@ -22,7 +22,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.ResourceBundle;
import java.util.TimeZone;
import javax.measure.Quantity;
import javax.measure.Unit;
@ -278,7 +277,7 @@ public class I18nProviderImpl
public ZoneId getTimeZone() {
final ZoneId timeZone = this.timeZone;
if (timeZone == null) {
return TimeZone.getDefault().toZoneId();
return ZoneId.systemDefault();
}
return timeZone;
}

5
bundles/org.openhab.core/src/test/java/org/openhab/core/internal/i18n/I18nProviderImplTest.java
View File

@ -23,7 +23,6 @@ import java.util.Dictionary;
import java.util.Hashtable;
import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
import org.junit.Before;
import org.junit.Test;
@ -104,7 +103,7 @@ public class I18nProviderImplTest {
Locale setLocale = i18nProviderImpl.getLocale();
assertNull(location);
assertThat(i18nProviderImpl.getTimeZone(), is(TimeZone.getDefault().toZoneId()));
assertThat(i18nProviderImpl.getTimeZone(), is(ZoneId.systemDefault()));
assertThat(setLocale, is(Locale.getDefault()));
}
@ -140,7 +139,7 @@ public class I18nProviderImplTest {
conf.put(TIMEZONE, "invalid");
i18nProviderImpl.modified(conf);
assertThat(i18nProviderImpl.getTimeZone(), is(TimeZone.getDefault().toZoneId()));
assertThat(i18nProviderImpl.getTimeZone(), is(ZoneId.systemDefault()));
}
@Test

2
bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/DateTimeTypeTest.java
View File

@ -325,7 +325,7 @@ public class DateTimeTypeTest {
dt2 = new DateTimeType(zonedDate);
} else if (inputTimeString != null) {
dt1 = new DateTimeType(inputTimeString);
dt2 = new DateTimeType(dt1.getZonedDateTime().withZoneSameInstant(TimeZone.getDefault().toZoneId()));
dt2 = new DateTimeType(dt1.getZonedDateTime().withZoneSameInstant(ZoneId.systemDefault()));
dt3 = new DateTimeType(dt1.getZonedDateTime());
} else {
throw new DateTimeException("Invalid inputs in parameter set");

4
itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/persistence/PersistenceResourceTest.java
View File

@ -17,10 +17,10 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
import static org.mockito.MockitoAnnotations.initMocks;
import java.time.ZoneId;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
import org.junit.Before;
import org.junit.Test;
@ -90,7 +90,7 @@ public class PersistenceResourceTest {
when(pService.query(any())).thenReturn(items);
when(persistenceServiceRegistry.get(PERSISTENCE_SERVICE_ID)).thenReturn(pService);
when(timeZoneProvider.getTimeZone()).thenReturn(TimeZone.getDefault().toZoneId());
when(timeZoneProvider.getTimeZone()).thenReturn(ZoneId.systemDefault());
}
@Test