From 44ea8f93dbfd954f81fd18117cfd502a668017e6 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Wed, 18 Dec 2024 18:47:40 +0800 Subject: [PATCH] Upgradle to Commons Lang3 3.13.0 Migrate Commons Lang 2.6 to Commons Lang3 3.13.0 Closes gh-33 --- app/taglib/grails/plugin/formfields/FormFieldsTagLib.groovy | 2 +- build.gradle | 2 +- .../grails/plugin/formfields/BeanPropertyAccessorImpl.groovy | 4 ++-- .../formfields/DelegatingBeanPropertyAccessorImpl.groovy | 4 ++-- .../grails/plugin/formfields/PropertyPathAccessor.groovy | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/taglib/grails/plugin/formfields/FormFieldsTagLib.groovy b/app/taglib/grails/plugin/formfields/FormFieldsTagLib.groovy index 799bab63..7fb1f317 100644 --- a/app/taglib/grails/plugin/formfields/FormFieldsTagLib.groovy +++ b/app/taglib/grails/plugin/formfields/FormFieldsTagLib.groovy @@ -19,7 +19,7 @@ package grails.plugin.formfields import grails.core.GrailsApplication import groovy.transform.CompileStatic import groovy.xml.MarkupBuilder -import org.apache.commons.lang.StringUtils +import org.apache.commons.lang3.StringUtils import org.grails.buffer.FastStringWriter import org.grails.datastore.mapping.model.MappingContext import org.grails.datastore.mapping.model.PersistentEntity diff --git a/build.gradle b/build.gradle index f447b051..622eea22 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ dependencies { api "org.graceframework:grace-datastore-core:$gormVersion" api "org.graceframework:grace-datastore-gorm:$gormVersion" api "org.graceframework:grace-scaffolding-core:$scaffoldingVersion" - api "commons-lang:commons-lang:2.6" + api "org.apache.commons:commons-lang3:3.13.0" compileOnly "org.graceframework:grace-boot" compileOnly "jakarta.servlet:jakarta.servlet-api" diff --git a/src/main/groovy/grails/plugin/formfields/BeanPropertyAccessorImpl.groovy b/src/main/groovy/grails/plugin/formfields/BeanPropertyAccessorImpl.groovy index 49e80751..3003f9cd 100644 --- a/src/main/groovy/grails/plugin/formfields/BeanPropertyAccessorImpl.groovy +++ b/src/main/groovy/grails/plugin/formfields/BeanPropertyAccessorImpl.groovy @@ -22,7 +22,7 @@ import grails.util.GrailsNameUtils import grails.web.databinding.WebDataBinding import groovy.transform.Canonical import groovy.transform.CompileStatic -import org.apache.commons.lang.ClassUtils +import org.apache.commons.lang3.ClassUtils import grails.core.* import grails.plugins.VersionComparator import org.grails.datastore.gorm.GormEntity @@ -125,7 +125,7 @@ class BeanPropertyAccessorImpl implements BeanPropertyAccessor { @CompileStatic private List getSuperclassesAndInterfaces(Class type) { List superclasses = new ArrayList<>() - superclasses.addAll((List) ClassUtils.getAllSuperclasses(ClassUtils.primitiveToWrapper(type))) + superclasses.addAll(ClassUtils.getAllSuperclasses(ClassUtils.primitiveToWrapper(type))) for(Object it in ClassUtils.getAllInterfaces(type)) { Class interfaceCls = (Class)it String name = interfaceCls.name diff --git a/src/main/groovy/grails/plugin/formfields/DelegatingBeanPropertyAccessorImpl.groovy b/src/main/groovy/grails/plugin/formfields/DelegatingBeanPropertyAccessorImpl.groovy index 334449b3..72486bd1 100644 --- a/src/main/groovy/grails/plugin/formfields/DelegatingBeanPropertyAccessorImpl.groovy +++ b/src/main/groovy/grails/plugin/formfields/DelegatingBeanPropertyAccessorImpl.groovy @@ -7,7 +7,7 @@ import grails.validation.Validateable import grails.web.databinding.WebDataBinding import groovy.transform.Canonical import groovy.transform.CompileStatic -import org.apache.commons.lang.ClassUtils +import org.apache.commons.lang3.ClassUtils import org.grails.datastore.gorm.GormEntity import org.grails.datastore.gorm.GormValidateable import org.grails.datastore.mapping.dirty.checking.DirtyCheckable @@ -143,7 +143,7 @@ class DelegatingBeanPropertyAccessorImpl implements BeanPropertyAccessor { private List getSuperclassesAndInterfaces(Class type) { List superclasses = new ArrayList<>() - superclasses.addAll((List) ClassUtils.getAllSuperclasses(ClassUtils.primitiveToWrapper(type))) + superclasses.addAll(ClassUtils.getAllSuperclasses(ClassUtils.primitiveToWrapper(type))) for (Object it in ClassUtils.getAllInterfaces(type)) { Class interfaceCls = (Class) it String name = interfaceCls.name diff --git a/src/main/groovy/grails/plugin/formfields/PropertyPathAccessor.groovy b/src/main/groovy/grails/plugin/formfields/PropertyPathAccessor.groovy index da8b20bc..bc008abb 100644 --- a/src/main/groovy/grails/plugin/formfields/PropertyPathAccessor.groovy +++ b/src/main/groovy/grails/plugin/formfields/PropertyPathAccessor.groovy @@ -15,7 +15,7 @@ import org.springframework.context.support.StaticMessageSource import org.springframework.validation.FieldError import static grails.plugin.formfields.BeanPropertyAccessorFactory.stripIndex import static java.util.Collections.EMPTY_LIST -import static org.apache.commons.lang.StringUtils.substringAfterLast +import static org.apache.commons.lang3.StringUtils.substringAfterLast import grails.core.* @CompileStatic