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 2019/04/28 06:03:31 UTC
[groovy] 04/05: minor refactor: formatting and tidy up
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 3bfe08232e55aee575a68fc1f4865b0112153b47
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sun Apr 28 09:32:08 2019 +1000
minor refactor: formatting and tidy up
---
src/test/gls/generics/GenericsTestBase.java | 61 ++++++++++++++---------------
1 file changed, 30 insertions(+), 31 deletions(-)
diff --git a/src/test/gls/generics/GenericsTestBase.java b/src/test/gls/generics/GenericsTestBase.java
index 779c77b..820a330 100644
--- a/src/test/gls/generics/GenericsTestBase.java
+++ b/src/test/gls/generics/GenericsTestBase.java
@@ -26,77 +26,76 @@ import org.codehaus.groovy.control.CompilationFailedException;
import org.codehaus.groovy.control.CompilationUnit;
import org.codehaus.groovy.control.CompilerConfiguration;
import org.codehaus.groovy.control.SourceUnit;
-import org.objectweb.asm.*;
import java.util.HashMap;
import java.util.Map;
public abstract class GenericsTestBase extends GroovyTestCase {
MyLoader loader;
- HashMap signatures;
-
- private class MyLoader extends GroovyClassLoader{
- public MyLoader(ClassLoader classLoader) {
+ HashMap<String, String> signatures;
+
+ private class MyLoader extends GroovyClassLoader {
+ MyLoader(ClassLoader classLoader) {
super(classLoader);
}
- protected ClassCollector createCollector(CompilationUnit unit,SourceUnit su) {
+ protected ClassCollector createCollector(CompilationUnit unit, SourceUnit su) {
return new MyCollector(new InnerLoader(this), unit, su);
}
}
- private class MyCollector extends GroovyClassLoader.ClassCollector{
- public MyCollector(InnerLoader myLoader, CompilationUnit unit, SourceUnit su) {
- super(myLoader,unit,su);
+ private class MyCollector extends GroovyClassLoader.ClassCollector {
+ MyCollector(InnerLoader myLoader, CompilationUnit unit, SourceUnit su) {
+ super(myLoader, unit, su);
}
+
protected Class createClass(byte[] code, ClassNode classNode) {
ClassReader cr = new ClassReader(code);
GenericsTester classVisitor = new GenericsTester(new org.objectweb.asm.tree.ClassNode());
cr.accept(classVisitor, ClassWriter.COMPUTE_MAXS);
- return super.createClass(code,classNode);
- }
+ return super.createClass(code, classNode);
+ }
}
+
private class GenericsTester extends ClassVisitor {
- public GenericsTester(ClassVisitor cv) {
+ GenericsTester(ClassVisitor cv) {
super(CompilerConfiguration.ASM_API_VERSION, cv);
}
- public void visit(int version, int access, String name,
- String signature, String superName, String[] interfaces) {
- if (signature!=null) signatures.put("class", signature);
+
+ public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
+ if (signature != null) signatures.put("class", signature);
}
- public FieldVisitor visitField(int access, String name, String desc,
- String signature, Object value) {
- if (signature!=null) signatures.put(name,signature);
+
+ public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {
+ if (signature != null) signatures.put(name, signature);
return super.visitField(access, name, desc, signature, value);
}
- public MethodVisitor visitMethod(int access, String name, String desc,
- String signature, String[] exceptions) {
- if (signature!=null) signatures.put(name+desc,signature);
+
+ public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
+ if (signature != null) signatures.put(name + desc, signature);
return super.visitMethod(access, name, desc, signature, exceptions);
}
-
}
-
- public void setUp(){
+
+ public void setUp() {
loader = new MyLoader(this.getClass().getClassLoader());
- signatures = new HashMap();
+ signatures = new HashMap<>();
}
-
+
public void createClassInfo(String script) {
loader.parseClass(script);
}
-
- public Map getSignatures() {
+
+ public Map<String, String> getSignatures() {
return signatures;
}
-
+
protected void shouldNotCompile(String script) {
try {
loader.parseClass(script);
} catch (CompilationFailedException cfe) {
return;
}
- throw new AssertionError("compilation of script '"+script+"' should have failed, but did not.");
+ throw new AssertionError("compilation of script '" + script + "' should have failed, but did not.");
}
}
-