[groovy] branch master updated: GROOVY-8647: Split package renaming (a few remaining deprecations)

[paulk]

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new a0971cc  GROOVY-8647: Split package renaming (a few remaining 
deprecations)
a0971cc is described below

commit a0971cc76fa8c6927ed00174e293c44ecf96e0ce
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat May 18 15:29:42 2019 +1000

    GROOVY-8647: Split package renaming (a few remaining deprecations)
---
 .../groovy/org/codehaus/groovy/tools/shell/Parser.groovy | 16 ++++++++--------
 .../groovy/tools/shell/util/PackageHelperImpl.groovy     |  1 +
 .../tools/shell/util/ScriptVariableAnalyzer.groovy       |  3 +++
 .../src/main/java/groovy/util/GroovyMBean.java           |  3 +++
 .../src/main/java/groovy/util/XmlNodePrinter.java        |  1 +
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git 
a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Parser.groovy
 
b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Parser.groovy
index 33efe3c..189d15a 100644
--- 
a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Parser.groovy
+++ 
b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Parser.groovy
@@ -79,8 +79,8 @@ class Parser
 /**
  * A relaxed parser, which tends to allow more, but won't really catch valid 
syntax errors.
  */
-final class RelaxedParser implements Parsing
-{
+@Deprecated
+final class RelaxedParser implements Parsing {
     private final Logger log = Logger.create(this.class)
 
     private SourceBuffer sourceBuffer
@@ -136,8 +136,8 @@ final class RelaxedParser implements Parsing
 /**
  * A more rigid parser which catches more syntax errors, but also tends to 
barf on stuff that is really valid from time to time.
  */
-final class RigidParser implements Parsing
-{
+@Deprecated
+final class RigidParser implements Parsing {
     private static final Pattern ANNOTATION_PATTERN = 
Pattern.compile('^@[a-zA-Z_][a-zA-Z_0-9]*(.*)$')
     static final String SCRIPT_FILENAME = 'groovysh_parse'
 
@@ -240,8 +240,8 @@ final class RigidParser implements Parsing
 /**
  * Container for the parse code.
  */
-final class ParseCode
-{
+@Deprecated
+final class ParseCode {
     static final ParseCode COMPLETE = new ParseCode(0)
 
     static final ParseCode INCOMPLETE = new ParseCode(1)
@@ -263,8 +263,8 @@ final class ParseCode
 /**
  * Container for parse status details.
  */
-final class ParseStatus
-{
+@Deprecated
+final class ParseStatus {
     final ParseCode code
 
     final Throwable cause
diff --git 
a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImpl.groovy
 
b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImpl.groovy
index 394f848..5a6556d 100644
--- 
a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImpl.groovy
+++ 
b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImpl.groovy
@@ -472,6 +472,7 @@ Files.walkFileTree(fs.getPath('modules'),
 }
 
 @CompileStatic
+@Deprecated
 class CachedPackage {
     String name
     boolean containsClasses
diff --git 
a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzer.groovy
 
b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzer.groovy
index a6e6fe7..28a0ba1 100644
--- 
a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzer.groovy
+++ 
b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzer.groovy
@@ -44,6 +44,7 @@ class ScriptVariableAnalyzer {
     /**
      * define a visitor that visits all variable expressions
      */
+    @Deprecated
     static class VariableVisitor extends ClassCodeVisitorSupport implements 
GroovyClassVisitor {
         Set<String> bound = new HashSet<String>()
         Set<String> unbound = new HashSet<String>()
@@ -73,6 +74,7 @@ class ScriptVariableAnalyzer {
      * custom PrimaryClassNodeOperation
      * to be able to hook our code visitor
      */
+    @Deprecated
     static class VisitorSourceOperation extends 
CompilationUnit.PrimaryClassNodeOperation {
 
         final GroovyClassVisitor visitor
@@ -91,6 +93,7 @@ class ScriptVariableAnalyzer {
     /**
      * class loader to add our phase operation
      */
+    @Deprecated
     static class VisitorClassLoader extends GroovyClassLoader {
         final GroovyClassVisitor visitor
 
diff --git a/subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java 
b/subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java
index 8f48699..0cb4bdc 100644
--- a/subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java
+++ b/subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java
@@ -43,7 +43,10 @@ import java.util.Map;
  * an underlying JMX MBean.
  * Properties and normal method invocations
  * delegate to the MBeanServer to the actual MBean.
+ *
+ * @deprecated Use {@link groovy.jmx.GroovyMBean}
  */
+@Deprecated
 public class GroovyMBean extends GroovyObjectSupport {
     private final MBeanServerConnection server;
     private final ObjectName name;
diff --git 
a/subprojects/groovy-xml/src/main/java/groovy/util/XmlNodePrinter.java 
b/subprojects/groovy-xml/src/main/java/groovy/util/XmlNodePrinter.java
index f29ccc2..261b9c9 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/util/XmlNodePrinter.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/util/XmlNodePrinter.java
@@ -415,6 +415,7 @@ public class XmlNodePrinter {
         }
     }
 
+    @Deprecated
     protected static class NamespaceContext {
         private final Map<String, String> namespaceMap;