Copilot commented on code in PR #15797:
URL: https://github.com/apache/grails-core/pull/15797#discussion_r3500795446
##########
grails-encoder/src/test/groovy/org/grails/encoder/ChainedEncodersSpec.groovy:
##########
@@ -97,4 +119,32 @@ class ChainedEncodersSpec extends Specification {
}
}
+
+ private static <T> T runOnVirtualThread(Closure<T> callable) {
+ def result = new AtomicReference<T>()
+ def error = new AtomicReference<Throwable>()
+ Runnable runnable = {
+ try {
Review Comment:
`runOnVirtualThread` is duplicated verbatim in multiple test specs in this
PR (here, DatastoreUtilsSpec, and ConvertersConfigurationHolderSpec). Keeping
three independent copies increases the chance they drift (e.g., when adjusting
reflection/fallback behavior) and makes future changes harder.
##########
grails-datastore-core/src/test/groovy/org/grails/datastore/mapping/core/DatastoreUtilsSpec.groovy:
##########
@@ -39,4 +42,75 @@ class DatastoreUtilsSpec extends Specification {
env != null
resolver.getProperty('grails.foo') == 'baz'
}
+
+ void "deferred close lifecycle is isolated on a virtual thread"() {
+ given:
+ Datastore datastore = Mock()
+ Session session = Mock()
+ def repeatedCloseMessage = new AtomicReference<String>()
+
+ when:
+ runOnVirtualThread {
+ DatastoreUtils.initDeferredClose(datastore)
+ DatastoreUtils.closeSessionOrRegisterDeferredClose(session,
datastore)
+ DatastoreUtils.processDeferredClose(datastore)
+ try {
+ DatastoreUtils.processDeferredClose(datastore)
+ }
+ catch (IllegalStateException e) {
+ repeatedCloseMessage.set(e.message)
+ }
+ }
+
+ then:
+ 1 * session.disconnect()
+ repeatedCloseMessage.get().contains('Deferred close not active')
+ }
+
+ void "soft thread local map does not expose parent entries to child
threads"() {
+ given:
+ def threadLocal = new SoftThreadLocalMap()
+ threadLocal.get().put('tenant', 'parent')
+ def childTenant = new AtomicReference<String>()
+
+ when:
+ runOnVirtualThread {
+ childTenant.set(threadLocal.get().get('tenant') as String)
+ }
+
+ then:
+ childTenant.get() == null
+ threadLocal.get().get('tenant') == 'parent'
+
+ cleanup:
+ threadLocal.remove()
+ }
+
+ private static <T> T runOnVirtualThread(Closure<T> callable) {
+ def result = new AtomicReference<T>()
+ def error = new AtomicReference<Throwable>()
+ Runnable runnable = {
+ try {
Review Comment:
`runOnVirtualThread` is duplicated verbatim in multiple test specs in this
PR. Duplicated helpers tend to diverge over time and make it easy for one
module’s tests to get updated while others are missed.
##########
grails-converters/src/test/groovy/org/grails/web/converters/configuration/ConvertersConfigurationHolderSpec.groovy:
##########
@@ -0,0 +1,150 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.grails.web.converters.configuration
+
+import java.util.concurrent.atomic.AtomicReference
+
+import grails.converters.JSON
+import grails.converters.XML
+
+import spock.lang.Specification
+
+class ConvertersConfigurationHolderSpec extends Specification {
+
+ void cleanup() {
+ ConvertersConfigurationHolder.clear()
+ }
+
+ void "thread-local converter configuration is scoped to a virtual
thread"() {
+ given:
+ def defaultConfiguration = new DefaultConverterConfiguration<JSON>()
+ def scopedConfiguration = new DefaultConverterConfiguration<JSON>()
+ def scopedResult = new AtomicReference<ConverterConfiguration<JSON>>()
+ def clearedResult = new AtomicReference<ConverterConfiguration<JSON>>()
+ ConvertersConfigurationHolder.setDefaultConfiguration(JSON,
defaultConfiguration)
+
+ when:
+ runOnVirtualThread {
+
ConvertersConfigurationHolder.setThreadLocalConverterConfiguration(JSON,
scopedConfiguration)
+
scopedResult.set(ConvertersConfigurationHolder.getConverterConfiguration(JSON))
+
ConvertersConfigurationHolder.setThreadLocalConverterConfiguration(JSON, null)
+
clearedResult.set(ConvertersConfigurationHolder.getConverterConfiguration(JSON))
+ }
+
+ then:
+ scopedResult.get().is(scopedConfiguration)
+ clearedResult.get().is(defaultConfiguration)
+
ConvertersConfigurationHolder.getConverterConfiguration(JSON).is(defaultConfiguration)
+ }
+
+ void "default converter lookups do not allocate a thread-local
configuration map"() {
+ given:
+ def defaultConfiguration = new DefaultConverterConfiguration<JSON>()
+ ConvertersConfigurationHolder.setDefaultConfiguration(JSON,
defaultConfiguration)
+
+ expect:
+
ConvertersConfigurationHolder.getConverterConfiguration(JSON).is(defaultConfiguration)
+
ConvertersConfigurationHolder.getThreadLocalConverterConfiguration(JSON) == null
+ }
+
+ void "clearing the last thread-local converter configuration removes the
map"() {
+ given:
+ def scopedConfiguration = new DefaultConverterConfiguration<JSON>()
+
ConvertersConfigurationHolder.setThreadLocalConverterConfiguration(JSON,
scopedConfiguration)
+
+ expect:
+
ConvertersConfigurationHolder.getThreadLocalConverterConfiguration(JSON).is(scopedConfiguration)
+
+ when:
+
ConvertersConfigurationHolder.setThreadLocalConverterConfiguration(JSON, null)
+
+ then:
+
ConvertersConfigurationHolder.getThreadLocalConverterConfiguration(JSON) == null
+ }
+
+ void "clearing one converter keeps other thread-local converter
configurations"() {
+ given:
+ def jsonConfiguration = new DefaultConverterConfiguration<JSON>()
+ def xmlConfiguration = new DefaultConverterConfiguration<XML>()
+
ConvertersConfigurationHolder.setThreadLocalConverterConfiguration(JSON,
jsonConfiguration)
+
ConvertersConfigurationHolder.setThreadLocalConverterConfiguration(XML,
xmlConfiguration)
+
+ when:
+
ConvertersConfigurationHolder.setThreadLocalConverterConfiguration(JSON, null)
+
+ then:
+
ConvertersConfigurationHolder.getThreadLocalConverterConfiguration(JSON) == null
+
ConvertersConfigurationHolder.getThreadLocalConverterConfiguration(XML).is(xmlConfiguration)
+
+ when:
+
ConvertersConfigurationHolder.setThreadLocalConverterConfiguration(XML, null)
+
+ then:
+
ConvertersConfigurationHolder.getThreadLocalConverterConfiguration(XML) == null
+ }
+
+ void "converter use restores a missing thread-local configuration after a
named scope"() {
+ given:
+ def defaultConfiguration = new DefaultConverterConfiguration<JSON>()
+ def namedConfiguration = new
DefaultConverterConfiguration<JSON>(defaultConfiguration)
+ ConvertersConfigurationHolder.setDefaultConfiguration(JSON,
defaultConfiguration)
+ ConvertersConfigurationHolder.setNamedConverterConfiguration(JSON,
'named', namedConfiguration)
+ def scopedConfiguration = new
AtomicReference<ConverterConfiguration<JSON>>()
+ def restoredConfiguration = new
AtomicReference<ConverterConfiguration<JSON>>()
+
+ when:
+ JSON.use('named') {
+
scopedConfiguration.set(ConvertersConfigurationHolder.getConverterConfiguration(JSON))
+ }
+
restoredConfiguration.set(ConvertersConfigurationHolder.getConverterConfiguration(JSON))
+
+ then:
+ scopedConfiguration.get().is(namedConfiguration)
+ restoredConfiguration.get().is(defaultConfiguration)
+
ConvertersConfigurationHolder.getThreadLocalConverterConfiguration(JSON) == null
+ }
+
+ private static <T> T runOnVirtualThread(Closure<T> callable) {
+ def result = new AtomicReference<T>()
+ def error = new AtomicReference<Throwable>()
+ Runnable runnable = {
+ try {
Review Comment:
`runOnVirtualThread` is duplicated verbatim in multiple test specs in this
PR. Pulling it into a shared test helper would reduce duplication and avoid
future inconsistencies when the helper needs to change.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
