Skip to content

Discover peer modules. #647

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
mezarin merged 2 commits into from
Jul 7, 2026
Merged

Discover peer modules. #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c5ab5c
Discover peer modules
mezarin Jul 7, 2026
a81a023
Re-enable associated test
mezarin Jul 7, 2026
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
6 changes: 1 addition & 5 deletions .../io.openliberty.tools.eclipse.ui/src/io/openliberty/tools/eclipse/model/ProjectModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,11 +452,7 @@ public boolean hasNature(String nature) throws CoreException {
* @param peerProjects The raw list of peer projects.
*/
public void setPeerDirProjects(List<ProjectModel> peerProjects) {
for (ProjectModel project : peerProjects) {
if (!getName().equals(project.getName())) {
this.peerDirProjects.add(project);
}
}
this.peerDirProjects.addAll(peerProjects);
}

/**
Expand Down
18 changes: 14 additions & 4 deletions ...o.openliberty.tools.eclipse.ui/src/io/openliberty/tools/eclipse/model/WorkspaceModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,17 @@ private void buildMultiProjectModel(List<IProject> projectsToScan, boolean class
}
}

// Step 3: Extract project/module dependencies.
// Step 3: Set peer projects for each child within the same parent.
for (ProjectModel projectModel : projectsByLocation.values()) {
List<ProjectModel> children = projectModel.getChildProjects();
if (!children.isEmpty()) {
for (ProjectModel child : children) {
child.setPeerDirProjects(children);
}
}
}

// Step 4: Extract project/module dependencies.
for (IProject iProject : projectsToScan) {
if (iProject.isOpen()) {
String projectLocation = iProject.getLocation().toOSString();
Expand All @@ -204,7 +214,7 @@ private void buildMultiProjectModel(List<IProject> projectsToScan, boolean class
}
}

// Step 4: Now that we have established parent and child relationships, classify with Liberty nature.
// Step 5: Now that we have established parent and child relationships, classify with Liberty nature.
if (classify) {
for (IProject iProject : projectsToScan) {
if (iProject.isOpen()) {
Expand All @@ -215,7 +225,7 @@ private void buildMultiProjectModel(List<IProject> projectsToScan, boolean class
}
}

// Step 5: Identify root projects (no parent or parent not in workspace).
// Step 6: Identify root projects (no parent or parent not in workspace).
rootProjects.clear();
for (ProjectModel projectModel : projectsByLocation.values()) {
if (projectModel.getParentProjectModel() == null) {
Expand All @@ -231,7 +241,7 @@ private void buildMultiProjectModel(List<IProject> projectsToScan, boolean class
}
}

// Step 6. Sort root projects alphabetically. Maven projects are shown first and Gradle projects second.
// Step 7. Sort root projects alphabetically. Maven projects are shown first and Gradle projects second.
rootProjects.sort((p1, p2) -> {
if (p1.getBuildType() != p2.getBuildType()) {
return p1.getBuildType() == BuildType.Maven ? -1 : 1;
Expand Down
2 changes: 0 additions & 2 deletions .../main/java/io/openliberty/tools/eclipse/test/it/LibertyPluginSWTBotMultiModMavenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.MethodOrderer.MethodName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
Expand Down Expand Up @@ -292,7 +291,6 @@ public void testStartWithDefaultRunAsConfig() {
/**
* Tests that the correct dependency projects are added to the debug source lookup list
*/
@Disabled("Until peer project discovery is implemented.")
@Test
public void testDebugSourceLookupContentSiblingModule() {

Expand Down
Loading