Skip to content

Commit 8cf4000

Browse files
Merge pull request eugenp#5293 from RanjeetKaur17/develop.0.3.0
Changes to directly create ZoneOffset using offset value rather using…
2 parents 6f93afc + 4be74d0 commit 8cf4000

File tree

5 files changed

+17
-29
lines changed

5 files changed

+17
-29
lines changed

core-java/src/main/java/com/baeldung/zoneddatetime/OffsetDateTimeExample.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
package com.baeldung.zoneddatetime;
22

3-
import java.time.LocalDateTime;
43
import java.time.OffsetDateTime;
5-
import java.time.ZoneId;
64
import java.time.ZoneOffset;
75

86
public class OffsetDateTimeExample {
97

10-
public OffsetDateTime getCurrentTimeByZoneOffset(String region) {
11-
LocalDateTime now = LocalDateTime.now();
12-
ZoneId zone = ZoneId.of(region);
13-
ZoneOffset zoneOffSet= zone.getRules().getOffset(now);
8+
public OffsetDateTime getCurrentTimeByZoneOffset(String offset) {
9+
ZoneOffset zoneOffSet= ZoneOffset.of(offset);
1410
OffsetDateTime date = OffsetDateTime.now(zoneOffSet);
1511
return date;
1612
}

core-java/src/main/java/com/baeldung/zoneddatetime/OffsetTimeExample.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
package com.baeldung.zoneddatetime;
22

3-
import java.time.LocalDateTime;
43
import java.time.OffsetTime;
5-
import java.time.ZoneId;
64
import java.time.ZoneOffset;
75

86
public class OffsetTimeExample {
97

10-
public OffsetTime getCurrentTimeByZoneOffset(String region) {
11-
LocalDateTime now = LocalDateTime.now();
12-
ZoneId zone = ZoneId.of(region);
13-
ZoneOffset zoneOffSet = zone.getRules()
14-
.getOffset(now);
8+
public OffsetTime getCurrentTimeByZoneOffset(String offset) {
9+
ZoneOffset zoneOffSet = ZoneOffset.of(offset);
1510
OffsetTime time = OffsetTime.now(zoneOffSet);
1611
return time;
1712
}

core-java/src/test/java/com/baeldung/zoneddatetime/OffsetDateTimeExampleUnitTest.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
import static org.junit.Assert.assertTrue;
44

5-
import java.time.LocalDateTime;
65
import java.time.OffsetDateTime;
7-
import java.time.ZoneId;
6+
import java.time.ZoneOffset;
87

98
import org.junit.Test;
109

@@ -14,12 +13,10 @@ public class OffsetDateTimeExampleUnitTest {
1413

1514
@Test
1615
public void givenZoneOffset_whenGetCurrentTime_thenResultHasZone() {
17-
String zone = "Europe/Berlin";
18-
OffsetDateTime time = offsetDateTimeExample.getCurrentTimeByZoneOffset(zone);
16+
String offset = "+02:00";
17+
OffsetDateTime time = offsetDateTimeExample.getCurrentTimeByZoneOffset(offset);
1918

2019
assertTrue(time.getOffset()
21-
.equals(ZoneId.of(zone)
22-
.getRules()
23-
.getOffset(LocalDateTime.now())));
20+
.equals(ZoneOffset.of(offset)));
2421
}
2522
}

core-java/src/test/java/com/baeldung/zoneddatetime/OffsetTimeExampleUnitTest.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
import static org.junit.Assert.assertTrue;
44

5-
import java.time.LocalDateTime;
65
import java.time.OffsetTime;
7-
import java.time.ZoneId;
6+
import java.time.ZoneOffset;
87

98
import org.junit.Test;
109

@@ -14,12 +13,10 @@ public class OffsetTimeExampleUnitTest {
1413

1514
@Test
1615
public void givenZoneOffset_whenGetCurrentTime_thenResultHasZone() {
17-
String zone = "Europe/Berlin";
18-
OffsetTime time = offsetTimeExample.getCurrentTimeByZoneOffset(zone);
16+
String offset = "+02:00";
17+
OffsetTime time = offsetTimeExample.getCurrentTimeByZoneOffset(offset);
1918

2019
assertTrue(time.getOffset()
21-
.equals(ZoneId.of(zone)
22-
.getRules()
23-
.getOffset(LocalDateTime.now())));
20+
.equals(ZoneOffset.of(offset)));
2421
}
2522
}

core-java/src/test/java/com/baeldung/zoneddatetime/ZoneDateTimeExampleUnitTest.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,19 @@ public class ZoneDateTimeExampleUnitTest {
1515
public void givenZone_whenGetCurrentTime_thenResultHasZone() {
1616
String zone = "Europe/Berlin";
1717
ZonedDateTime time = zoneDateTimeExample.getCurrentTimeByZoneId(zone);
18+
1819
assertTrue(time.getZone()
1920
.equals(ZoneId.of(zone)));
2021
}
21-
22+
2223
@Test
2324
public void givenZones_whenConvertDateByZone_thenGetConstantDiff() {
2425
String sourceZone = "Europe/Berlin";
2526
String destZone = "Asia/Tokyo";
2627
ZonedDateTime sourceDate = zoneDateTimeExample.getCurrentTimeByZoneId(sourceZone);
2728
ZonedDateTime destDate = zoneDateTimeExample.convertZonedDateTime(sourceDate, destZone);
28-
assertTrue(sourceDate.toInstant().compareTo(destDate.toInstant()) == 0);
29+
30+
assertTrue(sourceDate.toInstant()
31+
.compareTo(destDate.toInstant()) == 0);
2932
}
3033
}

0 commit comments

Comments
 (0)