mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-04-23 17:50:49 +00:00
Code Issues Releases Wiki Activity

Change !Optional.isPresent() to Optional.isEmpty() (#2325)

Browse Source 
Also uses the new Optional.stream() in one class.

Thank you Java 17!
This commit is contained in:
Ben McIlwain
2024-02-15 12:55:09 -05:00
committed by GitHub
parent 406059db72
commit 70942c87d1
77 changed files with 132 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/google/registry/batch/CloudTasksUtils.java
View File

@@ -207,7 +207,7 @@ public class CloudTasksUtils implements Serializable {
Service service,
Multimap<String, String> params,
Optional<Integer> jitterSeconds) {
if (!jitterSeconds.isPresent() || jitterSeconds.get() <= 0) {
if (jitterSeconds.isEmpty() || jitterSeconds.get() <= 0) {
return createTask(path, method, service, params);
}
return createTaskWithDelay(

2
core/src/main/java/google/registry/batch/DeleteExpiredDomainsAction.java
View File

@@ -171,7 +171,7 @@ public class DeleteExpiredDomainsAction implements Runnable {
tm().transact(
() -> {
Domain transDomain = tm().loadByKey(domain.createVKey());
if (!domain.getAutorenewEndTime().isPresent()
if (domain.getAutorenewEndTime().isEmpty()
|| domain.getAutorenewEndTime().get().isAfter(tm().getTransactionTime())) {
logger.atSevere().log(
"Failed to delete domain %s because of its autorenew end time: %s.",

2
core/src/main/java/google/registry/batch/SendExpiringCertificateNotificationEmailAction.java
View File

@@ -151,7 +151,7 @@ public class SendExpiringCertificateNotificationEmailAction implements Runnable
DateTime lastExpiringCertNotificationSentDate,
CertificateType certificateType,
Optional<String> certificate) {
if (!certificate.isPresent()
if (certificate.isEmpty()
|| !certificateChecker.shouldReceiveExpiringNotification(
lastExpiringCertNotificationSentDate, certificate.get())) {
return false;

2
core/src/main/java/google/registry/bsa/BsaDownloadAction.java
View File

@@ -116,7 +116,7 @@ public class BsaDownloadAction implements Runnable {
return null;
}
Optional<DownloadSchedule> scheduleOptional = downloadScheduler.schedule();
if (!scheduleOptional.isPresent()) {
if (scheduleOptional.isEmpty()) {
logger.atInfo().log("Nothing to do.");
return null;
}

2
core/src/main/java/google/registry/bsa/BsaRefreshAction.java
View File

@@ -102,7 +102,7 @@ public class BsaRefreshAction implements Runnable {
return null;
}
Optional<RefreshSchedule> maybeSchedule = scheduler.schedule();
if (!maybeSchedule.isPresent()) {
if (maybeSchedule.isEmpty()) {
logger.atInfo().log("No completed downloads yet. Exiting.");
return null;
}

2
core/src/main/java/google/registry/bsa/persistence/RefreshScheduler.java
View File

@@ -52,7 +52,7 @@ public class RefreshScheduler {
}
// No previously completed refreshes. Need start time of a completed download as
// lower bound of refresh checks.
if (!mostRecentDownload.isPresent()) {
if (mostRecentDownload.isEmpty()) {
return Optional.empty();
}

6
core/src/main/java/google/registry/dns/writer/clouddns/CloudDnsWriter.java
View File

@@ -128,7 +128,7 @@ public class CloudDnsWriter extends BaseDnsWriter {
// Return early if no DNS records should be published.
// desiredRecordsBuilder is populated with an empty set to indicate that all existing records
// should be deleted.
if (!domain.isPresent() || !domain.get().shouldPublishToDns()) {
if (domain.isEmpty() || !domain.get().shouldPublishToDns()) {
desiredRecords.put(absoluteDomainName, ImmutableSet.of());
return;
}
@@ -192,7 +192,7 @@ public class CloudDnsWriter extends BaseDnsWriter {
Optional<Host> host = loadByForeignKey(Host.class, hostName, clock.nowUtc());
// Return early if the host is deleted.
if (!host.isPresent()) {
if (host.isEmpty()) {
desiredRecords.put(absoluteHostName, ImmutableSet.of());
return;
}
@@ -247,7 +247,7 @@ public class CloudDnsWriter extends BaseDnsWriter {
Optional<InternetDomainName> tld = Tlds.findTldForName(host);
// Host not managed by our registry, no need to update DNS.
if (!tld.isPresent()) {
if (tld.isEmpty()) {
logger.atSevere().log("publishHost called for invalid host '%s'.", hostName);
return;
}

2
core/src/main/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java
View File

@@ -157,7 +157,7 @@ public class DnsUpdateWriter extends BaseDnsWriter {
Optional<InternetDomainName> tld = Tlds.findTldForName(host);
// host not managed by our registry, no need to update DNS.
if (!tld.isPresent()) {
if (tld.isEmpty()) {
return;
}

2
core/src/main/java/google/registry/export/ExportPremiumTermsAction.java
View File

@@ -115,7 +115,7 @@ public class ExportPremiumTermsAction implements Runnable {
"Skipping premium terms export for TLD %s because Drive folder isn't specified.", tldStr);
return Optional.of("Skipping export because no Drive folder is associated with this TLD");
}
if (!tld.getPremiumListName().isPresent()) {
if (tld.getPremiumListName().isEmpty()) {
logger.atInfo().log("No premium terms to export for TLD '%s'.", tldStr);
return Optional.of("No premium lists configured");
}

2
core/src/main/java/google/registry/export/sheet/SyncRegistrarsSheet.java
View File

@@ -63,7 +63,7 @@ class SyncRegistrarsSheet {
boolean wereRegistrarsModified() {
Optional<Cursor> cursor =
tm().transact(() -> tm().loadByKeyIfPresent(Cursor.createGlobalVKey(SYNC_REGISTRAR_SHEET)));
DateTime lastUpdateTime = !cursor.isPresent() ? START_OF_TIME : cursor.get().getCursorTime();
DateTime lastUpdateTime = cursor.isEmpty() ? START_OF_TIME : cursor.get().getCursorTime();
for (Registrar registrar : Registrar.loadAllCached()) {
if (DateTimeUtils.isAtOrAfter(registrar.getLastUpdateTime(), lastUpdateTime)) {
return true;

4
core/src/main/java/google/registry/export/sheet/SyncRegistrarsSheetAction.java
View File

@@ -112,11 +112,11 @@ public class SyncRegistrarsSheetAction implements Runnable {
@Override
public void run() {
final Optional<String> sheetId = Optional.ofNullable(idParam.orElse(idConfig.orElse(null)));
if (!sheetId.isPresent()) {
if (sheetId.isEmpty()) {
Result.MISSINGNO.send(response, null);
return;
}
if (!idParam.isPresent()) {
if (idParam.isEmpty()) {
if (!syncRegistrarsSheet.wereRegistrarsModified()) {
Result.NOTMODIFIED.send(response, null);
return;

4
core/src/main/java/google/registry/flows/ResourceFlowUtils.java
View File

@@ -122,7 +122,7 @@ public final class ResourceFlowUtils {
/** Check that the given AuthInfo is present for a resource being transferred. */
public static void verifyAuthInfoPresentForResourceTransfer(Optional<AuthInfo> authInfo)
throws EppException {
if (!authInfo.isPresent()) {
if (authInfo.isEmpty()) {
throw new MissingTransferRequestAuthInfoException();
}
}
@@ -160,7 +160,7 @@ public final class ResourceFlowUtils {
domain.getReferencedContacts().stream()
.filter(key -> key.getKey().equals(authRepoId))
.findFirst();
if (!foundContact.isPresent()) {
if (foundContact.isEmpty()) {
throw new BadAuthInfoForResourceException();
}
// Check the authInfo against the contact.

8
core/src/main/java/google/registry/flows/TlsCredentials.java
View File

@@ -105,7 +105,7 @@ public class TlsCredentials implements TransportCredentials {
}
// In the rare unexpected case that the client inet address wasn't passed along at all, then
// by default deny access.
if (!clientInetAddr.isPresent()) {
if (clientInetAddr.isEmpty()) {
logger.atWarning().log(
"Authentication error: Missing IP address for registrar %s.", registrar.getRegistrarId());
throw new BadRegistrarIpAddressException(clientInetAddr);
@@ -129,8 +129,8 @@ public class TlsCredentials implements TransportCredentials {
@VisibleForTesting
void validateCertificateHash(Registrar registrar) throws AuthenticationErrorException {
if (!registrar.getClientCertificateHash().isPresent()
&& !registrar.getFailoverClientCertificateHash().isPresent()) {
if (registrar.getClientCertificateHash().isEmpty()
&& registrar.getFailoverClientCertificateHash().isEmpty()) {
if (requireSslCertificates) {
throw new RegistrarCertificateNotConfiguredException();
} else {
@@ -140,7 +140,7 @@ public class TlsCredentials implements TransportCredentials {
}
}
// Check that the request included the certificate hash
if (!clientCertificateHash.isPresent()) {
if (clientCertificateHash.isEmpty()) {
logger.atInfo().log(
"Request from registrar %s did not include X-SSL-Certificate.",
registrar.getRegistrarId());

2
core/src/main/java/google/registry/flows/contact/ContactTransferQueryFlow.java
View File

@@ -75,7 +75,7 @@ public final class ContactTransferQueryFlow implements TransactionalFlow {
}
// Note that the authorization info on the command (if present) has already been verified. If
// it's present, then the other checks are unnecessary.
if (!authInfo.isPresent()
if (authInfo.isEmpty()
&& !registrarId.equals(contact.getTransferData().getGainingRegistrarId())
&& !registrarId.equals(contact.getTransferData().getLosingRegistrarId())) {
throw new NotAuthorizedToViewTransferException();

4
core/src/main/java/google/registry/flows/domain/DomainCheckFlow.java
View File

@@ -219,7 +219,7 @@ public final class DomainCheckFlow implements TransactionalFlow {
domainCheckResults,
tldStates,
allocationToken);
boolean isAvailable = !message.isPresent();
boolean isAvailable = message.isEmpty();
checksBuilder.add(DomainCheck.create(isAvailable, domainName, message.orElse(null)));
if (isAvailable) {
availableDomains.add(domainName);
@@ -289,7 +289,7 @@ public final class DomainCheckFlow implements TransactionalFlow {
throws EppException {
Optional<FeeCheckCommandExtension> feeCheckOpt =
eppInput.getSingleExtension(FeeCheckCommandExtension.class);
if (!feeCheckOpt.isPresent()) {
if (feeCheckOpt.isEmpty()) {
return ImmutableList.of(); // No fee checks were requested.
}
FeeCheckCommandExtension<?, ?> feeCheck = feeCheckOpt.get();

4
core/src/main/java/google/registry/flows/domain/DomainCreateFlow.java
View File

@@ -276,7 +276,7 @@ public final class DomainCreateFlow implements MutatingFlow {
now,
eppInput.getSingleExtension(AllocationTokenExtension.class));
boolean defaultTokenUsed = false;
if (!allocationToken.isPresent()) {
if (allocationToken.isEmpty()) {
allocationToken =
DomainFlowUtils.checkForDefaultToken(
tld, command.getDomainName(), CommandName.CREATE, registrarId, now);
@@ -519,7 +519,7 @@ public final class DomainCreateFlow implements MutatingFlow {
if (behavior.equals(RegistrationBehavior.BYPASS_TLD_STATE)
|| behavior.equals(RegistrationBehavior.ANCHOR_TENANT)) {
// Non-trademarked names with the state check bypassed are always available
if (!claimsList.getClaimKey(domainLabel).isPresent()) {
if (claimsList.getClaimKey(domainLabel).isEmpty()) {
return;
}
if (!currentState.equals(START_DATE_SUNRISE)) {

12
core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java
View File

@@ -215,7 +215,7 @@ public class DomainFlowUtils {
throw new DomainNameExistsAsTldException();
}
Optional<InternetDomainName> tldParsed = findTldForName(domainName);
if (!tldParsed.isPresent()) {
if (tldParsed.isEmpty()) {
throw new TldDoesNotExistException(domainName.parent().toString());
}
if (domainName.parts().size() != tldParsed.get().parts().size() + 1) {
@@ -256,7 +256,7 @@ public class DomainFlowUtils {
Optional<String> idnTableName =
IDN_LABEL_VALIDATOR.findValidIdnTableForTld(
domainName.parts().get(0), domainName.parent().toString());
if (!idnTableName.isPresent()) {
if (idnTableName.isEmpty()) {
throw new InvalidIdnDomainLabelException();
}
return idnTableName.get();
@@ -368,7 +368,7 @@ public class DomainFlowUtils {
}
ImmutableList<DomainDsData> invalidDigestTypes =
dsData.stream()
.filter(ds -> !DigestType.fromWireValue(ds.getDigestType()).isPresent())
.filter(ds -> DigestType.fromWireValue(ds.getDigestType()).isEmpty())
.collect(toImmutableList());
if (!invalidDigestTypes.isEmpty()) {
throw new InvalidDsRecordException(
@@ -816,7 +816,7 @@ public class DomainFlowUtils {
FeesAndCredits feesAndCredits,
boolean defaultTokenUsed)
throws EppException {
if (feesAndCredits.hasAnyPremiumFees() && !feeCommand.isPresent()) {
if (feesAndCredits.hasAnyPremiumFees() && feeCommand.isEmpty()) {
throw new FeesRequiredForPremiumNameException();
}
validateFeesAckedIfPresent(feeCommand, feesAndCredits, defaultTokenUsed);
@@ -837,7 +837,7 @@ public class DomainFlowUtils {
// Check for the case where a fee command extension was required but not provided.
// This only happens when the total fees are non-zero and include custom fees requiring the
// extension.
if (!feeCommand.isPresent()) {
if (feeCommand.isEmpty()) {
if (!feesAndCredits.getEapCost().isZero()) {
throw new FeesRequiredDuringEarlyAccessProgramException(feesAndCredits.getEapCost());
}
@@ -1049,7 +1049,7 @@ public class DomainFlowUtils {
/** Validate the secDNS extension, if present. */
static Optional<SecDnsCreateExtension> validateSecDnsExtension(
Optional<SecDnsCreateExtension> secDnsCreate) throws EppException {
if (!secDnsCreate.isPresent()) {
if (secDnsCreate.isEmpty()) {
return Optional.empty();
}
if (secDnsCreate.get().getDsData() == null) {

2
core/src/main/java/google/registry/flows/domain/DomainRenewFlow.java
View File

@@ -182,7 +182,7 @@ public final class DomainRenewFlow implements MutatingFlow {
CommandName.RENEW,
eppInput.getSingleExtension(AllocationTokenExtension.class));
boolean defaultTokenUsed = false;
if (!allocationToken.isPresent()) {
if (allocationToken.isEmpty()) {
allocationToken =
DomainFlowUtils.checkForDefaultToken(
tld, existingDomain.getDomainName(), CommandName.RENEW, registrarId, now);

2
core/src/main/java/google/registry/flows/domain/DomainTransferQueryFlow.java
View File

@@ -81,7 +81,7 @@ public final class DomainTransferQueryFlow implements TransactionalFlow {
}
// Note that the authorization info on the command (if present) has already been verified. If
// it's present, then the other checks are unnecessary.
if (!authInfo.isPresent()
if (authInfo.isEmpty()
&& !registrarId.equals(transferData.getGainingRegistrarId())
&& !registrarId.equals(transferData.getLosingRegistrarId())) {
throw new NotAuthorizedToViewTransferException();

2
core/src/main/java/google/registry/flows/domain/DomainTransferRequestFlow.java
View File

@@ -201,7 +201,7 @@ public final class DomainTransferRequestFlow implements MutatingFlow {
Optional<FeesAndCredits> feesAndCredits;
if (period.getValue() == 0) {
feesAndCredits = Optional.empty();
} else if (!existingDomain.getCurrentBulkToken().isPresent()) {
} else if (existingDomain.getCurrentBulkToken().isEmpty()) {
feesAndCredits =
Optional.of(pricingLogic.getTransferPrice(tld, targetId, now, existingBillingRecurrence));
} else {

8
core/src/main/java/google/registry/flows/domain/token/AllocationTokenFlowUtils.java
View File

@@ -182,7 +182,7 @@ public class AllocationTokenFlowUtils {
maybeTokenEntity =
tm().transact(() -> tm().loadByKeyIfPresent(VKey.create(AllocationToken.class, token)));
if (!maybeTokenEntity.isPresent()) {
if (maybeTokenEntity.isEmpty()) {
throw new InvalidAllocationTokenException();
}
if (maybeTokenEntity.get().isRedeemed()) {
@@ -199,7 +199,7 @@ public class AllocationTokenFlowUtils {
DateTime now,
Optional<AllocationTokenExtension> extension)
throws EppException {
if (!extension.isPresent()) {
if (extension.isEmpty()) {
return Optional.empty();
}
AllocationToken tokenEntity = loadToken(extension.get().getAllocationToken());
@@ -222,7 +222,7 @@ public class AllocationTokenFlowUtils {
CommandName commandName,
Optional<AllocationTokenExtension> extension)
throws EppException {
if (!extension.isPresent()) {
if (extension.isEmpty()) {
return Optional.empty();
}
AllocationToken tokenEntity = loadToken(extension.get().getAllocationToken());
@@ -254,7 +254,7 @@ public class AllocationTokenFlowUtils {
public static Domain maybeApplyBulkPricingRemovalToken(
Domain domain, Optional<AllocationToken> allocationToken) {
if (!allocationToken.isPresent()
if (allocationToken.isEmpty()
|| !TokenBehavior.REMOVE_BULK_PRICING.equals(allocationToken.get().getTokenBehavior())) {
return domain;
}

4
core/src/main/java/google/registry/flows/host/HostFlowUtils.java
View File

@@ -81,7 +81,7 @@ public class HostFlowUtils {
public static Optional<Domain> lookupSuperordinateDomain(
InternetDomainName hostName, DateTime now) throws EppException {
Optional<InternetDomainName> tld = findTldForName(hostName);
if (!tld.isPresent()) {
if (tld.isEmpty()) {
// This is an host on a TLD we don't run, therefore obviously external, so we are done.
return Optional.empty();
}
@@ -91,7 +91,7 @@ public class HostFlowUtils {
.skip(hostName.parts().size() - (tld.get().parts().size() + 1))
.collect(joining("."));
Optional<Domain> superordinateDomain = loadByForeignKey(Domain.class, domainName, now);
if (!superordinateDomain.isPresent() || !isActive(superordinateDomain.get(), now)) {
if (superordinateDomain.isEmpty() || !isActive(superordinateDomain.get(), now)) {
throw new SuperordinateDomainDoesNotExistException(domainName);
}
return superordinateDomain;

38
core/src/main/java/google/registry/flows/picker/FlowPicker.java
View File

@@ -148,23 +148,25 @@ public class FlowPicker {
* <p>This provider must be tried before {@link #RESOURCE_CRUD_FLOW_PROVIDER}. Otherwise, the
* regular domain update flow will match first.
*/
private static final FlowProvider DOMAIN_RESTORE_FLOW_PROVIDER = new FlowProvider() {
@Override
Class<? extends Flow> get(
EppInput eppInput, InnerCommand innerCommand, ResourceCommand resourceCommand) {
if (!(resourceCommand instanceof DomainCommand.Update)) {
return null;
}
Optional<RgpUpdateExtension> rgpUpdateExtension =
eppInput.getSingleExtension(RgpUpdateExtension.class);
if (!rgpUpdateExtension.isPresent()) {
return null;
}
// Restore command with an op of "report" is not currently supported.
return (rgpUpdateExtension.get().getRestoreCommand().getRestoreOp() == RestoreOp.REQUEST)
? DomainRestoreRequestFlow.class
: UnimplementedRestoreFlow.class;
}};
private static final FlowProvider DOMAIN_RESTORE_FLOW_PROVIDER =
new FlowProvider() {
@Override
Class<? extends Flow> get(
EppInput eppInput, InnerCommand innerCommand, ResourceCommand resourceCommand) {
if (!(resourceCommand instanceof DomainCommand.Update)) {
return null;
}
Optional<RgpUpdateExtension> rgpUpdateExtension =
eppInput.getSingleExtension(RgpUpdateExtension.class);
if (rgpUpdateExtension.isEmpty()) {
return null;
}
// Restore command with an op of "report" is not currently supported.
return (rgpUpdateExtension.get().getRestoreCommand().getRestoreOp() == RestoreOp.REQUEST)
? DomainRestoreRequestFlow.class
: UnimplementedRestoreFlow.class;
}
};
/**
* The claims check flow is keyed on the type of the {@link ResourceCommand} and on having the
@@ -180,7 +182,7 @@ public class FlowPicker {
}
Optional<LaunchCheckExtension> launchCheck =
eppInput.getSingleExtension(LaunchCheckExtension.class);
if (!launchCheck.isPresent()
if (launchCheck.isEmpty()
|| CheckType.AVAILABILITY.equals(launchCheck.get().getCheckType())) {
// We don't distinguish between registry phases for "avail", so don't bother checking
// phase.

2
core/src/main/java/google/registry/flows/poll/PollAckFlow.java
View File

@@ -86,7 +86,7 @@ public final class PollAckFlow implements MutatingFlow {
// it as if it doesn't exist yet. Same for if the message ID year isn't the same as the actual
// poll message's event time (that means they're passing in an old already-acked ID).
Optional<PollMessage> maybePollMessage = tm().loadByKeyIfPresent(pollMessageKey);
if (!maybePollMessage.isPresent()
if (maybePollMessage.isEmpty()
|| !isBeforeOrAt(maybePollMessage.get().getEventTime(), now)
|| !makePollMessageExternalId(maybePollMessage.get()).equals(messageId)) {
throw new MessageDoesNotExistException(messageId);

2
core/src/main/java/google/registry/flows/poll/PollRequestFlow.java
View File

@@ -66,7 +66,7 @@ public final class PollRequestFlow implements TransactionalFlow {
// Return the oldest message from the queue.
DateTime now = tm().getTransactionTime();
Optional<PollMessage> maybePollMessage = getFirstPollMessage(registrarId, now);
if (!maybePollMessage.isPresent()) {
if (maybePollMessage.isEmpty()) {
return responseBuilder.setResultFromCode(SUCCESS_WITH_NO_MESSAGES).build();
}
PollMessage pollMessage = maybePollMessage.get();

4
core/src/main/java/google/registry/flows/session/LoginFlow.java
View File

@@ -123,7 +123,7 @@ public class LoginFlow implements MutatingFlow {
serviceExtensionUrisBuilder.add(uri);
}
Optional<Registrar> registrar = Registrar.loadByRegistrarIdCached(login.getClientId());
if (!registrar.isPresent()) {
if (registrar.isEmpty()) {
throw new BadRegistrarIdException(login.getClientId());
}
@@ -155,7 +155,7 @@ public class LoginFlow implements MutatingFlow {
});
// Load fresh from database (bypassing the cache) to ensure we don't save stale data.
Optional<Registrar> freshRegistrar = Registrar.loadByRegistrarId(login.getClientId());
if (!freshRegistrar.isPresent()) {
if (freshRegistrar.isEmpty()) {
throw new BadRegistrarIdException(login.getClientId());
}
tm().put(freshRegistrar.get().asBuilder().setPassword(newPassword).build());

2
core/src/main/java/google/registry/model/domain/DomainBase.java
View File

@@ -539,7 +539,7 @@ public class DomainBase extends EppResource
for (GracePeriod gracePeriod : almostBuilt.getGracePeriods()) {
if (isBeforeOrAt(gracePeriod.getExpirationTime(), now)) {
builder.removeGracePeriod(gracePeriod);
if (!newLastEppUpdateTime.isPresent()
if (newLastEppUpdateTime.isEmpty()
|| isBeforeOrAt(newLastEppUpdateTime.get(), gracePeriod.getExpirationTime())) {
newLastEppUpdateTime = Optional.of(gracePeriod.getExpirationTime());
}

4
core/src/main/java/google/registry/model/domain/RegistryLock.java
View File

@@ -219,7 +219,7 @@ public final class RegistryLock extends UpdateAutoTimestampEntity implements Bui
/** Returns true iff the lock was requested &gt;= 1 hour ago and has not been verified. */
public boolean isLockRequestExpired(DateTime now) {
return !getLockCompletionTime().isPresent()
return getLockCompletionTime().isEmpty()
&& isBeforeOrAt(getLockRequestTime(), now.minusHours(1));
}
@@ -227,7 +227,7 @@ public final class RegistryLock extends UpdateAutoTimestampEntity implements Bui
public boolean isUnlockRequestExpired(DateTime now) {
Optional<DateTime> unlockRequestTimestamp = getUnlockRequestTime();
return unlockRequestTimestamp.isPresent()
&& !getUnlockCompletionTime().isPresent()
&& getUnlockCompletionTime().isEmpty()
&& isBeforeOrAt(unlockRequestTimestamp.get(), now.minusHours(1));
}

2
core/src/main/java/google/registry/model/server/ServerSecret.java
View File

@@ -46,7 +46,7 @@ public class ServerSecret extends CrossTldSingleton {
// Make sure we're in a transaction and attempt to load any existing secret, then
// create it if it's absent.
Optional<ServerSecret> secret = tm().loadSingleton(ServerSecret.class);
if (!secret.isPresent()) {
if (secret.isEmpty()) {
secret = Optional.of(create(UUID.randomUUID()));
tm().insert(secret.get());
}

2
core/src/main/java/google/registry/model/tld/label/PremiumListDao.java
View File

@@ -115,7 +115,7 @@ public final class PremiumListDao {
*/
public static Optional<Money> getPremiumPrice(String premiumListName, String label) {
Optional<PremiumList> maybeLoadedList = getLatestRevision(premiumListName);
if (!maybeLoadedList.isPresent()) {
if (maybeLoadedList.isEmpty()) {
return Optional.empty();
}
PremiumList loadedList = maybeLoadedList.get();

4
core/src/main/java/google/registry/rdap/AbstractJsonableObject.java
View File

@@ -387,7 +387,7 @@ abstract class AbstractJsonableObject implements Jsonable {
*/
static void verifyAllowedJsonKeyName(String name, @Nullable Member member, Class<?> clazz) {
Optional<ImmutableSet<String>> allowedFieldNames = getNameRestriction(clazz);
if (!allowedFieldNames.isPresent()) {
if (allowedFieldNames.isEmpty()) {
return;
}
checkState(
@@ -416,7 +416,7 @@ abstract class AbstractJsonableObject implements Jsonable {
// We ignore any Optional that are empty, as if they didn't exist at all
if (object instanceof Optional) {
Optional<?> optional = (Optional<?>) object;
if (!optional.isPresent()) {
if (optional.isEmpty()) {
return;
}
object = optional.get();

2
core/src/main/java/google/registry/rdap/RdapDomainAction.java
View File

@@ -64,7 +64,7 @@ public class RdapDomainAction extends RdapActionBase {
Domain.class,
pathSearchString,
shouldIncludeDeleted() ? START_OF_TIME : rdapJsonFormatter.getRequestTime());
if (!domain.isPresent() || !isAuthorized(domain.get())) {
if (domain.isEmpty() || !isAuthorized(domain.get())) {
// RFC7480 5.3 - if the server wishes to respond that it doesn't have data satisfying the
// query, it MUST reply with 404 response code.
//

2
core/src/main/java/google/registry/rdap/RdapDomainSearchAction.java
View File

@@ -342,7 +342,7 @@ public class RdapDomainSearchAction extends RdapSearchActionBase {
Host.class,
partialStringQuery.getInitialString(),
shouldIncludeDeleted() ? START_OF_TIME : getRequestTime());
return (!host.isPresent()
return (host.isEmpty()
|| !desiredRegistrar.get().equals(host.get().getPersistedCurrentSponsorRegistrarId()))
? ImmutableList.of()
: ImmutableList.of(host.get().createVKey());

4
core/src/main/java/google/registry/rdap/RdapEntitySearchAction.java
View File

@@ -121,7 +121,7 @@ public class RdapEntitySearchAction extends RdapSearchActionBase {
// Check the subtype.
Subtype subtype;
if (!subtypeParam.isPresent() || subtypeParam.get().equalsIgnoreCase("all")) {
if (subtypeParam.isEmpty() || subtypeParam.get().equalsIgnoreCase("all")) {
subtype = Subtype.ALL;
} else if (subtypeParam.get().equalsIgnoreCase("contacts")) {
subtype = Subtype.CONTACTS;
@@ -133,7 +133,7 @@ public class RdapEntitySearchAction extends RdapSearchActionBase {
CursorType cursorType;
Optional<String> cursorQueryString;
if (!cursorString.isPresent()) {
if (cursorString.isEmpty()) {
cursorType = CursorType.NONE;
cursorQueryString = Optional.empty();
} else {

2
core/src/main/java/google/registry/rdap/RdapModule.java
View File

@@ -101,7 +101,7 @@ public final class RdapModule {
@Provides
static RdapAuthorization provideRdapAuthorization(
AuthResult authResult, AuthenticatedRegistrarAccessor registrarAccessor) {
if (!authResult.userAuthInfo().isPresent()) {
if (authResult.userAuthInfo().isEmpty()) {
return RdapAuthorization.PUBLIC_AUTHORIZATION;
}
UserAuthInfo userAuthInfo = authResult.userAuthInfo().get();

2
core/src/main/java/google/registry/rdap/RdapNameserverAction.java
View File

@@ -66,7 +66,7 @@ public class RdapNameserverAction extends RdapActionBase {
Host.class,
pathSearchString,
shouldIncludeDeleted() ? START_OF_TIME : getRequestTime());
if (!host.isPresent() || !isAuthorized(host.get())) {
if (host.isEmpty() || !isAuthorized(host.get())) {
// RFC7480 5.3 - if the server wishes to respond that it doesn't have data satisfying the
// query, it MUST reply with 404 response code.
//

2
core/src/main/java/google/registry/rdap/RdapNameserverSearchAction.java
View File

@@ -175,7 +175,7 @@ public class RdapNameserverSearchAction extends RdapSearchActionBase {
RdapSearchPattern partialStringQuery) {
Optional<Domain> domain =
loadByForeignKeyCached(Domain.class, partialStringQuery.getSuffix(), getRequestTime());
if (!domain.isPresent()) {
if (domain.isEmpty()) {
// Don't allow wildcards with suffixes which are not domains we manage. That would risk a
// table scan in many easily foreseeable cases. The user might ask for ns*.zombo.com,
// forcing us to query for all hosts beginning with ns, then filter for those ending in

4
core/src/main/java/google/registry/rdap/RdapSearchActionBase.java
View File

@@ -121,7 +121,7 @@ public abstract class RdapSearchActionBase extends RdapActionBase {
*/
protected boolean shouldBeVisible(EppResource eppResource) {
return isAuthorized(eppResource)
&& (!registrarParam.isPresent()
&& (registrarParam.isEmpty()
|| registrarParam.get().equals(eppResource.getPersistedCurrentSponsorRegistrarId()));
}
@@ -135,7 +135,7 @@ public abstract class RdapSearchActionBase extends RdapActionBase {
*/
protected boolean shouldBeVisible(Registrar registrar) {
return isAuthorized(registrar)
&& (!registrarParam.isPresent() || registrarParam.get().equals(registrar.getRegistrarId()));
&& (registrarParam.isEmpty() || registrarParam.get().equals(registrar.getRegistrarId()));
}
/**

2
core/src/main/java/google/registry/rde/RdeReportAction.java
View File

@@ -99,7 +99,7 @@ public final class RdeReportAction implements Runnable, EscrowTask {
RdeRevision.getCurrentRevision(tld, watermark, FULL)
.orElseThrow(
() -> new IllegalStateException("RdeRevision was not set on generated deposit"));
if (!prefix.isPresent()) {
if (prefix.isEmpty()) {
prefix = Optional.of(findMostRecentPrefixForWatermark(watermark, bucket, tld, gcsUtils));
}
String name = prefix.get() + RdeNamingUtils.makeRydeFilename(tld, watermark, FULL, 1, revision);

2
core/src/main/java/google/registry/rde/RdeStagingAction.java
View File

@@ -352,7 +352,7 @@ public final class RdeStagingAction implements Runnable {
}
private ImmutableSetMultimap<String, PendingDeposit> getManualPendingDeposits() {
if (!directory.isPresent()) {
if (directory.isEmpty()) {
throw new BadRequestException("Directory parameter required in manual operation");
}
if (directory.get().startsWith("/")) {

2
core/src/main/java/google/registry/rde/RdeUploadAction.java
View File

@@ -138,7 +138,7 @@ public final class RdeUploadAction implements Runnable, EscrowTask {
public void runWithLock(final DateTime watermark) throws Exception {
// If a prefix is not provided,try to determine the prefix. This should only happen when the RDE
// upload cron job runs to catch up any un-retried (i. e. expected) RDE failures.
if (!prefix.isPresent()) {
if (prefix.isEmpty()) {
prefix = Optional.of(findMostRecentPrefixForWatermark(watermark, bucket, tld, gcsUtils));
}
logger.atInfo().log("Verifying readiness to upload the RDE deposit.");

2
core/src/main/java/google/registry/rde/RydeEncryption.java
View File

@@ -161,7 +161,7 @@ final class RydeEncryption {
.filter(ciphertext -> ciphertext.getKeyID() == privateKey.getKeyID())
.findAny();
// If we can't find one with our key ID, then we can't decrypt the file!
if (!cyphertext.isPresent()) {
if (cyphertext.isEmpty()) {
String keyIds =
PgpUtils.stream(ciphertextList, PGPPublicKeyEncryptedData.class)
.map(ciphertext -> Long.toHexString(ciphertext.getKeyID()))

2
core/src/main/java/google/registry/reporting/billing/CopyDetailReportsAction.java
View File

@@ -104,7 +104,7 @@ public final class CopyDetailReportsAction implements Runnable {
// TODO(larryruili): Determine a safer way of enforcing this.
String registrarId = Iterables.get(Splitter.on('_').split(detailReportName), 3);
Optional<Registrar> registrar = Registrar.loadByRegistrarId(registrarId);
if (!registrar.isPresent()) {
if (registrar.isEmpty()) {
logger.atWarning().log(
"Registrar %s not found in database for file '%s'.", registrar, detailReportName);
continue;

4
core/src/main/java/google/registry/request/RequestHandler.java
View File

@@ -132,7 +132,7 @@ public class RequestHandler<C> {
}
String path = req.getRequestURI();
Optional<Route> route = router.route(path);
if (!route.isPresent()) {
if (route.isEmpty()) {
logger.atInfo().log("No action found for: %s", path);
rsp.sendError(SC_NOT_FOUND);
return;
@@ -144,7 +144,7 @@ public class RequestHandler<C> {
}
Optional<AuthResult> authResult =
requestAuthenticator.authorize(route.get().action().auth().authSettings(), req);
if (!authResult.isPresent()) {
if (authResult.isEmpty()) {
rsp.sendError(SC_FORBIDDEN, "Not authorized");
return;
}

6
core/src/main/java/google/registry/request/auth/AuthenticatedRegistrarAccessor.java
View File

@@ -262,7 +262,7 @@ public class AuthenticatedRegistrarAccessor {
Lazy<GroupsConnection> lazyGroupsConnection,
String userEmail,
Optional<String> gSuiteSupportGroupEmailAddress) {
if (!gSuiteSupportGroupEmailAddress.isPresent()) {
if (gSuiteSupportGroupEmailAddress.isEmpty()) {
return false;
}
try {
@@ -282,7 +282,7 @@ public class AuthenticatedRegistrarAccessor {
AuthResult authResult,
Optional<String> gSuiteSupportGroupEmailAddress,
Lazy<GroupsConnection> lazyGroupsConnection) {
if (!authResult.userAuthInfo().isPresent()) {
if (authResult.userAuthInfo().isEmpty()) {
return false;
}
@@ -300,7 +300,7 @@ public class AuthenticatedRegistrarAccessor {
/** Returns a map of registrar IDs to roles for all registrars that the user has access to. */
private static ImmutableSetMultimap<String, Role> createRoleMap(
AuthResult authResult, boolean isAdmin, String registryAdminRegistrarId) {
if (!authResult.userAuthInfo().isPresent()) {
if (authResult.userAuthInfo().isEmpty()) {
return ImmutableSetMultimap.of();
}
ImmutableSetMultimap.Builder<String, Role> builder = new ImmutableSetMultimap.Builder<>();

2
core/src/main/java/google/registry/request/lock/LockHandlerImpl.java
View File

@@ -147,7 +147,7 @@ public class LockHandlerImpl implements LockHandler {
try {
for (String lockName : lockNames) {
Optional<Lock> lock = lockAcquirer.acquireLock(lockName, tld, leaseLength);
if (!lock.isPresent()) {
if (lock.isEmpty()) {
logger.atInfo().log("Couldn't acquire lock named: %s for TLD %s.", lockName, tld);
return false;
}

2
core/src/main/java/google/registry/tools/ConfigureTldCommand.java
View File

@@ -237,7 +237,7 @@ public class ConfigureTldCommand extends MutatingCommand {
private void checkPremiumList(Tld newTld) {
Optional<String> premiumListName = newTld.getPremiumListName();
if (!premiumListName.isPresent()) {
if (premiumListName.isEmpty()) {
return;
}
Optional<PremiumList> premiumList = PremiumListDao.getLatestRevision(premiumListName.get());

2
core/src/main/java/google/registry/tools/CreateBulkPricingPackageCommand.java
View File

@@ -31,7 +31,7 @@ public final class CreateBulkPricingPackageCommand extends CreateOrUpdateBulkPri
@Override
BulkPricingPackage getOldBulkPricingPackage(String tokenString) {
checkArgument(
!BulkPricingPackage.loadByTokenString(tokenString).isPresent(),
BulkPricingPackage.loadByTokenString(tokenString).isEmpty(),
"BulkPricingPackage with token %s already exists",
tokenString);
return null;

2
core/src/main/java/google/registry/tools/CreatePremiumListCommand.java
View File

@@ -47,7 +47,7 @@ public class CreatePremiumListCommand extends CreateOrUpdatePremiumListCommand {
currency = CurrencyUnit.of(currencyUnit);
name = Strings.isNullOrEmpty(name) ? convertFilePathToName(inputFile) : name;
checkArgument(
!PremiumListDao.getLatestRevision(name).isPresent(),
PremiumListDao.getLatestRevision(name).isEmpty(),
"A premium list already exists by this name");
if (!override) {
assertTldExists(

4
core/src/main/java/google/registry/tools/CreateRegistrarCommand.java
View File

@@ -81,9 +81,7 @@ final class CreateRegistrarCommand extends CreateOrUpdateRegistrarCommand
clientId);
}
checkState(
!Registrar.loadByRegistrarId(clientId).isPresent(),
"Registrar %s already exists",
clientId);
Registrar.loadByRegistrarId(clientId).isEmpty(), "Registrar %s already exists", clientId);
List<Registrar> collisions =
Streams.stream(Registrar.loadAll())
.filter(registrar -> normalizeRegistrarId(registrar.getRegistrarId()).equals(clientId))

3
core/src/main/java/google/registry/tools/CreateReservedListCommand.java
View File

@@ -47,8 +47,7 @@ final class CreateReservedListCommand extends CreateOrUpdateReservedListCommand
@Override
protected String prompt() throws Exception {
name = Strings.isNullOrEmpty(name) ? convertFilePathToName(input) : name;
checkArgument(
!ReservedList.get(name).isPresent(), "A reserved list already exists by this name");
checkArgument(ReservedList.get(name).isEmpty(), "A reserved list already exists by this name");
if (!override) {
validateListName(name);
}

3
core/src/main/java/google/registry/tools/CreateUserCommand.java
View File

@@ -28,8 +28,7 @@ public class CreateUserCommand extends CreateOrUpdateUserCommand {
@Nullable
@Override
User getExistingUser(String email) {
checkArgument(
!UserDao.loadUser(email).isPresent(), "A user with email %s already exists", email);
checkArgument(UserDao.loadUser(email).isEmpty(), "A user with email %s already exists", email);
return null;
}
}

2
core/src/main/java/google/registry/tools/DeleteAllocationTokensCommand.java
View File

@@ -76,7 +76,7 @@ final class DeleteAllocationTokensCommand extends UpdateOrDeleteAllocationTokens
// since the query ran. This also filters out per-domain tokens if they're not to be deleted.
ImmutableSet<VKey<AllocationToken>> tokensToDelete =
tm().loadByKeys(batch).values().stream()
.filter(t -> withDomains || !t.getDomainName().isPresent())
.filter(t -> withDomains || t.getDomainName().isEmpty())
.filter(t -> t.getTokenType().isOneTimeUse())
.filter(t -> !t.isRedeemed())
.map(AllocationToken::createVKey)

6
core/src/main/java/google/registry/tools/DomainLockUtils.java
View File

@@ -102,7 +102,7 @@ public final class DomainLockUtils {
RegistryLock lock = getByVerificationCode(verificationCode);
checkArgument(
!lock.getLockCompletionTime().isPresent(),
lock.getLockCompletionTime().isEmpty(),
"Domain %s is already locked",
lock.getDomainName());
@@ -129,7 +129,7 @@ public final class DomainLockUtils {
DateTime now = tm().getTransactionTime();
RegistryLock previousLock = getByVerificationCode(verificationCode);
checkArgument(
!previousLock.getUnlockCompletionTime().isPresent(),
previousLock.getUnlockCompletionTime().isEmpty(),
"Domain %s is already unlocked",
previousLock.getDomainName());
@@ -298,7 +298,7 @@ public final class DomainLockUtils {
checkArgument(
lock.isLocked(), "Lock object for domain %s is not currently locked", domainName);
checkArgument(
!lock.getUnlockRequestTime().isPresent() || lock.isUnlockRequestExpired(now),
lock.getUnlockRequestTime().isEmpty() || lock.isUnlockRequestExpired(now),
"A pending unlock action already exists for %s",
domainName);
checkArgument(

2
core/src/main/java/google/registry/tools/GetAllocationTokenCommand.java
View File

@@ -62,7 +62,7 @@ final class GetAllocationTokenCommand implements Command {
if (loadedTokens.containsKey(token)) {
AllocationToken loadedToken = loadedTokens.get(token);
System.out.println(loadedToken.toString());
if (!loadedToken.getRedemptionHistoryId().isPresent()) {
if (loadedToken.getRedemptionHistoryId().isEmpty()) {
System.out.printf("Token %s was not redeemed.\n", token);
} else {
VKey<Domain> domainKey =

2
core/src/main/java/google/registry/tools/LoadTestCommand.java
View File

@@ -96,7 +96,7 @@ class LoadTestCommand extends ConfirmingCommand implements CommandWithConnection
errorPrintStream.printf("No such TLD: %s\n", tld);
return false;
}
if (!Registrar.loadByRegistrarId(clientId).isPresent()) {
if (Registrar.loadByRegistrarId(clientId).isEmpty()) {
errorPrintStream.printf("No such client: %s\n", clientId);
return false;
}

3
core/src/main/java/google/registry/tools/UnrenewDomainCommand.java
View File

@@ -93,8 +93,7 @@ class UnrenewDomainCommand extends ConfirmingCommand {
continue;
}
Optional<Domain> domain = loadByForeignKey(Domain.class, domainName, now);
if (!domain.isPresent()
|| domain.get().getStatusValues().contains(StatusValue.PENDING_DELETE)) {
if (domain.isEmpty() || domain.get().getStatusValues().contains(StatusValue.PENDING_DELETE)) {
domainsDeletingBuilder.add(domainName);
continue;
}

4
core/src/main/java/google/registry/tools/server/CreateGroupsAction.java
View File

@@ -113,11 +113,11 @@ public class CreateGroupsAction implements Runnable {
}
private Registrar initAndLoadRegistrar() {
if (!clientId.isPresent()) {
if (clientId.isEmpty()) {
respondToBadRequest("Error creating Google Groups, missing parameter: clientId");
}
Optional<Registrar> registrar = Registrar.loadByRegistrarId(clientId.get());
if (!registrar.isPresent()) {
if (registrar.isEmpty()) {
respondToBadRequest(String.format(
"Error creating Google Groups; could not find registrar with id %s", clientId.get()));
}

2
core/src/main/java/google/registry/tools/server/ListObjectsAction.java
View File

@@ -139,7 +139,7 @@ public abstract class ListObjectsAction<T extends ImmutableObject> implements Ru
private ImmutableSet<String> getFieldsToUse(ImmutableSet<T> objects) {
// Get the list of fields from the received parameter.
List<String> fieldsToUse;
if ((fields == null) || !fields.isPresent()) {
if ((fields == null) || fields.isEmpty()) {
fieldsToUse = new ArrayList<>();
} else {
fieldsToUse = Splitter.on(',').splitToList(fields.get());

2
core/src/main/java/google/registry/ui/server/RegistrarFormFields.java
View File

@@ -360,7 +360,7 @@ public final class RegistrarFormFields {
return ImmutableList.of();
}
Optional<List<Map<String, ?>>> contactsAsMaps = CONTACTS_AS_MAPS.extractUntyped(args);
if (!contactsAsMaps.isPresent()) {
if (contactsAsMaps.isEmpty()) {
return ImmutableList.of();
}
ImmutableList.Builder<RegistrarPoc.Builder> result = new ImmutableList.Builder<>();

4
core/src/main/java/google/registry/ui/server/console/ConsoleApiAction.java
View File

@@ -35,7 +35,7 @@ public abstract class ConsoleApiAction implements Runnable {
@Override
public final void run() {
// Shouldn't be even possible because of Auth annotations on the various implementing classes
if (!consoleApiParams.authResult().userAuthInfo().get().consoleUser().isPresent()) {
if (consoleApiParams.authResult().userAuthInfo().get().consoleUser().isEmpty()) {
consoleApiParams.response().setStatus(HttpStatusCodes.STATUS_CODE_UNAUTHORIZED);
return;
}
@@ -62,7 +62,7 @@ public abstract class ConsoleApiAction implements Runnable {
Arrays.stream(consoleApiParams.request().getCookies())
.filter(c -> XsrfTokenManager.X_CSRF_TOKEN.equals(c.getName()))
.findFirst();
if (!maybeCookie.isPresent()
if (maybeCookie.isEmpty()
|| !consoleApiParams.xsrfTokenManager().validateToken(maybeCookie.get().getValue())) {
consoleApiParams.response().setStatus(HttpStatusCodes.STATUS_CODE_UNAUTHORIZED);
return false;

6
core/src/main/java/google/registry/ui/server/console/ConsoleDomainGetAction.java
View File

@@ -60,12 +60,12 @@ public class ConsoleDomainGetAction implements JsonGetAction {
@Override
public void run() {
if (!authResult.isAuthenticated() || !authResult.userAuthInfo().isPresent()) {
if (!authResult.isAuthenticated() || authResult.userAuthInfo().isEmpty()) {
response.setStatus(HttpStatusCodes.STATUS_CODE_UNAUTHORIZED);
return;
}
UserAuthInfo authInfo = authResult.userAuthInfo().get();
if (!authInfo.consoleUser().isPresent()) {
if (authInfo.consoleUser().isEmpty()) {
response.setStatus(HttpStatusCodes.STATUS_CODE_UNAUTHORIZED);
return;
}
@@ -75,7 +75,7 @@ public class ConsoleDomainGetAction implements JsonGetAction {
() ->
EppResourceUtils.loadByForeignKeyCached(
Domain.class, paramDomain, tm().getTransactionTime()));
if (!possibleDomain.isPresent()) {
if (possibleDomain.isEmpty()) {
response.setStatus(HttpStatusCodes.STATUS_CODE_NOT_FOUND);
return;
}

4
core/src/main/java/google/registry/ui/server/console/RegistrarsAction.java
View File

@@ -107,7 +107,7 @@ public class RegistrarsAction implements JsonGetAction {
return;
}
if (!registrar.isPresent()) {
if (registrar.isEmpty()) {
response.setStatus(HttpStatusCodes.STATUS_CODE_BAD_REQUEST);
response.setPayload(gson.toJson("'registrar' parameter is not present"));
return;
@@ -164,7 +164,7 @@ public class RegistrarsAction implements JsonGetAction {
tm().transact(
() -> {
checkArgument(
!Registrar.loadByRegistrarId(registrar.getRegistrarId()).isPresent(),
Registrar.loadByRegistrarId(registrar.getRegistrarId()).isEmpty(),
"Registrar with registrarId %s already exists",
registrar.getRegistrarId());
tm().putAll(registrar, contact);

2
core/src/main/java/google/registry/ui/server/console/settings/ContactAction.java
View File

@@ -109,7 +109,7 @@ public class ContactAction implements JsonGetAction {
return;
}
if (!contacts.isPresent()) {
if (contacts.isEmpty()) {
response.setStatus(HttpStatusCodes.STATUS_CODE_BAD_REQUEST);
response.setPayload(gson.toJson("Contacts parameter is not present"));
return;

2
core/src/main/java/google/registry/ui/server/console/settings/SecurityAction.java
View File

@@ -77,7 +77,7 @@ public class SecurityAction implements JsonGetAction {
return;
}
if (!registrar.isPresent()) {
if (registrar.isEmpty()) {
response.setStatus(HttpStatusCodes.STATUS_CODE_BAD_REQUEST);
response.setPayload(gson.toJson("'registrar' parameter is not present"));
return;

2
core/src/main/java/google/registry/ui/server/console/settings/WhoisRegistrarFieldsAction.java
View File

@@ -69,7 +69,7 @@ public class WhoisRegistrarFieldsAction implements JsonGetAction {
@Override
public void run() {
if (!registrar.isPresent()) {
if (registrar.isEmpty()) {
response.setStatus(HttpStatusCodes.STATUS_CODE_BAD_REQUEST);
response.setPayload(gson.toJson("'registrar' parameter is not present"));
return;

2
core/src/main/java/google/registry/ui/server/registrar/ConsoleRegistrarCreatorAction.java
View File

@@ -233,7 +233,7 @@ public final class ConsoleRegistrarCreatorAction extends HtmlAction {
tm().transact(
() -> {
checkState(
!Registrar.loadByRegistrarId(registrar.getRegistrarId()).isPresent(),
Registrar.loadByRegistrarId(registrar.getRegistrarId()).isEmpty(),
"Registrar with client ID %s already exists",
registrar.getRegistrarId());
tm().putAll(registrar, contact);

2
core/src/main/java/google/registry/ui/server/registrar/HtmlAction.java
View File

@@ -67,7 +67,7 @@ public abstract class HtmlAction implements Runnable {
response.setHeader(X_FRAME_OPTIONS, "SAMEORIGIN"); // Disallow iframing.
response.setHeader("X-Ui-Compatible", "IE=edge"); // Ask IE not to be silly.
if (!authResult.userAuthInfo().isPresent()) {
if (authResult.userAuthInfo().isEmpty()) {
response.setStatus(SC_MOVED_TEMPORARILY);
String location;
try {

6
core/src/main/java/google/registry/ui/server/registrar/RegistrarSettingsAction.java
View File

@@ -383,7 +383,7 @@ public class RegistrarSettingsAction implements Runnable, JsonActionRunner.JsonA
*/
private boolean validateCertificate(
Optional<String> existingCertificate, String certificateString) {
if (!existingCertificate.isPresent() || !existingCertificate.get().equals(certificateString)) {
if (existingCertificate.isEmpty() || !existingCertificate.get().equals(certificateString)) {
try {
certificateChecker.validateCertificate(certificateString);
} catch (InsecureCertificateException e) {
@@ -514,7 +514,7 @@ public class RegistrarSettingsAction implements Runnable, JsonActionRunner.JsonA
}
// If there was a domain WHOIS abuse contact in the old set, the new set must have one.
if (getDomainWhoisVisibleAbuseContact(existingContacts).isPresent()
&& !domainWhoisAbuseContact.isPresent()) {
&& domainWhoisAbuseContact.isEmpty()) {
throw new ContactRequirementException(
"An abuse contact visible in domain WHOIS query must be designated");
}
@@ -569,7 +569,7 @@ public class RegistrarSettingsAction implements Runnable, JsonActionRunner.JsonA
updatedContact ->
updatedContact.getEmailAddress().equals(contact.getEmailAddress()))
.findFirst();
if (!updatedContactOptional.isPresent()) {
if (updatedContactOptional.isEmpty()) {
throw new FormException(
String.format(
"Cannot delete the contact %s that has registry lock enabled",

4
core/src/main/java/google/registry/ui/server/registrar/RegistryLockGetAction.java
View File

@@ -210,11 +210,11 @@ public final class RegistryLockGetAction implements JsonGetAction {
.put(DOMAIN_NAME_PARAM, lock.getDomainName())
.put(LOCKED_TIME_PARAM, lock.getLockCompletionTime().map(DateTime::toString).orElse(""))
.put(LOCKED_BY_PARAM, lock.isSuperuser() ? "admin" : lock.getRegistrarPocId())
.put(IS_LOCK_PENDING_PARAM, !lock.getLockCompletionTime().isPresent())
.put(IS_LOCK_PENDING_PARAM, lock.getLockCompletionTime().isEmpty())
.put(
IS_UNLOCK_PENDING_PARAM,
lock.getUnlockRequestTime().isPresent()
&& !lock.getUnlockCompletionTime().isPresent()
&& lock.getUnlockCompletionTime().isEmpty()
&& !lock.isUnlockRequestExpired(now))
.put(USER_CAN_UNLOCK_PARAM, isAdmin || !lock.isSuperuser())
.build();

2
core/src/main/java/google/registry/whois/DomainLookupCommand.java
View File

@@ -62,7 +62,7 @@ public class DomainLookupCommand implements WhoisCommand {
Optional<InternetDomainName> tld = findTldForName(domainName);
// Google Registry Policy: Do not return records under TLDs for which we're not
// authoritative.
if (!tld.isPresent() || !getTlds().contains(tld.get().toString())) {
if (tld.isEmpty() || !getTlds().contains(tld.get().toString())) {
throw new WhoisException(now, SC_NOT_FOUND, ERROR_PREFIX + " not found.");
}
// Include `getResponse` and `isBlockedByBsa` in one transaction to reduce latency.

2
core/src/main/java/google/registry/whois/DomainWhoisResponse.java
View File

@@ -146,7 +146,7 @@ final class DomainWhoisResponse extends WhoisResponseImpl {
/** Emit the contact entry of the given type. */
DomainEmitter emitContact(
String contactType, Optional<VKey<Contact>> contact, boolean preferUnicode) {
if (!contact.isPresent()) {
if (contact.isEmpty()) {
return this;
}
// If we refer to a contact that doesn't exist, that's a bug. It means referential integrity

2
core/src/main/java/google/registry/whois/WhoisReader.java
View File

@@ -196,7 +196,7 @@ class WhoisReader {
// We don't know at this point whether we have a domain name or a host name. We have to
// search through our configured TLDs to see if there's one that prefixes the name.
Optional<InternetDomainName> tld = findTldForName(targetName);
if (!tld.isPresent()) {
if (tld.isEmpty()) {
// This target is not under any configured TLD, so just try it as a registrar name.
logger.atInfo().log("Attempting registrar lookup using %s as a registrar.", arg1);
return commandFactory.registrarLookup(arg1);

2
core/src/test/java/google/registry/beam/TestPipelineExtension.java
View File

@@ -285,7 +285,7 @@ public class TestPipelineExtension extends Pipeline
options.as(ApplicationNameOptions.class).setAppName(getAppName(context));
// if the enforcement level has not been set by the user do auto-inference
if (!enforcement.isPresent()) {
if (enforcement.isEmpty()) {
final boolean isCrashingRunner = CrashingRunner.class.isAssignableFrom(options.getRunner());
checkState(

1
core/src/test/java/google/registry/flows/domain/DomainCreateFlowTest.java
View File

@@ -2742,7 +2742,6 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
.isEqualTo(loadFile("domain_create_blocked_by_bsa.xml"));
}
@Test
void testFailure_uppercase() {
doFailingDomainNameTest("Example.tld", BadDomainNameCharacterException.class);

10
core/src/test/java/google/registry/flows/domain/DomainTransferRequestFlowTest.java
View File

@@ -251,11 +251,6 @@ class DomainTransferRequestFlowTest
.build());
}
/** Implements the missing Optional.stream function that is added in Java 9. */
private static <T> Stream<T> optionalToStream(Optional<T> optional) {
return optional.map(Stream::of).orElseGet(Stream::empty);
}
private void assertHistoryEntriesContainBillingEventsAndGracePeriods(
DateTime expectedExpirationTime,
DateTime implicitTransferTime,
@@ -314,7 +309,7 @@ class DomainTransferRequestFlowTest
ImmutableSet<BillingBase> expectedBillingBases =
Streams.concat(
Stream.of(losingClientAutorenew, gainingClientAutorenew),
optionalToStream(optionalTransferBillingEvent))
optionalTransferBillingEvent.stream())
.collect(toImmutableSet());
assertBillingEvents(Sets.union(expectedBillingBases, extraBillingBases));
// Assert that the domain's TransferData server-approve billing events match the above.
@@ -331,8 +326,7 @@ class DomainTransferRequestFlowTest
// Assert that the full set of server-approve billing events is exactly the extra ones plus
// the transfer billing event (if present) and the gaining client autorenew.
ImmutableSet<BillingBase> expectedServeApproveBillingBases =
Streams.concat(
Stream.of(gainingClientAutorenew), optionalToStream(optionalTransferBillingEvent))
Streams.concat(Stream.of(gainingClientAutorenew), optionalTransferBillingEvent.stream())
.collect(toImmutableSet());
assertBillingEventsEqual(
Iterables.filter(

2
core/src/test/java/google/registry/webdriver/WebDriverScreenDiffer.java
View File

@@ -181,7 +181,7 @@ class WebDriverScreenDiffer implements ScreenDiffer {
.setIsSizeDifferent(false)
.setNumDiffPixels(totalPixels);
if (!maybeGoldenImage.isPresent()) {
if (maybeGoldenImage.isEmpty()) {
return commonBuilder.setIsMissingGoldenImage(true).build();
}
BufferedImage goldenImage = maybeGoldenImage.get();