Skip to content

Commit d243e9e

Browse files
labkey-adamlabkey-adam
authored
Remove all support for legacy audit union table (#7230)
1 parent 8963dc5 commit d243e9e

23 files changed

Lines changed: 7 additions & 438 deletions

File tree

‎api/src/org/labkey/api/audit/AbstractAuditTypeProvider.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -279,10 +279,7 @@ public List<FieldKey> getDefaultVisibleColumns()
279279
@Override
280280
public Map<FieldKey, String> legacyNameMap()
281281
{
282-
Map<FieldKey, String> legacyNames = new LinkedHashMap<>();
283-
legacyNames.put(FieldKey.fromParts("ContainerId"), "Container");
284-
legacyNames.put(FieldKey.fromParts("Date"), "Created");
285-
return legacyNames;
282+
return new LinkedHashMap<>();
286283
}
287284

288285
public static Container getDomainContainer()

‎api/src/org/labkey/api/audit/AuditTypeProvider.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,7 @@ public interface AuditTypeProvider
5050

5151
<K extends AuditTypeEvent> Class<K> getEventClass();
5252

53-
/**
54-
* Mapping from old audit table names ("intKey1", "key1", and "Property/Foo" to the new column names.)
55-
*/
53+
@Deprecated // Not used anymore - remove
5654
Map<FieldKey, String> legacyNameMap();
5755

5856
ActionURL getAuditUrl();

‎api/src/org/labkey/api/audit/ClientApiAuditProvider.java‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -99,21 +99,6 @@ public String getDescription()
9999
return "Information about audit events created through the client API.";
100100
}
101101

102-
@Override
103-
public Map<FieldKey, String> legacyNameMap()
104-
{
105-
Map<FieldKey, String> legacyNames = super.legacyNameMap();
106-
107-
// 'key1' mapped to 'subtype' and other 'keyN' are mapped to 'stringN-1'
108-
legacyNames.put(FieldKey.fromParts("key1"), COLUMN_NAME_SUBTYPE);
109-
legacyNames.put(FieldKey.fromParts("key2"), COLUMN_NAME_STRING1);
110-
legacyNames.put(FieldKey.fromParts("key3"), COLUMN_NAME_STRING2);
111-
legacyNames.put(FieldKey.fromParts("intKey1"), COLUMN_NAME_INT1);
112-
legacyNames.put(FieldKey.fromParts("intKey2"), COLUMN_NAME_INT2);
113-
legacyNames.put(FieldKey.fromParts("intKey3"), COLUMN_NAME_INT3);
114-
return legacyNames;
115-
}
116-
117102
@Override
118103
public TableInfo createTableInfo(UserSchema userSchema, ContainerFilter cf)
119104
{

‎api/src/org/labkey/api/audit/provider/FileSystemAuditProvider.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,6 @@ public String getDescription()
8484
return "Displays information about file uploads and modifications.";
8585
}
8686

87-
@Override
88-
public Map<FieldKey, String> legacyNameMap()
89-
{
90-
Map<FieldKey, String> legacyNames = super.legacyNameMap();
91-
legacyNames.put(FieldKey.fromParts("key1"), COLUMN_NAME_DIRECTORY);
92-
legacyNames.put(FieldKey.fromParts("key2"), COLUMN_NAME_FILE);
93-
legacyNames.put(FieldKey.fromParts("key3"), COLUMN_NAME_RESOURCE_PATH);
94-
return legacyNames;
95-
}
96-
9787
@Override
9888
public <K extends AuditTypeEvent> Class<K> getEventClass()
9989
{

‎api/src/org/labkey/api/audit/provider/GroupAuditProvider.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -108,16 +108,6 @@ public GroupAuditProvider()
108108
super(new GroupAuditDomainKind());
109109
}
110110

111-
@Override
112-
public Map<FieldKey, String> legacyNameMap()
113-
{
114-
Map<FieldKey, String> legacyNames = super.legacyNameMap();
115-
legacyNames.put(FieldKey.fromParts("EntityId"), COLUMN_NAME_RESOURCE_ENTITY_ID);
116-
legacyNames.put(FieldKey.fromParts("intKey1"), COLUMN_NAME_USER);
117-
legacyNames.put(FieldKey.fromParts("intKey2"), COLUMN_NAME_GROUP);
118-
return legacyNames;
119-
}
120-
121111
@Override
122112
public <K extends AuditTypeEvent> Class<K> getEventClass()
123113
{

‎api/src/org/labkey/api/audit/provider/MessageAuditProvider.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,6 @@ public String getDescription()
7878
return "Data about messages sent from the server.";
7979
}
8080

81-
@Override
82-
public Map<FieldKey, String> legacyNameMap()
83-
{
84-
Map<FieldKey, String> legacyNames = super.legacyNameMap();
85-
legacyNames.put(FieldKey.fromParts("key1"), COLUMN_NAME_FROM);
86-
legacyNames.put(FieldKey.fromParts("key2"), COLUMN_NAME_TO);
87-
legacyNames.put(FieldKey.fromParts("key3"), COLUMN_NAME_CONTENT_TYPE);
88-
return legacyNames;
89-
}
90-
9181
@Override
9282
public <K extends AuditTypeEvent> Class<K> getEventClass()
9383
{

‎api/src/org/labkey/api/audit/provider/SiteSettingsAuditProvider.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,14 +150,6 @@ public Map<String, Object> getAuditLogMessageElements()
150150
}
151151
}
152152

153-
@Override
154-
public Map<FieldKey, String> legacyNameMap()
155-
{
156-
Map<FieldKey, String> legacyNames = super.legacyNameMap();
157-
legacyNames.put(FieldKey.fromParts("Property", AUDIT_PROP_DIFF), COLUMN_NAME_CHANGES);
158-
return legacyNames;
159-
}
160-
161153
public static class SiteSettingsAuditDomainKind extends AbstractAuditDomainKind
162154
{
163155
public static final String NAME = "SiteSettingsAuditDomain";

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

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.junit.Test;
2323
import org.labkey.api.audit.AbstractAuditTypeProvider;
2424
import org.labkey.api.audit.AuditLogService;
25-
import org.labkey.api.collections.CaseInsensitiveHashSet;
2625
import org.labkey.api.collections.LabKeyCollectors;
2726
import org.labkey.api.data.Container;
2827
import org.labkey.api.data.ContainerManager;
@@ -49,7 +48,6 @@
4948
import org.labkey.api.query.QueryService;
5049
import org.labkey.api.query.ValidationException;
5150
import org.labkey.api.security.User;
52-
import org.labkey.api.settings.OptionalFeatureService;
5351
import org.labkey.api.util.PageFlowUtil;
5452
import org.labkey.api.view.ActionURL;
5553
import org.labkey.api.view.NavTree;
@@ -66,8 +64,6 @@
6664
import java.util.Set;
6765
import java.util.stream.Collectors;
6866

69-
import static org.labkey.api.audit.query.DefaultAuditTypeTable.LEGACY_UNION_AUDIT_TABLE;
70-
7167
public abstract class AbstractAuditDomainKind extends DomainKind<JSONObject>
7268
{
7369
private static final String XAR_SUBSTITUTION_SCHEMA_NAME = "SchemaName";
@@ -398,14 +394,7 @@ public PropertyStorageSpec getPropertySpec(PropertyDescriptor pd, Domain domain)
398394
@Override
399395
public Set<String> getNonProvisionedTableNames()
400396
{
401-
// omit the legacy auditlog table, this can be removed once the
402-
// table is dropped after migration
403-
Set<String> tables = new CaseInsensitiveHashSet();
404-
405-
if (OptionalFeatureService.get().isFeatureEnabled(LEGACY_UNION_AUDIT_TABLE))
406-
tables.add("auditlog");
407-
408-
return tables;
397+
return Collections.emptySet();
409398
}
410399

411400
@Nullable

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

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import org.labkey.api.security.roles.CanSeeAuditLogRole;
4343
import org.labkey.api.security.roles.Role;
4444
import org.labkey.api.security.roles.RoleManager;
45-
import org.labkey.api.settings.OptionalFeatureService;
4645

4746
import java.util.ArrayList;
4847
import java.util.List;
@@ -51,10 +50,7 @@
5150

5251
public class DefaultAuditTypeTable extends FilteredTable<UserSchema>
5352
{
54-
public static final String LEGACY_UNION_AUDIT_TABLE = "legacyUnionAuditTable";
55-
5653
protected AuditTypeProvider _provider;
57-
protected Map<FieldKey, String> _legacyNameMap;
5854
protected Map<String, String> _dbSchemaToColumnMap;
5955

6056
public DefaultAuditTypeTable(AuditTypeProvider provider, TableInfo storage, UserSchema schema, ContainerFilter cf, List<FieldKey> defaultVisibleColumns)
@@ -67,17 +63,9 @@ public DefaultAuditTypeTable(AuditTypeProvider provider, TableInfo storage, User
6763
if (_provider.getDescription() != null)
6864
setDescription(_provider.getDescription());
6965

70-
_legacyNameMap = OptionalFeatureService.get().isFeatureEnabled(LEGACY_UNION_AUDIT_TABLE) ? provider.legacyNameMap() : Map.of();
71-
7266
// Create a mapping from the real dbTable names to the legacy query table names for QueryUpdateService.
7367
_dbSchemaToColumnMap = new CaseInsensitiveHashMap<>();
7468

75-
for (FieldKey legacyName : _legacyNameMap.keySet())
76-
{
77-
String newName = _legacyNameMap.get(legacyName);
78-
_dbSchemaToColumnMap.put(newName, legacyName.getName());
79-
}
80-
8169
setTitle(provider.getEventName());
8270

8371
wrapAllColumns(true);
@@ -171,17 +159,10 @@ protected ColumnInfo resolveColumn(String name)
171159

172160
String newName = null;
173161

174-
if (_legacyNameMap.isEmpty())
175-
{
176-
// Backward compatibility with widely used legacy name
177-
if ("Date".equalsIgnoreCase(name))
178-
newName = "Created";
179-
}
180-
else
181-
{
182-
// Handle the old style 'intKey1' and 'key1' columns
183-
newName = _legacyNameMap.get(FieldKey.fromParts(name));
184-
}
162+
// Backward compatibility with widely-used legacy name
163+
if ("Date".equalsIgnoreCase(name))
164+
newName = "Created";
165+
185166
col = super.resolveColumn(newName);
186167
if (col != null)
187168
{

‎api/src/org/labkey/api/exp/property/DomainAuditProvider.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,6 @@ public List<FieldKey> getDefaultVisibleColumns()
118118
return defaultVisibleColumns;
119119
}
120120

121-
@Override
122-
public Map<FieldKey, String> legacyNameMap()
123-
{
124-
Map<FieldKey, String> legacyNames = super.legacyNameMap();
125-
legacyNames.put(FieldKey.fromParts("key1"), COLUMN_NAME_DOMAIN_URI);
126-
legacyNames.put(FieldKey.fromParts("key3"), COLUMN_NAME_DOMAIN_NAME);
127-
return legacyNames;
128-
}
129-
130121
@Override
131122
public <K extends AuditTypeEvent> Class<K> getEventClass()
132123
{

0 commit comments

Comments
 (0)