diff --git a/java/google/registry/rde/Ghostryde.java b/java/google/registry/rde/Ghostryde.java
index 0305aba68..835d27f06 100644
--- a/java/google/registry/rde/Ghostryde.java
+++ b/java/google/registry/rde/Ghostryde.java
@@ -81,7 +81,7 @@ import org.joda.time.DateTime;
* try (OutputStream output = new FileOutputStream(out);
* Ghostryde.Encryptor encryptor = ghost.openEncryptor(output, publicKey);
* Ghostryde.Compressor kompressor = ghost.openCompressor(encryptor);
- * OutputStream go = ghost.openOutput(kompressor, in.getName(), DateTime.now());
+ * OutputStream go = ghost.openOutput(kompressor, in.getName(), DateTime.now(UTC));
* InputStream input = new FileInputStream(in)) {
* ByteStreams.copy(input, go);
* }}
@@ -109,7 +109,7 @@ import org.joda.time.DateTime;
*
*
{@code
* byte[] data = "hello kitty".getBytes(UTF_8);
- * byte[] blob = Ghostryde.encode(data, publicKey, "lol.txt", DateTime.now());
+ * byte[] blob = Ghostryde.encode(data, publicKey, "lol.txt", DateTime.now(UTC));
* Ghostryde.Result result = Ghostryde.decode(blob, privateKey);
* }
*
diff --git a/java/google/registry/rde/RdeImportUtils.java b/java/google/registry/rde/RdeImportUtils.java
index 9bfdd4e6c..54c431e8f 100644
--- a/java/google/registry/rde/RdeImportUtils.java
+++ b/java/google/registry/rde/RdeImportUtils.java
@@ -38,7 +38,6 @@ import java.io.InputStream;
import javax.inject.Inject;
import javax.xml.bind.JAXBException;
import javax.xml.stream.XMLStreamException;
-import org.joda.time.DateTime;
/**
* Utility functions for escrow file import.
@@ -134,7 +133,7 @@ public class RdeImportUtils {
String tld = parser.getHeader().getTld();
try {
Registry registry = Registry.get(tld);
- TldState currentState = registry.getTldState(DateTime.now());
+ TldState currentState = registry.getTldState(clock.nowUtc());
checkArgument(
currentState == TldState.PREDELEGATION,
String.format("Tld '%s' is in state %s and cannot be imported", tld, currentState));
diff --git a/javatests/google/registry/flows/contact/ContactInfoFlowTest.java b/javatests/google/registry/flows/contact/ContactInfoFlowTest.java
index 1ec2dd9f4..088e8b054 100644
--- a/javatests/google/registry/flows/contact/ContactInfoFlowTest.java
+++ b/javatests/google/registry/flows/contact/ContactInfoFlowTest.java
@@ -50,7 +50,7 @@ public class ContactInfoFlowTest extends ResourceFlowTestCase>of());
+ CommitLogManifest.create(getBucketKey(1), clock.nowUtc(), ImmutableSet.>of());
thrown.expect(IllegalArgumentException.class, "Can't save/delete a @NotBackedUp");
ofy().transactNew(new VoidWork() {
@Override
@@ -211,7 +211,7 @@ public class OfyCommitLogTest {
@Test
public void testTransactNew_saveNotBackedUpKind_throws() throws Exception {
final CommitLogManifest backupsArentAllowedOnMe =
- CommitLogManifest.create(getBucketKey(1), DateTime.now(), ImmutableSet.>of());
+ CommitLogManifest.create(getBucketKey(1), clock.nowUtc(), ImmutableSet.>of());
ofy().saveWithoutBackup().entity(backupsArentAllowedOnMe).now();
thrown.expect(IllegalArgumentException.class, "Can't save/delete a @NotBackedUp");
ofy().transactNew(new VoidWork() {
diff --git a/javatests/google/registry/rde/RdeImportUtilsTest.java b/javatests/google/registry/rde/RdeImportUtilsTest.java
index a20f8d936..f318e0ba2 100644
--- a/javatests/google/registry/rde/RdeImportUtilsTest.java
+++ b/javatests/google/registry/rde/RdeImportUtilsTest.java
@@ -19,6 +19,7 @@ import static google.registry.model.ofy.ObjectifyService.ofy;
import static google.registry.testing.DatastoreHelper.createTld;
import static google.registry.testing.DatastoreHelper.persistNewRegistrar;
import static google.registry.testing.DatastoreHelper.persistResource;
+import static org.joda.time.DateTimeZone.UTC;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -79,7 +80,7 @@ public class RdeImportUtilsTest extends ShardableTestCase {
@Before
public void before() {
clock = new FakeClock();
- clock.setTo(DateTime.now());
+ clock.setTo(DateTime.now(UTC));
rdeImportUtils = new RdeImportUtils(ofy(), clock, "import-bucket", gcsUtils);
createTld("test", TldState.PREDELEGATION);
createTld("getld", TldState.GENERAL_AVAILABILITY);
@@ -188,8 +189,8 @@ public class RdeImportUtilsTest extends ShardableTestCase {
}
/** Confirms that a ForeignKeyIndex exists in the datastore for a given resource. */
- private static void assertForeignKeyIndexFor(final T resource) {
- assertThat(ForeignKeyIndex.load(resource.getClass(), resource.getForeignKey(), DateTime.now()))
+ private void assertForeignKeyIndexFor(final T resource) {
+ assertThat(ForeignKeyIndex.load(resource.getClass(), resource.getForeignKey(), clock.nowUtc()))
.isNotNull();
}
diff --git a/javatests/google/registry/rde/RdeReportActionTest.java b/javatests/google/registry/rde/RdeReportActionTest.java
index ac7227d61..6de341a2b 100644
--- a/javatests/google/registry/rde/RdeReportActionTest.java
+++ b/javatests/google/registry/rde/RdeReportActionTest.java
@@ -23,6 +23,7 @@ import static google.registry.testing.DatastoreHelper.persistResource;
import static google.registry.testing.GcsTestingUtils.writeGcsFile;
import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
import static javax.servlet.http.HttpServletResponse.SC_OK;
+import static org.joda.time.DateTimeZone.UTC;
import static org.joda.time.Duration.standardDays;
import static org.joda.time.Duration.standardSeconds;
import static org.mockito.Matchers.any;
@@ -127,7 +128,7 @@ public class RdeReportActionTest {
writeGcsFile(
gcsService,
reportFile,
- Ghostryde.encode(REPORT_XML.read(), encryptKey, "darkside.xml", DateTime.now()));
+ Ghostryde.encode(REPORT_XML.read(), encryptKey, "darkside.xml", DateTime.now(UTC)));
}
@Test
diff --git a/javatests/google/registry/whois/WhoisServerTest.java b/javatests/google/registry/whois/WhoisServerTest.java
index 14c5e2af5..7650f959b 100644
--- a/javatests/google/registry/whois/WhoisServerTest.java
+++ b/javatests/google/registry/whois/WhoisServerTest.java
@@ -207,8 +207,8 @@ public class WhoisServerTest {
persistResource(makeHostResource("ns2.cat.lol", "bad:f00d:cafe::15:beef")),
persistResource(
makeRegistrar("example", "Example Registrar", ACTIVE))).asBuilder()
- .setCreationTimeForTest(DateTime.now().minusDays(2))
- .setDeletionTime(DateTime.now().minusDays(1)).build());
+ .setCreationTimeForTest(clock.nowUtc().minusDays(2))
+ .setDeletionTime(clock.nowUtc().minusDays(1)).build());
DomainResource domain2 = persistResource(makeDomainResource("cat.lol",
persistResource(
makeContactResource(
@@ -221,7 +221,7 @@ public class WhoisServerTest {
persistResource(makeHostResource("ns2.google.lol", "4311::f143")),
persistResource((registrar = makeRegistrar(
"example", "Example Registrar", ACTIVE)))).asBuilder()
- .setCreationTimeForTest(DateTime.now()).build());
+ .setCreationTimeForTest(clock.nowUtc()).build());
persistSimpleResources(makeRegistrarContacts(registrar));
assertThat(domain1.getRepoId()).isNotEqualTo(domain2.getRepoId());
newWhoisServer("domain cat.lol\r\n").run();