Skip to content

Commit 48e1fe5

Browse files
authored
Move single-module classes out of api into their owning modules (#3272)
## Rationale Shrink the api module by moving classes that only one module uses into that module, so they no longer compile on the api build path every module waits on. ## Related Pull Requests - LabKey/platform#8248 ## Changes - Move an api class used only by devtools into the module <!-- list of standard tasks (remove this comment to enable) ## Tasks - [ ] Claude Code Review - [ ] Manual Testing - [ ] Test Automation - [ ] Verify Fix -->
1 parent c2b2053 commit 48e1fe5

3 files changed

Lines changed: 39 additions & 2 deletions

File tree

‎modules/devtools/src/org/labkey/devtools/ToolsController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.labkey.api.action.SpringActionController;
3030
import org.labkey.api.cache.Cache;
3131
import org.labkey.api.cache.CacheManager;
32-
import org.labkey.api.collections.ArrayListValuedTreeMap;
3332
import org.labkey.api.collections.LabKeyCollectors;
3433
import org.labkey.api.data.BaseColumnInfo;
3534
import org.labkey.api.data.ColumnInfo;
@@ -70,6 +69,7 @@
7069
import org.labkey.api.view.NotFoundException;
7170
import org.labkey.api.view.VBox;
7271
import org.labkey.api.writer.PrintWriters;
72+
import org.labkey.devtools.collections.ArrayListValuedTreeMap;
7373
import org.springframework.validation.BindException;
7474
import org.springframework.validation.Errors;
7575
import org.springframework.web.servlet.ModelAndView;
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
/*
2+
* Copyright (c) 2025-2026 LabKey Corporation
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package org.labkey.devtools.collections;
17+
18+
import org.apache.commons.collections4.multimap.AbstractListValuedMap;
19+
20+
import java.util.ArrayList;
21+
import java.util.Comparator;
22+
import java.util.List;
23+
import java.util.TreeMap;
24+
25+
public class ArrayListValuedTreeMap<K, V> extends AbstractListValuedMap<K, V>
26+
{
27+
public ArrayListValuedTreeMap(Comparator<? super K> comparator)
28+
{
29+
super(new TreeMap<>(comparator));
30+
}
31+
32+
@Override
33+
protected List<V> createCollection()
34+
{
35+
return new ArrayList<>();
36+
}
37+
}

‎src/org/labkey/test/components/core/ProjectMenu.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
/**
3636
* Wraps the project/folder menu nav in labkey pages
37-
* Defined in org/labkey/core/project/folderNav.jsp and {@link org.labkey.api.view.menu.FolderMenu}
37+
* Defined in org/labkey/core/project/folderNav.jsp and {@link org.labkey.core.view.menu.FolderMenu}
3838
*/
3939
public class ProjectMenu extends WebDriverComponent<ProjectMenu.ElementCache>
4040
{

0 commit comments

Comments
 (0)