Skip to content
This repository was archived by the owner on Dec 10, 2025. It is now read-only.

Commit a8d7e46

Browse files
committed
feat: simplify resource loader initialization and remove AspectJ mode from async and caching annotations
1 parent ce66a1e commit a8d7e46

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/SurfCloudApplication.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration
66
import org.springframework.boot.autoconfigure.domain.EntityScan
77
import org.springframework.boot.context.TypeExcludeFilter
88
import org.springframework.cache.annotation.EnableCaching
9-
import org.springframework.context.annotation.AdviceMode
109
import org.springframework.context.annotation.ComponentScan
1110
import org.springframework.context.annotation.FilterType
1211
import org.springframework.scheduling.annotation.EnableAsync
@@ -23,10 +22,10 @@ import java.lang.annotation.Inherited
2322
@Target(AnnotationTarget.CLASS)
2423
@Retention(AnnotationRetention.RUNTIME)
2524
@EnableScheduling
26-
@EnableAsync(mode = AdviceMode.ASPECTJ)
25+
@EnableAsync
2726
//@EnableAspectJAutoProxy(proxyTargetClass = true, exposeProxy = true)
2827
@EntityScan
29-
@EnableCaching(mode = AdviceMode.ASPECTJ)
28+
@EnableCaching
3029
@AutoConfigurationPackage
3130
@Inherited
3231
@EnableAutoConfiguration

surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/CloudCoreInstance.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ class CloudCoreInstance : CloudInstance {
164164
val joinClassLoader = JoinClassLoader(classLoader, parentClassLoader)
165165
return tempChangeSystemClassLoader(joinClassLoader) {
166166
val parentContext = internalContext ?: error("Parent context is not initialized yet.")
167-
val resourceLoader = DefaultResourceLoader(joinClassLoader)
167+
val resourceLoader = DefaultResourceLoader(JoinClassLoader(joinClassLoader, listOf(javaClass.classLoader)))
168168
val childConfigurations =
169169
parentContext.getBeansOfType(CloudChildSpringApplicationConfiguration::class.java)
170170

0 commit comments

Comments
 (0)