Spring/spring-data-envers
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#112 - Fixed DefaultRevisionMetadata.getRevisionDate().

Browse Source 
Assuming UTC time zone for converting the long into a LocalDateTime.

Original pull request: #114.
This commit is contained in:
Jens Schauder
2018-01-31 15:29:28 +01:00
committed by Oliver Gierke
parent 901bcba65b
commit a4cdb30abb
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/springframework/data/envers/repository/support/DefaultRevisionMetadata.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012 the original author or authors.
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@ import lombok.Value;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.Optional;
import org.hibernate.envers.DefaultRevisionEntity;
@@ -32,6 +33,7 @@ import org.springframework.data.history.RevisionMetadata;
*
* @author Oliver Gierke
* @author Philip Huegelmeyer
* @author Jens Schauder
*/
@Value
public class DefaultRevisionMetadata implements RevisionMetadata<Integer> {
@@ -51,7 +53,7 @@ public class DefaultRevisionMetadata implements RevisionMetadata<Integer> {
* @see org.springframework.data.history.RevisionMetadata#getRevisionDate()
*/
public Optional<LocalDateTime> getRevisionDate() {
return Optional.of(LocalDateTime.from(Instant.ofEpochMilli(entity.getTimestamp())));
return Optional.of(LocalDateTime.ofInstant(Instant.ofEpochMilli(entity.getTimestamp()), ZoneOffset.UTC));
}
/*

17
src/test/java/org/springframework/data/envers/repository/support/DefaultRevisionMetadataUnitTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,24 +18,31 @@ package org.springframework.data.envers.repository.support;
import org.hibernate.envers.DefaultRevisionEntity;
import org.junit.Test;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Unit tests for {@link DefaultRevisionMetadata}.
*
* @author Benedikt Ritter
* @author Jens Schauder
*/
public class DefaultRevisionMetadataUnitTests {
private static final LocalDateTime NOW = LocalDateTime.now();
private static final Instant NOW = Instant.now();;
@Test
@Test // #112
public void createsLocalDateTimeFromTimestamp() {
DefaultRevisionEntity entity = new DefaultRevisionEntity();
entity.setTimestamp(NOW.toEpochSecond(ZoneOffset.UTC));
entity.setTimestamp(NOW.toEpochMilli());
DefaultRevisionMetadata metadata = new DefaultRevisionMetadata(entity);
assertThat(metadata.getRevisionDate()).hasValue(NOW);
assertThat(metadata.getRevisionDate()).hasValue(LocalDateTime.ofInstant(NOW, ZoneOffset.UTC));
}
}