[4.20] Fix account deletion blocked by deleted project admin mappings#12615

Open

SURYAS1306 wants to merge 14 commits intoapache:4.20from

SURYAS1306:fix-account-delete-4.20-clean

Commits on Feb 9, 2026

Fix account deletion blocked by deleted project admin mappings

Surya Srinivasan
authored and
Surya Srinivasan
committed
Fix indentation per review

Surya Srinivasan
authored and
Surya Srinivasan
committed
Update server/src/main/java/com/cloud/user/AccountManagerImpl.java

SURYAS1306
and
DaanHoogland
authored

Commits on Feb 10, 2026

Fix test mocks to use injected _projectAccountDao and _projectDao

Surya Srinivasan
authored and
Surya Srinivasan
committed
Fix missing imports for ProjectAccountDao, ProjectDao and InjectMocks

Surya Srinivasan
authored and
Surya Srinivasan
committed
Fix AccountManagerImplTest by spying AccountManagerImpl to allow stubbing internal methods

Surya Srinivasan
authored and
Surya Srinivasan
committed

Commits on Feb 11, 2026

Fix AccountManagerImplTest spy initialization order

Surya Srinivasan
authored and
Surya Srinivasan
committed
Remove unused org.mockito.Spy import

Surya Srinivasan
authored and
Surya Srinivasan
committed

Commits on Feb 12, 2026

Remove manual Mockito.mock calls and rely on @Mock injection

Surya Srinivasan
authored and
Surya Srinivasan
committed
test: fix Mockito NotMock errors by using proper @BeforeClass/@Before lifecycle

Surya Srinivasan
authored and
Surya Srinivasan
committed

Commits on Feb 13, 2026

fix checkstyle issue in AccountManagerImplTest

Surya Srinivasan
authored and
Surya Srinivasan
committed
test: add missing BeforeClass import

Surya Srinivasan
authored and
Surya Srinivasan
committed
test: stop mocking getCurrentCallingAccount and use CallContext

Surya Srinivasan
authored and
Surya Srinivasan
committed

Commits on Feb 16, 2026

test: add JUnit @After import for CallContext cleanup

Surya Srinivasan
authored and
Surya Srinivasan
committed