Skip to content

Commit b88b9fe

Browse files
committed
Revert changes to OtelPrivateConstructorForUtilityClass
1 parent 0f1460d commit b88b9fe

File tree

1 file changed

+1
-15
lines changed

1 file changed

+1
-15
lines changed

custom-checks/src/main/java/io/opentelemetry/javaagent/customchecks/OtelPrivateConstructorForUtilityClass.java

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import com.google.errorprone.bugpatterns.PrivateConstructorForUtilityClass;
1616
import com.google.errorprone.matchers.Description;
1717
import com.sun.source.tree.ClassTree;
18-
import com.sun.source.tree.Tree;
1918

2019
@AutoService(BugChecker.class)
2120
@BugPattern(
@@ -32,7 +31,7 @@ public class OtelPrivateConstructorForUtilityClass extends BugChecker
3231

3332
@Override
3433
public Description matchClass(ClassTree tree, VisitorState state) {
35-
if (isAdviceOrAdviceNestedClass(tree, state)) {
34+
if (tree.getSimpleName().toString().endsWith("Advice")) {
3635
return NO_MATCH;
3736
}
3837
Description description = delegate.matchClass(tree, state);
@@ -41,17 +40,4 @@ public Description matchClass(ClassTree tree, VisitorState state) {
4140
}
4241
return describeMatch(tree);
4342
}
44-
45-
private static boolean isAdviceOrAdviceNestedClass(ClassTree tree, VisitorState state) {
46-
if (tree.getSimpleName().toString().endsWith("Advice")) {
47-
return true;
48-
}
49-
for (Tree parent : state.getPath()) {
50-
if (parent instanceof ClassTree
51-
&& ((ClassTree) parent).getSimpleName().toString().endsWith("Advice")) {
52-
return true;
53-
}
54-
}
55-
return false;
56-
}
5743
}

0 commit comments

Comments
 (0)