Remove all support for legacy audit union table

Author: labkey-adam

api/src/org/labkey/api/audit/query/AbstractAuditDomainKind.java

@@ -22,7 +22,6 @@
 import org.junit.Test;
 import org.labkey.api.audit.AbstractAuditTypeProvider;
 import org.labkey.api.audit.AuditLogService;
-import org.labkey.api.collections.CaseInsensitiveHashSet;
 import org.labkey.api.collections.LabKeyCollectors;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.ContainerManager;
@@ -49,7 +48,6 @@
 import org.labkey.api.query.QueryService;
 import org.labkey.api.query.ValidationException;
 import org.labkey.api.security.User;
-import org.labkey.api.settings.OptionalFeatureService;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.NavTree;
@@ -66,8 +64,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static org.labkey.api.audit.query.DefaultAuditTypeTable.LEGACY_UNION_AUDIT_TABLE;
-
 public abstract class AbstractAuditDomainKind extends DomainKind<JSONObject>
 {
     private static final String XAR_SUBSTITUTION_SCHEMA_NAME = "SchemaName";
@@ -398,14 +394,7 @@ public PropertyStorageSpec getPropertySpec(PropertyDescriptor pd, Domain domain)
     @Override
     public Set<String> getNonProvisionedTableNames()
     {
-        // omit the legacy auditlog table, this can be removed once the
-        // table is dropped after migration
-        Set<String> tables = new CaseInsensitiveHashSet();
-
-        if (OptionalFeatureService.get().isFeatureEnabled(LEGACY_UNION_AUDIT_TABLE))
-            tables.add("auditlog");
-
-        return tables;
+        return Collections.emptySet();
     }
 
     @Nullable

api/src/org/labkey/api/audit/query/DefaultAuditTypeTable.java

@@ -42,7 +42,6 @@
 import org.labkey.api.security.roles.CanSeeAuditLogRole;
 import org.labkey.api.security.roles.Role;
 import org.labkey.api.security.roles.RoleManager;
-import org.labkey.api.settings.OptionalFeatureService;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -51,10 +50,7 @@
 
 public class DefaultAuditTypeTable extends FilteredTable<UserSchema>
 {
-    public static final String LEGACY_UNION_AUDIT_TABLE = "legacyUnionAuditTable";
-
     protected AuditTypeProvider _provider;
-    protected Map<FieldKey, String> _legacyNameMap;
     protected Map<String, String> _dbSchemaToColumnMap;
 
     public DefaultAuditTypeTable(AuditTypeProvider provider, TableInfo storage, UserSchema schema, ContainerFilter cf, List<FieldKey> defaultVisibleColumns)
@@ -67,17 +63,9 @@ public DefaultAuditTypeTable(AuditTypeProvider provider, TableInfo storage, User
         if (_provider.getDescription() != null)
             setDescription(_provider.getDescription());
 
-        _legacyNameMap = OptionalFeatureService.get().isFeatureEnabled(LEGACY_UNION_AUDIT_TABLE) ? provider.legacyNameMap() : Map.of();
-
         // Create a mapping from the real dbTable names to the legacy query table names for QueryUpdateService.
         _dbSchemaToColumnMap = new CaseInsensitiveHashMap<>();
 
-        for (FieldKey legacyName : _legacyNameMap.keySet())
-        {
-            String newName = _legacyNameMap.get(legacyName);
-            _dbSchemaToColumnMap.put(newName, legacyName.getName());
-        }
-
         setTitle(provider.getEventName());
 
         wrapAllColumns(true);
@@ -171,17 +159,10 @@ protected ColumnInfo resolveColumn(String name)
 
         String newName = null;
 
-        if (_legacyNameMap.isEmpty())
-        {
-            // Backward compatibility with widely used legacy name
-            if ("Date".equalsIgnoreCase(name))
-                newName = "Created";
-        }
-        else
-        {
-            // Handle the old style 'intKey1' and 'key1' columns
-            newName = _legacyNameMap.get(FieldKey.fromParts(name));
-        }
+        // Backward compatibility with widely-used legacy name
+        if ("Date".equalsIgnoreCase(name))
+            newName = "Created";
+
         col = super.resolveColumn(newName);
         if (col != null)
         {

audit/src/org/labkey/audit/AuditModule.java

@@ -19,11 +19,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.labkey.api.audit.AuditLogService;
 import org.labkey.api.audit.provider.SiteSettingsAuditProvider;
-import org.labkey.api.audit.query.DefaultAuditTypeTable;
 import org.labkey.api.module.DefaultModule;
 import org.labkey.api.module.ModuleContext;
-import org.labkey.api.settings.OptionalFeatureFlag;
-import org.labkey.api.settings.OptionalFeatureService;
 import org.labkey.api.view.WebPartFactory;
 import org.labkey.audit.query.AuditQuerySchema;
 
@@ -76,16 +73,7 @@ public void doStartup(ModuleContext moduleContext)
     {
         AuditQuerySchema.register(this);
         AuditLogService.get().registerAuditType(new SiteSettingsAuditProvider());
-
         AuditController.registerAdminConsoleLinks();
-        OptionalFeatureService.get().addFeatureFlag(new OptionalFeatureFlag(
-            DefaultAuditTypeTable.LEGACY_UNION_AUDIT_TABLE,
-            "Restore legacy union audit table",
-            "Restores a legacy query that unions all the event tables together into a single query. This option will be removed in LabKey Server v26.3.",
-            false,
-            false,
-            OptionalFeatureService.FeatureType.Deprecated
-        ));
     }
 
     @Override

audit/src/org/labkey/audit/query/AuditLogUnionTable.java

@@ -29,7 +29,6 @@
 import org.labkey.api.query.QueryView;
 import org.labkey.api.query.UserSchema;
 import org.labkey.api.security.User;
-import org.labkey.api.settings.OptionalFeatureService;
 import org.labkey.api.view.ViewContext;
 import org.labkey.audit.AuditSchema;
 import org.springframework.validation.BindException;
@@ -38,13 +37,10 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import static org.labkey.api.audit.query.DefaultAuditTypeTable.LEGACY_UNION_AUDIT_TABLE;
-
 public class AuditQuerySchema extends UserSchema
 {
     public static final String SCHEMA_NAME = "auditLog";
     public static final String SCHEMA_DESCR = "Contains data about audit log events.";
-    public static final String AUDIT_TABLE_NAME = "audit";
 
     static public void register(Module module)
     {
@@ -90,9 +86,6 @@ public TableInfo createTable(String name, ContainerFilter cf)
         if (provider != null)
             return provider.createTableInfo(this, cf);
 
-        if (OptionalFeatureService.get().isFeatureEnabled(LEGACY_UNION_AUDIT_TABLE) && AUDIT_TABLE_NAME.equalsIgnoreCase(name))
-            return new AuditLogUnionTable(this, cf);
-
         return null;
     }