Skip to content

Commit 3ffd027

Browse files
committed
Remove unneeded parameters
1 parent d85f8ca commit 3ffd027

3 files changed

Lines changed: 9 additions & 3 deletions

File tree

api/src/org/labkey/api/exp/LsidManager.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ public static LsidManager get()
7474
return INSTANCE;
7575
}
7676

77+
public static DbSequence getLsidPrefixDbSeq(String lsidPrefix, int batchSize)
78+
{
79+
return getLsidPrefixDbSeq(ContainerManager.getRoot(), lsidPrefix, batchSize);
80+
}
81+
7782
public static DbSequence getLsidPrefixDbSeq(Container container, String lsidPrefix, int batchSize)
7883
{
7984
Container projectContainer = container; // use DBSeq at project level to avoid duplicate lsid for types in child folder

list/src/org/labkey/list/model/ListDefinitionImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public ListDefinitionImpl(Container container, String name, KeyType keyType, @Nu
106106
builder.setKeyType(keyType.toString());
107107
builder.setCategory(category);
108108
_def = builder;
109-
Lsid lsid = ListDomainKind.generateDomainURI(name, container, keyType, category);
109+
Lsid lsid = ListDomainKind.generateDomainURI(container, keyType, category);
110110
_domain = PropertyService.get().createDomain(container, lsid.toString(), name, templateInfo);
111111
}
112112

list/src/org/labkey/list/model/ListDomainKind.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.labkey.api.data.ColumnInfo;
2828
import org.labkey.api.data.Container;
2929
import org.labkey.api.data.ContainerFilter;
30+
import org.labkey.api.data.ContainerManager;
3031
import org.labkey.api.data.DbScope;
3132
import org.labkey.api.data.JdbcType;
3233
import org.labkey.api.data.PropertyStorageSpec;
@@ -269,14 +270,14 @@ public Set<PropertyStorageSpec.Index> getPropertyIndices(Domain domain)
269270
return Collections.emptySet(); // TODO: Allow this to return the Key Column
270271
}
271272

272-
public static Lsid generateDomainURI(String name, Container c, KeyType keyType, @Nullable ListDefinition.Category category)
273+
public static Lsid generateDomainURI(Container c, KeyType keyType, @Nullable ListDefinition.Category category)
273274
{
274275
String type = getType(keyType, category);
275276
Lsid lsid;
276277
// assure LSID does not collide with previous lsids that may have had number names
277278
do
278279
{
279-
String dbSeqStr = String.valueOf(LsidManager.getLsidPrefixDbSeq(c, type, 1).next());
280+
String dbSeqStr = String.valueOf(LsidManager.getLsidPrefixDbSeq(type, 1).next());
280281
lsid = new Lsid(type, "Folder-" + c.getRowId(), dbSeqStr);
281282
} while (OntologyManager.getDomainDescriptor(lsid.toString(), c) != null);
282283

0 commit comments

Comments
 (0)