diff --git a/java/google/registry/backup/ExportCommitLogDiffAction.java b/java/google/registry/backup/ExportCommitLogDiffAction.java index eed7944c6..7e27f7915 100644 --- a/java/google/registry/backup/ExportCommitLogDiffAction.java +++ b/java/google/registry/backup/ExportCommitLogDiffAction.java @@ -29,7 +29,6 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import static google.registry.util.DateTimeUtils.START_OF_TIME; import static google.registry.util.DateTimeUtils.isAtOrAfter; import static java.nio.channels.Channels.newOutputStream; -import static java.util.Arrays.asList; import static java.util.Comparator.comparingLong; import com.google.appengine.tools.cloudstorage.GcsFileOptions; @@ -208,7 +207,7 @@ public final class ExportCommitLogDiffAction implements Runnable { ImmutableList.Builder> entities = new ImmutableList.Builder<>(); for (CommitLogManifest manifest : chunk) { - entities.add(asList(manifest)); + entities.add(ImmutableList.of(manifest)); entities.add(ofy().load().type(CommitLogMutation.class).ancestor(manifest)); } for (ImmutableObject entity : concat(entities.build())) { diff --git a/java/google/registry/backup/RestoreCommitLogsAction.java b/java/google/registry/backup/RestoreCommitLogsAction.java index 5a7615bd3..6b823717c 100644 --- a/java/google/registry/backup/RestoreCommitLogsAction.java +++ b/java/google/registry/backup/RestoreCommitLogsAction.java @@ -19,13 +19,13 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.Iterators.peekingIterator; import static google.registry.backup.BackupUtils.createDeserializingIterator; import static google.registry.model.ofy.ObjectifyService.ofy; -import static java.util.Arrays.asList; import com.google.appengine.api.datastore.DatastoreService; import com.google.appengine.api.datastore.Entity; import com.google.appengine.api.datastore.EntityTranslator; import com.google.appengine.tools.cloudstorage.GcsFileMetadata; import com.google.appengine.tools.cloudstorage.GcsService; +import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.PeekingIterator; import com.google.common.collect.Streams; @@ -106,7 +106,7 @@ public class RestoreCommitLogsAction implements Runnable { PeekingIterator commitLogs = peekingIterator(createDeserializingIterator(input)); lastCheckpoint = (CommitLogCheckpoint) commitLogs.next(); - saveOfy(asList(lastCheckpoint)); // Save the checkpoint itself. + saveOfy(ImmutableList.of(lastCheckpoint)); // Save the checkpoint itself. while (commitLogs.hasNext()) { CommitLogManifest manifest = restoreOneTransaction(commitLogs); bucketTimestamps.put(manifest.getBucketId(), manifest.getCommitTime()); diff --git a/java/google/registry/dns/DnsQueue.java b/java/google/registry/dns/DnsQueue.java index ed9b9c680..10f9eb7d6 100644 --- a/java/google/registry/dns/DnsQueue.java +++ b/java/google/registry/dns/DnsQueue.java @@ -61,7 +61,7 @@ import org.joda.time.Duration; * {@link ReadDnsQueueAction}, which is run as a cron job with running time shorter than the cron * repeat time - meaning there should never be two instances running at once. * - * @see google.registry.config.RegistryConfig#provideReadDnsQueueRuntime + * @see google.registry.config.RegistryConfig.ConfigModule#provideReadDnsQueueRuntime */ public class DnsQueue { diff --git a/java/google/registry/export/CheckBackupAction.java b/java/google/registry/export/CheckBackupAction.java index b3436d165..8fb8f0ee9 100644 --- a/java/google/registry/export/CheckBackupAction.java +++ b/java/google/registry/export/CheckBackupAction.java @@ -110,7 +110,7 @@ public class CheckBackupAction implements Runnable { throw e; } catch (Throwable e) { throw new InternalServerErrorException( - String.format("Exception occurred while checking datastore exports."), e); + "Exception occurred while checking datastore exports.", e); } } diff --git a/java/google/registry/keyring/api/ComparatorKeyring.java b/java/google/registry/keyring/api/ComparatorKeyring.java index 5897d9514..569665522 100644 --- a/java/google/registry/keyring/api/ComparatorKeyring.java +++ b/java/google/registry/keyring/api/ComparatorKeyring.java @@ -181,7 +181,7 @@ public final class ComparatorKeyring extends ComparingInvocationHandler return "null"; } - StringBuilder builder = new StringBuilder(""); + StringBuilder builder = new StringBuilder(); for (byte b : a.getFingerprint()) { builder.append(String.format("%02x:", b)); } diff --git a/java/google/registry/keyring/kms/KmsUpdater.java b/java/google/registry/keyring/kms/KmsUpdater.java index 02d971f34..5ee1fefb5 100644 --- a/java/google/registry/keyring/kms/KmsUpdater.java +++ b/java/google/registry/keyring/kms/KmsUpdater.java @@ -137,7 +137,7 @@ public final class KmsUpdater { * Encrypts updated secrets using KMS. If the configured {@code KeyRing} or {@code CryptoKey} * associated with a secret doesn't exist, they will first be created. * - * @see google.registry.config.RegistryConfigSettings#kms + * @see google.registry.config.RegistryConfigSettings.Kms */ private ImmutableMap encryptValues(Map keyValues) { ImmutableMap.Builder encryptedValues = new ImmutableMap.Builder<>(); diff --git a/java/google/registry/model/EppResource.java b/java/google/registry/model/EppResource.java index 9bf2d0f40..b14d08806 100644 --- a/java/google/registry/model/EppResource.java +++ b/java/google/registry/model/EppResource.java @@ -369,15 +369,8 @@ public abstract class EppResource extends BackupGroupRoot implements Buildable { Streams.stream(keys).map(key -> (Key) key).collect(toImmutableList()); // Typing shenanigans are required to return the map with the correct required generic type. - return ofy() - .load() - .keys(typedKeys) - .entrySet() - .stream() - .collect( - ImmutableMap - ., EppResource>, Key, EppResource> - toImmutableMap(Entry::getKey, Entry::getValue)); + return ofy().load().keys(typedKeys).entrySet().stream() + .collect(ImmutableMap.toImmutableMap(Entry::getKey, Entry::getValue)); } /** diff --git a/java/google/registry/model/SchemaVersion.java b/java/google/registry/model/SchemaVersion.java index 44c4ba4fa..5c5bc152c 100644 --- a/java/google/registry/model/SchemaVersion.java +++ b/java/google/registry/model/SchemaVersion.java @@ -33,11 +33,10 @@ public final class SchemaVersion { */ private static SortedSet> getAllPersistedTypes() { SortedSet> persistedTypes = new TreeSet<>(Ordering.usingToString()); - Queue> queue = new ArrayDeque<>(); // Do a breadth-first search for persisted types, starting with @Entity types and expanding each // ImmutableObject by querying it for all its persisted field types. persistedTypes.addAll(EntityClasses.ALL_CLASSES); - queue.addAll(persistedTypes); + Queue> queue = new ArrayDeque<>(persistedTypes); while (!queue.isEmpty()) { Class clazz = queue.remove(); if (ImmutableObject.class.isAssignableFrom(clazz)) { diff --git a/java/google/registry/model/ofy/AugmentedDeleter.java b/java/google/registry/model/ofy/AugmentedDeleter.java index a40a2327d..ac6ebddd6 100644 --- a/java/google/registry/model/ofy/AugmentedDeleter.java +++ b/java/google/registry/model/ofy/AugmentedDeleter.java @@ -60,7 +60,7 @@ abstract class AugmentedDeleter implements Deleter { @Override public Result key(Key key) { - handleDeletion(Arrays.asList(key)); + handleDeletion(ImmutableList.of(key)); return delegate.keys(key); } diff --git a/java/google/registry/model/package-info.java b/java/google/registry/model/package-info.java index 47d864b88..cd95b4721 100644 --- a/java/google/registry/model/package-info.java +++ b/java/google/registry/model/package-info.java @@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlNsForm; import javax.xml.bind.annotation.XmlSchema; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -/** +/* * This package defines all entities which are managed via EPP XML and persisted to the Datastore * via Objectify. * diff --git a/java/google/registry/tmch/TmchXmlSignature.java b/java/google/registry/tmch/TmchXmlSignature.java index 8a9d1188a..4209d6804 100644 --- a/java/google/registry/tmch/TmchXmlSignature.java +++ b/java/google/registry/tmch/TmchXmlSignature.java @@ -126,7 +126,7 @@ public class TmchXmlSignature { StringBuilder builder = new StringBuilder(); builder.append("Signature failed core validation\n"); boolean sv = signature.getSignatureValue().validate(context); - builder.append("Signature validation status: " + sv + "\n"); + builder.append(String.format("Signature validation status: %s\n", sv)); for (Reference ref : references) { builder.append("references["); builder.append(ref.getURI()); diff --git a/java/google/registry/tools/CommandWithRemoteApi.java b/java/google/registry/tools/CommandWithRemoteApi.java index caa2fd295..0d7dd855a 100644 --- a/java/google/registry/tools/CommandWithRemoteApi.java +++ b/java/google/registry/tools/CommandWithRemoteApi.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. +package google.registry.tools; + /** * Marker interface for commands that use the remote api. * - *

Just implementing this is sufficient to use the remote api; {@link RegistryTool} will - * install it as needed. + *

Just implementing this is sufficient to use the remote api; {@link RegistryTool} will install + * it as needed. */ -package google.registry.tools; - interface CommandWithRemoteApi extends Command {} diff --git a/java/google/registry/tools/GetResourceByKeyCommand.java b/java/google/registry/tools/GetResourceByKeyCommand.java index 1edb00608..235c93b4f 100644 --- a/java/google/registry/tools/GetResourceByKeyCommand.java +++ b/java/google/registry/tools/GetResourceByKeyCommand.java @@ -43,10 +43,12 @@ final class GetResourceByKeyCommand implements CommandWithRemoteApi { public void run() { for (String keyString : mainParameters) { System.out.println("\n"); - Key resourceKey = checkNotNull( - Key.create(keyString), "Could not parse key string: " + keyString); - EppResource resource = checkNotNull( - ofy().load().key(resourceKey).now(), "Could not load resource for key: " + resourceKey); + Key resourceKey = + checkNotNull(Key.create(keyString), "Could not parse key string: " + keyString); + EppResource resource = + checkNotNull( + ofy().load().key(resourceKey).now(), + "Could not load resource for key: " + resourceKey); System.out.println(expand ? resource.toHydratedString() : resource.toString()); } } diff --git a/java/google/registry/tools/ValidateEscrowDepositCommand.java b/java/google/registry/tools/ValidateEscrowDepositCommand.java index e589660d7..a0306649b 100644 --- a/java/google/registry/tools/ValidateEscrowDepositCommand.java +++ b/java/google/registry/tools/ValidateEscrowDepositCommand.java @@ -131,7 +131,7 @@ final class ValidateEscrowDepositCommand implements Command { } } System.out.println(); - System.out.printf("Contents:\n"); + System.out.println("Contents:"); for (Map.Entry count : counts.entrySet()) { System.out.printf(" - %s: %,d %s\n", count.getKey(), @@ -158,9 +158,9 @@ final class ValidateEscrowDepositCommand implements Command { good = false; } if (good) { - System.out.printf("RDE deposit is XML schema valid\n"); + System.out.println("RDE deposit is XML schema valid"); } else { - System.out.printf("RDE deposit is XML schema valid but has bad references\n"); + System.out.println("RDE deposit is XML schema valid but has bad references"); } } diff --git a/java/google/registry/tools/server/CreateGroupsAction.java b/java/google/registry/tools/server/CreateGroupsAction.java index e7d53b60f..9b56db4b9 100644 --- a/java/google/registry/tools/server/CreateGroupsAction.java +++ b/java/google/registry/tools/server/CreateGroupsAction.java @@ -83,13 +83,13 @@ public class CreateGroupsAction implements Runnable { // that type. groupsConnection.createGroup(groupKey); groupsConnection.addMemberToGroup(parentGroup, groupKey, Role.MEMBER); - return Optional.empty(); + return Optional.empty(); } catch (Exception e) { return Optional.of(e); } }); // Return the correct server response based on the results of the group creations. - if (results.stream().filter(Optional::isPresent).count() > 0) { + if (results.stream().anyMatch(Optional::isPresent)) { StringWriter responseString = new StringWriter(); PrintWriter responseWriter = new PrintWriter(responseString); for (int i = 0; i < results.size(); i++) { diff --git a/java/google/registry/ui/forms/FormFieldException.java b/java/google/registry/ui/forms/FormFieldException.java index f7023aeda..d59959405 100644 --- a/java/google/registry/ui/forms/FormFieldException.java +++ b/java/google/registry/ui/forms/FormFieldException.java @@ -31,8 +31,8 @@ import javax.annotation.concurrent.NotThreadSafe; /** * Exception thrown when a form field contains a bad value. * - *

You can safely throw {@code FormFieldException} from within your validator functions, and - * the field name will automatically be propagated into the exception object for you. + *

You can safely throw {@code FormFieldException} from within your validator functions, and the + * field name will automatically be propagated into the exception object for you. * *

The way that field names work is a bit complicated, because we need to support complex nested * field names like {@code foo[3].bar}. So what happens is the original exception will be thrown by @@ -41,9 +41,9 @@ import javax.annotation.concurrent.NotThreadSafe; * name of that component. Then when the exception reaches the user, the {@link #getFieldName()} * method will produce the fully-qualified field name. * - *

This propagation mechanism is also very important when writing - * {@link FormField.Builder#transform(com.google.common.base.Function) transform} functions, which - * oftentimes will not know the name of the field they're validating. + *

This propagation mechanism is also very important when writing {@link + * FormField.Builder#transform} functions, which oftentimes will not know the name of the field + * they're validating. */ @NotThreadSafe @SuppressWarnings("OverrideThrowableToString") diff --git a/java/google/registry/util/CollectionUtils.java b/java/google/registry/util/CollectionUtils.java index a2fc07905..60ff2f731 100644 --- a/java/google/registry/util/CollectionUtils.java +++ b/java/google/registry/util/CollectionUtils.java @@ -50,27 +50,27 @@ public class CollectionUtils { /** Turns a null set into an empty set. JAXB leaves lots of null sets lying around. */ public static Set nullToEmpty(@Nullable Set potentiallyNull) { - return firstNonNull(potentiallyNull, ImmutableSet.of()); + return firstNonNull(potentiallyNull, ImmutableSet.of()); } /** Turns a null list into an empty list. */ public static List nullToEmpty(@Nullable List potentiallyNull) { - return firstNonNull(potentiallyNull, ImmutableList.of()); + return firstNonNull(potentiallyNull, ImmutableList.of()); } /** Turns a null map into an empty map. */ public static Map nullToEmpty(@Nullable Map potentiallyNull) { - return firstNonNull(potentiallyNull, ImmutableMap.of()); + return firstNonNull(potentiallyNull, ImmutableMap.of()); } /** Turns a null multimap into an empty multimap. */ public static Multimap nullToEmpty(@Nullable Multimap potentiallyNull) { - return firstNonNull(potentiallyNull, ImmutableMultimap.of()); + return firstNonNull(potentiallyNull, ImmutableMultimap.of()); } /** Turns a null sorted map into an empty sorted map.. */ public static SortedMap nullToEmpty(@Nullable SortedMap potentiallyNull) { - return firstNonNull(potentiallyNull, ImmutableSortedMap.of()); + return firstNonNull(potentiallyNull, ImmutableSortedMap.of()); } /** Defensive copy helper for {@link Set}. */ diff --git a/java/google/registry/util/TaskQueueUtils.java b/java/google/registry/util/TaskQueueUtils.java index a9f825271..a09b585d5 100644 --- a/java/google/registry/util/TaskQueueUtils.java +++ b/java/google/registry/util/TaskQueueUtils.java @@ -14,13 +14,12 @@ package google.registry.util; -import static java.util.Arrays.asList; - import com.google.appengine.api.taskqueue.Queue; import com.google.appengine.api.taskqueue.TaskHandle; import com.google.appengine.api.taskqueue.TaskOptions; import com.google.appengine.api.taskqueue.TransientFailureException; import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.flogger.FluentLogger; import java.io.Serializable; @@ -65,7 +64,7 @@ public class TaskQueueUtils implements Serializable { * @return successfully enqueued task */ public TaskHandle enqueue(Queue queue, TaskOptions task) { - return enqueue(queue, asList(task)).get(0); + return enqueue(queue, ImmutableList.of(task)).get(0); } /** diff --git a/javatests/google/registry/backup/RestoreCommitLogsActionTest.java b/javatests/google/registry/backup/RestoreCommitLogsActionTest.java index acf91e035..20eb3e752 100644 --- a/javatests/google/registry/backup/RestoreCommitLogsActionTest.java +++ b/javatests/google/registry/backup/RestoreCommitLogsActionTest.java @@ -25,7 +25,6 @@ import static google.registry.backup.ExportCommitLogDiffAction.DIFF_FILE_PREFIX; import static google.registry.model.ofy.CommitLogBucket.getBucketIds; import static google.registry.model.ofy.CommitLogBucket.getBucketKey; import static google.registry.model.ofy.ObjectifyService.ofy; -import static java.util.Arrays.asList; import static org.joda.time.DateTimeZone.UTC; import com.google.appengine.api.datastore.DatastoreServiceFactory; @@ -135,7 +134,7 @@ public class RestoreCommitLogsActionTest { assertExpectedIds("previous to keep", "b", "d", "e", "f"); assertInDatastore(file1CommitLogs); assertInDatastore(file2CommitLogs); - assertInDatastore(asList(CommitLogCheckpointRoot.create(now))); + assertInDatastore(CommitLogCheckpointRoot.create(now)); assertCommitLogBuckets(ImmutableMap.of(1, now.minusMinutes(1), 2, now.minusMinutes(2))); } @@ -149,7 +148,7 @@ public class RestoreCommitLogsActionTest { ofy().clearSessionCache(); assertExpectedIds("previous to keep"); assertInDatastore(commitLogs); - assertInDatastore(asList(CommitLogCheckpointRoot.create(now))); + assertInDatastore(CommitLogCheckpointRoot.create(now)); assertCommitLogBuckets(ImmutableMap.of()); } @@ -168,7 +167,7 @@ public class RestoreCommitLogsActionTest { ofy().clearSessionCache(); assertExpectedIds("previous to keep", "a", "b"); assertInDatastore(commitLogs); - assertInDatastore(asList(CommitLogCheckpointRoot.create(now))); + assertInDatastore(CommitLogCheckpointRoot.create(now)); assertCommitLogBuckets(ImmutableMap.of(1, now)); } @@ -188,7 +187,7 @@ public class RestoreCommitLogsActionTest { ofy().clearSessionCache(); assertExpectedIds("previous to keep"); assertInDatastore(commitLogs); - assertInDatastore(asList(CommitLogCheckpointRoot.create(now))); + assertInDatastore(CommitLogCheckpointRoot.create(now)); assertCommitLogBuckets(ImmutableMap.of(1, now)); } @@ -205,7 +204,7 @@ public class RestoreCommitLogsActionTest { ofy().clearSessionCache(); assertExpectedIds("previous to keep"); assertInDatastore(commitLogs); - assertInDatastore(asList(CommitLogCheckpointRoot.create(now))); + assertInDatastore(CommitLogCheckpointRoot.create(now)); assertCommitLogBuckets(ImmutableMap.of(1, now)); } @@ -222,7 +221,7 @@ public class RestoreCommitLogsActionTest { ofy().clearSessionCache(); assertThat(ofy().load().entity(TestObject.create("existing")).now().getField()).isEqualTo("b"); assertInDatastore(commitLogs); - assertInDatastore(asList(CommitLogCheckpointRoot.create(now))); + assertInDatastore(CommitLogCheckpointRoot.create(now)); assertCommitLogBuckets(ImmutableMap.of(1, now)); } @@ -242,7 +241,7 @@ public class RestoreCommitLogsActionTest { assertExpectedIds("previous to keep"); assertInDatastore(commitLogs); assertCommitLogBuckets(ImmutableMap.of(1, now)); - assertInDatastore(asList(CommitLogCheckpointRoot.create(now))); + assertInDatastore(CommitLogCheckpointRoot.create(now)); } private CommitLogCheckpoint createCheckpoint(DateTime now) { @@ -280,6 +279,10 @@ public class RestoreCommitLogsActionTest { .containsExactly((Object[]) ids); } + private void assertInDatastore(ImmutableObject entity) { + assertThat(ofy().load().entity(entity).now()).isEqualTo(entity); + } + private void assertInDatastore(Iterable entities) { assertThat(ofy().load().entities(entities).values()).containsExactlyElementsIn(entities); } diff --git a/javatests/google/registry/export/datastore/OperationTest.java b/javatests/google/registry/export/datastore/OperationTest.java index 252b5dac3..43d20889e 100644 --- a/javatests/google/registry/export/datastore/OperationTest.java +++ b/javatests/google/registry/export/datastore/OperationTest.java @@ -24,7 +24,6 @@ import google.registry.export.datastore.Operation.Metadata; import google.registry.export.datastore.Operation.Progress; import google.registry.testing.FakeClock; import google.registry.testing.TestDataHelper; -import google.registry.util.Clock; import java.io.IOException; import org.joda.time.DateTime; import org.joda.time.Duration; @@ -91,8 +90,8 @@ public class OperationTest { Operation.OperationList operationList = loadJson("operation_list.json", Operation.OperationList.class); assertThat(operationList.toList()).hasSize(2); - Clock clock = new FakeClock(DateTime.parse("2018-10-29T16:01:04.645299Z")); - ((FakeClock) clock).advanceOneMilli(); + FakeClock clock = new FakeClock(DateTime.parse("2018-10-29T16:01:04.645299Z")); + clock.advanceOneMilli(); assertThat(operationList.toList().get(0).getRunningTime(clock)).isEqualTo(Duration.millis(1)); assertThat(operationList.toList().get(0).getProgress()) .isEqualTo("Progress: [51797/54513 entities]"); diff --git a/javatests/google/registry/export/sheet/SheetSynchronizerTest.java b/javatests/google/registry/export/sheet/SheetSynchronizerTest.java index 7eb2dc4f8..394553e89 100644 --- a/javatests/google/registry/export/sheet/SheetSynchronizerTest.java +++ b/javatests/google/registry/export/sheet/SheetSynchronizerTest.java @@ -84,9 +84,7 @@ public class SheetSynchronizerTest { // Explicitly constructs a List to avoid newArrayList typing to ArrayList private List createRow(Object... elements) { - List row = new ArrayList<>(); - row.addAll(Arrays.asList(elements)); - return row; + return new ArrayList<>(Arrays.asList(elements)); } @Test diff --git a/javatests/google/registry/flows/EppConsoleActionTest.java b/javatests/google/registry/flows/EppConsoleActionTest.java index cd44e6e8a..1ff177eb3 100644 --- a/javatests/google/registry/flows/EppConsoleActionTest.java +++ b/javatests/google/registry/flows/EppConsoleActionTest.java @@ -59,15 +59,15 @@ public class EppConsoleActionTest extends ShardableTestCase { ArgumentCaptor credentialsCaptor = ArgumentCaptor.forClass(TransportCredentials.class); ArgumentCaptor metadataCaptor = ArgumentCaptor.forClass(SessionMetadata.class); - verify(action.eppRequestHandler).executeEpp( - metadataCaptor.capture(), - credentialsCaptor.capture(), - eq(EppRequestSource.CONSOLE), - eq(false), - eq(false), - eq(INPUT_XML_BYTES)); - assertThat(((GaeUserCredentials) credentialsCaptor.getValue()).toString()) - .contains("user=TestUserId"); + verify(action.eppRequestHandler) + .executeEpp( + metadataCaptor.capture(), + credentialsCaptor.capture(), + eq(EppRequestSource.CONSOLE), + eq(false), + eq(false), + eq(INPUT_XML_BYTES)); + assertThat(credentialsCaptor.getValue().toString()).contains("user=TestUserId"); assertThat(metadataCaptor.getValue().getClientId()).isEqualTo("ClientIdentifier"); } } diff --git a/javatests/google/registry/flows/FlowTestCase.java b/javatests/google/registry/flows/FlowTestCase.java index 7913ee53b..b8f3cc625 100644 --- a/javatests/google/registry/flows/FlowTestCase.java +++ b/javatests/google/registry/flows/FlowTestCase.java @@ -30,7 +30,6 @@ import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.collect.ObjectArrays; import com.google.common.collect.Streams; @@ -173,29 +172,6 @@ public abstract class FlowTestCase extends ShardableTestCase { assertThat(ofy().load().type(HistoryEntry.class)).isEmpty(); } - public T getOnlyGlobalResource(Class clazz) { - return Iterables.getOnlyElement(ofy().load().type(clazz)); - } - - /** Helper to remove the grace period's billing event key to facilitate comparison. */ - /** A helper class that sets the billing event parent history entry to facilitate comparison. */ - public static class BillingEventParentSetter implements Function { - private HistoryEntry historyEntry; - - public static BillingEventParentSetter withParent(HistoryEntry historyEntry) { - BillingEventParentSetter instance = new BillingEventParentSetter(); - instance.historyEntry = historyEntry; - return instance; - } - - @Override - public BillingEvent apply(BillingEvent billingEvent) { - return billingEvent.asBuilder().setParent(historyEntry).build(); - } - - private BillingEventParentSetter() {} - } - /** * Helper to facilitate comparison of maps of GracePeriods to BillingEvents. This takes a map of * GracePeriods to BillingEvents and returns a map of the same entries that ignores the keys @@ -340,7 +316,7 @@ public abstract class FlowTestCase extends ShardableTestCase { String.format( "Invalid xml.\nExpected:\n%s\n\nActual:\n%s\n", xml, - marshal(output, ValidationMode.LENIENT)), + Arrays.toString(marshal(output, ValidationMode.LENIENT))), e); } // Clear the cache so that we don't see stale results in tests. diff --git a/javatests/google/registry/flows/domain/DomainDeleteFlowTest.java b/javatests/google/registry/flows/domain/DomainDeleteFlowTest.java index 9eaa22aee..24369c701 100644 --- a/javatests/google/registry/flows/domain/DomainDeleteFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainDeleteFlowTest.java @@ -762,12 +762,8 @@ public class DomainDeleteFlowTest extends ResourceFlowTestCaseof( - "com.google.appengine.api.users.UserService.user_id_key", userInfo.gaeUserId())) + .setEnvAttributes( + ImmutableMap.of( + "com.google.appengine.api.users.UserService.user_id_key", userInfo.gaeUserId())) .setEnvAuthDomain(userInfo.authDomain()) .setEnvEmail(userInfo.email()) .setEnvIsAdmin(userInfo.isAdmin()); diff --git a/javatests/google/registry/testing/FakeLockHandler.java b/javatests/google/registry/testing/FakeLockHandler.java index 44b11953a..cf42050d6 100644 --- a/javatests/google/registry/testing/FakeLockHandler.java +++ b/javatests/google/registry/testing/FakeLockHandler.java @@ -26,7 +26,7 @@ public class FakeLockHandler implements LockHandler { private static final long serialVersionUID = 6437880915118738492L; - boolean lockSucceeds = true; + boolean lockSucceeds; /** * @param lockSucceeds if true - the lock acquisition will succeed and the callable will be diff --git a/javatests/google/registry/tools/CreateTldCommandTest.java b/javatests/google/registry/tools/CreateTldCommandTest.java index e2ecb6764..856cdfcd4 100644 --- a/javatests/google/registry/tools/CreateTldCommandTest.java +++ b/javatests/google/registry/tools/CreateTldCommandTest.java @@ -23,6 +23,7 @@ import static google.registry.testing.DatastoreHelper.persistPremiumList; import static google.registry.testing.DatastoreHelper.persistReservedList; import static google.registry.testing.JUnitBackports.assertThrows; import static google.registry.util.DateTimeUtils.START_OF_TIME; +import static java.math.BigDecimal.ROUND_UNNECESSARY; import static org.joda.money.CurrencyUnit.JPY; import static org.joda.money.CurrencyUnit.USD; import static org.joda.time.DateTimeZone.UTC; @@ -135,7 +136,7 @@ public class CreateTldCommandTest extends CommandTestCase { Registry registry = Registry.get("xn--q9jyb4c"); assertThat(registry.getEapFeeFor(now.minusHours(1)).getCost()) - .isEqualTo(BigDecimal.ZERO.setScale(2)); + .isEqualTo(BigDecimal.ZERO.setScale(2, ROUND_UNNECESSARY)); assertThat(registry.getEapFeeFor(now.plusHours(1)).getCost()) .isEqualTo(new BigDecimal("50.00")); assertThat(registry.getEapFeeFor(now.plusDays(1).plusHours(1)).getCost()) diff --git a/javatests/google/registry/tools/EppToolVerifier.java b/javatests/google/registry/tools/EppToolVerifier.java index 03cfc5d08..65a18e262 100644 --- a/javatests/google/registry/tools/EppToolVerifier.java +++ b/javatests/google/registry/tools/EppToolVerifier.java @@ -36,10 +36,11 @@ import org.mockito.ArgumentCaptor; /** * Class for verifying EPP commands sent to the server via the tool endpoint. * - *

Provides its own (mock) {@link Connection} that will be monitored for EPP transmission. This - * Connection needs to be registered with the tool endpoint - something like this: + *

Provides its own (mock) {@link AppEngineConnection} that will be monitored for EPP + * transmission. This Connection needs to be registered with the tool endpoint - something like + * this: * - * 

   {@code
+ * 
{@code
  * SomeToolCommand command = ...;
  * EppToolVerifier eppToolVerifier = EppToolVerifier.create(command);
  * // run command...
diff --git a/javatests/google/registry/ui/server/registrar/RegistrarSettingsActionTest.java b/javatests/google/registry/ui/server/registrar/RegistrarSettingsActionTest.java
index 927c2400b..f573a7eac 100644
--- a/javatests/google/registry/ui/server/registrar/RegistrarSettingsActionTest.java
+++ b/javatests/google/registry/ui/server/registrar/RegistrarSettingsActionTest.java
@@ -20,7 +20,6 @@ import static google.registry.testing.DatastoreHelper.persistResource;
 import static google.registry.testing.TaskQueueHelper.assertNoTasksEnqueued;
 import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued;
 import static google.registry.testing.TestDataHelper.loadFile;
-import static java.util.Arrays.asList;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -108,7 +107,7 @@ public class RegistrarSettingsActionTest extends RegistrarSettingsActionTestCase
         .containsExactly(
             "status", "SUCCESS",
             "message", "Success",
-            "results", asList(loadRegistrar(CLIENT_ID).toJsonMap()));
+            "results", ImmutableList.of(loadRegistrar(CLIENT_ID).toJsonMap()));
     assertMetric(CLIENT_ID, "read", "[OWNER]", "SUCCESS");
   }
 
@@ -164,7 +163,7 @@ public class RegistrarSettingsActionTest extends RegistrarSettingsActionTestCase
     assertThat(response).containsExactly(
         "status", "SUCCESS",
         "message", "Saved TheRegistrar",
-        "results", asList(loadRegistrar(CLIENT_ID).toJsonMap()));
+        "results", ImmutableList.of(loadRegistrar(CLIENT_ID).toJsonMap()));
     assertMetric(CLIENT_ID, "update", "[OWNER]", "SUCCESS");
   }
 
@@ -285,7 +284,7 @@ public class RegistrarSettingsActionTest extends RegistrarSettingsActionTestCase
     // This role is authorized to perform this change, make sure the change succeeded
     // We got a success result:
     assertThat(response).containsEntry("status", "SUCCESS");
-    assertThat(response).containsEntry("results", asList(updatedRegistrar.toJsonMap()));
+    assertThat(response).containsEntry("results", ImmutableList.of(updatedRegistrar.toJsonMap()));
     // The updatedRegistrar had its value changed:
     // (We check it separately from the next assert to get better error message on failure)
     assertThat(getter.apply(updatedRegistrar)).isEqualTo(newValue);
@@ -467,7 +466,7 @@ public class RegistrarSettingsActionTest extends RegistrarSettingsActionTestCase
         .containsExactly(
             "status", "SUCCESS",
             "message", "Saved TheRegistrar",
-            "results", asList(loadRegistrar(CLIENT_ID).toJsonMap()));
+            "results", ImmutableList.of(loadRegistrar(CLIENT_ID).toJsonMap()));
     assertMetric(CLIENT_ID, "update", "[OWNER]", "SUCCESS");
   }
 
diff --git a/javatests/google/registry/ui/server/registrar/SecuritySettingsTest.java b/javatests/google/registry/ui/server/registrar/SecuritySettingsTest.java
index dd9ddd691..c10756115 100644
--- a/javatests/google/registry/ui/server/registrar/SecuritySettingsTest.java
+++ b/javatests/google/registry/ui/server/registrar/SecuritySettingsTest.java
@@ -22,8 +22,8 @@ import static google.registry.testing.CertificateSamples.SAMPLE_CERT_HASH;
 import static google.registry.testing.DatastoreHelper.loadRegistrar;
 import static google.registry.testing.DatastoreHelper.persistResource;
 import static google.registry.util.DateTimeUtils.START_OF_TIME;
-import static java.util.Arrays.asList;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import google.registry.model.registrar.Registrar;
 import java.util.Map;
@@ -52,7 +52,7 @@ public class SecuritySettingsTest extends RegistrarSettingsActionTestCase {
         "id", CLIENT_ID,
         "args", modified.toJsonMap()));
     assertThat(response).containsEntry("status", "SUCCESS");
-    assertThat(response).containsEntry("results", asList(modified.toJsonMap()));
+    assertThat(response).containsEntry("results", ImmutableList.of(modified.toJsonMap()));
     assertThat(loadRegistrar(CLIENT_ID)).isEqualTo(modified);
     assertMetric(CLIENT_ID, "update", "[OWNER]", "SUCCESS");
   }
diff --git a/javatests/google/registry/ui/server/registrar/WhoisSettingsTest.java b/javatests/google/registry/ui/server/registrar/WhoisSettingsTest.java
index 0632fc9bd..d66b8c33d 100644
--- a/javatests/google/registry/ui/server/registrar/WhoisSettingsTest.java
+++ b/javatests/google/registry/ui/server/registrar/WhoisSettingsTest.java
@@ -17,7 +17,6 @@ package google.registry.ui.server.registrar;
 import static com.google.common.base.Strings.repeat;
 import static com.google.common.truth.Truth.assertThat;
 import static google.registry.testing.DatastoreHelper.loadRegistrar;
-import static java.util.Arrays.asList;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -59,7 +58,7 @@ public class WhoisSettingsTest extends RegistrarSettingsActionTestCase {
         action.handleJsonRequest(
             ImmutableMap.of("op", "update", "id", CLIENT_ID, "args", modified.toJsonMap()));
     assertThat(response.get("status")).isEqualTo("SUCCESS");
-    assertThat(response.get("results")).isEqualTo(asList(modified.toJsonMap()));
+    assertThat(response.get("results")).isEqualTo(ImmutableList.of(modified.toJsonMap()));
     assertThat(loadRegistrar(CLIENT_ID)).isEqualTo(modified);
     assertMetric(CLIENT_ID, "update", "[OWNER]", "SUCCESS");
   }
diff --git a/javatests/google/registry/util/CidrAddressBlockTest.java b/javatests/google/registry/util/CidrAddressBlockTest.java
index 1f59ba87d..23f9a9985 100644
--- a/javatests/google/registry/util/CidrAddressBlockTest.java
+++ b/javatests/google/registry/util/CidrAddressBlockTest.java
@@ -67,8 +67,6 @@ public class CidrAddressBlockTest extends TestCase {
     assertEquals(32, b1.getNetmask());
     b1 = new CidrAddressBlock("2001:db8::1");
     assertEquals(128, b1.getNetmask());
-    b1 = new CidrAddressBlock("3ffe::/16");
-
     b1 = new CidrAddressBlock(InetAddresses.forString("5ffe::1"));
     assertEquals(128, b1.getNetmask());
     assertEquals("5ffe:0:0:0:0:0:0:1", b1.getIp());
diff --git a/javatests/google/registry/util/TeeOutputStreamTest.java b/javatests/google/registry/util/TeeOutputStreamTest.java
index 5551cc12c..ff3a70f70 100644
--- a/javatests/google/registry/util/TeeOutputStreamTest.java
+++ b/javatests/google/registry/util/TeeOutputStreamTest.java
@@ -19,6 +19,7 @@ import static google.registry.testing.JUnitBackports.assertThrows;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Arrays.asList;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
@@ -60,7 +61,7 @@ public class TeeOutputStreamTest {
 
   @Test
   public void testWriteInteger_failsAfterClose() throws Exception {
-    OutputStream tee = new TeeOutputStream(asList(outputA));
+    OutputStream tee = new TeeOutputStream(ImmutableList.of(outputA));
     tee.close();
     IllegalStateException thrown = assertThrows(IllegalStateException.class, () -> tee.write(1));
     assertThat(thrown).hasMessageThat().contains("outputstream closed");
@@ -68,7 +69,7 @@ public class TeeOutputStreamTest {
 
   @Test
   public void testWriteByteArray_failsAfterClose() throws Exception {
-    OutputStream tee = new TeeOutputStream(asList(outputA));
+    OutputStream tee = new TeeOutputStream(ImmutableList.of(outputA));
     tee.close();
     IllegalStateException thrown =
         assertThrows(IllegalStateException.class, () -> tee.write("hello".getBytes(UTF_8)));
@@ -77,7 +78,7 @@ public class TeeOutputStreamTest {
 
   @Test
   public void testWriteByteSubarray_failsAfterClose() throws Exception {
-    OutputStream tee = new TeeOutputStream(asList(outputA));
+    OutputStream tee = new TeeOutputStream(ImmutableList.of(outputA));
     tee.close();
     IllegalStateException thrown =
         assertThrows(IllegalStateException.class, () -> tee.write("hello".getBytes(UTF_8), 1, 3));
diff --git a/javatests/google/registry/xml/XmlTestUtils.java b/javatests/google/registry/xml/XmlTestUtils.java
index f677d5d9c..139336c1f 100644
--- a/javatests/google/registry/xml/XmlTestUtils.java
+++ b/javatests/google/registry/xml/XmlTestUtils.java
@@ -139,8 +139,7 @@ public class XmlTestUtils {
         }
         // First, handle all namespace specifications, updating our ns-to-URI map. Use a HashMap
         // rather than an ImmutableMap.Builder so that we can override existing map entries.
-        HashMap newNsMap = new HashMap<>();
-        newNsMap.putAll(nsMap);
+        HashMap newNsMap = new HashMap<>(nsMap);
         for (String key : namespacesBuilder.build()) {
           // Parse the attribute name, of the form xmlns:nsid, and extract the namespace identifier.
           // If there's no colon, we are setting the default namespace.