File tree Expand file tree Collapse file tree 4 files changed +10
-8
lines changed
grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/api
grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm Expand file tree Collapse file tree 4 files changed +10
-8
lines changed Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ javaParserCoreVersion=3.15.14
2222junitVersion =4.12
2323junit-jupiter.version =5.7.0
2424javassistVersion =3.29.0-GA
25- groovyVersion =3.0.10
25+ groovyVersion =3.0.11
2626
2727org.gradle.caching =true
2828org.gradle.parallel =true
Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ import org.grails.datastore.gorm.GormValidateable
1212import org.grails.datastore.gorm.finders.DynamicFinder
1313import org.grails.datastore.gorm.finders.FinderMethod
1414import org.grails.datastore.mapping.core.connections.ConnectionSource
15+ import org.grails.datastore.mapping.core.connections.ConnectionSourceSettings
1516import org.grails.datastore.mapping.core.connections.ConnectionSources
1617import org.grails.datastore.mapping.model.PersistentEntity
1718import org.grails.datastore.mapping.multitenancy.MultiTenancySettings
@@ -54,7 +55,8 @@ class RxGormStaticApi<D> implements RxGormAllOperations<D> {
5455 this . datastoreClient = datastoreClient
5556 this . gormDynamicFinders = createDynamicFinders()
5657 this . connectionSources = datastoreClient. connectionSources
57- this . multiTenancyMode = connectionSources. defaultConnectionSource. settings. multiTenancy. mode
58+ ConnectionSource<?, ? extends ConnectionSourceSettings > defaultConnectionSource = connectionSources. defaultConnectionSource
59+ this . multiTenancyMode = defaultConnectionSource. settings. multiTenancy. mode
5860 }
5961
6062 /**
Original file line number Diff line number Diff line change @@ -36,6 +36,7 @@ import org.grails.datastore.mapping.core.Session
3636import org.grails.datastore.mapping.core.SessionCallback
3737import org.grails.datastore.mapping.core.StatelessDatastore
3838import org.grails.datastore.mapping.core.connections.ConnectionSource
39+ import org.grails.datastore.mapping.core.connections.ConnectionSourceSettings
3940import org.grails.datastore.mapping.core.connections.ConnectionSources
4041import org.grails.datastore.mapping.core.connections.ConnectionSourcesProvider
4142import org.grails.datastore.mapping.model.PersistentEntity
@@ -79,7 +80,7 @@ class GormStaticApi<D> extends AbstractGormApi<D> implements GormAllOperations<D
7980 String qualifier = ConnectionSource . DEFAULT
8081 if (datastore instanceof ConnectionSourcesProvider ) {
8182 this . connectionSources = ((ConnectionSourcesProvider ) datastore). connectionSources
82- ConnectionSource defaultConnectionSource = connectionSources. defaultConnectionSource
83+ ConnectionSource<?, ? extends ConnectionSourceSettings > defaultConnectionSource = connectionSources. defaultConnectionSource
8384 qualifier = defaultConnectionSource. name
8485 multiTenancyMode = defaultConnectionSource. settings. multiTenancy. mode
8586
Original file line number Diff line number Diff line change @@ -65,12 +65,11 @@ class JavaxValidatorRegistry extends DefaultValidatorRegistry implements Validat
6565 * @return The configuration
6666 */
6767 static Configuration buildConfigurationFor (MappingContext context , MessageSource messageSource ) {
68- Configuration validatorConfiguration = Validation . byDefaultProvider()
68+ Configuration<? extends Configuration > validatorConfiguration = Validation . byDefaultProvider()
6969 .configure()
70- validatorConfiguration = validatorConfiguration
71- .ignoreXmlConfiguration()
72- .traversableResolver(new MappingContextTraversableResolver (context))
73- .messageInterpolator(new ResourceBundleMessageInterpolator (new MessageSourceResourceBundleLocator (messageSource)))
70+ validatorConfiguration = validatorConfiguration. ignoreXmlConfiguration()
71+ validatorConfiguration = validatorConfiguration. traversableResolver(new MappingContextTraversableResolver (context))
72+ validatorConfiguration = validatorConfiguration. messageInterpolator(new ResourceBundleMessageInterpolator (new MessageSourceResourceBundleLocator (messageSource)))
7473
7574 if (messageSource instanceof ApplicationContext ) {
7675 validatorConfiguration = validatorConfiguration. constraintValidatorFactory(
You can’t perform that action at this time.
0 commit comments