This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
commit ad16043d781a24e4d8d79be9114dd26fc2fccde3
Author: Matt Benson <mben...@apache.org>
AuthorDate: Thu Apr 19 18:01:04 2018 -0500
centralize ASM versions
---
.../org/apache/commons/weaver/normalizer/Normalizer.java | 13 +++++++------
.../commons/weaver/privilizer/BlueprintingVisitor.java | 10 +++++-----
.../weaver/privilizer/InlineNestedPrivilegedCalls.java | 6 +++---
.../org/apache/commons/weaver/privilizer/Privilizer.java | 5 +++--
.../apache/commons/weaver/privilizer/PrivilizerCleaner.java | 2 +-
.../commons/weaver/privilizer/PrivilizingVisitor.java | 2 +-
.../src/main/java/org/apache/commons/weaver/Finder.java | 9 +++++----
7 files changed, 25 insertions(+), 22 deletions(-)
diff --git
a/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
b/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
index 1c8be3f..d0be3dd 100644
---
a/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
+++
b/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
@@ -72,7 +72,7 @@ public class Normalizer {
private static final class Inspector extends ClassVisitor {
private final class InspectConstructor extends MethodVisitor {
private InspectConstructor() {
- super(Opcodes.ASM5);
+ super(ASM_VERSION);
}
@Override
@@ -104,7 +104,7 @@ public class Normalizer {
private String superName;
private Inspector() {
- super(Opcodes.ASM5);
+ super(ASM_VERSION);
}
@Override
@@ -159,7 +159,7 @@ public class Normalizer {
private static final class Remap extends ClassRemapper {
private final class RewriteConstructor extends MethodVisitor {
private RewriteConstructor(final MethodVisitor wrapped) {
- super(Opcodes.ASM5, wrapped);
+ super(ASM_VERSION, wrapped);
}
@Override
@@ -240,11 +240,11 @@ public class Normalizer {
private String className;
WriteClass() {
- super(Opcodes.ASM5, new
CustomClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS));
+ super(ASM_VERSION, new
CustomClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS));
}
WriteClass(final ClassReader reader) {
- super(Opcodes.ASM5, new CustomClassWriter(reader, 0));
+ super(ASM_VERSION, new CustomClassWriter(reader, 0));
}
@Override
@@ -290,6 +290,7 @@ public class Normalizer {
*/
public static final String CONFIG_TARGET_PACKAGE = CONFIG_WEAVER +
"targetPackage";
+ private static final int ASM_VERSION = Opcodes.ASM5;
private static final Charset UTF8 = Charset.forName(CharEncoding.UTF_8);
private final WeaveEnvironment env;
@@ -507,7 +508,7 @@ public class Normalizer {
// we're doing most of this by hand; we only read the original
class to hijack signature, ctor exceptions,
// etc.:
- reader.accept(new ClassVisitor(Opcodes.ASM5) {
+ reader.accept(new ClassVisitor(ASM_VERSION) {
Type supertype;
@Override
diff --git
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/BlueprintingVisitor.java
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/BlueprintingVisitor.java
index 00a7049..a12e79d 100644
---
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/BlueprintingVisitor.java
+++
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/BlueprintingVisitor.java
@@ -72,7 +72,7 @@ class BlueprintingVisitor extends
Privilizer.PrivilizerClassVisitor {
BlueprintingVisitor(@SuppressWarnings("PMD.UnusedFormalParameter") final
Privilizer privilizer, //false positive
final ClassVisitor nextVisitor,
final Privilizing config) {
- privilizer.super(new ClassNode(Opcodes.ASM5));
+ privilizer.super(new ClassNode(Privilizer.ASM_VERSION));
this.nextVisitor = nextVisitor;
// load up blueprint methods:
@@ -117,7 +117,7 @@ class BlueprintingVisitor extends
Privilizer.PrivilizerClassVisitor {
}
private ClassNode read(final String className) {
- final ClassNode result = new ClassNode(Opcodes.ASM5);
+ final ClassNode result = new ClassNode(Privilizer.ASM_VERSION);
try (InputStream bytecode =
privilizer().env.getClassfile(className).getInputStream();) {
new ClassReader(bytecode).accept(result, ClassReader.SKIP_DEBUG |
ClassReader.EXPAND_FRAMES);
} catch (final Exception e) {
@@ -167,7 +167,7 @@ class BlueprintingVisitor extends
Privilizer.PrivilizerClassVisitor {
// non-public fields accessed
final Set<FieldAccess> fieldAccesses = new LinkedHashSet<>();
- source.accept(new MethodVisitor(Opcodes.ASM5) {
+ source.accept(new MethodVisitor(Privilizer.ASM_VERSION) {
@Override
public void visitFieldInsn(final int opcode, final String owner,
final String name, final String desc) {
final FieldAccess fieldAccess =
fieldAccess(Type.getObjectType(owner), name);
@@ -253,7 +253,7 @@ class BlueprintingVisitor extends
Privilizer.PrivilizerClassVisitor {
private abstract class MethodInvocationHandler extends MethodVisitor {
MethodInvocationHandler(final MethodVisitor mvr) {
- super(Opcodes.ASM5, mvr);
+ super(Privilizer.ASM_VERSION, mvr);
}
@Override
@@ -323,7 +323,7 @@ class BlueprintingVisitor extends
Privilizer.PrivilizerClassVisitor {
AccessibleAdvisor(final MethodVisitor mvr, final int access, final
String name, final String desc,
final List<FieldAccess> fieldAccesses) {
- super(ASM5, mvr, access, name, desc);
+ super(Privilizer.ASM_VERSION, mvr, access, name, desc);
this.fieldAccesses = fieldAccesses;
}
diff --git
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/InlineNestedPrivilegedCalls.java
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/InlineNestedPrivilegedCalls.java
index ddb6da5..c045b13 100644
---
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/InlineNestedPrivilegedCalls.java
+++
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/InlineNestedPrivilegedCalls.java
@@ -38,7 +38,7 @@ class InlineNestedPrivilegedCalls extends ClassNode {
private final Method outer;
private VisitMethod(final MethodVisitor orig, final Method outer) {
- super(Opcodes.ASM5, orig);
+ super(Privilizer.ASM_VERSION, orig);
this.outer = outer;
}
@@ -59,7 +59,7 @@ class InlineNestedPrivilegedCalls extends ClassNode {
}
private VisitEnd() {
- super(Opcodes.ASM5, next);
+ super(Privilizer.ASM_VERSION, next);
}
@Override
@@ -92,7 +92,7 @@ class InlineNestedPrivilegedCalls extends ClassNode {
*/
InlineNestedPrivilegedCalls(final Privilizer privilizer, final Map<Method,
String> privilegedMethods,
final ClassVisitor next) {
- super(Opcodes.ASM5);
+ super(Privilizer.ASM_VERSION);
this.privilizer = privilizer;
this.privilegedMethods = privilegedMethods;
this.next = next;
diff --git
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
index ffd4e33..ae8036b 100644
---
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
+++
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
@@ -56,7 +56,7 @@ public class Privilizer {
}
protected PrivilizerClassVisitor(final ClassVisitor cv) { //NOPMD
- super(Opcodes.ASM5, cv);
+ super(ASM_VERSION, cv);
}
protected Privilizer privilizer() {
@@ -144,6 +144,7 @@ public class Privilizer {
private static final String GENERATE_NAME = "__privileged_%s";
+ static final int ASM_VERSION = Opcodes.ASM5;
static final Type[] EMPTY_TYPE_ARRAY = new Type[0];
final WeaveEnvironment env;
@@ -240,7 +241,7 @@ public class Privilizer {
}
Validate.validState(StringUtils.isBlank(error), error);
- final ClassVisitor checkInnerClasses = new ClassVisitor(Opcodes.ASM5,
null) {
+ final ClassVisitor checkInnerClasses = new ClassVisitor(ASM_VERSION,
null) {
final Set<String> innerNames = new HashSet<>();
@Override
diff --git
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizerCleaner.java
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizerCleaner.java
index 4c45ffa..78673f5 100644
---
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizerCleaner.java
+++
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizerCleaner.java
@@ -57,7 +57,7 @@ public class PrivilizerCleaner implements Cleaner {
try (InputStream bytecode =
privilizer.env.getClassfile(className).getInputStream()) {
final ClassReader classReader = new ClassReader(bytecode);
- classReader.accept(new ClassVisitor(Opcodes.ASM5) {
+ classReader.accept(new ClassVisitor(Privilizer.ASM_VERSION) {
@Override
@SuppressWarnings("PMD.UseVarargs") // overridden method
public void visit(final int version, final int access,
final String name, final String signature,
diff --git
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizingVisitor.java
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizingVisitor.java
index 8d4c1a5..ccfe259 100644
---
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizingVisitor.java
+++
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizingVisitor.java
@@ -92,7 +92,7 @@ class PrivilizingVisitor extends
Privilizer.PrivilizerClassVisitor {
final MethodVisitor originalMethod = super.visitMethod(access, name,
desc, signature, exceptions);
final Method methd = new Method(name, desc);
- return new GeneratorAdapter(Opcodes.ASM5, originalMethod, access,
name, desc) {
+ return new GeneratorAdapter(Privilizer.ASM_VERSION, originalMethod,
access, name, desc) {
@Override
public AnnotationVisitor visitAnnotation(final String desc, final
boolean visible) {
diff --git a/processor/src/main/java/org/apache/commons/weaver/Finder.java
b/processor/src/main/java/org/apache/commons/weaver/Finder.java
index 548998e..9eb5b60 100644
--- a/processor/src/main/java/org/apache/commons/weaver/Finder.java
+++ b/processor/src/main/java/org/apache/commons/weaver/Finder.java
@@ -110,7 +110,7 @@ class Finder extends AnnotationFinder implements Scanner {
private abstract class AnnotationCapturer extends AnnotationVisitor {
public AnnotationCapturer(final AnnotationVisitor wrapped) {
- super(Opcodes.ASM5, wrapped);
+ super(ASM_VERSION, wrapped);
}
/**
@@ -196,7 +196,7 @@ class Finder extends AnnotationFinder implements Scanner {
private final InfoBuildingVisitor wrapped;
public Visitor(final InfoBuildingVisitor wrapped) {
- super(Opcodes.ASM5, wrapped);
+ super(ASM_VERSION, wrapped);
this.wrapped = wrapped;
}
@@ -223,7 +223,7 @@ class Finder extends AnnotationFinder implements Scanner {
return toWrap;
}
final FieldInfo fieldInfo = testFieldInfo;
- return new FieldVisitor(Opcodes.ASM5, toWrap) {
+ return new FieldVisitor(ASM_VERSION, toWrap) {
@Override
public AnnotationVisitor visitAnnotation(final String desc,
final boolean visible) {
final AnnotationVisitor toWrap =
super.visitAnnotation(desc, visible);
@@ -258,7 +258,7 @@ class Finder extends AnnotationFinder implements Scanner {
return toWrap;
}
final MethodInfo methodInfo = testMethodInfo;
- return new MethodVisitor(Opcodes.ASM5, toWrap) {
+ return new MethodVisitor(ASM_VERSION, toWrap) {
@Override
public AnnotationVisitor visitAnnotation(final String desc,
final boolean visible) {
final AnnotationVisitor toWrap =
super.visitAnnotation(desc, visible);
@@ -494,6 +494,7 @@ class Finder extends AnnotationFinder implements Scanner {
}
}
+ private static final int ASM_VERSION = Opcodes.ASM5;
private static final int ASM_FLAGS = ClassReader.SKIP_CODE +
ClassReader.SKIP_DEBUG + ClassReader.SKIP_FRAMES;
private static final String INIT = "<init>";
--
To stop receiving notification emails like this one, please contact
mben...@apache.org.
