Stricter checks on namespace prefixes

Author: labkey-adam

ehr/api-src/org/labkey/api/ehr/security/EHRSecurityEscalatorAuditProvider.java

@@ -15,7 +15,6 @@
  */
 package org.labkey.api.ehr.security;
 
-import org.labkey.api.audit.query.AbstractAuditDomainKind;
 import org.labkey.api.data.Container;
 import org.labkey.api.study.security.SecurityEscalationAuditProvider;
 
@@ -27,8 +26,14 @@ public class EHRSecurityEscalatorAuditProvider extends SecurityEscalationAuditPr
     public static String EVENT_TYPE = EHRSecurityEscalationEvent.class.getSimpleName();
     public static String AUDIT_LOG_TITLE = "EHR Security Escalations";
 
+    public EHRSecurityEscalatorAuditProvider()
+    {
+        super(new EHRSecurityEscalationDomainKind());
+    }
+
     @Override
-    public String getDescription() {
+    public String getDescription()
+    {
         return "This audits all uses of the EHR Security Escalation";
     }
 
@@ -47,12 +52,6 @@ public String getAuditLogTitle() {
         return AUDIT_LOG_TITLE;
     }
 
-    @Override
-    protected AbstractAuditDomainKind getDomainKind()
-    {
-        return new EHRSecurityEscalationDomainKind();
-    }
-
     public static class EHRSecurityEscalationEvent extends SecurityEscalationEvent
     {
         /** Important for reflection-based instantiation */

snd/src/org/labkey/snd/NarrativeAuditProvider.java

@@ -42,10 +42,10 @@ public class NarrativeAuditProvider extends AbstractAuditTypeProvider implements
     public static final String COLUMN_NAME_EVENTDATE = "EventDate";
     public static final String COLUMN_NAME_QCSTATE = "QcState";
 
-    static final List<FieldKey> defaultVisibleColumns = new ArrayList<>();
-
-    static {
+    private static final List<FieldKey> defaultVisibleColumns = new ArrayList<>();
 
+    static
+    {
         defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_CREATED));
         defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_CREATED_BY));
         defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_IMPERSONATED_BY));
@@ -57,10 +57,9 @@ public class NarrativeAuditProvider extends AbstractAuditTypeProvider implements
         defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_QCSTATE));
     }
 
-    @Override
-    protected AbstractAuditDomainKind getDomainKind()
+    public NarrativeAuditProvider()
     {
-        return new org.labkey.snd.NarrativeAuditProvider.NarrativeAuditDomainKind();
+        super(new NarrativeAuditDomainKind());
     }
 
     @Override