Skip to content

Make SpringTypeReplacer actually call its delegate #2465

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
merged 1 commit into from
Aug 1, 2023
Merged

Make SpringTypeReplacer actually call its delegate #2465

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 6 additions & 7 deletions utbot-framework/src/main/kotlin/org/utbot/framework/context/spring/SpringTypeReplacer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,13 @@ class SpringTypeReplacer(
private val springApplicationContext: SpringApplicationContext
) : TypeReplacer {
override val typeReplacementMode: TypeReplacementMode =
// TODO add ` || delegateTypeReplacer.typeReplacementMode == TypeReplacementMode.KnownImplementor`
// (TODO is added as a part of only equivalent transformations refactoring PR and should be completed in the follow up PR)
if (springApplicationContext.beanDefinitions.isNotEmpty()) TypeReplacementMode.KnownImplementor
else TypeReplacementMode.NoImplementors
if (springApplicationContext.beanDefinitions.isNotEmpty() ||
delegateTypeReplacer.typeReplacementMode == TypeReplacementMode.KnownImplementor)
TypeReplacementMode.KnownImplementor
else
TypeReplacementMode.NoImplementors

override fun replaceTypeIfNeeded(type: RefType): ClassId? =
// TODO add `delegateTypeReplacer.replaceTypeIfNeeded(type) ?: `
// (TODO is added as a part of only equivalent transformations refactoring PR and should be completed in the follow up PR)
if (type.isAbstractType) springApplicationContext.injectedTypes.singleOrNull { it.isSubtypeOf(type.id) }
else null
else delegateTypeReplacer.replaceTypeIfNeeded(type)
}