jamesfredley commented on code in PR #16003: URL: https://github.com/apache/grails-core/pull/16003#discussion_r3918588675
########## grails-test-suite-web/src/test/groovy/org/grails/web/binding/DefaultDatabindingWhitelistBehaviorSpec.groovy: ########## @@ -0,0 +1,117 @@ +/* + * 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.binding + +import grails.artefact.Artefact +import grails.persistence.Entity +import grails.testing.web.controllers.ControllerUnitTest +import grails.validation.Validateable +import grails.web.databinding.DataBindingUtils +import spock.lang.Specification + +class DefaultDatabindingWhitelistBehaviorSpec extends Specification implements ControllerUnitTest<WhitelistBehaviorController> { + + void 'domain binding includes simple and association properties but excludes special and unlisted properties'() { + given: + Date dateCreated = new Date() + Date lastUpdated = new Date() + Map source = [ + name: 'Ada', + address: [street: 'Analytical Engine Way'], + id: 99L, + version: 7L, + dateCreated: dateCreated, + lastUpdated: lastUpdated, + ignored: 'not bindable' + ] + + when: + WhitelistDomain domain = new WhitelistDomain() + DataBindingUtils.bindObjectToInstance(domain, source) + + then: + domain.name == 'Ada' + domain.address.street == 'Analytical Engine Way' + domain.id == null + domain.version == null + domain.dateCreated == null + domain.lastUpdated == null + domain.ignored == null + } + + void 'Validateable command binding includes declared special properties but excludes unlisted properties'() { + given: + Date dateCreated = new Date() + Date lastUpdated = new Date() + params.name = 'Grace' + params.'address.street' = 'Compiler Lane' + params.id = '99' + params.version = '7' + params.dateCreated = dateCreated + params.lastUpdated = lastUpdated + params.ignored = 'not bindable' + + when: + WhitelistCommand command = controller.bindCommand().command + + then: + command.name == 'Grace' + command.address.street == 'Compiler Lane' + command.id == 99L + command.version == 7L + command.dateCreated == dateCreated + command.lastUpdated == lastUpdated + command.ignored == null + } +} + +@Entity +class WhitelistDomain { + String name + WhitelistAddress address = new WhitelistAddress() + Long id + Long version + Date dateCreated + Date lastUpdated + Object ignored Review Comment: Addressed: the field is now `Object untypedProperty`, the test names talk about Object/def-typed exclusion rather than an "unlisted" category, and we also pin a `def untypedDefProperty` plus an extra `String extra` that *does* bind so the auto-whitelist for ordinary typed properties is observable too. ########## grails-test-suite-web/src/test/groovy/org/grails/web/binding/DefaultDatabindingWhitelistBehaviorSpec.groovy: ########## @@ -0,0 +1,117 @@ +/* + * 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.binding + +import grails.artefact.Artefact +import grails.persistence.Entity +import grails.testing.web.controllers.ControllerUnitTest +import grails.validation.Validateable +import grails.web.databinding.DataBindingUtils +import spock.lang.Specification + +class DefaultDatabindingWhitelistBehaviorSpec extends Specification implements ControllerUnitTest<WhitelistBehaviorController> { + + void 'domain binding includes simple and association properties but excludes special and unlisted properties'() { + given: + Date dateCreated = new Date() + Date lastUpdated = new Date() + Map source = [ + name: 'Ada', + address: [street: 'Analytical Engine Way'], + id: 99L, + version: 7L, + dateCreated: dateCreated, + lastUpdated: lastUpdated, + ignored: 'not bindable' + ] + + when: + WhitelistDomain domain = new WhitelistDomain() + DataBindingUtils.bindObjectToInstance(domain, source) + + then: + domain.name == 'Ada' + domain.address.street == 'Analytical Engine Way' + domain.id == null + domain.version == null + domain.dateCreated == null + domain.lastUpdated == null + domain.ignored == null + } + + void 'Validateable command binding includes declared special properties but excludes unlisted properties'() { + given: + Date dateCreated = new Date() + Date lastUpdated = new Date() + params.name = 'Grace' + params.'address.street' = 'Compiler Lane' + params.id = '99' + params.version = '7' + params.dateCreated = dateCreated + params.lastUpdated = lastUpdated + params.ignored = 'not bindable' + + when: + WhitelistCommand command = controller.bindCommand().command + + then: + command.name == 'Grace' + command.address.street == 'Compiler Lane' + command.id == 99L + command.version == 7L + command.dateCreated == dateCreated + command.lastUpdated == lastUpdated + command.ignored == null + } +} + +@Entity +class WhitelistDomain { + String name + WhitelistAddress address = new WhitelistAddress() + Long id + Long version + Date dateCreated + Date lastUpdated + Object ignored + + static hasOne = [address: WhitelistAddress] Review Comment: Addressed in 1c34ff: `hasOne` was dropped. Nested binding is covered by the typed `address` field and its initializer alone. ########## grails-test-suite-web/src/test/groovy/org/grails/web/binding/DefaultDatabindingWhitelistBehaviorSpec.groovy: ########## @@ -0,0 +1,117 @@ +/* + * 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.binding + +import grails.artefact.Artefact +import grails.persistence.Entity +import grails.testing.web.controllers.ControllerUnitTest +import grails.validation.Validateable +import grails.web.databinding.DataBindingUtils +import spock.lang.Specification + +class DefaultDatabindingWhitelistBehaviorSpec extends Specification implements ControllerUnitTest<WhitelistBehaviorController> { + + void 'domain binding includes simple and association properties but excludes special and unlisted properties'() { Review Comment: Addressed: the domain test no longer re-asserts id/version/dateCreated/lastUpdated exclusion, and there is a cross-reference to `DefaultASTDatabindingHelperDomainClassSpecialPropertiesSpec` (GRAILS-11173, #15681). This spec now only pins nested association binding, extra typed-property inclusion, and Object/def-typed exclusion. -- 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]
