diff --git a/api/src/org/labkey/api/audit/AbstractAuditTypeProvider.java b/api/src/org/labkey/api/audit/AbstractAuditTypeProvider.java index da95c90b575..e93f465653e 100644 --- a/api/src/org/labkey/api/audit/AbstractAuditTypeProvider.java +++ b/api/src/org/labkey/api/audit/AbstractAuditTypeProvider.java @@ -279,10 +279,7 @@ public List getDefaultVisibleColumns() @Override public Map legacyNameMap() { - Map legacyNames = new LinkedHashMap<>(); - legacyNames.put(FieldKey.fromParts("ContainerId"), "Container"); - legacyNames.put(FieldKey.fromParts("Date"), "Created"); - return legacyNames; + return new LinkedHashMap<>(); } public static Container getDomainContainer() diff --git a/api/src/org/labkey/api/audit/AuditTypeProvider.java b/api/src/org/labkey/api/audit/AuditTypeProvider.java index 332f1a5d681..2872cb78b05 100644 --- a/api/src/org/labkey/api/audit/AuditTypeProvider.java +++ b/api/src/org/labkey/api/audit/AuditTypeProvider.java @@ -50,9 +50,7 @@ public interface AuditTypeProvider Class getEventClass(); - /** - * Mapping from old audit table names ("intKey1", "key1", and "Property/Foo" to the new column names.) - */ + @Deprecated // Not used anymore - remove Map legacyNameMap(); ActionURL getAuditUrl(); diff --git a/api/src/org/labkey/api/audit/ClientApiAuditProvider.java b/api/src/org/labkey/api/audit/ClientApiAuditProvider.java index 2304e4735d7..28d46e84d4c 100644 --- a/api/src/org/labkey/api/audit/ClientApiAuditProvider.java +++ b/api/src/org/labkey/api/audit/ClientApiAuditProvider.java @@ -99,21 +99,6 @@ public String getDescription() return "Information about audit events created through the client API."; } - @Override - public Map legacyNameMap() - { - Map legacyNames = super.legacyNameMap(); - - // 'key1' mapped to 'subtype' and other 'keyN' are mapped to 'stringN-1' - legacyNames.put(FieldKey.fromParts("key1"), COLUMN_NAME_SUBTYPE); - legacyNames.put(FieldKey.fromParts("key2"), COLUMN_NAME_STRING1); - legacyNames.put(FieldKey.fromParts("key3"), COLUMN_NAME_STRING2); - legacyNames.put(FieldKey.fromParts("intKey1"), COLUMN_NAME_INT1); - legacyNames.put(FieldKey.fromParts("intKey2"), COLUMN_NAME_INT2); - legacyNames.put(FieldKey.fromParts("intKey3"), COLUMN_NAME_INT3); - return legacyNames; - } - @Override public TableInfo createTableInfo(UserSchema userSchema, ContainerFilter cf) { diff --git a/api/src/org/labkey/api/audit/provider/FileSystemAuditProvider.java b/api/src/org/labkey/api/audit/provider/FileSystemAuditProvider.java index 441f5862e21..8f3f51ed9a5 100644 --- a/api/src/org/labkey/api/audit/provider/FileSystemAuditProvider.java +++ b/api/src/org/labkey/api/audit/provider/FileSystemAuditProvider.java @@ -84,16 +84,6 @@ public String getDescription() return "Displays information about file uploads and modifications."; } - @Override - public Map legacyNameMap() - { - Map legacyNames = super.legacyNameMap(); - legacyNames.put(FieldKey.fromParts("key1"), COLUMN_NAME_DIRECTORY); - legacyNames.put(FieldKey.fromParts("key2"), COLUMN_NAME_FILE); - legacyNames.put(FieldKey.fromParts("key3"), COLUMN_NAME_RESOURCE_PATH); - return legacyNames; - } - @Override public Class getEventClass() { diff --git a/api/src/org/labkey/api/audit/provider/GroupAuditProvider.java b/api/src/org/labkey/api/audit/provider/GroupAuditProvider.java index 3d003cb03f0..ef1bf8f3ba8 100644 --- a/api/src/org/labkey/api/audit/provider/GroupAuditProvider.java +++ b/api/src/org/labkey/api/audit/provider/GroupAuditProvider.java @@ -108,16 +108,6 @@ public GroupAuditProvider() super(new GroupAuditDomainKind()); } - @Override - public Map legacyNameMap() - { - Map legacyNames = super.legacyNameMap(); - legacyNames.put(FieldKey.fromParts("EntityId"), COLUMN_NAME_RESOURCE_ENTITY_ID); - legacyNames.put(FieldKey.fromParts("intKey1"), COLUMN_NAME_USER); - legacyNames.put(FieldKey.fromParts("intKey2"), COLUMN_NAME_GROUP); - return legacyNames; - } - @Override public Class getEventClass() { diff --git a/api/src/org/labkey/api/audit/provider/MessageAuditProvider.java b/api/src/org/labkey/api/audit/provider/MessageAuditProvider.java index 2f831f54011..77836cabd12 100644 --- a/api/src/org/labkey/api/audit/provider/MessageAuditProvider.java +++ b/api/src/org/labkey/api/audit/provider/MessageAuditProvider.java @@ -78,16 +78,6 @@ public String getDescription() return "Data about messages sent from the server."; } - @Override - public Map legacyNameMap() - { - Map legacyNames = super.legacyNameMap(); - legacyNames.put(FieldKey.fromParts("key1"), COLUMN_NAME_FROM); - legacyNames.put(FieldKey.fromParts("key2"), COLUMN_NAME_TO); - legacyNames.put(FieldKey.fromParts("key3"), COLUMN_NAME_CONTENT_TYPE); - return legacyNames; - } - @Override public Class getEventClass() { diff --git a/api/src/org/labkey/api/audit/provider/SiteSettingsAuditProvider.java b/api/src/org/labkey/api/audit/provider/SiteSettingsAuditProvider.java index e02a6682a5e..d35ab4a8fe7 100644 --- a/api/src/org/labkey/api/audit/provider/SiteSettingsAuditProvider.java +++ b/api/src/org/labkey/api/audit/provider/SiteSettingsAuditProvider.java @@ -150,14 +150,6 @@ public Map getAuditLogMessageElements() } } - @Override - public Map legacyNameMap() - { - Map legacyNames = super.legacyNameMap(); - legacyNames.put(FieldKey.fromParts("Property", AUDIT_PROP_DIFF), COLUMN_NAME_CHANGES); - return legacyNames; - } - public static class SiteSettingsAuditDomainKind extends AbstractAuditDomainKind { public static final String NAME = "SiteSettingsAuditDomain"; diff --git a/api/src/org/labkey/api/audit/query/AbstractAuditDomainKind.java b/api/src/org/labkey/api/audit/query/AbstractAuditDomainKind.java index 4c7635376cf..5068f6e3218 100644 --- a/api/src/org/labkey/api/audit/query/AbstractAuditDomainKind.java +++ b/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 { private static final String XAR_SUBSTITUTION_SCHEMA_NAME = "SchemaName"; @@ -398,14 +394,7 @@ public PropertyStorageSpec getPropertySpec(PropertyDescriptor pd, Domain domain) @Override public Set getNonProvisionedTableNames() { - // omit the legacy auditlog table, this can be removed once the - // table is dropped after migration - Set tables = new CaseInsensitiveHashSet(); - - if (OptionalFeatureService.get().isFeatureEnabled(LEGACY_UNION_AUDIT_TABLE)) - tables.add("auditlog"); - - return tables; + return Collections.emptySet(); } @Nullable diff --git a/api/src/org/labkey/api/audit/query/DefaultAuditTypeTable.java b/api/src/org/labkey/api/audit/query/DefaultAuditTypeTable.java index 46b164a9a86..4a1647ae863 100644 --- a/api/src/org/labkey/api/audit/query/DefaultAuditTypeTable.java +++ b/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 { - public static final String LEGACY_UNION_AUDIT_TABLE = "legacyUnionAuditTable"; - protected AuditTypeProvider _provider; - protected Map _legacyNameMap; protected Map _dbSchemaToColumnMap; public DefaultAuditTypeTable(AuditTypeProvider provider, TableInfo storage, UserSchema schema, ContainerFilter cf, List 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) { diff --git a/api/src/org/labkey/api/exp/property/DomainAuditProvider.java b/api/src/org/labkey/api/exp/property/DomainAuditProvider.java index d5ade35f243..3869bf0e3f1 100644 --- a/api/src/org/labkey/api/exp/property/DomainAuditProvider.java +++ b/api/src/org/labkey/api/exp/property/DomainAuditProvider.java @@ -118,15 +118,6 @@ public List getDefaultVisibleColumns() return defaultVisibleColumns; } - @Override - public Map legacyNameMap() - { - Map legacyNames = super.legacyNameMap(); - legacyNames.put(FieldKey.fromParts("key1"), COLUMN_NAME_DOMAIN_URI); - legacyNames.put(FieldKey.fromParts("key3"), COLUMN_NAME_DOMAIN_NAME); - return legacyNames; - } - @Override public Class getEventClass() { diff --git a/audit/src/org/labkey/audit/AuditModule.java b/audit/src/org/labkey/audit/AuditModule.java index f36e763cb1d..9dfa2ec23c9 100644 --- a/audit/src/org/labkey/audit/AuditModule.java +++ b/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 diff --git a/audit/src/org/labkey/audit/query/AuditLogUnionTable.java b/audit/src/org/labkey/audit/query/AuditLogUnionTable.java deleted file mode 100644 index efdb451dc23..00000000000 --- a/audit/src/org/labkey/audit/query/AuditLogUnionTable.java +++ /dev/null @@ -1,204 +0,0 @@ -/* - * Copyright (c) 2013-2019 LabKey Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.labkey.audit.query; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.labkey.api.audit.AuditLogService; -import org.labkey.api.audit.AuditTypeProvider; -import org.labkey.api.data.BaseColumnInfo; -import org.labkey.api.data.ContainerFilter; -import org.labkey.api.data.JdbcType; -import org.labkey.api.data.SQLFragment; -import org.labkey.api.data.TableInfo; -import org.labkey.api.data.VirtualTable; -import org.labkey.api.query.FieldKey; -import org.labkey.api.query.FilteredTable; -import org.labkey.api.query.QueryUpdateService; -import org.labkey.api.query.UserSchema; -import org.labkey.api.query.column.BuiltInColumnTypes; -import org.labkey.api.security.User; -import org.labkey.api.security.UserPrincipal; -import org.labkey.api.security.permissions.InsertPermission; -import org.labkey.api.security.permissions.Permission; -import org.labkey.api.security.permissions.ReadPermission; -import org.labkey.audit.AuditSchema; - -import java.util.Map; - -/** - * User: klum - * Date: 8/13/13 - */ -public class AuditLogUnionTable extends FilteredTable -{ - public AuditLogUnionTable(AuditQuerySchema schema, ContainerFilter cf) - { - super(createVirtualTable(schema, cf), schema, null); - wrapAllColumns(true); - } - - private static TableInfo createVirtualTable(AuditQuerySchema schema, ContainerFilter cf) - { - return new AuditUnionTable(schema, cf); - } - - private static class AuditUnionTable extends VirtualTable - { - private final SQLFragment _query; - - public AuditUnionTable(@NotNull UserSchema schema, ContainerFilter cf) - { - super(AuditSchema.getInstance().getSchema(), AuditQuerySchema.AUDIT_TABLE_NAME, schema, ContainerFilter.getUnsafeEverythingFilter()); - - _query = new SQLFragment(); - _query.appendComment("", getSchema().getSqlDialect()); - setInsertURL(LINK_DISABLER); - String union = ""; - - for (AuditTypeProvider provider : AuditLogService.get().getAuditProviders()) - { - // issue: 14463, exclude dataset audit events from the general query - if (provider.getEventName().equals("DatasetAuditEvent")) - continue; - - _query.append(union).append("\n"); - - TableInfo table = provider.createTableInfo(schema, cf); - Map legacyMap = provider.legacyNameMap(); - - _query.append("SELECT\n"); - _query.append(" CreatedBy,\n"); - _query.append(" ImpersonatedBy,\n"); - _query.append(" RowId,\n"); - _query.append(" Created AS Date,\n"); - _query.append(" EventType,\n"); - _query.append(" Comment,\n"); - _query.append(" Container AS ContainerId,\n"); - _query.append(" ProjectId,\n"); - - // unsupported, but provided for legacy - _query.append(" NULL AS EntityId,\n"); - _query.append(" NULL AS Lsid,\n"); - - // need to map new column names to legacy names - addLegacyName(_query, "Key1", legacyMap, ",\n"); - addLegacyName(_query, "Key2", legacyMap, ",\n"); - addLegacyName(_query, "Key3", legacyMap, ",\n"); - addLegacyName(_query, "IntKey1", legacyMap, ",\n"); - addLegacyName(_query, "IntKey2", legacyMap, ",\n"); - addLegacyName(_query, "IntKey3", legacyMap, "\n"); - - _query.append("FROM ").append(table, "X").append("\n"); - - union = "UNION"; - } - _query.appendComment("", getSchema().getSqlDialect()); - - var createdByCol = new BaseColumnInfo("CreatedBy", this, JdbcType.INTEGER); - createdByCol.setConceptURI(BuiltInColumnTypes.CREATEDBY_CONCEPT_URI); - addColumn(createdByCol); - - var impersonatedByCol = new BaseColumnInfo("ImpersonatedBy", this, JdbcType.INTEGER); - impersonatedByCol.setConceptURI(BuiltInColumnTypes.USERID_CONCEPT_URI); - addColumn(impersonatedByCol); - - var rowIdCol = new BaseColumnInfo("RowId", this, JdbcType.INTEGER); - rowIdCol.setKeyField(true); - addColumn(rowIdCol); - - var dateCol = new BaseColumnInfo("Date", this, JdbcType.DATE); - addColumn(dateCol); - - var eventTypeCol = new BaseColumnInfo("EventType", this, JdbcType.VARCHAR); - addColumn(eventTypeCol); - - var commentCol = new BaseColumnInfo("Comment", this, JdbcType.VARCHAR); - addColumn(commentCol); - - var containerCol = new BaseColumnInfo("ContainerId", this, JdbcType.VARCHAR); - containerCol.setConceptURI(BuiltInColumnTypes.CONTAINERID_CONCEPT_URI); - addColumn(containerCol); - - var projIdCol = new BaseColumnInfo("ProjectId", this, JdbcType.VARCHAR); - containerCol.setConceptURI(BuiltInColumnTypes.CONTAINERID_CONCEPT_URI); - addColumn(projIdCol); - - var entityIdCol = new BaseColumnInfo("EntityId", this, JdbcType.VARCHAR); - addColumn(entityIdCol); - - var lsidCol = new BaseColumnInfo("Lsid", this, JdbcType.VARCHAR); - addColumn(lsidCol); - - var key1Col = new BaseColumnInfo("Key1", this, JdbcType.VARCHAR); - addColumn(key1Col); - - var key2Col = new BaseColumnInfo("Key2", this, JdbcType.VARCHAR); - addColumn(key2Col); - - var key3Col = new BaseColumnInfo("Key3", this, JdbcType.VARCHAR); - addColumn(key3Col); - - var intKey1Col = new BaseColumnInfo("IntKey1", this, JdbcType.INTEGER); - addColumn(intKey1Col); - - var intKey2Col = new BaseColumnInfo("IntKey2", this, JdbcType.INTEGER); - addColumn(intKey2Col); - - var intKey3Col = new BaseColumnInfo("IntKey3", this, JdbcType.INTEGER); - addColumn(intKey3Col); - } - - private void addLegacyName(SQLFragment sql, String fieldName, Map legacyMap, String delim) - { - FieldKey field = FieldKey.fromParts(fieldName); - - if (legacyMap.containsKey(field)) - sql.appendValue(legacyMap.get(field)).append(" AS ").append(fieldName); - else - sql.append("NULL AS ").append(fieldName); - - sql.append(delim); - } - - @NotNull - @Override - public SQLFragment getFromSQL() - { - return _query; - } - } - - private boolean isGuest(UserPrincipal user) - { - return user instanceof User && user.isGuest(); - } - - @Override - public boolean hasPermission(@NotNull UserPrincipal user, @NotNull Class perm) - { - // Don't allow deletes or updates for audit events, and don't let guests insert - return ((perm.equals(InsertPermission.class) && !isGuest(user)) || perm.equals(ReadPermission.class)) && - getContainer().hasPermission(user, perm); - } - - @Nullable - @Override - public QueryUpdateService getUpdateService() - { - return new AuditLogUpdateService(this); - } -} diff --git a/audit/src/org/labkey/audit/query/AuditQuerySchema.java b/audit/src/org/labkey/audit/query/AuditQuerySchema.java index f82217ff05f..2612940d62d 100644 --- a/audit/src/org/labkey/audit/query/AuditQuerySchema.java +++ b/audit/src/org/labkey/audit/query/AuditQuerySchema.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; } diff --git a/core/src/org/labkey/core/query/AttachmentAuditProvider.java b/core/src/org/labkey/core/query/AttachmentAuditProvider.java index 5c2c7dd5fdf..978f3d1fe4b 100644 --- a/core/src/org/labkey/core/query/AttachmentAuditProvider.java +++ b/core/src/org/labkey/core/query/AttachmentAuditProvider.java @@ -81,15 +81,6 @@ public String getDescription() return "Data about attachment additions, deletions, modifications and downloads"; } - @Override - public Map legacyNameMap() - { - Map legacyMap = super.legacyNameMap(); - legacyMap.put(FieldKey.fromParts("EntityId"), COLUMN_NAME_ATTACHMENT_PARENT_ENTITY_ID); - legacyMap.put(FieldKey.fromParts("key1"), COLUMN_NAME_ATTACHMENT); - return legacyMap; - } - public int moveEvents(Container targetContainer, Collection entityIds) { return moveEvents(targetContainer, COLUMN_NAME_ATTACHMENT_PARENT_ENTITY_ID, entityIds); diff --git a/core/src/org/labkey/core/query/UserAuditProvider.java b/core/src/org/labkey/core/query/UserAuditProvider.java index 80ef2be5a15..1f229a1a923 100644 --- a/core/src/org/labkey/core/query/UserAuditProvider.java +++ b/core/src/org/labkey/core/query/UserAuditProvider.java @@ -36,7 +36,6 @@ import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; -import java.util.Map; import java.util.Set; /** @@ -82,14 +81,6 @@ public UserAuditProvider() super(new UserAuditDomainKind()); } - @Override - public Map legacyNameMap() - { - Map legacyNames = super.legacyNameMap(); - legacyNames.put(FieldKey.fromParts("intKey1"), COLUMN_NAME_USER); - return legacyNames; - } - @Override public TableInfo createTableInfo(UserSchema userSchema, ContainerFilter cf) { diff --git a/experiment/src/org/labkey/experiment/ExperimentAuditProvider.java b/experiment/src/org/labkey/experiment/ExperimentAuditProvider.java index af70cc21124..d541f7bece8 100644 --- a/experiment/src/org/labkey/experiment/ExperimentAuditProvider.java +++ b/experiment/src/org/labkey/experiment/ExperimentAuditProvider.java @@ -44,7 +44,6 @@ import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; -import java.util.Map; import java.util.Set; /** @@ -100,17 +99,6 @@ public String getDescription() return "Data about assay run creations, deletions, modifications."; } - @Override - public Map legacyNameMap() - { - Map legacyNames = super.legacyNameMap(); - legacyNames.put(FieldKey.fromParts("key1"), COLUMN_NAME_PROTOCOL_LSID); - legacyNames.put(FieldKey.fromParts("key2"), COLUMN_NAME_RUN_LSID); - legacyNames.put(FieldKey.fromParts("key3"), COLUMN_NAME_PROTOCOL_RUN); - legacyNames.put(FieldKey.fromParts("intKey1"), COLUMN_NAME_RUN_GROUP); - return legacyNames; - } - @Override public Class getEventClass() { diff --git a/list/src/org/labkey/list/model/ListAuditProvider.java b/list/src/org/labkey/list/model/ListAuditProvider.java index ac40e3dab9b..b8583f2bc82 100644 --- a/list/src/org/labkey/list/model/ListAuditProvider.java +++ b/list/src/org/labkey/list/model/ListAuditProvider.java @@ -117,22 +117,6 @@ public List getDefaultVisibleColumns() return defaultVisibleColumns; } - @Override - public Map legacyNameMap() - { - Map legacyMap = super.legacyNameMap(); - legacyMap.put(FieldKey.fromParts("intKey1"), COLUMN_NAME_LIST_ID); - legacyMap.put(FieldKey.fromParts("key1"), COLUMN_NAME_LIST_DOMAIN_URI); - legacyMap.put(FieldKey.fromParts("key2"), COLUMN_NAME_LIST_ITEM_ENTITY_ID); - legacyMap.put(FieldKey.fromParts("key3"), COLUMN_NAME_LIST_NAME); - legacyMap.put(FieldKey.fromParts("Property", AbstractAuditDomainKind.OLD_RECORD_PROP_NAME), AbstractAuditDomainKind.OLD_RECORD_PROP_NAME); - legacyMap.put(FieldKey.fromParts("Property", AbstractAuditDomainKind.NEW_RECORD_PROP_NAME), AbstractAuditDomainKind.NEW_RECORD_PROP_NAME); - // Unused Property/oldRecord and Property/newRecord columns should just be migrated to the oldRecordMap and newRecordMap columns - legacyMap.put(FieldKey.fromParts("Property", "OldRecord"), AbstractAuditDomainKind.OLD_RECORD_PROP_NAME); - legacyMap.put(FieldKey.fromParts("Property", "NewRecord"), AbstractAuditDomainKind.NEW_RECORD_PROP_NAME); - return legacyMap; - } - @Override public Class getEventClass() { diff --git a/query/src/org/labkey/query/audit/QueryExportAuditProvider.java b/query/src/org/labkey/query/audit/QueryExportAuditProvider.java index 3af2648722a..70379ecf2e5 100644 --- a/query/src/org/labkey/query/audit/QueryExportAuditProvider.java +++ b/query/src/org/labkey/query/audit/QueryExportAuditProvider.java @@ -89,17 +89,6 @@ public String getDescription() return "Data about queries used for exporting data."; } - @Override - public Map legacyNameMap() - { - Map legacyMap = super.legacyNameMap(); - legacyMap.put(FieldKey.fromParts("key1"), COLUMN_NAME_SCHEMA_NAME); - legacyMap.put(FieldKey.fromParts("key2"), COLUMN_NAME_QUERY_NAME); - legacyMap.put(FieldKey.fromParts("key3"), COLUMN_NAME_DETAILS_URL); - legacyMap.put(FieldKey.fromParts("intKey1"), COLUMN_NAME_DATA_ROW_COUNT); - return legacyMap; - } - @Override public Class getEventClass() { diff --git a/query/src/org/labkey/query/audit/QueryUpdateAuditProvider.java b/query/src/org/labkey/query/audit/QueryUpdateAuditProvider.java index ce48da2a02c..0945120793f 100644 --- a/query/src/org/labkey/query/audit/QueryUpdateAuditProvider.java +++ b/query/src/org/labkey/query/audit/QueryUpdateAuditProvider.java @@ -95,18 +95,6 @@ public String getDescription() return "Data about insert and update queries."; } - @Override - public Map legacyNameMap() - { - Map legacyMap = super.legacyNameMap(); - legacyMap.put(FieldKey.fromParts("key1"), COLUMN_NAME_ROW_PK); - legacyMap.put(FieldKey.fromParts("key2"), COLUMN_NAME_SCHEMA_NAME); - legacyMap.put(FieldKey.fromParts("key3"), COLUMN_NAME_QUERY_NAME); - legacyMap.put(FieldKey.fromParts("Property", AbstractAuditDomainKind.OLD_RECORD_PROP_NAME), AbstractAuditDomainKind.OLD_RECORD_PROP_NAME); - legacyMap.put(FieldKey.fromParts("Property", AbstractAuditDomainKind.NEW_RECORD_PROP_NAME), AbstractAuditDomainKind.NEW_RECORD_PROP_NAME); - return legacyMap; - } - @Override public Class getEventClass() { diff --git a/search/src/org/labkey/search/audit/SearchAuditProvider.java b/search/src/org/labkey/search/audit/SearchAuditProvider.java index 35ac24b5ecc..b46bdfc59cd 100644 --- a/search/src/org/labkey/search/audit/SearchAuditProvider.java +++ b/search/src/org/labkey/search/audit/SearchAuditProvider.java @@ -77,14 +77,6 @@ public String getDescription() return "Data about search queries and indexing actions"; } - @Override - public Map legacyNameMap() - { - Map legacyNames = super.legacyNameMap(); - legacyNames.put(FieldKey.fromParts("key1"), COLUMN_NAME_QUERY); - return legacyNames; - } - @Override public Class getEventClass() { diff --git a/specimen/src/org/labkey/specimen/SpecimenCommentAuditProvider.java b/specimen/src/org/labkey/specimen/SpecimenCommentAuditProvider.java index d7ddb3a95ca..f15aa3df286 100644 --- a/specimen/src/org/labkey/specimen/SpecimenCommentAuditProvider.java +++ b/specimen/src/org/labkey/specimen/SpecimenCommentAuditProvider.java @@ -37,7 +37,6 @@ import org.labkey.specimen.actions.SpecimenController; import java.util.List; -import java.util.Map; import java.util.Set; import static org.labkey.specimen.SpecimenCommentAuditDomainKind.COLUMN_NAME_VIAL_ID; @@ -78,14 +77,6 @@ public String getDescription() return "Specimen Comments and QC"; } - @Override - public Map legacyNameMap() - { - Map legacyNames = super.legacyNameMap(); - legacyNames.put(FieldKey.fromParts("key1"), COLUMN_NAME_VIAL_ID); - return legacyNames; - } - @Override public Class getEventClass() { diff --git a/study/src/org/labkey/study/assay/query/PublishAuditProvider.java b/study/src/org/labkey/study/assay/query/PublishAuditProvider.java index a00b32eb9cd..56376ac1bfb 100644 --- a/study/src/org/labkey/study/assay/query/PublishAuditProvider.java +++ b/study/src/org/labkey/study/assay/query/PublishAuditProvider.java @@ -180,19 +180,6 @@ public PublishAuditProvider() super(new PublishAuditDomainKind()); } - @Override - public Map legacyNameMap() - { - Map legacyMap = super.legacyNameMap(); - legacyMap.put(FieldKey.fromParts("intKey1"), COLUMN_NAME_PROTOCOL); - legacyMap.put(FieldKey.fromParts("key1"), COLUMN_NAME_TARGET_STUDY); - - legacyMap.put(FieldKey.fromParts("Property", "sourceLsid"), COLUMN_NAME_SOURCE_LSID); - legacyMap.put(FieldKey.fromParts("Property", "datasetId"), COLUMN_NAME_DATASET_ID); - legacyMap.put(FieldKey.fromParts("Property", "recordCount"), COLUMN_NAME_RECORD_COUNT); - return legacyMap; - } - @Override public Class getEventClass() { diff --git a/study/src/org/labkey/study/dataset/DatasetAuditProvider.java b/study/src/org/labkey/study/dataset/DatasetAuditProvider.java index 2c353d8c3ae..a8fd3a85a81 100644 --- a/study/src/org/labkey/study/dataset/DatasetAuditProvider.java +++ b/study/src/org/labkey/study/dataset/DatasetAuditProvider.java @@ -169,18 +169,6 @@ private void restrictDatasetAccess(FilteredTable table, User user) } } - @Override - public Map legacyNameMap() - { - Map legacyNames = super.legacyNameMap(); - legacyNames.put(FieldKey.fromParts("intKey1"), COLUMN_NAME_DATASET_ID); - legacyNames.put(FieldKey.fromParts("intKey2"), COLUMN_NAME_HAS_DETAILS); - legacyNames.put(FieldKey.fromParts("key1"), COLUMN_NAME_LSID); - legacyNames.put(FieldKey.fromParts("Property", AbstractAuditDomainKind.OLD_RECORD_PROP_NAME), AbstractAuditDomainKind.OLD_RECORD_PROP_NAME); - legacyNames.put(FieldKey.fromParts("Property", AbstractAuditDomainKind.NEW_RECORD_PROP_NAME), AbstractAuditDomainKind.NEW_RECORD_PROP_NAME); - return legacyNames; - } - @Override public Class getEventClass() {