Skip to content

Make loading Spring bean classes even more safe #2154

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 2 commits into from
Apr 17, 2023
Merged

Make loading Spring bean classes even more safe #2154

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23abd79
Make Spring bean class loading safer
IlyaMuravjov Apr 17, 2023
7aefd99
Also log exception message when Spring bean class loading fails
IlyaMuravjov Apr 17, 2023
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
14 changes: 12 additions & 2 deletions utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

package org.utbot.framework.plugin.api

import mu.KotlinLogging
import org.utbot.common.FileUtil
import org.utbot.common.isDefaultValue
import org.utbot.common.withToStringThreadLocalReentrancyGuard
Expand Down Expand Up @@ -1270,6 +1271,10 @@ class SpringApplicationContext(
private val shouldUseImplementors: Boolean,
): ApplicationContext(mockInstalled, staticsMockingIsConfigured) {

companion object {
private val logger = KotlinLogging.logger {}
}

private var areInjectedClassesInitialized : Boolean = false

// Classes representing concrete types that are actually used in Spring application
Expand All @@ -1283,10 +1288,15 @@ class SpringApplicationContext(
!beanClass.isLocalClass && (!beanClass.isMemberClass || beanClass.isStatic)) {
springInjectedClassesStorage += beanClass.id
}
} catch (e: ClassNotFoundException) {
} catch (e: Throwable) {
// For some Spring beans (e.g. with anonymous classes)
// it is possible to have problems with classes loading.
continue
when (e) {
is ClassNotFoundException, is NoClassDefFoundError, is IllegalAccessError ->
logger.warn { "Failed to load bean class for $beanFqn (${e.message})" }

else -> throw e
}
}
}

Expand Down