mirror of
https://github.com/google/nomulus.git
synced 2025-08-05 01:11:50 +02:00
Run automatic Java 8 conversion over codebase
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=171174380
This commit is contained in:
mcilwain
Ben McIlwain
parent
44df5da771
commit
5edb7935ed
190 changed files with 2312 additions and 3096 deletions
|
|
@ -23,7 +23,6 @@ import static org.mockito.Mockito.when;
|
|||
|
||||
import com.google.appengine.api.datastore.Entity;
|
||||
import com.google.appengine.api.modules.ModulesService;
|
||||
import com.google.common.base.Function;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import google.registry.testing.AppEngineRule;
|
||||
|
|
@ -98,30 +97,24 @@ public class DatastoreBackupServiceTest {
|
|||
.param("kind", "bar"));
|
||||
}
|
||||
|
||||
private static final Function<DatastoreBackupInfo, String> BACKUP_NAME_GETTER =
|
||||
new Function<DatastoreBackupInfo, String>() {
|
||||
@Override
|
||||
public String apply(DatastoreBackupInfo backup) {
|
||||
return backup.getName();
|
||||
}};
|
||||
|
||||
@Test
|
||||
public void testSuccess_findAllByNamePrefix() throws Exception {
|
||||
assertThat(transform(backupService.findAllByNamePrefix("backupA"), BACKUP_NAME_GETTER))
|
||||
assertThat(
|
||||
transform(backupService.findAllByNamePrefix("backupA"), DatastoreBackupInfo::getName))
|
||||
.containsExactly("backupA1", "backupA2", "backupA3");
|
||||
assertThat(transform(backupService.findAllByNamePrefix("backupB"), BACKUP_NAME_GETTER))
|
||||
assertThat(
|
||||
transform(backupService.findAllByNamePrefix("backupB"), DatastoreBackupInfo::getName))
|
||||
.containsExactly("backupB1", "backupB42");
|
||||
assertThat(transform(backupService.findAllByNamePrefix("backupB4"), BACKUP_NAME_GETTER))
|
||||
assertThat(
|
||||
transform(backupService.findAllByNamePrefix("backupB4"), DatastoreBackupInfo::getName))
|
||||
.containsExactly("backupB42");
|
||||
assertThat(backupService.findAllByNamePrefix("backupX")).isEmpty();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSuccess_findByName() throws Exception {
|
||||
assertThat(BACKUP_NAME_GETTER.apply(backupService.findByName("backupA1")))
|
||||
.isEqualTo("backupA1");
|
||||
assertThat(BACKUP_NAME_GETTER.apply(backupService.findByName("backupB4")))
|
||||
.isEqualTo("backupB42");
|
||||
assertThat(backupService.findByName("backupA1").getName()).isEqualTo("backupA1");
|
||||
assertThat(backupService.findByName("backupB4").getName()).isEqualTo("backupB42");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
package google.registry.export;
|
||||
|
||||
import static com.google.common.base.Strings.repeat;
|
||||
import static com.google.common.collect.ImmutableList.toImmutableList;
|
||||
import static com.google.common.io.Resources.getResource;
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static com.google.common.truth.Truth.assertWithMessage;
|
||||
|
|
@ -22,14 +23,12 @@ import static google.registry.export.ExportConstants.getBackupKinds;
|
|||
import static google.registry.export.ExportConstants.getReportingKinds;
|
||||
import static google.registry.util.ResourceUtils.readResourceUtf8;
|
||||
|
||||
import com.google.common.base.Function;
|
||||
import com.google.common.base.Joiner;
|
||||
import com.google.common.base.Splitter;
|
||||
import com.google.common.collect.FluentIterable;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.google.common.collect.Streams;
|
||||
import com.google.re2j.Pattern;
|
||||
import javax.annotation.Nullable;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.junit.runners.JUnit4;
|
||||
|
|
@ -91,15 +90,8 @@ public class ExportConstantsTest {
|
|||
private static ImmutableList<String> extractListFromFile(String filename) {
|
||||
String fileContents = readResourceUtf8(ExportConstantsTest.class, filename);
|
||||
final Pattern stripComments = Pattern.compile("\\s*#.*$");
|
||||
return FluentIterable.from(Splitter.on('\n').split(fileContents.trim()))
|
||||
.transform(
|
||||
new Function<String, String>() {
|
||||
@Override
|
||||
@Nullable
|
||||
public String apply(@Nullable String line) {
|
||||
return stripComments.matcher(line).replaceFirst("");
|
||||
}
|
||||
})
|
||||
.toList();
|
||||
return Streams.stream(Splitter.on('\n').split(fileContents.trim()))
|
||||
.map(line -> stripComments.matcher(line).replaceFirst(""))
|
||||
.collect(toImmutableList());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ import com.google.api.services.bigquery.model.Job;
|
|||
import com.google.api.services.bigquery.model.JobConfigurationLoad;
|
||||
import com.google.api.services.bigquery.model.JobReference;
|
||||
import com.google.appengine.api.taskqueue.QueueFactory;
|
||||
import com.google.common.base.Function;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.google.common.collect.Iterables;
|
||||
import google.registry.bigquery.BigqueryFactory;
|
||||
|
|
@ -138,31 +137,27 @@ public class LoadSnapshotActionTest {
|
|||
}
|
||||
|
||||
// Check the job IDs for each load job.
|
||||
assertThat(transform(jobs, new Function<Job, String>() {
|
||||
@Override
|
||||
public String apply(Job job) {
|
||||
return job.getJobReference().getJobId();
|
||||
}})).containsExactly(
|
||||
assertThat(transform(jobs, job -> job.getJobReference().getJobId()))
|
||||
.containsExactly(
|
||||
"load-snapshot-id12345-one-1391096117045",
|
||||
"load-snapshot-id12345-two-1391096117045",
|
||||
"load-snapshot-id12345-three-1391096117045");
|
||||
|
||||
// Check the source URI for each load job.
|
||||
assertThat(transform(jobs, new Function<Job, String>() {
|
||||
@Override
|
||||
public String apply(Job job) {
|
||||
return Iterables.getOnlyElement(job.getConfiguration().getLoad().getSourceUris());
|
||||
}})).containsExactly(
|
||||
assertThat(
|
||||
transform(
|
||||
jobs,
|
||||
job -> Iterables.getOnlyElement(job.getConfiguration().getLoad().getSourceUris())))
|
||||
.containsExactly(
|
||||
"gs://bucket/snapshot.one.backup_info",
|
||||
"gs://bucket/snapshot.two.backup_info",
|
||||
"gs://bucket/snapshot.three.backup_info");
|
||||
|
||||
// Check the destination table ID for each load job.
|
||||
assertThat(transform(jobs, new Function<Job, String>() {
|
||||
@Override
|
||||
public String apply(Job job) {
|
||||
return job.getConfiguration().getLoad().getDestinationTable().getTableId();
|
||||
}})).containsExactly("id12345_one", "id12345_two", "id12345_three");
|
||||
assertThat(
|
||||
transform(
|
||||
jobs, job -> job.getConfiguration().getLoad().getDestinationTable().getTableId()))
|
||||
.containsExactly("id12345_one", "id12345_two", "id12345_three");
|
||||
|
||||
// Check that we executed the inserted jobs.
|
||||
verify(bigqueryJobsInsert, times(3)).execute();
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ import static org.mockito.Mockito.times;
|
|||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import com.google.common.base.Predicate;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.google.common.collect.Iterables;
|
||||
import google.registry.groups.DirectoryGroupsConnection;
|
||||
|
|
@ -198,11 +197,8 @@ public class SyncGroupMembersActionTest {
|
|||
"hexadecimal@snow.fall",
|
||||
Role.MEMBER);
|
||||
verify(response).setStatus(SC_OK);
|
||||
assertThat(Iterables.filter(Registrar.loadAll(), new Predicate<Registrar>() {
|
||||
@Override
|
||||
public boolean apply(Registrar registrar) {
|
||||
return registrar.getContactsRequireSyncing();
|
||||
}})).isEmpty();
|
||||
assertThat(Iterables.filter(Registrar.loadAll(), Registrar::getContactsRequireSyncing))
|
||||
.isEmpty();
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ import static org.mockito.Mockito.when;
|
|||
import com.google.api.services.bigquery.Bigquery;
|
||||
import com.google.api.services.bigquery.model.Dataset;
|
||||
import com.google.api.services.bigquery.model.Table;
|
||||
import com.google.common.base.Function;
|
||||
import com.google.common.collect.Iterables;
|
||||
import google.registry.bigquery.BigqueryFactory;
|
||||
import google.registry.request.HttpException.InternalServerErrorException;
|
||||
|
|
@ -118,14 +117,7 @@ public class UpdateSnapshotViewActionTest {
|
|||
tableOrder.verify(bigqueryTables)
|
||||
.update(eq("myproject"), eq("latest_datastore_export"), eq("fookind"), tableArg.capture());
|
||||
Iterable<String> actualQueries =
|
||||
Iterables.transform(
|
||||
tableArg.getAllValues(),
|
||||
new Function<Table, String>() {
|
||||
@Override
|
||||
public String apply(Table table) {
|
||||
return table.getView().getQuery();
|
||||
}
|
||||
});
|
||||
Iterables.transform(tableArg.getAllValues(), table -> table.getView().getQuery());
|
||||
assertThat(actualQueries).containsExactly(
|
||||
"#legacySQL\nSELECT * FROM [myproject:some_dataset.12345_fookind]",
|
||||
"#standardSQL\nSELECT * FROM `myproject.some_dataset.12345_fookind`");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue