Skip to content

Domain Templates: reserve column names #1013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-nicka merged 1 commit into from
May 22, 2026
Merged

Domain Templates: reserve column names #1013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions elispotassay/src/org/labkey/elispot/query/ElispotAntigenDomainKind.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,11 @@
*/
package org.labkey.elispot.query;

import org.jetbrains.annotations.NotNull;
import org.labkey.api.assay.AssayDomainKind;
import org.labkey.api.data.DbScope;
import org.labkey.api.data.JdbcType;
import org.labkey.api.data.PropertyStorageSpec;
import org.labkey.api.exp.property.Domain;
import org.labkey.api.security.User;
import org.labkey.elispot.ElispotAssayProvider;
import org.labkey.elispot.ElispotDataHandler;
import org.labkey.elispot.ElispotManager;
Expand Down Expand Up @@ -86,10 +84,4 @@ public String getStorageSchemaName()
{
return ElispotProtocolSchema.ELISPOT_ANTIGEN_SCHEMA_NAME;
}

@Override
public @NotNull Set<String> getReservedPropertyNames(Domain domain, User user)
{
return getAssayReservedPropertyNames();
}
}
6 changes: 1 addition & 5 deletions luminex/src/org/labkey/luminex/LuminexAnalyteDomainKind.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@
import java.util.List;
import java.util.Set;

/**
* User: jeckels
* Date: Jan 27, 2012
*/
public class LuminexAnalyteDomainKind extends AssayDomainKind
{
private static final Set<String> RESERVED_NAMES;
Expand Down Expand Up @@ -58,7 +54,7 @@ public String getKindName()
}

@Override
public @NotNull Set<String> getReservedPropertyNames(Domain domain, User user)
protected @NotNull Set<String> getKindReservedPropertyNames(Domain domain, User user, boolean forCreate)
{
return RESERVED_NAMES;
}
Expand Down
7 changes: 2 additions & 5 deletions luminex/src/org/labkey/luminex/LuminexDataDomainKind.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@
import java.util.Map;
import java.util.Set;

/**
* User: jeckels
* Date: Jan 27, 2012
*/
public class LuminexDataDomainKind extends AssayDomainKind
{
public static final Set<String> RESERVED_NAMES;
Expand All @@ -49,6 +45,7 @@ public class LuminexDataDomainKind extends AssayDomainKind

RESERVED_NAMES = DomainUtil.getNamesAndLabels(names);
}

public LuminexDataDomainKind()
{
super(LuminexAssayProvider.ASSAY_DOMAIN_CUSTOM_DATA);
Expand All @@ -61,7 +58,7 @@ public String getKindName()
}

@Override
public @NotNull Set<String> getReservedPropertyNames(Domain domain, User user)
protected @NotNull Set<String> getKindReservedPropertyNames(Domain domain, User user, boolean forCreate)
{
return RESERVED_NAMES;
}
Expand Down
2 changes: 1 addition & 1 deletion nab/src/org/labkey/nab/query/NabVirusDomainKind.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public String getStorageSchemaName()
}

@Override
public @NotNull Set<String> getReservedPropertyNames(Domain domain, User user)
protected @NotNull Set<String> getKindReservedPropertyNames(Domain domain, User user, boolean forCreate)
{
return RESERVED_PROPERTY_NAMES;
}
Expand Down
Loading