Organize imports, fix 2 bugs with ASM upgrade

jon-bell · jon-bell · commit 456059770aa4 · 2016-12-31T17:23:54.000-05:00
diff --git a/Code/ChroniclerJ/src/main/java/com/rits/cloning/Cloner.java b/Code/ChroniclerJ/src/main/java/com/rits/cloning/Cloner.java
@@ -1,7 +1,6 @@
 
 package com.rits.cloning;
 
-import java.lang.annotation.Annotation;
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -10,8 +9,6 @@
 import java.net.URI;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -26,8 +23,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
 
-import javax.activation.FileDataSource;
-
 /**
  * Cloner: deep clone objects. This class is thread safe. One instance can be
  * used by multiple threads on the same time.
diff --git a/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/ChroniclerJExportRunner.java b/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/ChroniclerJExportRunner.java
@@ -12,11 +12,11 @@
 import java.util.jar.Attributes;
 import java.util.jar.JarEntry;
 import java.util.jar.JarOutputStream;
+import java.util.jar.Manifest;
 
 import com.thoughtworks.xstream.XStream;
 
 import edu.columbia.cs.psl.chroniclerj.xstream.StaticReflectionProvider;
-import java.util.jar.Manifest;
 
 public class ChroniclerJExportRunner extends Thread {
 
diff --git a/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/Instrumenter.java b/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/Instrumenter.java
@@ -8,7 +8,6 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.nio.channels.FileChannel;
diff --git a/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/analysis/MutabilityAnalyzer.java b/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/analysis/MutabilityAnalyzer.java
@@ -14,7 +14,6 @@
 import org.objectweb.asm.tree.FieldInsnNode;
 import org.objectweb.asm.tree.MethodInsnNode;
 import org.objectweb.asm.tree.MethodNode;
-import org.objectweb.asm.util.Printer;
 
 import edu.columbia.cs.psl.chroniclerj.struct.AnnotatedMethod;
 import edu.columbia.cs.psl.chroniclerj.struct.Expression;
diff --git a/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/bench/ChroniclerJLogExplorer.java b/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/bench/ChroniclerJLogExplorer.java
@@ -2,9 +2,6 @@
 package edu.columbia.cs.psl.chroniclerj.bench;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.ObjectInputStream;
-import java.util.Arrays;
 
 import edu.columbia.cs.psl.chroniclerj.ExportedSerializableLog;
 import edu.columbia.cs.psl.chroniclerj.replay.ReplayRunner;
diff --git a/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/replay/FinalizerReplayingMethodVisitor.java b/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/replay/FinalizerReplayingMethodVisitor.java
@@ -3,7 +3,6 @@
 
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
 
 import edu.columbia.cs.psl.chroniclerj.Instrumenter;
 
diff --git a/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/replay/NonDeterministicReplayMethodVisitor.java b/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/replay/NonDeterministicReplayMethodVisitor.java
@@ -12,19 +12,15 @@
 import org.objectweb.asm.Type;
 import org.objectweb.asm.commons.AdviceAdapter;
 import org.objectweb.asm.commons.AnalyzerAdapter;
-import org.objectweb.asm.commons.GeneratorAdapter;
-import org.objectweb.asm.commons.LocalVariablesSorter;
 import org.objectweb.asm.tree.MethodInsnNode;
 
 import edu.columbia.cs.psl.chroniclerj.CallbackRegistry;
 import edu.columbia.cs.psl.chroniclerj.ChroniclerJExportRunner;
-import edu.columbia.cs.psl.chroniclerj.Constants;
 import edu.columbia.cs.psl.chroniclerj.ExportedLog;
 import edu.columbia.cs.psl.chroniclerj.Instrumenter;
 import edu.columbia.cs.psl.chroniclerj.Log;
 import edu.columbia.cs.psl.chroniclerj.MethodCall;
 import edu.columbia.cs.psl.chroniclerj.struct.AnnotatedMethod;
-import edu.columbia.cs.psl.chroniclerj.visitor.CloningAdviceAdapter;
 import edu.columbia.cs.psl.chroniclerj.visitor.NonDeterministicLoggingMethodVisitor;
 
 public class NonDeterministicReplayMethodVisitor extends AdviceAdapter implements Opcodes {
diff --git a/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/replay/ReplayRunner.java b/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/replay/ReplayRunner.java
@@ -2,7 +2,6 @@
 package edu.columbia.cs.psl.chroniclerj.replay;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.lang.reflect.InvocationTargetException;
diff --git a/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/replay/Replayer.java b/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/replay/Replayer.java
@@ -8,12 +8,8 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URL;
-import java.net.URLClassLoader;
 import java.nio.channels.FileChannel;
 import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Scanner;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
@@ -24,12 +20,9 @@
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.commons.SerialVersionUIDAdder;
-import org.objectweb.asm.tree.ClassNode;
 
 import edu.columbia.cs.psl.chroniclerj.Instrumenter;
 import edu.columbia.cs.psl.chroniclerj.InstrumenterClassWriter;
-import edu.columbia.cs.psl.chroniclerj.MethodCall;
-import edu.columbia.cs.psl.chroniclerj.analysis.MutabilityAnalyzer;
 import edu.columbia.cs.psl.chroniclerj.struct.AnnotatedMethod;
 
 public class Replayer {
diff --git a/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/struct/AnnotatedMethod.java b/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/struct/AnnotatedMethod.java
@@ -5,9 +5,6 @@
 
 import org.objectweb.asm.commons.Method;
 
-import edu.columbia.cs.psl.chroniclerj.Instrumenter;
-import edu.columbia.cs.psl.chroniclerj.visitor.NonDeterministicLoggingMethodVisitor;
-
 public class AnnotatedMethod {
 
     /**
diff --git a/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/CallbackDuplicatingClassVisitor.java b/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/CallbackDuplicatingClassVisitor.java
@@ -4,15 +4,12 @@
 import java.util.HashSet;
 
 import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.Label;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.commons.LocalVariablesSorter;
 import org.objectweb.asm.tree.MethodNode;
 
-import edu.columbia.cs.psl.chroniclerj.MethodCall;
-
 /**
  * If we identify a method as a callback method: Rename it. the renamed one will
  * then not be logged. Create a new method with the original name, and the only
diff --git a/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/CallbackLoggingMethodVisitor.java b/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/CallbackLoggingMethodVisitor.java
@@ -5,7 +5,6 @@
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.commons.AdviceAdapter;
-import org.objectweb.asm.commons.GeneratorAdapter;
 import org.objectweb.asm.commons.LocalVariablesSorter;
 
 import edu.columbia.cs.psl.chroniclerj.CallbackInvocation;
diff --git a/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/FinalizerLoggingMethodVisitor.java b/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/FinalizerLoggingMethodVisitor.java
@@ -3,7 +3,6 @@
 
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
 
 import edu.columbia.cs.psl.chroniclerj.Instrumenter;
 
diff --git a/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/NonDeterministicLoggingClassVisitor.java b/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/NonDeterministicLoggingClassVisitor.java
@@ -1,8 +1,6 @@
 
 package edu.columbia.cs.psl.chroniclerj.visitor;
 
-import java.io.File;
-import java.io.FileNotFoundException;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -226,15 +224,15 @@ else if (mi.getOpcode() != Opcodes.INVOKESTATIC) {
                 for (int i = 0; i < args.length; i++) {
                     caa.loadArg(i);
                 }
-                lvs.visitMethodInsn(Opcodes.INVOKESPECIAL, mi.owner, mi.name, mi.desc, false);
+                lvs.visitMethodInsn(Opcodes.INVOKESPECIAL, mi.owner, mi.name, mi.desc, mi.itf);
                 caa.loadArg(0);
             } else {
                 if ((opcode & Opcodes.ACC_STATIC) == 0)
                     caa.loadThis();
                 for (int i = 0; i < args.length; i++) {
                     caa.loadArg(i);
                 }
-                lvs.visitMethodInsn(mi.getOpcode(), mi.owner, mi.name, mi.desc, false);
+                lvs.visitMethodInsn(mi.getOpcode(), mi.owner, mi.name, mi.desc, mi.itf);
                 for (int i = 0; i < args.length; i++) {
                     if (args[i].getSort() == Type.ARRAY) {
                         boolean minimalCopy = (Type.getReturnType(methodDesc).getSort() == Type.INT);
diff --git a/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/NonDeterministicLoggingMethodVisitor.java b/Code/ChroniclerJ/src/main/java/edu/columbia/cs/psl/chroniclerj/visitor/NonDeterministicLoggingMethodVisitor.java
@@ -1,8 +1,6 @@
 
 package edu.columbia.cs.psl.chroniclerj.visitor;
 
-import java.io.File;
-import java.io.FileNotFoundException;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Scanner;
@@ -14,10 +12,8 @@
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.commons.AnalyzerAdapter;
-import org.objectweb.asm.commons.LocalVariablesSorter;
 import org.objectweb.asm.tree.MethodInsnNode;
 
-import edu.columbia.cs.psl.chroniclerj.Constants;
 import edu.columbia.cs.psl.chroniclerj.Instrumenter;
 import edu.columbia.cs.psl.chroniclerj.MethodCall;
 import edu.columbia.cs.psl.chroniclerj.replay.NonDeterministicReplayMethodVisitor;
diff --git a/Code/ChroniclerJ/src/test/java/edu/columbia/cs/psl/test/chroniclerj/RandomITCase.java b/Code/ChroniclerJ/src/test/java/edu/columbia/cs/psl/test/chroniclerj/RandomITCase.java
@@ -1,7 +1,5 @@
 package edu.columbia.cs.psl.test.chroniclerj;
 
-import static org.junit.Assert.*;
-
 import org.junit.Test;
 
 public class RandomITCase {
