mirror of
https://github.com/google/nomulus
synced 2026-09-19 22:44:26 +00:00
Change all uses of legacy sharedFields to use EppResource fields
This is the penultimate step of migrating away from sharedFields. The next step is to remove them entirely. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=116364048
This commit is contained in:
@@ -172,7 +172,7 @@ public abstract class RdapActionBase implements Runnable {
|
||||
.type(clazz)
|
||||
.filter(filterField + " >=", partialStringQuery.getInitialString())
|
||||
.filter(filterField + " <", partialStringQuery.getNextInitialString())
|
||||
.filter("sharedFields.deletionTime", END_OF_TIME)
|
||||
.filter("deletionTime", END_OF_TIME)
|
||||
.limit(resultSetMaxSize);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -230,7 +230,7 @@ public class RdapDomainSearchAction extends RdapActionBase {
|
||||
.load()
|
||||
.type(HostResource.class)
|
||||
.filter("inetAddresses", inetAddress.getHostAddress())
|
||||
.filter("sharedFields.deletionTime", END_OF_TIME)
|
||||
.filter("deletionTime", END_OF_TIME)
|
||||
.limit(1000)
|
||||
.keys();
|
||||
ImmutableList.Builder<Ref<HostResource>> builder = new ImmutableList.Builder<>();
|
||||
@@ -258,7 +258,7 @@ public class RdapDomainSearchAction extends RdapActionBase {
|
||||
Query<DomainResource> query = ofy().load()
|
||||
.type(DomainResource.class)
|
||||
.filter("nameservers.linked in", chunk)
|
||||
.filter("sharedFields.deletionTime >", now)
|
||||
.filter("deletionTime >", now)
|
||||
.limit(1000);
|
||||
for (DomainResource domainResource : query) {
|
||||
builder.add(
|
||||
|
||||
@@ -134,7 +134,7 @@ public class RdapEntitySearchAction extends RdapActionBase {
|
||||
.filterKey(">=", Key.create(ContactResource.class, partialStringQuery.getInitialString()))
|
||||
.filterKey(
|
||||
"<", Key.create(ContactResource.class, partialStringQuery.getNextInitialString()))
|
||||
.filter("sharedFields.deletionTime", END_OF_TIME)
|
||||
.filter("deletionTime", END_OF_TIME)
|
||||
.limit(rdapResultSetMaxSize);
|
||||
for (ContactResource contactResource : query) {
|
||||
builder.add(RdapJsonFormatter.makeRdapJsonForContact(
|
||||
|
||||
@@ -169,7 +169,7 @@ public class RdapNameserverSearchAction extends RdapActionBase {
|
||||
.load()
|
||||
.type(HostResource.class)
|
||||
.filter("inetAddresses", inetAddress.getHostAddress())
|
||||
.filter("sharedFields.deletionTime", END_OF_TIME)
|
||||
.filter("deletionTime", END_OF_TIME)
|
||||
.limit(rdapResultSetMaxSize);
|
||||
ImmutableList.Builder<ImmutableMap<String, Object>> builder = new ImmutableList.Builder<>();
|
||||
for (HostResource hostResource : query) {
|
||||
|
||||
Reference in New Issue
Block a user