Use Class, Field, and Method in spotbugs exclusions

jenkinsci · Feb 10, 2023 · e42bc19 · e42bc19
1 parent 0b32055
commit e42bc19
Showing 1 changed file with 14 additions and 16 deletions.
diff --git a/src/spotbugs/excludesFilter.xml b/src/spotbugs/excludesFilter.xml
@@ -19,20 +19,18 @@
       exclusion from this section.
    -->
   <Match>
-    <Or>
-      <And>
-        <Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED"/>
-        <Class name="org.jenkinsci.plugins.GitLabAuthenticationToken.gitLabAPI"/>
-      </And>
-      <And>
-        <Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED"/>
-        <Class name="org.jenkinsci.plugins.GitLabAuthenticationToken.me"/>
-      </And>
-      <And>
-      <Bug pattern="DM_CONVERT_CASE"/>
-      <Class name="org.jenkinsci.plugins.GitLabSecurityRealm$ConverterImpl.setValue"/>
-      </And>
-
-    </Or>
+    <Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED"/>
+    <Class name="org.jenkinsci.plugins.GitLabAuthenticationToken"/>
+    <Field name="gitLabAPI"/>
   </Match>
-</FindBugsFilter>
+  <Match>
+    <Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED"/>
+    <Class name="org.jenkinsci.plugins.GitLabAuthenticationToken"/>
+    <Field name="me"/>
+  </Match>
+  <Match>
+    <Bug pattern="DM_CONVERT_CASE"/>
+    <Class name="org.jenkinsci.plugins.GitLabSecurityRealm$ConverterImpl"/>
+    <Method name="setValue"/>
+  </Match>
+</FindBugsFilter>