commit 57923be1231e721ade1139df8de326ff2bf6a2ae
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 18 10:19:34 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 18 10:19:34 2018 +0000
tree 42b903a1855a90fbff8ee24af7f64211eac46423
parent 3fbfab7896e1e2f13be229e61c0da901788e5113
parent 7f494c121fe979cb47de9b3a1bc7b97312c9ad02

Merge "Warn: Change GuardedBy regular expressions"

tools/warn.py

diff --git a/tools/warn.py b/tools/warn.py
index 62feac3..f42fb96 100755
--- a/tools/warn.py
+++ b/tools/warn.py
@@ -1010,12 +1010,7 @@
      'severity': Severity.HIGH,
      'description':
          'Java: Checks for unguarded accesses to fields and methods with @GuardedBy annotations',
-     'patterns': [r".*: warning: \[GuardedByChecker\] .+"]},
-    {'category': 'java',
-     'severity': Severity.HIGH,
-     'description':
-         'Java: Invalid @GuardedBy expression',
-     'patterns': [r".*: warning: \[GuardedByValidator\] .+"]},
+     'patterns': [r".*: warning: \[GuardedBy\] .+"]},
     {'category': 'java',
      'severity': Severity.HIGH,
      'description':