From e56e75165246e1df98c09bab03cf37d7d1ed265e Mon Sep 17 00:00:00 2001 From: Ben McIlwain Date: Tue, 9 Jan 2024 13:15:54 -0500 Subject: [PATCH] Fix build warnings (#2274) All of these were causing warnings to appear during a build of the codebase. --- core/src/main/java/google/registry/bsa/BsaRefreshAction.java | 2 +- .../java/google/registry/bsa/api/UnblockableDomainChange.java | 4 ++-- .../java/google/registry/flows/domain/DomainFlowUtils.java | 2 -- .../main/java/google/registry/request/UrlConnectionUtils.java | 2 +- core/src/test/java/google/registry/model/tld/TldsTest.java | 4 ++-- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/google/registry/bsa/BsaRefreshAction.java b/core/src/main/java/google/registry/bsa/BsaRefreshAction.java index 062dd587a..39adc5bc1 100644 --- a/core/src/main/java/google/registry/bsa/BsaRefreshAction.java +++ b/core/src/main/java/google/registry/bsa/BsaRefreshAction.java @@ -153,7 +153,7 @@ public class BsaRefreshAction implements Runnable { Optional report = JsonSerializations.toUnblockableDomainsReport( changes - .filter(UnblockableDomainChange::AddOrChange) + .filter(UnblockableDomainChange::isAddOrChange) .map(UnblockableDomainChange::newValue)); if (report.isPresent()) { gcsClient.logRemovedUnblockableDomainsReport( diff --git a/core/src/main/java/google/registry/bsa/api/UnblockableDomainChange.java b/core/src/main/java/google/registry/bsa/api/UnblockableDomainChange.java index 9b5aafa78..61c519cd9 100644 --- a/core/src/main/java/google/registry/bsa/api/UnblockableDomainChange.java +++ b/core/src/main/java/google/registry/bsa/api/UnblockableDomainChange.java @@ -52,12 +52,12 @@ public abstract class UnblockableDomainChange { return UnblockableDomain.of(unblockable().domainName(), newReason().get()); } - public boolean AddOrChange() { + public boolean isAddOrChange() { return newReason().isPresent(); } public boolean isDelete() { - return !this.AddOrChange(); + return !this.isAddOrChange(); } public boolean isNew() { diff --git a/core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java b/core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java index f6443a255..8de74a0e6 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java +++ b/core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java @@ -264,8 +264,6 @@ public class DomainFlowUtils { /** * Verifies that the {@code domainLabel} is not blocked by any BSA block label for the given * {@code tld} at the specified time. - * - * @throws DomainLabelBlockedByBsaException */ public static void verifyNotBlockedByBsa(String domainLabel, Tld tld, DateTime now) throws DomainLabelBlockedByBsaException { diff --git a/core/src/main/java/google/registry/request/UrlConnectionUtils.java b/core/src/main/java/google/registry/request/UrlConnectionUtils.java index fa14dd342..bd04a6391 100644 --- a/core/src/main/java/google/registry/request/UrlConnectionUtils.java +++ b/core/src/main/java/google/registry/request/UrlConnectionUtils.java @@ -68,7 +68,7 @@ public final class UrlConnectionUtils { /** Checks whether {@code bytes} are GZIP encoded. */ public static boolean isGZipped(byte[] bytes) { // See GzipOutputStream.writeHeader() - return (bytes.length > 2 && bytes[0] == (byte) (GZIPInputStream.GZIP_MAGIC)) + return (bytes.length > 2 && bytes[0] == (byte) GZIPInputStream.GZIP_MAGIC) && (bytes[1] == (byte) (GZIPInputStream.GZIP_MAGIC >> 8)); } diff --git a/core/src/test/java/google/registry/model/tld/TldsTest.java b/core/src/test/java/google/registry/model/tld/TldsTest.java index 03ae5f918..70e692336 100644 --- a/core/src/test/java/google/registry/model/tld/TldsTest.java +++ b/core/src/test/java/google/registry/model/tld/TldsTest.java @@ -120,7 +120,7 @@ class TldsTest { Tld.get("foo") .asBuilder() .setTldType(TldType.TEST) - .setBsaEnrollStartTime(Optional.of(fakeClock.nowUtc().minus(1))) + .setBsaEnrollStartTime(Optional.of(fakeClock.nowUtc().minusMillis(1))) .build()); assertThat(hasActiveBsaEnrollment(fakeClock.nowUtc())).isFalse(); } @@ -131,7 +131,7 @@ class TldsTest { persistResource( Tld.get("foo") .asBuilder() - .setBsaEnrollStartTime(Optional.of(fakeClock.nowUtc().minus(1))) + .setBsaEnrollStartTime(Optional.of(fakeClock.nowUtc().minusMillis(1))) .build()); assertThat(hasActiveBsaEnrollment(fakeClock.nowUtc())).isTrue(); }