Skip to content

Commit 7c58f5b

Browse files
authored
Fix encoding failure (#6203)
Per [b/361535657](https://b.corp.google.com/issues/361535657), This fixes the encoders unit test failures. Encoders generates imports that aren't necessarily needed, just for the sake of being safe. This also means that our resource files that we use for checking the generated encoding have the extra imports. But, our formatting/linting (spotless) removes these imports as it recognizes they're not needed. Since we're testing the expected behavior of encoders- we expect these imports to be present regardless. It's also a reasonable assumption that spotless doesn't need to check resource files. So this PR re-adds the missing imports, and configures spotless to ignore files under `test/resources` directories.
1 parent 3afffc1 commit 7c58f5b

9 files changed

+21
-0
lines changed

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ configure(subprojects) {
9191
spotless {
9292
java {
9393
target 'src/**/*.java'
94+
targetExclude '**/test/resources/**'
9495
googleJavaFormat('1.22.0').reorderImports(false).skipJavadocFormatting()
9596
}
9697
kotlin {

encoders/firebase-encoders-processor/src/test/resources/ExpectedAtEmptyAnnotation.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414

1515
package com.example;
1616

17+
import java.lang.Class;
18+
import java.lang.Object;
19+
import java.lang.Override;
20+
import java.lang.String;
1721
import java.lang.annotation.Annotation;
1822

1923
public final class AtEmptyAnnotation {

encoders/firebase-encoders-processor/src/test/resources/ExpectedAtMyAnnotation.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414

1515
package com.example;
1616

17+
import java.lang.Class;
18+
import java.lang.Object;
19+
import java.lang.Override;
20+
import java.lang.String;
1721
import java.lang.annotation.Annotation;
1822
import java.util.Arrays;
1923

encoders/firebase-encoders-processor/src/test/resources/ExpectedGenericsEncoder.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
import com.google.firebase.encoders.config.Configurator;
1919
import com.google.firebase.encoders.config.EncoderConfig;
2020
import java.io.IOException;
21+
import java.lang.Override;
22+
import java.lang.SuppressWarnings;
2123

2224
/**
2325
* @hide */

encoders/firebase-encoders-processor/src/test/resources/ExpectedGenericsEncoderWithUnknownType.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
import com.google.firebase.encoders.config.Configurator;
1919
import com.google.firebase.encoders.config.EncoderConfig;
2020
import java.io.IOException;
21+
import java.lang.Override;
22+
import java.lang.SuppressWarnings;
2123

2224
/**
2325
* @hide */

encoders/firebase-encoders-processor/src/test/resources/ExpectedMyClassEncoderWithExtraProperty.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import com.google.firebase.encoders.config.Configurator;
2020
import com.google.firebase.encoders.config.EncoderConfig;
2121
import java.io.IOException;
22+
import java.lang.Override;
23+
import java.lang.SuppressWarnings;
2224

2325
/**
2426
* @hide */

encoders/firebase-encoders-processor/src/test/resources/ExpectedRecursiveGenericEncoder.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import com.google.firebase.encoders.config.Configurator;
2121
import com.google.firebase.encoders.config.EncoderConfig;
2222
import java.io.IOException;
23+
import java.lang.Override;
24+
import java.lang.SuppressWarnings;
2325

2426
/**
2527
* @hide */

encoders/firebase-encoders-processor/src/test/resources/ExpectedSimpleClassEncoder.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
import com.google.firebase.encoders.config.Configurator;
1919
import com.google.firebase.encoders.config.EncoderConfig;
2020
import java.io.IOException;
21+
import java.lang.Override;
22+
import java.lang.SuppressWarnings;
2123

2224
/**
2325
* @hide */

encoders/firebase-encoders-processor/src/test/resources/ExpectedTypeWithListEncoder.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
import com.google.firebase.encoders.config.Configurator;
1919
import com.google.firebase.encoders.config.EncoderConfig;
2020
import java.io.IOException;
21+
import java.lang.Override;
22+
import java.lang.SuppressWarnings;
2123

2224
/**
2325
* @hide */

0 commit comments

Comments
 (0)