mirror of
https://github.com/google/nomulus.git
synced 2025-06-29 07:43:37 +02:00
Refactor Guava functional methods to use lambdas
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=177027488
This commit is contained in:
mcilwain
jianglai
parent
2ae496bfce
commit
bbe2584da4
47 changed files with 478 additions and 647 deletions
|
|
@ -34,7 +34,6 @@ import com.google.common.collect.ImmutableMap;
|
|||
import com.google.template.soy.data.SoyMapData;
|
||||
import com.googlecode.objectify.Key;
|
||||
import com.googlecode.objectify.VoidWork;
|
||||
import com.googlecode.objectify.Work;
|
||||
import google.registry.flows.EppException;
|
||||
import google.registry.model.domain.DesignatedContact;
|
||||
import google.registry.model.domain.DomainApplication;
|
||||
|
|
@ -71,27 +70,24 @@ final class AllocateDomainCommand extends MutatingEppToolCommand {
|
|||
.append(
|
||||
ofy()
|
||||
.transactNewReadOnly(
|
||||
new Work<String>() {
|
||||
@Override
|
||||
public String run() {
|
||||
String failureMessage =
|
||||
ofy()
|
||||
.load()
|
||||
.keys(applicationKeys)
|
||||
.values()
|
||||
.stream()
|
||||
.map(
|
||||
application ->
|
||||
application.getApplicationStatus()
|
||||
== ApplicationStatus.ALLOCATED
|
||||
? null
|
||||
: application.getFullyQualifiedDomainName())
|
||||
.filter(Objects::nonNull)
|
||||
.collect(joining("\n"));
|
||||
return failureMessage.isEmpty()
|
||||
? "ALL SUCCEEDED"
|
||||
: addHeader("FAILURES", failureMessage);
|
||||
}
|
||||
() -> {
|
||||
String failureMessage =
|
||||
ofy()
|
||||
.load()
|
||||
.keys(applicationKeys)
|
||||
.values()
|
||||
.stream()
|
||||
.map(
|
||||
application ->
|
||||
application.getApplicationStatus()
|
||||
== ApplicationStatus.ALLOCATED
|
||||
? null
|
||||
: application.getFullyQualifiedDomainName())
|
||||
.filter(Objects::nonNull)
|
||||
.collect(joining("\n"));
|
||||
return failureMessage.isEmpty()
|
||||
? "ALL SUCCEEDED"
|
||||
: addHeader("FAILURES", failureMessage);
|
||||
}))
|
||||
.toString();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ import com.google.api.client.http.HttpHeaders;
|
|||
import com.google.api.client.http.HttpRequest;
|
||||
import com.google.api.client.http.HttpRequestFactory;
|
||||
import com.google.api.client.http.HttpResponse;
|
||||
import com.google.api.client.http.HttpUnsuccessfulResponseHandler;
|
||||
import com.google.common.base.Supplier;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
|
|
@ -98,20 +97,15 @@ class AppEngineConnection implements Connection {
|
|||
request.setFollowRedirects(false);
|
||||
request.setThrowExceptionOnExecuteError(false);
|
||||
request.setUnsuccessfulResponseHandler(
|
||||
new HttpUnsuccessfulResponseHandler() {
|
||||
@Override
|
||||
public boolean handleResponse(
|
||||
HttpRequest request, HttpResponse response, boolean supportsRetry)
|
||||
throws IOException {
|
||||
String errorTitle = extractHtmlTitle(getErrorHtmlAsString(response));
|
||||
throw new IOException(
|
||||
String.format(
|
||||
"Error from %s: %d %s%s",
|
||||
request.getUrl().toString(),
|
||||
response.getStatusCode(),
|
||||
response.getStatusMessage(),
|
||||
(errorTitle == null ? "" : ": " + errorTitle)));
|
||||
}
|
||||
(request1, response, supportsRetry) -> {
|
||||
String errorTitle = extractHtmlTitle(getErrorHtmlAsString(response));
|
||||
throw new IOException(
|
||||
String.format(
|
||||
"Error from %s: %d %s%s",
|
||||
request1.getUrl().toString(),
|
||||
response.getStatusCode(),
|
||||
response.getStatusMessage(),
|
||||
(errorTitle == null ? "" : ": " + errorTitle)));
|
||||
});
|
||||
HttpResponse response = null;
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -28,11 +28,11 @@ import com.google.common.base.Strings;
|
|||
import com.google.common.collect.ComparisonChain;
|
||||
import com.google.common.collect.FluentIterable;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableList.Builder;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Ordering;
|
||||
import com.google.common.net.InternetDomainName;
|
||||
import com.googlecode.objectify.Work;
|
||||
import google.registry.model.contact.ContactResource;
|
||||
import google.registry.model.domain.DomainApplication;
|
||||
import google.registry.tools.Command.RemoteApiCommand;
|
||||
|
|
@ -71,20 +71,17 @@ final class AuctionStatusCommand implements RemoteApiCommand {
|
|||
fullyQualifiedDomainName);
|
||||
return ofy()
|
||||
.transactNewReadOnly(
|
||||
new Work<Iterable<String>>() {
|
||||
@Override
|
||||
public Iterable<String> run() {
|
||||
ImmutableList.Builder<DomainApplication> applications =
|
||||
new ImmutableList.Builder<>();
|
||||
for (String domain : domains) {
|
||||
applications.addAll(
|
||||
loadActiveApplicationsByDomainName(
|
||||
domain, ofy().getTransactionTime()));
|
||||
}
|
||||
return Lists.transform(
|
||||
ImmutableList.sortedCopyOf(ORDERING, applications.build()),
|
||||
APPLICATION_FORMATTER);
|
||||
() -> {
|
||||
Builder<DomainApplication> applications =
|
||||
new Builder<>();
|
||||
for (String domain : domains) {
|
||||
applications.addAll(
|
||||
loadActiveApplicationsByDomainName(
|
||||
domain, ofy().getTransactionTime()));
|
||||
}
|
||||
return Lists.transform(
|
||||
ImmutableList.sortedCopyOf(ORDERING, applications.build()),
|
||||
APPLICATION_FORMATTER);
|
||||
});
|
||||
}),
|
||||
UTF_8);
|
||||
|
|
|
|||
|
|
@ -15,9 +15,7 @@
|
|||
package google.registry.tools;
|
||||
|
||||
import com.google.api.client.auth.oauth2.Credential;
|
||||
import com.google.api.client.http.HttpRequest;
|
||||
import com.google.api.client.http.HttpRequestFactory;
|
||||
import com.google.api.client.http.HttpRequestInitializer;
|
||||
import com.google.api.client.http.javanet.NetHttpTransport;
|
||||
import dagger.Binds;
|
||||
import dagger.Module;
|
||||
|
|
@ -50,14 +48,9 @@ class DefaultRequestFactoryModule {
|
|||
if (connectionFlags.getServer().getHost().equals("localhost")) {
|
||||
return new NetHttpTransport()
|
||||
.createRequestFactory(
|
||||
new HttpRequestInitializer() {
|
||||
@Override
|
||||
public void initialize(HttpRequest request) {
|
||||
request
|
||||
.getHeaders()
|
||||
.setCookie("dev_appserver_login=test@example.com:true:1858047912411");
|
||||
}
|
||||
});
|
||||
request -> request
|
||||
.getHeaders()
|
||||
.setCookie("dev_appserver_login=test@example.com:true:1858047912411"));
|
||||
} else {
|
||||
return new NetHttpTransport().createRequestFactory(credentialProvider.get());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,11 +23,9 @@ import static java.nio.charset.StandardCharsets.US_ASCII;
|
|||
|
||||
import com.beust.jcommander.Parameter;
|
||||
import com.beust.jcommander.Parameters;
|
||||
import com.google.common.base.Function;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import google.registry.model.domain.DomainResource;
|
||||
import google.registry.model.domain.secdns.DelegationSignerData;
|
||||
import google.registry.model.host.HostResource;
|
||||
import google.registry.tools.Command.RemoteApiCommand;
|
||||
import google.registry.tools.params.PathParameter;
|
||||
|
|
@ -104,16 +102,12 @@ final class GenerateDnsReportCommand implements RemoteApiCommand {
|
|||
.getDsData()
|
||||
.stream()
|
||||
.map(
|
||||
new Function<DelegationSignerData, Map<String, ?>>() {
|
||||
@Override
|
||||
public Map<String, ?> apply(DelegationSignerData dsData) {
|
||||
return ImmutableMap.of(
|
||||
"keyTag", dsData.getKeyTag(),
|
||||
"algorithm", dsData.getAlgorithm(),
|
||||
"digestType", dsData.getDigestType(),
|
||||
"digest", base16().encode(dsData.getDigest()));
|
||||
}
|
||||
})
|
||||
dsData1 ->
|
||||
ImmutableMap.of(
|
||||
"keyTag", dsData1.getKeyTag(),
|
||||
"algorithm", dsData1.getAlgorithm(),
|
||||
"digestType", dsData1.getDigestType(),
|
||||
"digest", base16().encode(dsData1.getDigest())))
|
||||
.collect(toImmutableList());
|
||||
ImmutableMap.Builder<String, Object> mapBuilder = new ImmutableMap.Builder<>();
|
||||
mapBuilder.put("domain", domain.getFullyQualifiedDomainName());
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ import com.beust.jcommander.Parameter;
|
|||
import com.beust.jcommander.Parameters;
|
||||
import com.google.common.base.Joiner;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.googlecode.objectify.Work;
|
||||
import google.registry.model.billing.RegistrarCredit;
|
||||
import google.registry.model.billing.RegistrarCreditBalance.BalanceMap;
|
||||
import google.registry.model.registrar.Registrar;
|
||||
|
|
@ -52,22 +51,19 @@ final class ListCreditsCommand implements RemoteApiCommand {
|
|||
private ImmutableList<String> createCreditStrings(final Registrar registrar) {
|
||||
return ofy()
|
||||
.transactNewReadOnly(
|
||||
new Work<ImmutableList<String>>() {
|
||||
@Override
|
||||
public ImmutableList<String> run() {
|
||||
ImmutableList.Builder<String> builder = new ImmutableList.Builder<>();
|
||||
for (RegistrarCredit credit : RegistrarCredit.loadAllForRegistrar(registrar)) {
|
||||
BalanceMap balanceMap = BalanceMap.createForCredit(credit);
|
||||
Optional<Money> activeBalance =
|
||||
balanceMap.getActiveBalanceAtTime(ofy().getTransactionTime());
|
||||
// Unless showAll is true, only show credits with a positive active balance (which
|
||||
// excludes just zero-balance credits since credit balances cannot be negative).
|
||||
if (showAll || (activeBalance.isPresent() && activeBalance.get().isPositive())) {
|
||||
builder.add(credit.getSummary() + "\n" + balanceMap);
|
||||
}
|
||||
() -> {
|
||||
ImmutableList.Builder<String> builder = new ImmutableList.Builder<>();
|
||||
for (RegistrarCredit credit : RegistrarCredit.loadAllForRegistrar(registrar)) {
|
||||
BalanceMap balanceMap = BalanceMap.createForCredit(credit);
|
||||
Optional<Money> activeBalance =
|
||||
balanceMap.getActiveBalanceAtTime(ofy().getTransactionTime());
|
||||
// Unless showAll is true, only show credits with a positive active balance (which
|
||||
// excludes just zero-balance credits since credit balances cannot be negative).
|
||||
if (showAll || (activeBalance.isPresent() && activeBalance.get().isPositive())) {
|
||||
builder.add(credit.getSummary() + "\n" + balanceMap);
|
||||
}
|
||||
return builder.build();
|
||||
}
|
||||
return builder.build();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue