zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-21 11:49:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Correct usages of DateTime.now() everywhere to DateTime.now(UTC)

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166393128
This commit is contained in:
mcilwain 2017-08-24 14:16:48 -07:00 • committed by Ben McIlwain
parent 7fb44e4f66
commit 103b3d7608
7 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
java/google/registry/rde/imports/RdeHostLinkAction.java
View file

@ -18,6 +18,7 @@ import static google.registry.flows.host.HostFlowUtils.lookupSuperordinateDomain
import static google.registry.mapreduce.MapreduceRunner.PARAM_MAP_SHARDS; import static google.registry.mapreduce.MapreduceRunner.PARAM_MAP_SHARDS;
import static google.registry.model.ofy.ObjectifyService.ofy; import static google.registry.model.ofy.ObjectifyService.ofy;
import static google.registry.util.PipelineUtils.createJobPath; import static google.registry.util.PipelineUtils.createJobPath;
import static org.joda.time.DateTimeZone.UTC;
import com.google.appengine.tools.mapreduce.Mapper; import com.google.appengine.tools.mapreduce.Mapper;
import com.google.common.base.Optional; import com.google.common.base.Optional;
@ -105,7 +106,7 @@ public class RdeHostLinkAction implements Runnable {
try { try {
InternetDomainName hostName = InternetDomainName.from(xjcHost.getName()); InternetDomainName hostName = InternetDomainName.from(xjcHost.getName());
Optional<DomainResource> superordinateDomain = Optional<DomainResource> superordinateDomain =
lookupSuperordinateDomain(hostName, DateTime.now()); lookupSuperordinateDomain(hostName, DateTime.now(UTC));
// if suporordinateDomain is null, this is an out of zone host and can't be linked // if suporordinateDomain is null, this is an out of zone host and can't be linked
if (!superordinateDomain.isPresent()) { if (!superordinateDomain.isPresent()) {
getContext().incrementCounter("post-import hosts out of zone"); getContext().incrementCounter("post-import hosts out of zone");

3
java/google/registry/rde/imports/RdeImportUtils.java
View file

@ -21,6 +21,7 @@ import static google.registry.util.DateTimeUtils.START_OF_TIME;
import static google.registry.util.PreconditionsUtils.checkArgumentPresent; import static google.registry.util.PreconditionsUtils.checkArgumentPresent;
import static java.nio.charset.StandardCharsets.US_ASCII; import static java.nio.charset.StandardCharsets.US_ASCII;
import static java.nio.charset.StandardCharsets.UTF_8; import static java.nio.charset.StandardCharsets.UTF_8;
import static org.joda.time.DateTimeZone.UTC;
import com.google.appengine.tools.cloudstorage.GcsFilename; import com.google.appengine.tools.cloudstorage.GcsFilename;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
@ -220,7 +221,7 @@ public class RdeImportUtils {
.setType(HistoryEntry.Type.RDE_IMPORT) .setType(HistoryEntry.Type.RDE_IMPORT)
.setClientId(domain.getClID()) .setClientId(domain.getClID())
.setTrid(generateTridForImport()) .setTrid(generateTridForImport())
.setModificationTime(DateTime.now()) .setModificationTime(DateTime.now(UTC))
.setXmlBytes(getObjectXml(element)) .setXmlBytes(getObjectXml(element))
.setBySuperuser(true) .setBySuperuser(true)
.setReason("RDE Import") .setReason("RDE Import")

7
java/google/registry/rde/imports/XjcToDomainResourceConverter.java
View file

@ -19,6 +19,7 @@ import static com.google.common.base.Preconditions.checkState;
import static com.google.common.collect.Iterables.transform; import static com.google.common.collect.Iterables.transform;
import static google.registry.util.DomainNameUtils.canonicalizeDomainName; import static google.registry.util.DomainNameUtils.canonicalizeDomainName;
import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import static google.registry.util.PreconditionsUtils.checkArgumentNotNull;
import static org.joda.time.DateTimeZone.UTC;
import com.google.common.base.Ascii; import com.google.common.base.Ascii;
import com.google.common.base.Function; import com.google.common.base.Function;
@ -95,7 +96,7 @@ final class XjcToDomainResourceConverter extends XjcToEppResourceConverter {
fullyQualifiedHostName = canonicalizeDomainName(fullyQualifiedHostName); fullyQualifiedHostName = canonicalizeDomainName(fullyQualifiedHostName);
Key<HostResource> key = Key<HostResource> key =
ForeignKeyIndex.loadAndGetKey( ForeignKeyIndex.loadAndGetKey(
HostResource.class, fullyQualifiedHostName, DateTime.now()); HostResource.class, fullyQualifiedHostName, DateTime.now(UTC));
checkState( checkState(
key != null, key != null,
String.format("HostResource not found with name '%s'", fullyQualifiedHostName)); String.format("HostResource not found with name '%s'", fullyQualifiedHostName));
@ -221,7 +222,7 @@ final class XjcToDomainResourceConverter extends XjcToEppResourceConverter {
/** Returns {@link Key} for registrant from foreign key */ /** Returns {@link Key} for registrant from foreign key */
private static Key<ContactResource> convertRegistrant(String contactId) { private static Key<ContactResource> convertRegistrant(String contactId) {
Key<ContactResource> key = Key<ContactResource> key =
ForeignKeyIndex.loadAndGetKey(ContactResource.class, contactId, DateTime.now()); ForeignKeyIndex.loadAndGetKey(ContactResource.class, contactId, DateTime.now(UTC));
checkState(key != null, "Registrant not found: '%s'", contactId); checkState(key != null, "Registrant not found: '%s'", contactId);
return key; return key;
} }
@ -269,7 +270,7 @@ final class XjcToDomainResourceConverter extends XjcToEppResourceConverter {
private static DesignatedContact convertContactType(XjcDomainContactType contact) { private static DesignatedContact convertContactType(XjcDomainContactType contact) {
String contactId = contact.getValue(); String contactId = contact.getValue();
Key<ContactResource> key = Key<ContactResource> key =
ForeignKeyIndex.loadAndGetKey(ContactResource.class, contactId, DateTime.now()); ForeignKeyIndex.loadAndGetKey(ContactResource.class, contactId, DateTime.now(UTC));
checkState(key != null, "Contact not found: '%s'", contactId); checkState(key != null, "Contact not found: '%s'", contactId);
DesignatedContact.Type type = DesignatedContact.Type type =
DesignatedContact.Type.valueOf(Ascii.toUpperCase(contact.getType().toString())); DesignatedContact.Type.valueOf(Ascii.toUpperCase(contact.getType().toString()));

3
java/google/registry/rde/imports/XjcToHostResourceConverter.java
View file

@ -19,6 +19,7 @@ import static com.google.common.base.Predicates.not;
import static google.registry.model.ofy.ObjectifyService.ofy; import static google.registry.model.ofy.ObjectifyService.ofy;
import static google.registry.rde.imports.RdeImportUtils.generateTridForImport; import static google.registry.rde.imports.RdeImportUtils.generateTridForImport;
import static google.registry.util.DomainNameUtils.canonicalizeDomainName; import static google.registry.util.DomainNameUtils.canonicalizeDomainName;
import static org.joda.time.DateTimeZone.UTC;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.collect.FluentIterable; import com.google.common.collect.FluentIterable;
@ -65,7 +66,7 @@ public class XjcToHostResourceConverter extends XjcToEppResourceConverter {
.setType(HistoryEntry.Type.RDE_IMPORT) .setType(HistoryEntry.Type.RDE_IMPORT)
.setClientId(host.getClID()) .setClientId(host.getClID())
.setTrid(generateTridForImport()) .setTrid(generateTridForImport())
.setModificationTime(DateTime.now()) .setModificationTime(DateTime.now(UTC))
.setXmlBytes(getObjectXml(new XjcRdeHostElement(host))) .setXmlBytes(getObjectXml(new XjcRdeHostElement(host)))
.setBySuperuser(true) .setBySuperuser(true)
.setReason("RDE Import") .setReason("RDE Import")

3
javatests/google/registry/rde/imports/RdeContactImportActionTest.java
View file

@ -20,6 +20,7 @@ import static google.registry.testing.DatastoreHelper.getHistoryEntries;
import static google.registry.testing.DatastoreHelper.newContactResource; import static google.registry.testing.DatastoreHelper.newContactResource;
import static google.registry.testing.DatastoreHelper.persistResource; import static google.registry.testing.DatastoreHelper.persistResource;
import static google.registry.testing.DatastoreHelper.persistSimpleResource; import static google.registry.testing.DatastoreHelper.persistSimpleResource;
import static org.joda.time.DateTimeZone.UTC;
import com.google.appengine.tools.cloudstorage.GcsFilename; import com.google.appengine.tools.cloudstorage.GcsFilename;
import com.google.appengine.tools.cloudstorage.GcsService; import com.google.appengine.tools.cloudstorage.GcsService;
@ -128,7 +129,7 @@ public class RdeContactImportActionTest extends MapreduceTestCase<RdeContactImpo
.setType(HistoryEntry.Type.RDE_IMPORT) .setType(HistoryEntry.Type.RDE_IMPORT)
.setClientId(clid) .setClientId(clid)
.setTrid(Trid.create("client-trid", "server-trid")) .setTrid(Trid.create("client-trid", "server-trid"))
.setModificationTime(DateTime.now()) .setModificationTime(DateTime.now(UTC))
.setXmlBytes(objectXml) .setXmlBytes(objectXml)
.setBySuperuser(true) .setBySuperuser(true)
.setReason("RDE Import") .setReason("RDE Import")

3
javatests/google/registry/rde/imports/RdeDomainImportActionTest.java
View file

@ -26,6 +26,7 @@ import static google.registry.testing.DatastoreHelper.persistSimpleResource;
import static google.registry.testing.TaskQueueHelper.assertDnsTasksEnqueued; import static google.registry.testing.TaskQueueHelper.assertDnsTasksEnqueued;
import static google.registry.util.DateTimeUtils.END_OF_TIME; import static google.registry.util.DateTimeUtils.END_OF_TIME;
import static org.joda.money.CurrencyUnit.USD; import static org.joda.money.CurrencyUnit.USD;
import static org.joda.time.DateTimeZone.UTC;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import com.google.appengine.tools.cloudstorage.GcsFilename; import com.google.appengine.tools.cloudstorage.GcsFilename;
@ -341,7 +342,7 @@ public class RdeDomainImportActionTest extends MapreduceTestCase<RdeDomainImport
.setType(HistoryEntry.Type.RDE_IMPORT) .setType(HistoryEntry.Type.RDE_IMPORT)
.setClientId(clid) .setClientId(clid)
.setTrid(Trid.create("client-trid", "server-trid")) .setTrid(Trid.create("client-trid", "server-trid"))
.setModificationTime(DateTime.now()) .setModificationTime(DateTime.now(UTC))
.setXmlBytes(objectXml) .setXmlBytes(objectXml)
.setBySuperuser(true) .setBySuperuser(true)
.setReason("RDE Import") .setReason("RDE Import")

3
javatests/google/registry/rde/imports/RdeHostImportActionTest.java
View file

@ -20,6 +20,7 @@ import static google.registry.testing.DatastoreHelper.getHistoryEntries;
import static google.registry.testing.DatastoreHelper.newHostResource; import static google.registry.testing.DatastoreHelper.newHostResource;
import static google.registry.testing.DatastoreHelper.persistResource; import static google.registry.testing.DatastoreHelper.persistResource;
import static google.registry.testing.DatastoreHelper.persistSimpleResource; import static google.registry.testing.DatastoreHelper.persistSimpleResource;
import static org.joda.time.DateTimeZone.UTC;
import com.google.appengine.tools.cloudstorage.GcsFilename; import com.google.appengine.tools.cloudstorage.GcsFilename;
import com.google.appengine.tools.cloudstorage.GcsService; import com.google.appengine.tools.cloudstorage.GcsService;
@ -159,7 +160,7 @@ public class RdeHostImportActionTest extends MapreduceTestCase<RdeHostImportActi
.setType(HistoryEntry.Type.RDE_IMPORT) .setType(HistoryEntry.Type.RDE_IMPORT)
.setClientId(clid) .setClientId(clid)
.setTrid(Trid.create("client-trid", "server-trid")) .setTrid(Trid.create("client-trid", "server-trid"))
.setModificationTime(DateTime.now()) .setModificationTime(DateTime.now(UTC))
.setXmlBytes(objectXml) .setXmlBytes(objectXml)
.setBySuperuser(true) .setBySuperuser(true)
.setReason("RDE Import") .setReason("RDE Import")