[commons-weaver] 08/13: small cleanups

[mbenson]

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 c419b33493ab5578e3a2d73675bcfd3b2111b215
Author: Matt Benson <mben...@apache.org>
AuthorDate: Fri Apr 20 11:26:46 2018 -0500

    small cleanups
---
 .../org/apache/commons/weaver/privilizer/ActionGenerator.java     | 2 +-
 .../commons/weaver/privilizer/InlineNestedPrivilegedCalls.java    | 1 -
 .../org/apache/commons/weaver/privilizer/PrivilizerCleaner.java   | 1 -
 .../org/apache/commons/weaver/privilizer/PrivilizingVisitor.java  | 8 ++------
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git 
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/ActionGenerator.java
 
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/ActionGenerator.java
index 20f2121..9f880a8 100644
--- 
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/ActionGenerator.java
+++ 
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/ActionGenerator.java
@@ -86,7 +86,7 @@ class ActionGenerator extends Privilizer.WriteClass 
implements Builder<Type> {
         this.impl = new Method(implName, methd.getDescriptor());
         this.implIsStatic = Modifier.isStatic(access);
         final Type[] args =
-            implIsStatic ? methd.getArgumentTypes() : 
ArrayUtils.add(methd.getArgumentTypes(), 0, owner.target);
+            implIsStatic ? methd.getArgumentTypes() : ArrayUtils.insert(0, 
methd.getArgumentTypes(), owner.target);
         this.helper = new Method(privilizer().generateName("access$" + index), 
methd.getReturnType(), args);
         this.result = privilizer().wrap(methd.getReturnType());
         this.fields = fields(args);
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 c045b13..2795a22 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
@@ -22,7 +22,6 @@ import java.util.Map;
 
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.commons.Method;
 import org.objectweb.asm.tree.ClassNode;
 
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 78673f5..bb09954 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
@@ -31,7 +31,6 @@ import org.apache.commons.weaver.model.WeaveInterest;
 import org.apache.commons.weaver.spi.Cleaner;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.Opcodes;
 
 /**
  * Removes classes privilized with a different policy.
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 ccfe259..09c8cce 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
@@ -149,12 +149,8 @@ class PrivilizingVisitor extends 
Privilizer.PrivilizerClassVisitor {
                     privilizer().env.debug("setting up unconditional 
privileged execution due to policy %s", policy);
                 }
                 // generate action:
-                final Type[] ctorArgs;
-                if (instanceMethod) {
-                    ctorArgs = ArrayUtils.add(methd.getArgumentTypes(), 0, 
target);
-                } else {
-                    ctorArgs = methd.getArgumentTypes();
-                }
+                final Type[] ctorArgs =
+                    instanceMethod ? ArrayUtils.insert(0, 
methd.getArgumentTypes(), target) : methd.getArgumentTypes();
                 final Type actionType = new ActionGenerator(access, methd, 
exceptions, PrivilizingVisitor.this).build();
                 newInstance(actionType);
                 dup();

-- 
To stop receiving notification emails like this one, please contact
mben...@apache.org.