zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-08-17 15:04:06 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove a couple unnecessary inner transact() calls (#2124)

Browse source 
Also refactors a function to no longer unnecessarily return a low level Iterable
type.
This commit is contained in:
Ben McIlwain 2023-08-24 18:10:44 -04:00 • committed by GitHub
parent 7624826a09
commit 0695b23932
3 changed files with 28 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/src/main/java/google/registry/beam/rde/RdeIO.java
View file

@ -274,10 +274,7 @@ public class RdeIO {
PendingDeposit key = input.getKey(); PendingDeposit key = input.getKey();
Tld tld = Tld.get(key.tld()); Tld tld = Tld.get(key.tld());
Optional<Cursor> cursor = Optional<Cursor> cursor =
tm().transact( tm().loadByKeyIfPresent(Cursor.createScopedVKey(key.cursor(), tld));
() ->
tm().loadByKeyIfPresent(
Cursor.createScopedVKey(key.cursor(), tld)));
DateTime position = getCursorTimeOrStartOfTime(cursor); DateTime position = getCursorTimeOrStartOfTime(cursor);
checkState(key.interval() != null, "Interval must be present"); checkState(key.interval() != null, "Interval must be present");
DateTime newPosition = key.watermark().plus(key.interval()); DateTime newPosition = key.watermark().plus(key.interval());

13
core/src/main/java/google/registry/model/registrar/Registrar.java
View file

@ -19,7 +19,6 @@ import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Strings.emptyToNull; import static com.google.common.base.Strings.emptyToNull;
import static com.google.common.base.Strings.nullToEmpty; import static com.google.common.base.Strings.nullToEmpty;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableSet.toImmutableSet; import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static com.google.common.collect.ImmutableSortedSet.toImmutableSortedSet; import static com.google.common.collect.ImmutableSortedSet.toImmutableSortedSet;
import static com.google.common.collect.Sets.immutableEnumSet; import static com.google.common.collect.Sets.immutableEnumSet;
@ -49,7 +48,6 @@ import com.google.common.collect.ImmutableSortedSet;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.collect.Range; import com.google.common.collect.Range;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.google.common.collect.Streams;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import com.google.re2j.Pattern; import com.google.re2j.Pattern;
import google.registry.model.Buildable; import google.registry.model.Buildable;
@ -556,7 +554,7 @@ public class Registrar extends UpdateAutoTimestampEntity implements Buildable, J
* address. * address.
*/ */
public ImmutableSortedSet<RegistrarPoc> getContacts() { public ImmutableSortedSet<RegistrarPoc> getContacts() {
return Streams.stream(getContactsIterable()) return getContactPocs().stream()
.filter(Objects::nonNull) .filter(Objects::nonNull)
.collect(toImmutableSortedSet(CONTACT_EMAIL_COMPARATOR)); .collect(toImmutableSortedSet(CONTACT_EMAIL_COMPARATOR));
} }
@ -566,7 +564,7 @@ public class Registrar extends UpdateAutoTimestampEntity implements Buildable, J
* their email address. * their email address.
*/ */
public ImmutableSortedSet<RegistrarPoc> getContactsOfType(final RegistrarPoc.Type type) { public ImmutableSortedSet<RegistrarPoc> getContactsOfType(final RegistrarPoc.Type type) {
return Streams.stream(getContactsIterable()) return getContactPocs().stream()
.filter(Objects::nonNull) .filter(Objects::nonNull)
.filter((@Nullable RegistrarPoc contact) -> contact.getTypes().contains(type)) .filter((@Nullable RegistrarPoc contact) -> contact.getTypes().contains(type))
.collect(toImmutableSortedSet(CONTACT_EMAIL_COMPARATOR)); .collect(toImmutableSortedSet(CONTACT_EMAIL_COMPARATOR));
@ -580,13 +578,13 @@ public class Registrar extends UpdateAutoTimestampEntity implements Buildable, J
return getContacts().stream().filter(RegistrarPoc::getVisibleInDomainWhoisAsAbuse).findFirst(); return getContacts().stream().filter(RegistrarPoc::getVisibleInDomainWhoisAsAbuse).findFirst();
} }
private Iterable<RegistrarPoc> getContactsIterable() { private ImmutableSet<RegistrarPoc> getContactPocs() {
return tm().transact( return tm().transact(
() -> () ->
tm().query("FROM RegistrarPoc WHERE registrarId = :registrarId", RegistrarPoc.class) tm().query("FROM RegistrarPoc WHERE registrarId = :registrarId", RegistrarPoc.class)
.setParameter("registrarId", registrarId) .setParameter("registrarId", registrarId)
.getResultStream() .getResultStream()
.collect(toImmutableList())); .collect(toImmutableSet()));
} }
@Override @Override
@ -732,8 +730,7 @@ public class Registrar extends UpdateAutoTimestampEntity implements Buildable, J
.map(Tld::createVKey) .map(Tld::createVKey)
.collect(toImmutableSet()); .collect(toImmutableSet());
Set<VKey<Tld>> missingTldKeys = Set<VKey<Tld>> missingTldKeys =
Sets.difference( Sets.difference(newTldKeys, tm().loadByKeysIfPresent(newTldKeys).keySet());
newTldKeys, tm().transact(() -> tm().loadByKeysIfPresent(newTldKeys)).keySet());
checkArgument(missingTldKeys.isEmpty(), "Trying to set nonexistent TLDs: %s", missingTldKeys); checkArgument(missingTldKeys.isEmpty(), "Trying to set nonexistent TLDs: %s", missingTldKeys);
getInstance().allowedTlds = ImmutableSortedSet.copyOf(allowedTlds); getInstance().allowedTlds = ImmutableSortedSet.copyOf(allowedTlds);
return this; return this;

35
core/src/test/java/google/registry/model/registrar/RegistrarTest.java
View file

@ -507,11 +507,14 @@ class RegistrarTest extends EntityTestCase {
@Test @Test
void testSuccess_setAllowedTldsUncached() { void testSuccess_setAllowedTldsUncached() {
assertThat( assertThat(
registrar tm().transact(
.asBuilder() () -> {
.setAllowedTldsUncached(ImmutableSet.of("xn--q9jyb4c")) return registrar
.build() .asBuilder()
.getAllowedTlds()) .setAllowedTldsUncached(ImmutableSet.of("xn--q9jyb4c"))
.build()
.getAllowedTlds();
}))
.containsExactly("xn--q9jyb4c"); .containsExactly("xn--q9jyb4c");
} }
@ -524,9 +527,12 @@ class RegistrarTest extends EntityTestCase {
@Test @Test
void testFailure_setAllowedTldsUncached_nonexistentTld() { void testFailure_setAllowedTldsUncached_nonexistentTld() {
assertThrows( tm().transact(
IllegalArgumentException.class, () -> {
() -> registrar.asBuilder().setAllowedTldsUncached(ImmutableSet.of("bad"))); assertThrows(
IllegalArgumentException.class,
() -> registrar.asBuilder().setAllowedTldsUncached(ImmutableSet.of("bad")));
});
} }
@Test @Test
@ -614,11 +620,14 @@ class RegistrarTest extends EntityTestCase {
// Test that the uncached version works // Test that the uncached version works
assertThat( assertThat(
registrar tm().transact(
.asBuilder() () -> {
.setAllowedTldsUncached(ImmutableSet.of("newtld")) return registrar
.build() .asBuilder()
.getAllowedTlds()) .setAllowedTldsUncached(ImmutableSet.of("newtld"))
.build()
.getAllowedTlds();
}))
.containsExactly("newtld"); .containsExactly("newtld");
// Test that the "regular" cached version fails. If this doesn't throw - then we changed how // Test that the "regular" cached version fails. If this doesn't throw - then we changed how