You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2022/04/18 12:25:52 UTC
[groovy] branch master updated (0a4579946f -> 56a4ee1555)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
from 0a4579946f GROOVY-10570: `@AnnotationCollector`: better error for missing `value()`
new c38a78c371 minor refactor: remove some deprecation warnings
new 56a4ee1555 minor refactor: remove style warnings
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/main/java/groovy/lang/GroovyClassLoader.java | 1 +
.../org/codehaus/groovy/classgen/asm/util/LoggableTextifier.java | 9 +++++----
.../java/org/codehaus/groovy/control/CompilerConfiguration.java | 2 +-
.../java/org/codehaus/groovy/reflection/ReflectionUtils.java | 1 +
.../groovy/org/apache/groovy/macrolib/MacroLibGroovyMethods.java | 3 +++
5 files changed, 11 insertions(+), 5 deletions(-)
[groovy] 02/02: minor refactor: remove style warnings
Posted by pa...@apache.org.
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
commit 56a4ee15558311ce7be6c7d37732c151eb6906db
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Apr 18 22:10:03 2022 +1000
minor refactor: remove style warnings
---
.../org/codehaus/groovy/classgen/asm/util/LoggableTextifier.java | 9 +++++----
.../java/org/codehaus/groovy/control/CompilerConfiguration.java | 2 +-
.../groovy/org/apache/groovy/macrolib/MacroLibGroovyMethods.java | 3 +++
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/util/LoggableTextifier.java b/src/main/java/org/codehaus/groovy/classgen/asm/util/LoggableTextifier.java
index 3d29b6054c..0da008d90b 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/util/LoggableTextifier.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/util/LoggableTextifier.java
@@ -312,8 +312,8 @@ public class LoggableTextifier extends Textifier {
}
@Override
- public void visitVarInsn(int opcode, int var) {
- super.visitVarInsn(opcode, var);
+ public void visitVarInsn(int opcode, int varIndex) {
+ super.visitVarInsn(opcode, varIndex);
log();
}
@@ -330,6 +330,7 @@ public class LoggableTextifier extends Textifier {
}
@Override
+ @Deprecated
public void visitMethodInsn(int opcode, String owner, String name, String desc) {
super.visitMethodInsn(opcode, owner, name, desc);
log();
@@ -366,8 +367,8 @@ public class LoggableTextifier extends Textifier {
}
@Override
- public void visitIincInsn(int var, int increment) {
- super.visitIincInsn(var, increment);
+ public void visitIincInsn(int varIndex, int increment) {
+ super.visitIincInsn(varIndex, increment);
log();
}
diff --git a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
index f3739f7262..1654281f6a 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -512,7 +512,7 @@ public class CompilerConfiguration {
public CompilerConfiguration(final CompilerConfiguration configuration) {
setWarningLevel(configuration.getWarningLevel());
setTargetDirectory(configuration.getTargetDirectory());
- setClasspathList(new LinkedList<String>(configuration.getClasspath()));
+ setClasspathList(new LinkedList<>(configuration.getClasspath()));
setVerbose(configuration.getVerbose());
setDebug(configuration.getDebug());
setParameters(configuration.getParameters());
diff --git a/subprojects/groovy-macro-library/src/main/groovy/org/apache/groovy/macrolib/MacroLibGroovyMethods.java b/subprojects/groovy-macro-library/src/main/groovy/org/apache/groovy/macrolib/MacroLibGroovyMethods.java
index f34bab5315..933e0ce5db 100644
--- a/subprojects/groovy-macro-library/src/main/groovy/org/apache/groovy/macrolib/MacroLibGroovyMethods.java
+++ b/subprojects/groovy-macro-library/src/main/groovy/org/apache/groovy/macrolib/MacroLibGroovyMethods.java
@@ -40,6 +40,8 @@ import static org.codehaus.groovy.ast.tools.GeneralUtils.ctorX;
import static org.codehaus.groovy.ast.tools.GeneralUtils.listX;
public class MacroLibGroovyMethods {
+ private MacroLibGroovyMethods() {}
+
private static final ClassNode NAMED_VALUE = ClassHelper.make(NamedValue.class);
@Macro
@@ -98,6 +100,7 @@ public class MacroLibGroovyMethods {
return listX(Arrays.stream(exps).map(exp -> namedValueExpr(exp)).collect(Collectors.toList()));
}
+ @SuppressWarnings("unchecked")
public static <T> List<NamedValue<T>> NVL(Object self, T... args) {
throw new IllegalStateException("MacroLibGroovyMethods.NVL(Object...) should never be called at runtime. Are you sure you are using it correctly?");
}
[groovy] 01/02: minor refactor: remove some deprecation warnings
Posted by pa...@apache.org.
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
commit c38a78c371cbed1280d92e9481c306b8822e4fae
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Apr 18 21:31:32 2022 +1000
minor refactor: remove some deprecation warnings
---
src/main/java/groovy/lang/GroovyClassLoader.java | 1 +
src/main/java/org/codehaus/groovy/reflection/ReflectionUtils.java | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/main/java/groovy/lang/GroovyClassLoader.java b/src/main/java/groovy/lang/GroovyClassLoader.java
index 2c03b16e3f..cb5e5bde92 100644
--- a/src/main/java/groovy/lang/GroovyClassLoader.java
+++ b/src/main/java/groovy/lang/GroovyClassLoader.java
@@ -392,6 +392,7 @@ public class GroovyClassLoader extends URLClassLoader {
}
}
+ @SuppressWarnings("deprecation") // TODO replace getPackage with getDefinedPackage once min JDK version >= 9
private void definePackageInternal(String className) {
int i = className.lastIndexOf('.');
if (i != -1) {
diff --git a/src/main/java/org/codehaus/groovy/reflection/ReflectionUtils.java b/src/main/java/org/codehaus/groovy/reflection/ReflectionUtils.java
index 1268899c02..dc390437d4 100644
--- a/src/main/java/org/codehaus/groovy/reflection/ReflectionUtils.java
+++ b/src/main/java/org/codehaus/groovy/reflection/ReflectionUtils.java
@@ -211,6 +211,7 @@ public class ReflectionUtils {
}
// to be run in PrivilegedAction!
+ @SuppressWarnings("deprecation") // replace isAccessible with canAccess once min JDK version >= 9
public static Optional<AccessibleObject> makeAccessible(final AccessibleObject ao) {
try {
if (ao.isAccessible() || trySetAccessible(ao)) {