#1953: Complete cleanup commandlet implementation and review handover by Caylipp · Pull Request #2230 · devonfw/IDEasy

Caylipp · 2026-07-29T11:27:30Z

This PR fixes #1953

This PR completes and supersedes #1957 after the original author left the team.

Implemented changes:

Reused the existing global -f / --force mode instead of introducing a cleanup-specific force option.
Removed the obsolete --force-delete help entries.
Kept cleanup discovery stateless by creating the discovered-tool list locally for each execution.
Moved the cleanup model into reusable top-level classes in the lowercase commandlet.cleanup package.
Scanned all repositories below _ide/software, including default, maven, and custom repository IDs.
Matched project software references against resolved installation paths instead of relying on fixed path positions.
Supported project links to subdirectories of an installation, such as Contents/MacOS.
Supported the following software link structures:
- software/<tool>
- software/extra/<tool>
- software/extra/<tool>/<name>
Stored project usage only on the concrete tool edition version.
Derived the unused state of editions and tools from their child versions.
Improved JavaDoc for the cleanup model and its properties.

Testing instructions

Please add conscise, understandable instructions on how a reviewer can test/verify the functionality of your contribution here:

mvn -pl cli -Dtest=CleanupCommandletTest test
mvn clean test

Checklist for this PR

Make sure everything is checked before merging this PR. For further info please also see
our DoD.

When running mvn clean test locally all tests pass and build is successful
PR title is of the form #«issue-id»: «brief summary» (e.g. #921: fixed setup.bat). If no issue ID exists, title only.
PR top-level comment summarizes what has been done and contains link to addressed issue(s)
PR and issue(s) have suitable labels
Issue is set to In Progress and assigned to you or there is no issue (might happen for very small PRs)
You followed all coding conventions
You have added the issue implemented by your PR in CHANGELOG.adoc unless issue is labeled
with internal
You have formulated clear instructions on how to test your contribution under "Testing instructions"

Checklist for tool commandlets

Have you added a new «tool» as commandlet? There are the following additional checks:

The tool can be installed automatically (during setup via settings) or via the commandlet call
The tool is isolated in its IDEasy project, see Sandbox Principle
The new tool is added to the table of tools in LICENSE.asciidoc
The new commandlet is a command-wrapper for «tool»
Proper help texts for all supported languages are added here
The new commandlet installs potential dependencies automatically
The variables «TOOL»_VERSION and «TOOL»_EDITION are honored by your commandlet
The new commandlet is tested on all platforms it is available for or tested on all platforms that are in scope of the linked issue

…p-commandlet-handover

- scan all global software repositories - detect used versions by resolved installation paths - support links to installation subfolders and nested extra tools - make cleanup discovery stateless - track project usage only on version level - reuse the global force mode for confirmation - add regression tests for used and unused installations

coveralls · 2026-07-29T11:38:44Z

Coverage Report for CI Build 31014731240

Coverage increased (+0.3%) to 72.861%

Details

Coverage increased (+0.3%) from the base build.
Patch coverage: No coverable lines changed in this PR.
28 coverage regressions across 4 files.

Uncovered Changes

No uncovered changes found.

Coverage Regressions

28 previously-covered lines in 4 files lost coverage.

File	Lines Losing Coverage	Coverage
com/devonfw/tools/ide/context/IdeContext.java	17	77.46%
com/devonfw/tools/ide/commandlet/CommandletManagerImpl.java	7	91.94%
com/devonfw/ide/gui/context/ProjectManager.java	3	86.67%
com/devonfw/tools/ide/version/VersionSegment.java	1	91.86%

Coverage Stats


Relevant Lines:	17453
Covered Lines:	13262
Line Coverage:	75.99%
Relevant Branches:	7721
Covered Branches:	5080
Branch Coverage:	65.79%
Branches in Coverage %:	Yes
Coverage Strength:	3.23 hits per line

💛 - Coveralls

hohwille

We are closing the finishing line 👍
Still I found some points...

quando632

Thanks for picking this up the substance of the #1957 review is addressed and the new tests cover exactly the cases that were requested there. I went through the branch and found a few points before this can go in, three of them blocking from my side:

the new tests error out on Windows without symlink privileges (verified locally, 3 of 4 tests)
the CHANGELOG entry landed in an already released section
the confirmation cannot actually be skipped with -f alone

The remaining ones are smaller correctness and consistency points. I left out anything already covered by the review above (common super class for the model classes, delete flag only on version level, central findProjects()).

- add common abstract base class for installed software items - centralize software item name and path - rename cleanup model classes for reuse

- keep deletion state only on software versions - delete unused versions before empty parent folders - remove redundant deletion state from tools and editions

- add reusable project discovery to IdeContext - exclude non project folders centrally - reuse project discovery in cleanup and GUI

- scan default, Maven, and configured custom repositories explicitly - update cleanup test for the configured custom repository

Co-authored-by: quando632 <quang-hieu.do@capgemini.com>

- add better help message - propagate user cancellation through the standard abort handling - correct software discovery variable names - report affected tools and editions accurately - cover batch force mode and Windows symlink restrictions - adjust CHANGELOG.adoc entry

quando632

All eight points from my previous review are addressed on dc95fdea. mvn -Dtest=CleanupCommandletTest test is green (5 tests, 3 skipped for missing symlink privileges), and checkstyle and spotless report no violations in the new files. Solving the counter problem by reporting "affected" tools and editions is nicer than what I suggested.

Two issues came out of the changes themselves, one of them blocking. Both only appear when the individual fixes are combined, so they are not visible in any single change.

…anupCommandlet.java Co-authored-by: quando632 <quang-hieu.do@capgemini.com>

hohwille

@Caylipp thanks for taking up this story and PR. 👍
I still have suggestions for improvement.
I hope you can address them tomorrow and I can merge the next day what would be awesome.
If you are running out of time, you may skip some "nice to haves" and I will create a cleanup issue and merge then. Thanks.

…anupCommandlet.java Co-authored-by: Jörg Hohwiller <hohwille@users.noreply.github.com>

- minor changes

- index installed versions by path - replace nested version lookup with map based lookup - preserve lookup for referenced subdirectories - centralize hierarchy updates through add methods - use a set for projects using a version

hohwille · 2026-08-06T11:01:40Z

Build failed with:

[ERROR] Errors: 
[ERROR]   TaskWindowTest.listContentsAreCoherent:111 » ConcurrentModification
[INFO] 
[ERROR] Tests run: 56, Failures: 0, Errors: 1, Skipped: 0

Seems to be #2242 - I restarted the build and hope we get a green run.
Will also look at PR for #2242 and get this merged/fixed.
If that goes fast, I can also just sync this PR with main.

quando632 · 2026-08-07T11:52:46Z

Successfully tested with ide-cli 2026.08.001-SNAPSHOT on Windows

areinicke and others added 29 commits May 15, 2026 16:05

First push

a5ce507

Allow discvery of software and unused software

f4ed982

Further Implementation

c3cfee4

Update Help descriptions

eea15ae

Finish Base Implementation

a4d933a

Merge branch 'main' into feature/1580-cleanup-commandlet

417a095

Added changelog entry

6af2558

Changed variable names to follow Coding conventions

bf63125

Add comments, method and class descriptions

a094a7d

Minor fixes

533c686

Add basic test

bf79fef

Small optimization

cfb9a1b

Test commit. No relevant changes

a333425

Add fix for ide shell

beeb33d

Minor adjustment: Move Completion message to end of method

b8a590a

Merge branch 'main' into feature/1580-cleanup-commandlet

3f5171b

Merge branch 'main' into feature/1580-cleanup-commandlet

d0f5a35

Refactor Step 1

ed172b1

Add additional JavaDoc

17ded28

Update help files

432c81e

Update Help files

8a6b88d

Merge branch 'main' into feature/1580-cleanup-commandlet

af18fdb

Merge branch 'main' into feature/1580-cleanup-commandlet

82b550f

Change package name and move cleanup commandlet into package

ca229d2

Merge branch 'main' into feature/1580-cleanup-commandlet

d0972ba

Merge branch 'main' into feature/1580-cleanup-commandlet

3e5330d

Merge branch 'main' into feature/1580-cleanup-commandlet

58570de

Merge remote-tracking branch 'upstream/main' into feature/1953-cleanu…

5d2e208

…p-commandlet-handover

github-project-automation Bot added this to IDEasy board Jul 29, 2026

Merge branch 'main' into feature/1953-cleanup-commandlet-handover

21ff00a

quando632 self-assigned this Jul 29, 2026

hohwille reviewed Jul 30, 2026

View reviewed changes

quando632 reviewed Jul 30, 2026

View reviewed changes

Caylipp and others added 7 commits July 30, 2026 14:02

devonfw#1953: Introduce installed software hierarchy

3665d3e

- add common abstract base class for installed software items - centralize software item name and path - rename cleanup model classes for reuse

devonfw#1953: Simplify installed software deletion state

79c9f95

- keep deletion state only on software versions - delete unused versions before empty parent folders - remove redundant deletion state from tools and editions

devonfw#1953: Centralize IDEasy project discovery

26a1049

- add reusable project discovery to IdeContext - exclude non project folders centrally - reuse project discovery in cleanup and GUI

devonfw#1953: Fix custom repository cleanup

1890d1b

- scan default, Maven, and configured custom repositories explicitly - update cleanup test for the configured custom repository

Update cli/src/main/resources/nls/Help.properties

86f291a

Co-authored-by: quando632 <quang-hieu.do@capgemini.com>

Merge branch 'main' into feature/1953-cleanup-commandlet-handover

dc95fde

quando632 reviewed Aug 3, 2026

View reviewed changes

Caylipp and others added 4 commits August 4, 2026 08:56

Update cli/src/main/java/com/devonfw/tools/ide/commandlet/cleanup/Cle…

91b0fe3

…anupCommandlet.java Co-authored-by: quando632 <quang-hieu.do@capgemini.com>

Update cli/src/main/java/com/devonfw/tools/ide/commandlet/cleanup/Cle…

7754a3f

…anupCommandlet.java Co-authored-by: quando632 <quang-hieu.do@capgemini.com>

Merge branch 'main' into feature/1953-cleanup-commandlet-handover

b6c0f20

devonfw#1953: Address review

430b0bd

Caylipp moved this from Team Review to 👀 In review in IDEasy board Aug 4, 2026

hohwille approved these changes Aug 4, 2026

View reviewed changes

Caylipp changed the title ~~#1953: Complete cleanup commandlet implementation and review handoverShow more lines~~ #1953: Complete cleanup commandlet implementation and review handoverShow Aug 5, 2026

Caylipp changed the title ~~#1953: Complete cleanup commandlet implementation and review handoverShow~~ #1953: Complete cleanup commandlet implementation and review handover Aug 5, 2026

Caylipp and others added 3 commits August 5, 2026 14:33

Update cli/src/main/java/com/devonfw/tools/ide/commandlet/cleanup/Cle…

dcbfb7d

…anupCommandlet.java Co-authored-by: Jörg Hohwiller <hohwille@users.noreply.github.com>

devonfw#1953: Address Review points

248bb62

- minor changes

devonfw#1953: Optimize installed software lookup

b439f31

- index installed versions by path - replace nested version lookup with map based lookup - preserve lookup for referenced subdirectories - centralize hierarchy updates through add methods - use a set for projects using a version

hohwille merged commit f0f4c29 into devonfw:main Aug 6, 2026
4 of 5 checks passed

github-project-automation Bot moved this from 👀 In review to ✅ Done in IDEasy board Aug 6, 2026

hohwille added this to the release:2026.08.001 milestone Aug 6, 2026

quando632 added the QA approved Label a PR that has been re-testet via nightly SNAPSHOT after merge and commented. label Aug 7, 2026

Uh oh!

Conversation

Caylipp commented Jul 29, 2026 • edited by hohwille Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

This PR fixes #1953

Implemented changes:

Testing instructions

Related

Checklist for this PR

Checklist for tool commandlets

Uh oh!

coveralls commented Jul 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Coverage Report for CI Build 31014731240

Coverage increased (+0.3%) to 72.861%

Details

Uncovered Changes

Coverage Regressions

Coverage Stats

💛 - Coveralls

Uh oh!

hohwille left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

quando632 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

quando632 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

hohwille left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

hohwille commented Aug 6, 2026

Uh oh!

Uh oh!

quando632 commented Aug 7, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Caylipp commented Jul 29, 2026 •

edited by hohwille

Loading

coveralls commented Jul 29, 2026 •

edited

Loading

quando632 left a comment •

edited

Loading