Revert "feat(core): Remove/Replace deprecated Groovy classes to prepare upgrade to Groovy 4 (#13386)"

This reverts commit e2061a8.

# Conflicts:
#	gradle.properties
#	grails-databinding/src/test/groovy/grails/databinding/SimpleDataBinderSpec.groovy

Author: jdaugherty

gradle/idea.gradle

@@ -1,5 +1,3 @@
-import groovy.xml.XmlParser
-
 idea {
     project {
         jdkName "1.7"

grails-bootstrap/src/main/groovy/grails/codegen/model/ModelBuilder.groovy

@@ -17,7 +17,7 @@ package grails.codegen.model
 
 import grails.util.GrailsNameUtils
 import groovy.transform.CompileStatic
-import org.apache.groovy.util.BeanUtils
+import org.codehaus.groovy.runtime.MetaClassHelper
 import org.grails.io.support.FileSystemResource
 import org.grails.io.support.GrailsResourceUtils
 import org.grails.io.support.Resource
@@ -89,7 +89,7 @@ trait ModelBuilder {
         final String packagePath
 
         ModelImpl(String className) {
-            this.className = BeanUtils.capitalize(GrailsNameUtils.getShortName(className))
+            this.className = MetaClassHelper.capitalize(GrailsNameUtils.getShortName(className))
             this.fullName = className
             this.propertyName = GrailsNameUtils.getPropertyName(className)
             this.packageName = GrailsNameUtils.getPackageName(className)
@@ -111,14 +111,7 @@ trait ModelBuilder {
 
         @Override
         Map<String, Object> asMap() {
-            [className: className,
-             fullName: fullName,
-             propertyName: propertyName,
-             modelName: propertyName,
-             packageName: packageName,
-             packagePath: packagePath,
-             simpleName: simpleName,
-             lowerCaseName: lowerCaseName] as Map<String, Object>
+            (Map<String,Object>) [ className: className, fullName: fullName, propertyName: propertyName, modelName: propertyName, packageName: packageName, packagePath: packagePath, simpleName: simpleName, lowerCaseName: lowerCaseName]
         }
     }
 

grails-bootstrap/src/main/groovy/org/grails/io/support/SpringIOUtils.java

@@ -15,7 +15,7 @@
  */
 package org.grails.io.support;
 
-import groovy.xml.XmlSlurper;
+import groovy.util.XmlSlurper;
 import groovy.xml.FactorySupport;
 import org.xml.sax.SAXException;
 import javax.xml.XMLConstants;

grails-console/src/main/groovy/grails/ui/shell/support/GroovyshApplicationContext.groovy

@@ -16,10 +16,12 @@
 package grails.ui.shell.support
 
 import grails.core.GrailsApplication
-import org.apache.groovy.groovysh.Groovysh
+import grails.ui.support.DevelopmentWebApplicationContext
+import org.codehaus.groovy.tools.shell.Groovysh
 import org.codehaus.groovy.tools.shell.IO
 import org.springframework.context.support.GenericApplicationContext
 
+
 /**
  * @author Graeme Rocher
  * @since 3.0

grails-console/src/main/groovy/grails/ui/shell/support/GroovyshWebApplicationContext.groovy

@@ -19,9 +19,10 @@ import grails.core.GrailsApplication
 import grails.ui.support.DevelopmentWebApplicationContext
 import groovy.transform.CompileStatic
 import groovy.transform.InheritConstructors
-import org.apache.groovy.groovysh.Groovysh
+import org.codehaus.groovy.tools.shell.Groovysh
 import org.codehaus.groovy.tools.shell.IO
 
+
 /**
  * @author Graeme Rocher
  * @since 3.0

grails-core/src/main/groovy/grails/util/AbstractTypeConvertingMap.java

@@ -15,6 +15,7 @@
  */
 package grails.util;
 
+import grails.util.GrailsStringUtils;
 import groovy.lang.GroovyObjectSupport;
 import org.codehaus.groovy.runtime.DefaultGroovyMethods;
 import org.codehaus.groovy.util.HashCodeHelper;

grails-core/src/main/groovy/grails/util/GrailsStringUtils.groovy

@@ -165,7 +165,7 @@ abstract class GrailsStringUtils extends StringUtils{
      * Same as {@link StringUtils#isEmpty(java.lang.Object)} but trims the string for surrounding whitespace
      */
     static boolean isBlank(String str) {
-        !hasText(str?.trim())
+        isEmpty(str?.trim())
     }
 
     /**
@@ -179,7 +179,7 @@ abstract class GrailsStringUtils extends StringUtils{
      * Opposite of {@link GrailsStringUtils#isEmpty(java.lang.Object)}
      */
     static boolean isNotEmpty(String str) {
-        hasText(str)
+        !isEmpty(str)
     }
 
     /**

grails-core/src/main/groovy/grails/util/GrailsUtil.java

@@ -15,12 +15,27 @@
  */
 package grails.util;
 
+import grails.io.IOUtils;
+import groovy.lang.Binding;
+import groovy.lang.GroovyShell;
+import groovy.lang.Writable;
+import groovy.util.slurpersupport.GPathResult;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.grails.core.io.CachingPathMatchingResourcePatternResolver;
 import org.grails.exceptions.reporting.DefaultStackTraceFilterer;
 import org.grails.exceptions.reporting.StackTraceFilterer;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.UrlResource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.io.PrintWriter;
+import java.io.Writer;
+import java.net.URL;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
 
 /**
  * Grails utility methods for command line and GUI applications.

grails-core/src/main/groovy/org/grails/compiler/injection/GlobalGrailsClassInjectorTransformation.groovy

@@ -9,10 +9,9 @@ import grails.util.GrailsNameUtils
 import groovy.transform.CompilationUnitAware
 import groovy.transform.CompileDynamic
 import groovy.transform.CompileStatic
+import groovy.util.slurpersupport.GPathResult
 import groovy.xml.MarkupBuilder
 import groovy.xml.StreamingMarkupBuilder
-import groovy.xml.XmlSlurper
-import groovy.xml.slurpersupport.GPathResult
 import org.codehaus.groovy.ast.*
 import org.codehaus.groovy.ast.expr.ConstantExpression
 import org.codehaus.groovy.control.CompilationUnit

grails-core/src/main/groovy/org/grails/core/io/support/GrailsFactoriesLoader.groovy

@@ -62,7 +62,7 @@ class GrailsFactoriesLoader extends FactoriesLoaderSupport {
         boolean hasArguments = !(arguments != null && arguments.length==0)
         List<T> results = new ArrayList<T>() 
         for(Class<? extends T> clazz : loadFactoryClasses(factoryClass, classLoader)) {
-            results.add(hasArguments ? clazz.newInstance(arguments) : clazz.getDeclaredConstructor().newInstance())
+            results.add(hasArguments ? clazz.newInstance(arguments) : clazz.newInstance()) 
         }
         OrderComparator.sort((List<?>) results)
         results