diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 48859acb1..48f227839 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
strategy:
matrix:
- java-version: [8, 11, 17]
+ java-version: [8, 11, 17, 21, 25]
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 907223c5c..ab7d6174d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -233,13 +233,13 @@ mvn javadoc:javadoc
This will generate the API docs, and place them in the `target/site/apidocs` directory.
To generate API docs for only the public APIs (i.e. ones that are not marked with `@hide` tags),
-you need to trigger the `devsite-apidocs` Maven profile. This profile uses Maven Javadoc plugin
-with [Doclava](https://code.google.com/archive/p/doclava/), which honors the `@hide` tags in
-source code. Dovlava also accepts a set of [Clearsilver](http://www.clearsilver.net/) templates as
-a parameter. You can trigger this Maven profile by running the following command:
+you need to trigger the `devsite-apidocs` Maven profile on JDK 17 or higher. This profile uses the
+Maven Javadoc plugin with a JDK 17+ compatible Doclava doclet JAR, which honors the `@hide` tags in
+source code and accepts a set of [Clearsilver](http://www.clearsilver.net/) templates as a
+parameter. You can trigger this Maven profile by running the following command:
```
-mvn site -Ddevsite.template=path/to/templates/directory/
+mvn site -Ddevsite.template=path/to/templates/directory/ -Ddoclava.jar=path/to/doclet_jdk17.jar
```
This command will place the generated API docs in the `target/apidocs` directory.
diff --git a/checkstyle.xml b/checkstyle.xml
index c2a35946a..9ef7676e4 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -43,14 +43,30 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
@@ -64,11 +80,6 @@
-
-
-
-
@@ -78,22 +89,26 @@
value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
-
-
-
+
+ value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_DO"/>
+ value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT"/>
+
+
+
+
+
@@ -186,7 +201,9 @@
-
+
+
+
@@ -221,17 +238,10 @@
value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
-
+
-
-
-
-
-
-
-
diff --git a/pom.xml b/pom.xml
index 7bf8ae3db..20ebfc6ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,13 +94,12 @@
-
- com.google.doclava
- doclava
- 1.0.6
-
+ ${doclava.jar}
com.google.doclava.Doclava
- ${sun.boot.class.path}
+
+
+ **/*.java
+
com.google.j2objc
@@ -111,15 +110,24 @@
-hdf book.path /docs/reference/_book.yaml
-hdf project.path /_project.yaml
- -hdf devsite.path /docs/reference/admin/java/reference/
+ -hdf devsite.path /docs/reference/admin/java/
-d ${project.build.directory}/apidocs
-templatedir ${devsite.template}
- -toroot /docs/reference/admin/java/reference/
+ -toroot /docs/reference/admin/java/
-yaml _toc.yaml
-warning 101
false
- -J-Xmx1024m
+ true
+
+ -J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
+ -J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
+ -J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+ -J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
+ -J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+ -J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+ -J--add-exports=jdk.javadoc/jdk.javadoc.internal.tool=ALL-UNNAMED
+
none
@@ -136,8 +144,7 @@
-
-
+
@@ -246,14 +253,14 @@
maven-checkstyle-plugin
- 2.17
+ 3.6.0
validate
validate
checkstyle.xml
- UTF-8
+ UTF-8
true
true
true
@@ -309,13 +316,13 @@
-
- com.google.doclava
- doclava
- 1.0.6
-
- com.google.doclava.Doclava
- ${sun.boot.class.path}
+ *.internal:com.google.firebase.database.annotations:com.google.firebase.database.collection:com.google.firebase.database.connection:com.google.firebase.database.connection.*:com.google.firebase.database.core:com.google.firebase.database.core.*:com.google.firebase.database.snapshot:com.google.firebase.database.util:com.google.firebase.database.utilities:com.google.firebase.database.utilities.*
+
+
+ hide
+ X
+
+
com.google.j2objc
@@ -323,10 +330,6 @@
1.3
-
- -warning 101
-
- false
-J-Xmx1024m
none
diff --git a/src/main/java/com/google/firebase/auth/AbstractFirebaseAuth.java b/src/main/java/com/google/firebase/auth/AbstractFirebaseAuth.java
index 44fe9b7d2..24dc8bb67 100644
--- a/src/main/java/com/google/firebase/auth/AbstractFirebaseAuth.java
+++ b/src/main/java/com/google/firebase/auth/AbstractFirebaseAuth.java
@@ -1448,13 +1448,13 @@ public ApiFuture> listOidcProviderCo
final DefaultOidcProviderConfigSource source = new DefaultOidcProviderConfigSource(userManager);
final ListProviderConfigsPage.Factory factory =
new ListProviderConfigsPage.Factory(source, maxResults, pageToken);
- return
- new CallableOperation, FirebaseAuthException>() {
- @Override
- protected ListProviderConfigsPage execute()
- throws FirebaseAuthException {
- return factory.create();
- }
+ return new CallableOperation<
+ ListProviderConfigsPage, FirebaseAuthException>() {
+ @Override
+ protected ListProviderConfigsPage execute()
+ throws FirebaseAuthException {
+ return factory.create();
+ }
};
}
@@ -1706,13 +1706,13 @@ public ApiFuture> listSamlProviderCo
final DefaultSamlProviderConfigSource source = new DefaultSamlProviderConfigSource(userManager);
final ListProviderConfigsPage.Factory factory =
new ListProviderConfigsPage.Factory(source, maxResults, pageToken);
- return
- new CallableOperation, FirebaseAuthException>() {
- @Override
- protected ListProviderConfigsPage execute()
- throws FirebaseAuthException {
- return factory.create();
- }
+ return new CallableOperation<
+ ListProviderConfigsPage, FirebaseAuthException>() {
+ @Override
+ protected ListProviderConfigsPage execute()
+ throws FirebaseAuthException {
+ return factory.create();
+ }
};
}
diff --git a/src/main/java/com/google/firebase/auth/EmailIdentifier.java b/src/main/java/com/google/firebase/auth/EmailIdentifier.java
index 2786d5117..fbb0877cd 100644
--- a/src/main/java/com/google/firebase/auth/EmailIdentifier.java
+++ b/src/main/java/com/google/firebase/auth/EmailIdentifier.java
@@ -22,7 +22,7 @@
/**
* Used for looking up an account by email.
*
- * @see {FirebaseAuth#getUsers}
+ * @see FirebaseAuth#getUsers
*/
public final class EmailIdentifier extends UserIdentifier {
private final String email;
diff --git a/src/main/java/com/google/firebase/auth/ListProviderConfigsPage.java b/src/main/java/com/google/firebase/auth/ListProviderConfigsPage.java
index 0e35337a9..c6313b020 100644
--- a/src/main/java/com/google/firebase/auth/ListProviderConfigsPage.java
+++ b/src/main/java/com/google/firebase/auth/ListProviderConfigsPage.java
@@ -196,7 +196,7 @@ private void setCurrentPage(ListProviderConfigsPage page) {
interface ProviderConfigSource {
@NonNull
ListProviderConfigsResponse fetch(int maxResults, String pageToken)
- throws FirebaseAuthException;
+ throws FirebaseAuthException;
}
static class DefaultOidcProviderConfigSource implements ProviderConfigSource {
diff --git a/src/main/java/com/google/firebase/auth/PhoneIdentifier.java b/src/main/java/com/google/firebase/auth/PhoneIdentifier.java
index f387a8abd..a0eb330b6 100644
--- a/src/main/java/com/google/firebase/auth/PhoneIdentifier.java
+++ b/src/main/java/com/google/firebase/auth/PhoneIdentifier.java
@@ -22,7 +22,7 @@
/**
* Used for looking up an account by phone number.
*
- * @see {FirebaseAuth#getUsers}
+ * @see FirebaseAuth#getUsers
*/
public final class PhoneIdentifier extends UserIdentifier {
private final String phoneNumber;
diff --git a/src/main/java/com/google/firebase/auth/ProviderIdentifier.java b/src/main/java/com/google/firebase/auth/ProviderIdentifier.java
index cb44e0c0a..0c2cfb6aa 100644
--- a/src/main/java/com/google/firebase/auth/ProviderIdentifier.java
+++ b/src/main/java/com/google/firebase/auth/ProviderIdentifier.java
@@ -22,7 +22,7 @@
/**
* Used for looking up an account by provider.
*
- * @see {FirebaseAuth#getUsers}
+ * @see FirebaseAuth#getUsers
*/
public final class ProviderIdentifier extends UserIdentifier {
private final String providerId;
diff --git a/src/main/java/com/google/firebase/auth/UidIdentifier.java b/src/main/java/com/google/firebase/auth/UidIdentifier.java
index 1819c11d3..b448cd6d1 100644
--- a/src/main/java/com/google/firebase/auth/UidIdentifier.java
+++ b/src/main/java/com/google/firebase/auth/UidIdentifier.java
@@ -22,7 +22,7 @@
/**
* Used for looking up an account by uid.
*
- * @see {FirebaseAuth#getUsers}
+ * @see FirebaseAuth#getUsers
*/
public final class UidIdentifier extends UserIdentifier {
private final String uid;
diff --git a/src/main/java/com/google/firebase/auth/multitenancy/ListTenantsPage.java b/src/main/java/com/google/firebase/auth/multitenancy/ListTenantsPage.java
index 5f9917bce..81fb00381 100644
--- a/src/main/java/com/google/firebase/auth/multitenancy/ListTenantsPage.java
+++ b/src/main/java/com/google/firebase/auth/multitenancy/ListTenantsPage.java
@@ -192,7 +192,7 @@ private void setCurrentPage(ListTenantsPage page) {
interface TenantSource {
@NonNull
ListTenantsResponse fetch(int maxResults, String pageToken)
- throws FirebaseAuthException;
+ throws FirebaseAuthException;
}
static class DefaultTenantSource implements TenantSource {
diff --git a/src/main/java/com/google/firebase/database/core/Repo.java b/src/main/java/com/google/firebase/database/core/Repo.java
index 0850cca5a..845c70624 100644
--- a/src/main/java/com/google/firebase/database/core/Repo.java
+++ b/src/main/java/com/google/firebase/database/core/Repo.java
@@ -648,16 +648,16 @@ public void startTransaction(Path path, final Transaction.Handler handler, boole
DatabaseReference watchRef = InternalHelpers.createReference(this, path);
ValueEventListener listener =
new ValueEventListener() {
- @Override
- public void onDataChange(DataSnapshot snapshot) {
- // No-op. We don't care, this is just to make sure we have a listener outstanding
- }
+ @Override
+ public void onDataChange(DataSnapshot snapshot) {
+ // No-op. We don't care, this is just to make sure we have a listener outstanding
+ }
- @Override
- public void onCancelled(DatabaseError error) {
- // Also a no-op? We'll cancel the transaction in this case
- }
- };
+ @Override
+ public void onCancelled(DatabaseError error) {
+ // Also a no-op? We'll cancel the transaction in this case
+ }
+ };
addEventCallback(new ValueEventRegistration(this, listener, watchRef.getSpec()));
TransactionData transaction =
diff --git a/src/main/java/com/google/firebase/database/core/view/ViewProcessor.java b/src/main/java/com/google/firebase/database/core/view/ViewProcessor.java
index 3b3aedaff..db2c7c2b9 100644
--- a/src/main/java/com/google/firebase/database/core/view/ViewProcessor.java
+++ b/src/main/java/com/google/firebase/database/core/view/ViewProcessor.java
@@ -44,16 +44,16 @@ public class ViewProcessor {
/** An implementation of CompleteChildSource that never returns any additional children */
private static final NodeFilter.CompleteChildSource NO_COMPLETE_SOURCE =
new NodeFilter.CompleteChildSource() {
- @Override
- public Node getCompleteChild(ChildKey childKey) {
- return null;
- }
+ @Override
+ public Node getCompleteChild(ChildKey childKey) {
+ return null;
+ }
- @Override
- public NamedNode getChildAfterChild(Index index, NamedNode child, boolean reverse) {
- return null;
- }
- };
+ @Override
+ public NamedNode getChildAfterChild(Index index, NamedNode child, boolean reverse) {
+ return null;
+ }
+ };
private final NodeFilter filter;
@@ -73,8 +73,7 @@ public ProcessorResult applyOperation(
ChildChangeAccumulator accumulator = new ChildChangeAccumulator();
ViewCache newViewCache;
switch (operation.getType()) {
- case Overwrite:
- {
+ case Overwrite: {
Overwrite overwrite = (Overwrite) operation;
if (overwrite.getSource().isFromUser()) {
newViewCache =
@@ -108,8 +107,7 @@ public ProcessorResult applyOperation(
}
break;
}
- case Merge:
- {
+ case Merge: {
Merge merge = (Merge) operation;
if (merge.getSource().isFromUser()) {
newViewCache =
@@ -138,8 +136,7 @@ public ProcessorResult applyOperation(
}
break;
}
- case AckUserWrite:
- {
+ case AckUserWrite: {
AckUserWrite ackUserWrite = (AckUserWrite) operation;
if (!ackUserWrite.isRevert()) {
newViewCache =
@@ -161,14 +158,12 @@ public ProcessorResult applyOperation(
}
break;
}
- case ListenComplete:
- {
+ case ListenComplete: {
newViewCache =
this.listenComplete(oldViewCache, operation.getPath(), writesCache, accumulator);
break;
}
- default:
- {
+ default: {
throw new AssertionError("Unknown operation: " + operation.getType());
}
}
diff --git a/src/main/java/com/google/firebase/messaging/FirebaseMessaging.java b/src/main/java/com/google/firebase/messaging/FirebaseMessaging.java
index b38e8d827..6f0daafe8 100644
--- a/src/main/java/com/google/firebase/messaging/FirebaseMessaging.java
+++ b/src/main/java/com/google/firebase/messaging/FirebaseMessaging.java
@@ -310,7 +310,7 @@ public BatchResponse sendEachForMulticast(
* no failures are only indicated by a {@link BatchResponse}.
*/
public BatchResponse sendEachForMulticast(@NonNull MulticastMessage message, boolean dryRun)
- throws FirebaseMessagingException {
+ throws FirebaseMessagingException {
checkNotNull(message, "multicast message must not be null");
return sendEach(message.getMessageList(), dryRun);
}
diff --git a/src/main/java/com/google/firebase/remoteconfig/ServerTemplate.java b/src/main/java/com/google/firebase/remoteconfig/ServerTemplate.java
index bd1a59940..faf55e0bf 100644
--- a/src/main/java/com/google/firebase/remoteconfig/ServerTemplate.java
+++ b/src/main/java/com/google/firebase/remoteconfig/ServerTemplate.java
@@ -24,21 +24,24 @@ public interface Builder {
Builder defaultConfig(KeysAndValues config);
Builder cachedTemplate(String templateJson);
-
+
ServerTemplate build();
}
+
/**
- * Process the template data with a condition evaluator
- * based on the provided context.
- */
+ * Process the template data with a condition evaluator
+ * based on the provided context.
+ */
ServerConfig evaluate(KeysAndValues context) throws FirebaseRemoteConfigException;
+
/**
- * Process the template data without context.
- */
+ * Process the template data without context.
+ */
ServerConfig evaluate() throws FirebaseRemoteConfigException;
+
/**
- * Fetches and caches the current active version of the project.
- */
+ * Fetches and caches the current active version of the project.
+ */
ApiFuture load() throws FirebaseRemoteConfigException;
String toJson();
diff --git a/src/test/java/com/google/firebase/auth/OidcProviderConfigTest.java b/src/test/java/com/google/firebase/auth/OidcProviderConfigTest.java
index 43bbc275c..37c6edbfd 100644
--- a/src/test/java/com/google/firebase/auth/OidcProviderConfigTest.java
+++ b/src/test/java/com/google/firebase/auth/OidcProviderConfigTest.java
@@ -93,14 +93,14 @@ public void testEnsureResponseTypeAlreadyPresent() {
public void testCreateRequest() throws IOException {
OidcProviderConfig.CreateRequest createRequest = new OidcProviderConfig.CreateRequest();
createRequest
- .setProviderId("oidc.provider-id")
- .setDisplayName("DISPLAY_NAME")
- .setEnabled(false)
- .setClientId("CLIENT_ID")
- .setClientSecret("CLIENT_SECRET")
- .setIssuer("https://oidc.com/issuer")
- .setCodeResponseType(true)
- .setIdTokenResponseType(false);
+ .setProviderId("oidc.provider-id")
+ .setDisplayName("DISPLAY_NAME")
+ .setEnabled(false)
+ .setClientId("CLIENT_ID")
+ .setClientSecret("CLIENT_SECRET")
+ .setIssuer("https://oidc.com/issuer")
+ .setCodeResponseType(true)
+ .setIdTokenResponseType(false);
assertEquals("oidc.provider-id", createRequest.getProviderId());
Map properties = createRequest.getProperties();
@@ -189,13 +189,13 @@ public void testUpdateRequest() throws IOException {
OidcProviderConfig.UpdateRequest updateRequest =
new OidcProviderConfig.UpdateRequest("oidc.provider-id");
updateRequest
- .setDisplayName("DISPLAY_NAME")
- .setEnabled(false)
- .setClientId("CLIENT_ID")
- .setClientSecret("CLIENT_SECRET")
- .setIssuer("https://oidc.com/issuer")
- .setCodeResponseType(true)
- .setIdTokenResponseType(false);
+ .setDisplayName("DISPLAY_NAME")
+ .setEnabled(false)
+ .setClientId("CLIENT_ID")
+ .setClientSecret("CLIENT_SECRET")
+ .setIssuer("https://oidc.com/issuer")
+ .setCodeResponseType(true)
+ .setIdTokenResponseType(false);
assertEquals("oidc.provider-id", updateRequest.getProviderId());
Map properties = updateRequest.getProperties();
diff --git a/src/test/java/com/google/firebase/auth/SamlProviderConfigTest.java b/src/test/java/com/google/firebase/auth/SamlProviderConfigTest.java
index a21d09d39..15f586d16 100644
--- a/src/test/java/com/google/firebase/auth/SamlProviderConfigTest.java
+++ b/src/test/java/com/google/firebase/auth/SamlProviderConfigTest.java
@@ -223,14 +223,14 @@ public void testUpdateRequest() throws IOException {
SamlProviderConfig.UpdateRequest updateRequest =
new SamlProviderConfig.UpdateRequest("saml.provider-id");
updateRequest
- .setDisplayName("DISPLAY_NAME")
- .setEnabled(false)
- .setIdpEntityId("IDP_ENTITY_ID")
- .setSsoUrl("https://example.com/login")
- .addX509Certificate("certificate1")
- .addX509Certificate("certificate2")
- .setRpEntityId("RP_ENTITY_ID")
- .setCallbackUrl("https://projectId.firebaseapp.com/__/auth/handler");
+ .setDisplayName("DISPLAY_NAME")
+ .setEnabled(false)
+ .setIdpEntityId("IDP_ENTITY_ID")
+ .setSsoUrl("https://example.com/login")
+ .addX509Certificate("certificate1")
+ .addX509Certificate("certificate2")
+ .setRpEntityId("RP_ENTITY_ID")
+ .setCallbackUrl("https://projectId.firebaseapp.com/__/auth/handler");
Map properties = updateRequest.getProperties();
assertEquals(4, properties.size());
@@ -260,9 +260,9 @@ public void testUpdateRequestX509Certificates() throws IOException {
SamlProviderConfig.UpdateRequest updateRequest =
new SamlProviderConfig.UpdateRequest("saml.provider-id");
updateRequest
- .addX509Certificate("certificate1")
- .addAllX509Certificates(ImmutableList.of("certificate2", "certificate3"))
- .addX509Certificate("certificate4");
+ .addX509Certificate("certificate1")
+ .addAllX509Certificates(ImmutableList.of("certificate2", "certificate3"))
+ .addX509Certificate("certificate4");
Map properties = updateRequest.getProperties();
assertEquals(1, properties.size());
diff --git a/src/test/java/com/google/firebase/auth/multitenancy/TenantTest.java b/src/test/java/com/google/firebase/auth/multitenancy/TenantTest.java
index 21e8b8984..acfce9b2b 100644
--- a/src/test/java/com/google/firebase/auth/multitenancy/TenantTest.java
+++ b/src/test/java/com/google/firebase/auth/multitenancy/TenantTest.java
@@ -66,9 +66,9 @@ public void testUpdateRequestFromTenant() throws IOException {
public void testUpdateRequestFromTenantId() throws IOException {
Tenant.UpdateRequest updateRequest = new Tenant.UpdateRequest("TENANT_ID");
updateRequest
- .setDisplayName("DISPLAY_NAME")
- .setPasswordSignInAllowed(false)
- .setEmailLinkSignInEnabled(true);
+ .setDisplayName("DISPLAY_NAME")
+ .setPasswordSignInAllowed(false)
+ .setEmailLinkSignInEnabled(true);
assertEquals("TENANT_ID", updateRequest.getTenantId());
Map properties = updateRequest.getProperties();
@@ -101,9 +101,9 @@ public void testUpdateRequestInvalidTenantId() {
public void testCreateRequest() throws IOException {
Tenant.CreateRequest createRequest = new Tenant.CreateRequest();
createRequest
- .setDisplayName("DISPLAY_NAME")
- .setPasswordSignInAllowed(false)
- .setEmailLinkSignInEnabled(true);
+ .setDisplayName("DISPLAY_NAME")
+ .setPasswordSignInAllowed(false)
+ .setEmailLinkSignInEnabled(true);
Map properties = createRequest.getProperties();
assertEquals(properties.size(), 3);
diff --git a/src/test/java/com/google/firebase/internal/AbstractPlatformErrorHandlerTest.java b/src/test/java/com/google/firebase/internal/AbstractPlatformErrorHandlerTest.java
index 5660c0a00..c38f74ed9 100644
--- a/src/test/java/com/google/firebase/internal/AbstractPlatformErrorHandlerTest.java
+++ b/src/test/java/com/google/firebase/internal/AbstractPlatformErrorHandlerTest.java
@@ -257,7 +257,7 @@ private ErrorHandlingHttpClient createHttpClient(
private ErrorHandlingHttpClient createHttpClient(
final IOException exception) {
- MockHttpTransport transport = new MockHttpTransport(){
+ MockHttpTransport transport = new MockHttpTransport() {
@Override
public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
throw exception;
diff --git a/src/test/java/com/google/firebase/internal/ApiClientUtilsTest.java b/src/test/java/com/google/firebase/internal/ApiClientUtilsTest.java
index c2a3bdbd4..674454abf 100644
--- a/src/test/java/com/google/firebase/internal/ApiClientUtilsTest.java
+++ b/src/test/java/com/google/firebase/internal/ApiClientUtilsTest.java
@@ -127,7 +127,7 @@ public void testDisconnect() throws IOException {
@Test
public void testDisconnectWithErrorSuppression() throws IOException {
- MockLowLevelHttpResponse lowLevelResponse = new MockLowLevelHttpResponse(){
+ MockLowLevelHttpResponse lowLevelResponse = new MockLowLevelHttpResponse() {
@Override
public void disconnect() throws IOException {
super.disconnect();
diff --git a/src/test/java/com/google/firebase/internal/ErrorHandlingHttpClientTest.java b/src/test/java/com/google/firebase/internal/ErrorHandlingHttpClientTest.java
index 39d3929d0..ff27ab5e4 100644
--- a/src/test/java/com/google/firebase/internal/ErrorHandlingHttpClientTest.java
+++ b/src/test/java/com/google/firebase/internal/ErrorHandlingHttpClientTest.java
@@ -186,7 +186,7 @@ public void testUnsupportedMethod() throws FirebaseException, IOException {
@Test
public void testNetworkError() {
final IOException exception = new IOException("Test");
- MockHttpTransport transport = new MockHttpTransport(){
+ MockHttpTransport transport = new MockHttpTransport() {
@Override
public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
throw exception;
diff --git a/src/test/java/com/google/firebase/internal/RetryInitializerTest.java b/src/test/java/com/google/firebase/internal/RetryInitializerTest.java
index 5bc93607e..ea26633ac 100644
--- a/src/test/java/com/google/firebase/internal/RetryInitializerTest.java
+++ b/src/test/java/com/google/firebase/internal/RetryInitializerTest.java
@@ -136,7 +136,7 @@ public void testMaxRetriesCountIsCumulative() throws IOException {
retryOnIOAndServiceUnavailableErrors(sleeper));
final AtomicInteger counter = new AtomicInteger(0);
- MockLowLevelHttpRequest failingRequest = new MockLowLevelHttpRequest(){
+ MockLowLevelHttpRequest failingRequest = new MockLowLevelHttpRequest() {
@Override
public LowLevelHttpResponse execute() throws IOException {
if (counter.getAndIncrement() < 2) {
diff --git a/src/test/java/com/google/firebase/remoteconfig/MockRemoteConfigClient.java b/src/test/java/com/google/firebase/remoteconfig/MockRemoteConfigClient.java
index 3ac7f6b1c..6e972cf52 100644
--- a/src/test/java/com/google/firebase/remoteconfig/MockRemoteConfigClient.java
+++ b/src/test/java/com/google/firebase/remoteconfig/MockRemoteConfigClient.java
@@ -18,7 +18,7 @@
import com.google.firebase.remoteconfig.internal.TemplateResponse.ListVersionsResponse;
-public class MockRemoteConfigClient implements FirebaseRemoteConfigClient{
+public class MockRemoteConfigClient implements FirebaseRemoteConfigClient {
private final Template resultTemplate;
private final String resultServerTemplate;