Skip to content

Commit 4cb9533

Browse files
renovate[bot]renovate-botpuneetbehl
authored
Update groovy monorepo to v3.0.11 (#1655)
* Update groovy monorepo to v3.0.11 * Workaround to make code compatible with Groovy 3.0.11 Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: Puneet Behl <[email protected]>
1 parent cfc19a8 commit 4cb9533

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ javaParserCoreVersion=3.15.14
2222
junitVersion=4.12
2323
junit-jupiter.version=5.7.0
2424
javassistVersion=3.29.0-GA
25-
groovyVersion=3.0.10
25+
groovyVersion=3.0.11
2626

2727
org.gradle.caching=true
2828
org.gradle.parallel=true

grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/api/RxGormStaticApi.groovy

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import org.grails.datastore.gorm.GormValidateable
1212
import org.grails.datastore.gorm.finders.DynamicFinder
1313
import org.grails.datastore.gorm.finders.FinderMethod
1414
import org.grails.datastore.mapping.core.connections.ConnectionSource
15+
import org.grails.datastore.mapping.core.connections.ConnectionSourceSettings
1516
import org.grails.datastore.mapping.core.connections.ConnectionSources
1617
import org.grails.datastore.mapping.model.PersistentEntity
1718
import 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
/**

grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/GormStaticApi.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import org.grails.datastore.mapping.core.Session
3636
import org.grails.datastore.mapping.core.SessionCallback
3737
import org.grails.datastore.mapping.core.StatelessDatastore
3838
import org.grails.datastore.mapping.core.connections.ConnectionSource
39+
import org.grails.datastore.mapping.core.connections.ConnectionSourceSettings
3940
import org.grails.datastore.mapping.core.connections.ConnectionSources
4041
import org.grails.datastore.mapping.core.connections.ConnectionSourcesProvider
4142
import 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

grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/javax/JavaxValidatorRegistry.groovy

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff 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(

0 commit comments

Comments
 (0)