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

Add @Deprecated to DomainApplication.cloneProjectedAtTime()

Browse source 
DomainApplications have nothing to project, so it's a mistake to call their cloneProjectedAtTime() method.  Marking it @Deprecated helps prevent such inadvertent use.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=146716189
This commit is contained in:
nickfelt 2017-02-06 15:04:29 -08:00 • committed by Ben McIlwain
parent bf068e61d9
commit 7986be139d
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
java/google/registry/model/domain/DomainApplication.java
View file

@ -169,6 +169,8 @@ public class DomainApplication extends DomainBase {
return getRepoId(); return getRepoId();
} }
/** This is a no-op and should never be called on an application explicitly. */
@Deprecated
@Override @Override
public DomainApplication cloneProjectedAtTime(DateTime now) { public DomainApplication cloneProjectedAtTime(DateTime now) {
// Applications have no grace periods and can't be transferred, so there is nothing to project. // Applications have no grace periods and can't be transferred, so there is nothing to project.

6
java/google/registry/model/index/DomainApplicationIndex.java
View file

@ -19,7 +19,6 @@ import static com.google.common.base.Strings.isNullOrEmpty;
import static google.registry.model.ofy.ObjectifyService.ofy; import static google.registry.model.ofy.ObjectifyService.ofy;
import static google.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; import static google.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION;
import static google.registry.util.CollectionUtils.isNullOrEmpty; import static google.registry.util.CollectionUtils.isNullOrEmpty;
import static google.registry.util.DateTimeUtils.latestOf;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.googlecode.objectify.Key; import com.googlecode.objectify.Key;
@ -95,9 +94,8 @@ public class DomainApplicationIndex extends BackupGroupRoot {
} }
ImmutableSet.Builder<DomainApplication> apps = new ImmutableSet.Builder<>(); ImmutableSet.Builder<DomainApplication> apps = new ImmutableSet.Builder<>();
for (DomainApplication app : ofy().load().keys(index.getKeys()).values()) { for (DomainApplication app : ofy().load().keys(index.getKeys()).values()) {
DateTime forwardedNow = latestOf(now, app.getUpdateAutoTimestamp().getTimestamp()); if (app.getDeletionTime().isAfter(now)) {
if (app.getDeletionTime().isAfter(forwardedNow)) { apps.add(app);
apps.add(app.cloneProjectedAtTime(forwardedNow));
} }
} }
return apps.build(); return apps.build();