errorprone :: MemberName - JDOMUtil (#850)

NationalSecurityAgency · Jul 24, 2024 · 95275db · 95275db
1 parent 8ad24c1
commit 95275db
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/emissary/util/xml/AbstractJDOMUtil.java b/src/main/java/emissary/util/xml/AbstractJDOMUtil.java
@@ -33,6 +33,7 @@ public abstract class AbstractJDOMUtil {
 
     public static final String ERR_MSG = "Could not parse document: ";
 
+    @SuppressWarnings("MemberName")
     protected static SAXBuilder createSAXBuilder(final boolean validate) {
         SAXBuilder builder;
         if (validate) {

diff --git a/src/main/java/emissary/util/xml/SaferJDOMUtil.java b/src/main/java/emissary/util/xml/SaferJDOMUtil.java
@@ -14,6 +14,7 @@
  */
 public class SaferJDOMUtil extends AbstractJDOMUtil {
 
+    @SuppressWarnings("MemberName")
     protected static SAXBuilder createSAXBuilder() {
         SAXBuilder builder = createSAXBuilder(false);
         // This is the PRIMARY defense. If DTDs (doctypes) are disallowed, almost all XML entity attacks are prevented

diff --git a/src/test/java/emissary/util/xml/JDOMUtilTest.java b/src/test/java/emissary/util/xml/JDOMUtilTest.java
@@ -12,7 +12,7 @@
 
 class JDOMUtilTest extends UnitTest {
 
-    static final String plist_xml =
+    static final String PLIST_XML =
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
                     + "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
                     + "<plist version=\"1.0\">\n" + "<dict>\n" + "   <key>Label</key>\n" + "   <string>com.apple.AOSNotification</string>\n"
@@ -25,7 +25,7 @@ class JDOMUtilTest extends UnitTest {
     @Test
     void testNonValidatingDTDRetrievalSuppression() {
         try {
-            final Document doc = JDOMUtil.createDocument(plist_xml, null, false);
+            final Document doc = JDOMUtil.createDocument(PLIST_XML, null, false);
             assertNotNull(doc, "Document should be created");
         } catch (Throwable t) {
             fail("An exception should not be thrown here, perhaps the DTD validation is not fully disabled.", t);
@@ -34,6 +34,6 @@ void testNonValidatingDTDRetrievalSuppression() {
 
     @Test
     void testValidationFailedDTDRetrieval() {
-        assertThrows(JDOMParseException.class, () -> JDOMUtil.createDocument(plist_xml, null, true));
+        assertThrows(JDOMParseException.class, () -> JDOMUtil.createDocument(PLIST_XML, null, true));
     }
 }