From ee3ea921ac4d4870a83436c8434a12d19a1c046b Mon Sep 17 00:00:00 2001
From: Dmitriy Kopylenko <dima767@gmail.com>
Date: Tue, 25 Jun 2019 13:37:54 -0400
Subject: [PATCH] Fix test

---
 ...EnversMetadataResolverVersionServiceTests.groovy |  3 ++-
 .../ui/envers/EnversVersionServiceSupport.java      |  7 +++----
 .../EnversMetadataResolverVersionService.java       | 13 +------------
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversMetadataResolverVersionServiceTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversMetadataResolverVersionServiceTests.groovy
index 1ac1dae1f..8f68922ed 100644
--- a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversMetadataResolverVersionServiceTests.groovy
+++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversMetadataResolverVersionServiceTests.groovy
@@ -24,6 +24,7 @@ import org.springframework.transaction.PlatformTransactionManager
 import spock.lang.Specification
 
 import java.time.LocalDateTime
+import java.time.ZonedDateTime
 
 
 @DataJpaTest
@@ -53,7 +54,7 @@ class EnversMetadataResolverVersionServiceTests extends Specification {
         versions.size() == 1
         versions[0].id
         versions[0].creator
-        versions[0].date < LocalDateTime.now()
+        versions[0].date < ZonedDateTime.now()
 
         when: 'Second version'
         mr.name = 'ldmr2'
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java
index 9b8cc860b..ba1631ade 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/envers/EnversVersionServiceSupport.java
@@ -1,13 +1,12 @@
 package edu.internet2.tier.shibboleth.admin.ui.envers;
 
-import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver;
 import edu.internet2.tier.shibboleth.admin.ui.domain.versioning.Version;
 import org.hibernate.envers.AuditReaderFactory;
 import org.hibernate.envers.query.AuditEntity;
 
 import javax.persistence.EntityManager;
 import javax.persistence.NoResultException;
-import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.util.List;
 
 import static java.util.Comparator.comparing;
@@ -38,8 +37,8 @@ public List<Version> findVersionsForPersistentEntity(String resourceId, Class<?>
                             ((PrincipalAwareRevisionEntity) it).getPrincipalUserName(),
                             ((PrincipalAwareRevisionEntity) it).getRevisionDate()
                                     .toInstant()
-                                    .atZone(ZoneId.systemDefault())
-                                    .toLocalDateTime());
+                                    .atOffset(ZoneOffset.UTC)
+                                    .toZonedDateTime());
                 })
                 .sorted(comparing(Version::getDate))
                 .collect(toList());
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversMetadataResolverVersionService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversMetadataResolverVersionService.java
index 5a77c2b87..c98203eca 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversMetadataResolverVersionService.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversMetadataResolverVersionService.java
@@ -1,22 +1,11 @@
 package edu.internet2.tier.shibboleth.admin.ui.service;
 
-import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor;
-import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRepresentation;
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver;
 import edu.internet2.tier.shibboleth.admin.ui.domain.versioning.Version;
 import edu.internet2.tier.shibboleth.admin.ui.envers.EnversVersionServiceSupport;
-import edu.internet2.tier.shibboleth.admin.ui.envers.PrincipalAwareRevisionEntity;
-import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository;
-import org.hibernate.envers.AuditReaderFactory;
-import org.hibernate.envers.query.AuditEntity;
-
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import java.time.ZoneId;
+
 import java.util.List;
 
-import static java.util.Comparator.comparing;
-import static java.util.stream.Collectors.toList;
 
 /**
  * Hibernate Envers based implementation of {@link MetadataResolverVersionService}.