Repository: james-project Updated Branches: refs/heads/master be37b9c0c -> 7eb1c5245
http://git-wip-us.apache.org/repos/asf/james-project/blob/b93d42ca/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveQuotaDAOTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveQuotaDAOTest.java b/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveQuotaDAOTest.java index 51ae3ed..e3ff18a 100644 --- a/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveQuotaDAOTest.java +++ b/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveQuotaDAOTest.java @@ -31,11 +31,12 @@ import org.junit.Test; public class CassandraSieveQuotaDAOTest { public static final String USER = "user"; - private static CassandraCluster cassandra = CassandraCluster.create(new CassandraSieveRepositoryModule()); + private CassandraCluster cassandra; private CassandraSieveQuotaDAO sieveQuotaDAO; @Before public void setUp() { + cassandra = CassandraCluster.create(new CassandraSieveRepositoryModule()); cassandra.ensureAllTables(); sieveQuotaDAO = new CassandraSieveQuotaDAO(cassandra.getConf()); } @@ -43,6 +44,7 @@ public class CassandraSieveQuotaDAOTest { @After public void tearDown() { cassandra.clearAllTables(); + cassandra.close(); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/b93d42ca/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryTest.java b/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryTest.java index 8451207..8d37f63 100644 --- a/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryTest.java +++ b/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryTest.java @@ -37,5 +37,6 @@ public class CassandraSieveRepositoryTest extends AbstractSieveRepositoryTest { @Override protected void cleanUp() throws Exception { cassandra.clearAllTables(); + cassandra.close(); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/james-project/blob/b93d42ca/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationDAO.java ---------------------------------------------------------------------- diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationDAO.java b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationDAO.java index 8394be1..d2ac082 100644 --- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationDAO.java +++ b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationDAO.java @@ -102,7 +102,7 @@ public class CassandraVacationDAO { private Optional<ZonedDateTime> retrieveDate(Row row, String dateField) { return Optional.ofNullable(row.getUDTValue(dateField)) .map(udtValue -> ZonedDateTimeRepresentation.fromDate( - udtValue.getDate(CassandraZonedDateTimeModule.DATE), + udtValue.getTimestamp(CassandraZonedDateTimeModule.DATE), udtValue.getString(CassandraZonedDateTimeModule.TIME_ZONE)) .getZonedDateTime()); } @@ -132,7 +132,7 @@ public class CassandraVacationDAO { private Optional<UDTValue> convertToUDTOptional(Optional<ZonedDateTime> zonedDateTimeOptional) { return zonedDateTimeOptional.map(ZonedDateTimeRepresentation::fromZonedDateTime) .map(representation -> zonedDateTimeUserType.newValue() - .setDate(CassandraZonedDateTimeModule.DATE, representation.getDate()) + .setTimestamp(CassandraZonedDateTimeModule.DATE, representation.getDate()) .setString(CassandraZonedDateTimeModule.TIME_ZONE, representation.getSerializedZoneId())); } } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
