Skip to content

Extend ProtoStringFieldReferenceEquality to support older versions of protobuf #5260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −10
Open

Extend ProtoStringFieldReferenceEquality to support older versions of protobuf #5260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions core/src/main/java/com/google/errorprone/bugpatterns/ProtoStringFieldReferenceEquality.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,11 @@
summary = "Comparing protobuf fields of type String using reference equality")
public class ProtoStringFieldReferenceEquality extends BugChecker implements BinaryTreeMatcher {

private static final String PROTO_SUPER_CLASS = "com.google.protobuf.GeneratedMessage";

private static final String LITE_PROTO_SUPER_CLASS = "com.google.protobuf.GeneratedMessageLite";
private static final String LITE_PROTO_INTERFACE = "com.google.protobuf.MessageLite";

private static final Matcher<ExpressionTree> PROTO_STRING_METHOD =
allOf(
instanceMethod().onDescendantOfAny(PROTO_SUPER_CLASS, LITE_PROTO_SUPER_CLASS),
instanceMethod().onDescendantOf(LITE_PROTO_INTERFACE),
isSameType(Suppliers.STRING_TYPE));

@Override
Expand Down
12 changes: 6 additions & 6 deletions ...rc/test/java/com/google/errorprone/bugpatterns/ProtoStringFieldReferenceEqualityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ public class ProtoStringFieldReferenceEqualityTest {
public void positive() {
compilationHelper
.addSourceLines(
"com/google/protobuf/GeneratedMessage.java",
"com/google/protobuf/MessageLite.java",
"""
package com.google.protobuf;

public class GeneratedMessage {}
public interface MessageLite {}
""")
.addSourceLines(
"Proto.java",
"""
public abstract class Proto extends com.google.protobuf.GeneratedMessage {
public abstract class Proto implements com.google.protobuf.MessageLite {
public abstract String getMessage();
}
""")
Expand All @@ -68,16 +68,16 @@ boolean g(Proto proto) {
public void negative() {
compilationHelper
.addSourceLines(
"com/google/protobuf/GeneratedMessage.java",
"com/google/protobuf/MessageLite.java",
"""
package com.google.protobuf;

public class GeneratedMessage {}
public interface MessageLite {}
""")
.addSourceLines(
"Proto.java",
"""
public abstract class Proto extends com.google.protobuf.GeneratedMessage {
public abstract class Proto implements com.google.protobuf.MessageLite {
public abstract int getId();

public abstract String getMessage();
Expand Down