Skip to content

fix: support ResourceLoader #190 #193

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
imuromtsev merged 1 commit into from
Feb 24, 2026
Merged

fix: support ResourceLoader #190 #193

Show file tree
Hide file tree
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
6 changes: 5 additions & 1 deletion modules/spring-core/src/main/kotlin/com/explyt/spring/core/service/SpringSearchService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,11 @@ class SpringSearchService(private val project: Project) {
val beanQualifiedName = beanPsiClass?.qualifiedName
val byTypeComponents = getStaticBeans(module)
.filter { bean ->
beanQualifiedName != null && InheritanceUtil.isInheritor(bean.psiClass, beanQualifiedName)
bean.psiClass.qualifiedName?.let { InheritanceUtil.isInheritor(beanPsiClass, it) } == true
|| beanQualifiedName != null && InheritanceUtil.isInheritor(
bean.psiClass,
beanQualifiedName
)
}
.map { it.psiClass } +
getPsiClassesByComponents(module, sourcePsiType, beanPsiType, byTypeBeanMethods.isEmpty()).toSet()
Expand Down
1 change: 0 additions & 1 deletion ...in/com/explyt/spring/core/service/beans/discoverer/SpringCoreAdditionalBeansDiscoverer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ class SpringCoreAdditionalBeansDiscoverer : AdditionalBeansDiscoverer() {
getStaticBean(module, SpringCoreClasses.PROPERTY_RESOLVER, "propertyResolver"),
getStaticBean(module, SpringCoreClasses.CONVERSION_SERVICE, "conversionService"),
getStaticBean(module, SpringCoreClasses.APPLICATION_CONTEXT, "applicationContext"),
getStaticBean(module, SpringCoreClasses.RESOURCE_LOADER, "resourceLoader"),
)
}

Expand Down
3 changes: 3 additions & 0 deletions ...in/com/explyt/spring/core/inspections/java/SpringBeanIncorrectAutowiringInspectionTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,16 @@ class SpringBeanIncorrectAutowiringInspectionTest : ExplytInspectionJavaTestCase
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.core.io.ResourceLoader;
import org.springframework.context.support.AbstractApplicationContext;

@${SpringCoreClasses.COMPONENT}
public class DemoApplication {
@Autowired
ResourceLoader resourceLoader;
@Autowired
ApplicationContext context;
@Autowired
AbstractApplicationContext abstractContext;
}
"""
myFixture.configureByText("DemoApplication.java", code.trimIndent())
Expand Down
15 changes: 7 additions & 8 deletions .../com/explyt/spring/core/inspections/kotlin/SpringBeanIncorrectAutowiringInspectionTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,16 @@ class SpringBeanIncorrectAutowiringInspectionTest : ExplytInspectionKotlinTestCa

fun testResourceLoader() {
@Language("kotlin") val code = """

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.core.io.ResourceLoader;
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.context.ApplicationContext
import org.springframework.core.io.ResourceLoader
import org.springframework.context.support.AbstractApplicationContext

@${SpringCoreClasses.COMPONENT}
class DemoApplication {
@Autowired
var resourceLoader: ResourceLoader? = null
@Autowired
var context: ApplicationContext? = null
@Autowired var resourceLoader: ResourceLoader? = null
@Autowired var context: ApplicationContext? = null
@Autowired var abstractContext: AbstractApplicationContext? = null
}
"""
myFixture.configureByText("DemoApplication.kt", code.trimIndent())
Expand Down
Loading