diff --git a/grace-plugin-controllers/build.gradle b/grace-plugin-controllers/build.gradle index 7af1a74916..f907222c26 100644 --- a/grace-plugin-controllers/build.gradle +++ b/grace-plugin-controllers/build.gradle @@ -3,6 +3,7 @@ dependencies { api project(":grace-bootstrap") api project(":grace-core") api project(":grace-plugin-api") + api project(":grace-plugin-databinding") api project(":grace-plugin-mimetypes") api project(":grace-plugin-validation") api project(":grace-util") diff --git a/grace-plugin-databinding/build.gradle b/grace-plugin-databinding/build.gradle index 9ebdd68a28..d590de4120 100644 --- a/grace-plugin-databinding/build.gradle +++ b/grace-plugin-databinding/build.gradle @@ -1,7 +1,7 @@ dependencies { api project(":grace-api") api project(":grace-plugin-api") - api project(":grace-web-databinding") + api project(":grace-web-common") compileOnly libs.jakarta.servlet api libs.spring.boot.autoconfigure diff --git a/grace-web-databinding/src/main/groovy/grails/compiler/traits/WebDataBindingTraitInjector.groovy b/grace-plugin-databinding/src/main/groovy/grails/compiler/traits/WebDataBindingTraitInjector.groovy similarity index 100% rename from grace-web-databinding/src/main/groovy/grails/compiler/traits/WebDataBindingTraitInjector.groovy rename to grace-plugin-databinding/src/main/groovy/grails/compiler/traits/WebDataBindingTraitInjector.groovy diff --git a/grace-web-databinding/src/main/groovy/grails/web/databinding/DataBinder.groovy b/grace-plugin-databinding/src/main/groovy/grails/web/databinding/DataBinder.groovy similarity index 98% rename from grace-web-databinding/src/main/groovy/grails/web/databinding/DataBinder.groovy rename to grace-plugin-databinding/src/main/groovy/grails/web/databinding/DataBinder.groovy index d2ccd4f0ac..5aba37ce26 100644 --- a/grace-web-databinding/src/main/groovy/grails/web/databinding/DataBinder.groovy +++ b/grace-plugin-databinding/src/main/groovy/grails/web/databinding/DataBinder.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2014-2022 the original author or authors. + * Copyright 2014-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-databinding/src/main/groovy/grails/web/databinding/WebDataBinding.groovy b/grace-plugin-databinding/src/main/groovy/grails/web/databinding/WebDataBinding.groovy similarity index 96% rename from grace-web-databinding/src/main/groovy/grails/web/databinding/WebDataBinding.groovy rename to grace-plugin-databinding/src/main/groovy/grails/web/databinding/WebDataBinding.groovy index eba8d0da27..debbf7cbb9 100644 --- a/grace-web-databinding/src/main/groovy/grails/web/databinding/WebDataBinding.groovy +++ b/grace-plugin-databinding/src/main/groovy/grails/web/databinding/WebDataBinding.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2014-2022 the original author or authors. + * Copyright 2014-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-databinding/src/main/resources/META-INF/grails.factories b/grace-plugin-databinding/src/main/resources/META-INF/grails.factories similarity index 100% rename from grace-web-databinding/src/main/resources/META-INF/grails.factories rename to grace-plugin-databinding/src/main/resources/META-INF/grails.factories diff --git a/grace-web-databinding/src/test/groovy/grails/web/databinding/DataBinderTraitGeneratedSpec.groovy b/grace-plugin-databinding/src/test/groovy/grails/web/databinding/DataBinderTraitGeneratedSpec.groovy similarity index 100% rename from grace-web-databinding/src/test/groovy/grails/web/databinding/DataBinderTraitGeneratedSpec.groovy rename to grace-plugin-databinding/src/test/groovy/grails/web/databinding/DataBinderTraitGeneratedSpec.groovy diff --git a/grace-web-databinding/src/test/groovy/grails/web/databinding/WebDataBindingTraitGeneratedSpec.groovy b/grace-plugin-databinding/src/test/groovy/grails/web/databinding/WebDataBindingTraitGeneratedSpec.groovy similarity index 100% rename from grace-web-databinding/src/test/groovy/grails/web/databinding/WebDataBindingTraitGeneratedSpec.groovy rename to grace-plugin-databinding/src/test/groovy/grails/web/databinding/WebDataBindingTraitGeneratedSpec.groovy diff --git a/grace-plugin-fields/build.gradle b/grace-plugin-fields/build.gradle index c7eff9b2c0..4fa1f82c18 100644 --- a/grace-plugin-fields/build.gradle +++ b/grace-plugin-fields/build.gradle @@ -1,7 +1,8 @@ dependencies { + api project(":grace-plugin-databinding") api project(":grace-plugin-validation") api project(":grace-scaffolding-core") - api project(":grace-web-databinding") + api project(":grace-web-common") api project(":grace-web-gsp") api project(":grace-web-taglib") implementation libs.grace.datastore.core diff --git a/grace-test-suite-web/build.gradle b/grace-test-suite-web/build.gradle index 6350d66a2f..b47302d05e 100644 --- a/grace-test-suite-web/build.gradle +++ b/grace-test-suite-web/build.gradle @@ -23,7 +23,7 @@ dependencies { testImplementation project(":grace-plugin-controllers") testImplementation project(":grace-plugin-rest") testImplementation project(":grace-web") - testImplementation project(":grace-web-databinding") + testImplementation project(":grace-web-common") testImplementation project(":grace-spring") testImplementation project(":grace-test-support") diff --git a/grace-web-common/build.gradle b/grace-web-common/build.gradle index 89c00d3641..04b1e52c93 100644 --- a/grace-web-common/build.gradle +++ b/grace-web-common/build.gradle @@ -5,6 +5,8 @@ dependencies { api project(":grace-encoder") api project(":grace-util") + compileOnly libs.grace.datastore.core + compileOnly libs.jakarta.annotation.api compileOnlyApi libs.jakarta.servlet api libs.groovy.templates api libs.spring.contextSupport @@ -13,5 +15,6 @@ dependencies { implementation libs.caffeine testImplementation libs.jakarta.servlet + testImplementation libs.spring.test testImplementation project(":grace-test") } diff --git a/grace-web-databinding/src/main/groovy/grails/beans/util/LazyMetaPropertyMap.java b/grace-web-common/src/main/groovy/grails/beans/util/LazyMetaPropertyMap.java similarity index 99% rename from grace-web-databinding/src/main/groovy/grails/beans/util/LazyMetaPropertyMap.java rename to grace-web-common/src/main/groovy/grails/beans/util/LazyMetaPropertyMap.java index 0738835f08..a9c49b4995 100644 --- a/grace-web-databinding/src/main/groovy/grails/beans/util/LazyMetaPropertyMap.java +++ b/grace-web-common/src/main/groovy/grails/beans/util/LazyMetaPropertyMap.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2022 the original author or authors. + * Copyright 2004-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-databinding/src/main/groovy/grails/web/databinding/DataBindingUtils.java b/grace-web-common/src/main/groovy/grails/web/databinding/DataBindingUtils.java similarity index 99% rename from grace-web-databinding/src/main/groovy/grails/web/databinding/DataBindingUtils.java rename to grace-web-common/src/main/groovy/grails/web/databinding/DataBindingUtils.java index 9e44cecac4..be13cf8710 100644 --- a/grace-web-databinding/src/main/groovy/grails/web/databinding/DataBindingUtils.java +++ b/grace-web-common/src/main/groovy/grails/web/databinding/DataBindingUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2023 the original author or authors. + * Copyright 2006-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-databinding/src/main/groovy/grails/web/databinding/GrailsWebDataBinder.groovy b/grace-web-common/src/main/groovy/grails/web/databinding/GrailsWebDataBinder.groovy similarity index 100% rename from grace-web-databinding/src/main/groovy/grails/web/databinding/GrailsWebDataBinder.groovy rename to grace-web-common/src/main/groovy/grails/web/databinding/GrailsWebDataBinder.groovy diff --git a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/ASTDatabindingHelper.java b/grace-web-common/src/main/groovy/org/grails/web/databinding/ASTDatabindingHelper.java similarity index 94% rename from grace-web-databinding/src/main/groovy/org/grails/web/databinding/ASTDatabindingHelper.java rename to grace-web-common/src/main/groovy/org/grails/web/databinding/ASTDatabindingHelper.java index 8f012baab4..5e9ab3df9c 100644 --- a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/ASTDatabindingHelper.java +++ b/grace-web-common/src/main/groovy/org/grails/web/databinding/ASTDatabindingHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2022 the original author or authors. + * Copyright 2012-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/DataBindingEventMulticastListener.groovy b/grace-web-common/src/main/groovy/org/grails/web/databinding/DataBindingEventMulticastListener.groovy similarity index 98% rename from grace-web-databinding/src/main/groovy/org/grails/web/databinding/DataBindingEventMulticastListener.groovy rename to grace-web-common/src/main/groovy/org/grails/web/databinding/DataBindingEventMulticastListener.groovy index 6f2d590d1e..51f266f71b 100644 --- a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/DataBindingEventMulticastListener.groovy +++ b/grace-web-common/src/main/groovy/org/grails/web/databinding/DataBindingEventMulticastListener.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 the original author or authors. + * Copyright 2013-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMap.java b/grace-web-common/src/main/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMap.java similarity index 97% rename from grace-web-databinding/src/main/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMap.java rename to grace-web-common/src/main/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMap.java index 8f25989e84..3f0c7a1b19 100644 --- a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMap.java +++ b/grace-web-common/src/main/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMap.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2023 the original author or authors. + * Copyright 2004-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/DefaultASTDatabindingHelper.java b/grace-web-common/src/main/groovy/org/grails/web/databinding/DefaultASTDatabindingHelper.java similarity index 99% rename from grace-web-databinding/src/main/groovy/org/grails/web/databinding/DefaultASTDatabindingHelper.java rename to grace-web-common/src/main/groovy/org/grails/web/databinding/DefaultASTDatabindingHelper.java index 8bcd1636a5..f22eeb81f9 100644 --- a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/DefaultASTDatabindingHelper.java +++ b/grace-web-common/src/main/groovy/org/grails/web/databinding/DefaultASTDatabindingHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/GrailsWebDataBindingListener.groovy b/grace-web-common/src/main/groovy/org/grails/web/databinding/GrailsWebDataBindingListener.groovy similarity index 98% rename from grace-web-databinding/src/main/groovy/org/grails/web/databinding/GrailsWebDataBindingListener.groovy rename to grace-web-common/src/main/groovy/org/grails/web/databinding/GrailsWebDataBindingListener.groovy index 0fcbe86edc..4bfce75f8b 100644 --- a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/GrailsWebDataBindingListener.groovy +++ b/grace-web-common/src/main/groovy/org/grails/web/databinding/GrailsWebDataBindingListener.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 the original author or authors. + * Copyright 2013-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/SpringConversionServiceAdapter.groovy b/grace-web-common/src/main/groovy/org/grails/web/databinding/SpringConversionServiceAdapter.groovy similarity index 96% rename from grace-web-databinding/src/main/groovy/org/grails/web/databinding/SpringConversionServiceAdapter.groovy rename to grace-web-common/src/main/groovy/org/grails/web/databinding/SpringConversionServiceAdapter.groovy index b024839eda..0ce4ebbff3 100644 --- a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/SpringConversionServiceAdapter.groovy +++ b/grace-web-common/src/main/groovy/org/grails/web/databinding/SpringConversionServiceAdapter.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 the original author or authors. + * Copyright 2013-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/AbstractRequestBodyDataBindingSourceCreator.groovy b/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/AbstractRequestBodyDataBindingSourceCreator.groovy similarity index 98% rename from grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/AbstractRequestBodyDataBindingSourceCreator.groovy rename to grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/AbstractRequestBodyDataBindingSourceCreator.groovy index 4e8ca0037a..18e481a795 100644 --- a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/AbstractRequestBodyDataBindingSourceCreator.groovy +++ b/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/AbstractRequestBodyDataBindingSourceCreator.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2013-2024 the original author or authors. + * Copyright 2013-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceCreator.groovy b/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceCreator.groovy similarity index 98% rename from grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceCreator.groovy rename to grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceCreator.groovy index 5c9cd81535..95c35e58b4 100644 --- a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceCreator.groovy +++ b/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceCreator.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 the original author or authors. + * Copyright 2013-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceRegistry.groovy b/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceRegistry.groovy similarity index 98% rename from grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceRegistry.groovy rename to grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceRegistry.groovy index 180ec0444e..fb40f4e368 100644 --- a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceRegistry.groovy +++ b/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceRegistry.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 the original author or authors. + * Copyright 2013-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMap.groovy b/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMap.groovy similarity index 97% rename from grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMap.groovy rename to grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMap.groovy index 8dc62769a8..387c2e3610 100644 --- a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMap.groovy +++ b/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMap.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 the original author or authors. + * Copyright 2013-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/HalJsonDataBindingSourceCreator.groovy b/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/HalJsonDataBindingSourceCreator.groovy similarity index 97% rename from grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/HalJsonDataBindingSourceCreator.groovy rename to grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/HalJsonDataBindingSourceCreator.groovy index 8da9aba7c3..9fa2bce042 100644 --- a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/HalJsonDataBindingSourceCreator.groovy +++ b/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/HalJsonDataBindingSourceCreator.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 the original author or authors. + * Copyright 2013-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/HalXmlDataBindingSourceCreator.groovy b/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/HalXmlDataBindingSourceCreator.groovy similarity index 100% rename from grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/HalXmlDataBindingSourceCreator.groovy rename to grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/HalXmlDataBindingSourceCreator.groovy diff --git a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/InvalidRequestBodyException.java b/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/InvalidRequestBodyException.java similarity index 95% rename from grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/InvalidRequestBodyException.java rename to grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/InvalidRequestBodyException.java index 328114eb37..097f541bee 100644 --- a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/InvalidRequestBodyException.java +++ b/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/InvalidRequestBodyException.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 the original author or authors. + * Copyright 2013-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/JsonApiDataBindingSourceCreator.groovy b/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/JsonApiDataBindingSourceCreator.groovy similarity index 98% rename from grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/JsonApiDataBindingSourceCreator.groovy rename to grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/JsonApiDataBindingSourceCreator.groovy index 2308b67f5a..7a1f61351e 100644 --- a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/JsonApiDataBindingSourceCreator.groovy +++ b/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/JsonApiDataBindingSourceCreator.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2013-2022 the original author or authors. + * Copyright 2013-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/JsonDataBindingSourceCreator.groovy b/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/JsonDataBindingSourceCreator.groovy similarity index 98% rename from grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/JsonDataBindingSourceCreator.groovy rename to grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/JsonDataBindingSourceCreator.groovy index 1ff203cbe2..5403ff4db9 100644 --- a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/JsonDataBindingSourceCreator.groovy +++ b/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/JsonDataBindingSourceCreator.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 the original author or authors. + * Copyright 2013-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/XmlDataBindingSourceCreator.groovy b/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/XmlDataBindingSourceCreator.groovy similarity index 100% rename from grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/XmlDataBindingSourceCreator.groovy rename to grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/XmlDataBindingSourceCreator.groovy diff --git a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/converters/AbstractStructuredBindingEditor.groovy b/grace-web-common/src/main/groovy/org/grails/web/databinding/converters/AbstractStructuredBindingEditor.groovy similarity index 98% rename from grace-web-databinding/src/main/groovy/org/grails/web/databinding/converters/AbstractStructuredBindingEditor.groovy rename to grace-web-common/src/main/groovy/org/grails/web/databinding/converters/AbstractStructuredBindingEditor.groovy index a3ac240074..bc22038d49 100644 --- a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/converters/AbstractStructuredBindingEditor.groovy +++ b/grace-web-common/src/main/groovy/org/grails/web/databinding/converters/AbstractStructuredBindingEditor.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 the original author or authors. + * Copyright 2013-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/converters/ByteArrayMultipartFileValueConverter.groovy b/grace-web-common/src/main/groovy/org/grails/web/databinding/converters/ByteArrayMultipartFileValueConverter.groovy similarity index 97% rename from grace-web-databinding/src/main/groovy/org/grails/web/databinding/converters/ByteArrayMultipartFileValueConverter.groovy rename to grace-web-common/src/main/groovy/org/grails/web/databinding/converters/ByteArrayMultipartFileValueConverter.groovy index 6f19bcbea0..3789f118d2 100644 --- a/grace-web-databinding/src/main/groovy/org/grails/web/databinding/converters/ByteArrayMultipartFileValueConverter.groovy +++ b/grace-web-common/src/main/groovy/org/grails/web/databinding/converters/ByteArrayMultipartFileValueConverter.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 the original author or authors. + * Copyright 2013-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-databinding/src/test/groovy/grails/bean/util/LazyMetaPropertyMapSpec.groovy b/grace-web-common/src/test/groovy/grails/bean/util/LazyMetaPropertyMapSpec.groovy similarity index 100% rename from grace-web-databinding/src/test/groovy/grails/bean/util/LazyMetaPropertyMapSpec.groovy rename to grace-web-common/src/test/groovy/grails/bean/util/LazyMetaPropertyMapSpec.groovy diff --git a/grace-web-databinding/src/test/groovy/grails/bean/util/LazyMetaPropertyMapTests.groovy b/grace-web-common/src/test/groovy/grails/bean/util/LazyMetaPropertyMapTests.groovy similarity index 100% rename from grace-web-databinding/src/test/groovy/grails/bean/util/LazyMetaPropertyMapTests.groovy rename to grace-web-common/src/test/groovy/grails/bean/util/LazyMetaPropertyMapTests.groovy diff --git a/grace-web-databinding/src/test/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMapTests.groovy b/grace-web-common/src/test/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMapTests.groovy similarity index 95% rename from grace-web-databinding/src/test/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMapTests.groovy rename to grace-web-common/src/test/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMapTests.groovy index bf381e4dd3..341373f75d 100644 --- a/grace-web-databinding/src/test/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMapTests.groovy +++ b/grace-web-common/src/test/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMapTests.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2004-2005 the original author or authors. + * Copyright 2004-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grace-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/AbstractRequestBodyDataBindingSourceCreatorSpec.groovy b/grace-web-common/src/test/groovy/org/grails/web/databinding/bindingsource/AbstractRequestBodyDataBindingSourceCreatorSpec.groovy similarity index 100% rename from grace-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/AbstractRequestBodyDataBindingSourceCreatorSpec.groovy rename to grace-web-common/src/test/groovy/org/grails/web/databinding/bindingsource/AbstractRequestBodyDataBindingSourceCreatorSpec.groovy diff --git a/grace-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMapSpec.groovy b/grace-web-common/src/test/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMapSpec.groovy similarity index 100% rename from grace-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMapSpec.groovy rename to grace-web-common/src/test/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMapSpec.groovy diff --git a/grace-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/hal/json/HalJsonDataBindingSourceCreatorSpec.groovy b/grace-web-common/src/test/groovy/org/grails/web/databinding/bindingsource/hal/json/HalJsonDataBindingSourceCreatorSpec.groovy similarity index 100% rename from grace-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/hal/json/HalJsonDataBindingSourceCreatorSpec.groovy rename to grace-web-common/src/test/groovy/org/grails/web/databinding/bindingsource/hal/json/HalJsonDataBindingSourceCreatorSpec.groovy diff --git a/grace-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/json/JsonDataBindingSourceCreatorSpec.groovy b/grace-web-common/src/test/groovy/org/grails/web/databinding/bindingsource/json/JsonDataBindingSourceCreatorSpec.groovy similarity index 100% rename from grace-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/json/JsonDataBindingSourceCreatorSpec.groovy rename to grace-web-common/src/test/groovy/org/grails/web/databinding/bindingsource/json/JsonDataBindingSourceCreatorSpec.groovy diff --git a/grace-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/json/api/JsonApiDataBindingSourceCreatorSpec.groovy b/grace-web-common/src/test/groovy/org/grails/web/databinding/bindingsource/json/api/JsonApiDataBindingSourceCreatorSpec.groovy similarity index 100% rename from grace-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/json/api/JsonApiDataBindingSourceCreatorSpec.groovy rename to grace-web-common/src/test/groovy/org/grails/web/databinding/bindingsource/json/api/JsonApiDataBindingSourceCreatorSpec.groovy diff --git a/grace-web-databinding/README.md b/grace-web-databinding/README.md deleted file mode 100644 index 16f36e4874..0000000000 --- a/grace-web-databinding/README.md +++ /dev/null @@ -1,11 +0,0 @@ -## grace-web-databinding - -This subproject includes a lot of code to support data binding. - -The [GrailsWebDataBinder)[src/main/groovy/grails/web/databindeing/WebDataBinding.groovy) -class extends [SimpleDataBinder](../grails-databinding/src/main/groovy/grails/databinding/SimpleDataBinder.groovy) from -the (grails-databinding)[../grails-databinding] subproject and adds to it a lot of Grails specific behavior like -special handing of GORM entities, code specificaly relevant to binding web requests to objects and other behaviors. - -The [WebDataBinding](src/main/groovy/grails/web/databinding/WebDataBinding.groovy) trait adds special methods -which support special binding usage patterns like `someObj.properties = request`. diff --git a/grace-web-databinding/build.gradle b/grace-web-databinding/build.gradle deleted file mode 100644 index 571fc92c43..0000000000 --- a/grace-web-databinding/build.gradle +++ /dev/null @@ -1,12 +0,0 @@ -dependencies { - api project(":grace-databinding") - api project(":grace-util") - api project(":grace-web-common") - - compileOnly libs.grace.datastore.core - compileOnly libs.jakarta.annotation.api - compileOnlyApi libs.jakarta.servlet - - testImplementation libs.jakarta.servlet - testImplementation libs.spring.test -} diff --git a/grace-web/build.gradle b/grace-web/build.gradle index e10a8b37a6..16b3dc3b9c 100644 --- a/grace-web/build.gradle +++ b/grace-web/build.gradle @@ -2,7 +2,6 @@ dependencies { api project(":grace-api") api project(":grace-plugin-api") api project(":grace-web-common") - api project(":grace-web-databinding") api project(":grace-web-gsp") api project(":grace-web-mvc") api project(":grace-web-sitemesh") diff --git a/settings.gradle b/settings.gradle index e72bbf8c54..2cb75aee1f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -32,7 +32,6 @@ include ( 'grace-views-markup', 'grace-web', 'grace-web-common', - 'grace-web-databinding', 'grace-web-gsp', 'grace-web-mvc', 'grace-web-sitemesh',