Squashed 'bytefrog/' changes from 010e2ed..ed3fe53

ed3fe53 Avoid instrumenting complex constructors
a5adfe9 Fix line level mapping arithmetic the right way
2c1b777 Fix line level mapping arithmetic
4c6b71b Implement JSP/mapped source support
407a310 Fix uninitialized stackmap reference exception
6510fc3 Don't repackage bytefrog dependencies
7508807 Update license header
2da38b5 Inject filter class immediately
f05917d Fix jarjar path when referencing project

git-subtree-dir: bytefrog
git-subtree-split: ed3fe53a99f9d1b6e2c8eae92adc90d6db4467f6

Author: Steve Salas

build.sbt

@@ -1,14 +1,17 @@
 val shared = Seq(
 	organization := "com.codedx",
-	scalacOptions := List("-deprecation", "-unchecked", "-feature"),
+	scalacOptions := Seq("-deprecation", "-unchecked", "-feature"),
 	scalaVersion := "2.12.4",
-	javacOptions := List("-source", "1.7", "-target", "1.7", "-Xlint:-options", "-Xlint:unchecked")
+	javacOptions := Seq("-source", "1.7", "-target", "1.7", "-Xlint:-options")
 )
 
 val javaOnly = Seq(
 	autoScalaLibrary := false,
 	crossPaths := false
-	// unmanagedSourceDirectories in Compile <<= (javaSource in Compile) { _ :: Nil }
+)
+
+val javaWarnings = Seq(
+	javacOptions ++= Seq("-Xlint:unchecked")
 )
 
 val withTesting = Seq(
@@ -17,43 +20,45 @@ val withTesting = Seq(
 	libraryDependencies += Dependencies.scalaMock
 )
 
-lazy val RepackagedAsm = project
+lazy val Instrumentation = (project in file("instrumentation"))
+	.dependsOn(SourceMapParser)
 	.settings(
 		shared,
 		javaOnly,
-		Repackager("asm", Dependencies.asm, Repackager.Rename("org.objectweb.asm.**", "com.codedx.bytefrog.thirdparty.asm.@1")).settings
-	)
+		javaWarnings,
+		withTesting,
 
-lazy val RepackagedMinlog = project
-	.settings(
-		shared,
-		javaOnly,
-		Repackager("minlog", Dependencies.minlog, Repackager.Rename("com.esotericsoftware.minlog.**", "com.codedx.bytefrog.thirdparty.minlog.@1")).settings
+		libraryDependencies ++= Dependencies.asm,
+		libraryDependencies += Dependencies.minlog
 	)
 
-lazy val Instrumentation = (project in file("instrumentation"))
-	.dependsOn(RepackagedAsm)
+lazy val FilterInjector = (project in file("filter-injector"))
+	.dependsOn(Util)
 	.settings(
 		shared,
 		javaOnly,
-		withTesting
+		javaWarnings,
+
+		libraryDependencies ++= Dependencies.asm,
+		libraryDependencies += Dependencies.minlog
 	)
 
-lazy val FilterInjector = (project in file("filter-injector"))
-	.dependsOn(RepackagedAsm, RepackagedMinlog, Util)
+lazy val SourceMapParser = (project in file("sourcemap-parser"))
 	.settings(
 		shared,
 		javaOnly
 	)
 
 lazy val Util = (project in file("util"))
-	.dependsOn(RepackagedAsm, RepackagedMinlog)
 	.settings(
 		shared,
 		javaOnly,
-		withTesting
+		javaWarnings,
+		withTesting,
+
+		libraryDependencies ++= Dependencies.asm,
+		libraryDependencies += Dependencies.minlog
 	)
 
 lazy val Stack = (project in file("."))
-	.settings(JarJarRunner.globalSettings)
-	.aggregate(RepackagedAsm, RepackagedMinlog, Instrumentation, FilterInjector, Util)
+	.aggregate(Instrumentation, FilterInjector, SourceMapParser, Util)

filter-injector/src/main/java/com/codedx/bytefrog/filterinjector/FilterInjector.java

@@ -1,13 +1,31 @@
+/* bytefrog: a tracing instrumentation toolset for the JVM. For more information, see
+ * <https://github.com/codedx/bytefrog>
+ *
+ * Copyright (C) 2014-2017 Code Dx, Inc. <https://codedx.com/>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.codedx.bytefrog.filterinjector;
 
 import com.codedx.bytefrog.filterinjector.adapters.*;
 import com.codedx.bytefrog.filterinjector.filter.InjectableFilter;
 
-import com.codedx.bytefrog.thirdparty.asm.ClassReader;
-import com.codedx.bytefrog.thirdparty.asm.ClassVisitor;
-import com.codedx.bytefrog.thirdparty.asm.Opcodes;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.Opcodes;
 
-import com.codedx.bytefrog.thirdparty.minlog.Log;
+import com.esotericsoftware.minlog.Log;
 
 /** A helper utility that, via instrumentation, can inject a filter into one of several known
   * servlet containers.

filter-injector/src/main/java/com/codedx/bytefrog/filterinjector/adapters/Adapter.java

@@ -1,6 +1,24 @@
+/* bytefrog: a tracing instrumentation toolset for the JVM. For more information, see
+ * <https://github.com/codedx/bytefrog>
+ *
+ * Copyright (C) 2014-2017 Code Dx, Inc. <https://codedx.com/>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.codedx.bytefrog.filterinjector.adapters;
 
-import com.codedx.bytefrog.thirdparty.asm.ClassVisitor;
+import org.objectweb.asm.ClassVisitor;
 
 /** Adapters are used for injecting servlet filters into a container at runtime, in a generic/
   * extensible manner. Adapterss are enumerated in FilterInjector such that an instrumentation

filter-injector/src/main/java/com/codedx/bytefrog/filterinjector/adapters/JettyAdapter.java

@@ -1,10 +1,28 @@
+/* bytefrog: a tracing instrumentation toolset for the JVM. For more information, see
+ * <https://github.com/codedx/bytefrog>
+ *
+ * Copyright (C) 2014-2017 Code Dx, Inc. <https://codedx.com/>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.codedx.bytefrog.filterinjector.adapters;
 
 import com.codedx.bytefrog.filterinjector.filter.InjectableFilter;
 import com.codedx.bytefrog.util.ClassLoaderUtil;
 
-import com.codedx.bytefrog.thirdparty.asm.*;
-import com.codedx.bytefrog.thirdparty.minlog.Log;
+import org.objectweb.asm.*;
+import com.esotericsoftware.minlog.Log;
 
 /** For Jetty, injects the filter into instances of Jetty's ServletHandler.
   *

filter-injector/src/main/java/com/codedx/bytefrog/filterinjector/adapters/TomcatAdapter.java

@@ -1,3 +1,21 @@
+/* bytefrog: a tracing instrumentation toolset for the JVM. For more information, see
+ * <https://github.com/codedx/bytefrog>
+ *
+ * Copyright (C) 2014-2017 Code Dx, Inc. <https://codedx.com/>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.codedx.bytefrog.filterinjector.adapters;
 
 import java.lang.reflect.InvocationTargetException;
@@ -6,8 +24,8 @@
 import com.codedx.bytefrog.filterinjector.filter.InjectableFilter;
 import com.codedx.bytefrog.util.ClassLoaderUtil;
 
-import com.codedx.bytefrog.thirdparty.asm.*;
-import com.codedx.bytefrog.thirdparty.minlog.Log;
+import org.objectweb.asm.*;
+import com.esotericsoftware.minlog.Log;
 
 /** For Tomcat, injects the filter into Tomcat contexts.
   *

filter-injector/src/main/java/com/codedx/bytefrog/filterinjector/filter/InjectableFilter.java

@@ -1,6 +1,24 @@
+/* bytefrog: a tracing instrumentation toolset for the JVM. For more information, see
+ * <https://github.com/codedx/bytefrog>
+ *
+ * Copyright (C) 2014-2017 Code Dx, Inc. <https://codedx.com/>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.codedx.bytefrog.filterinjector.filter;
 
-import com.codedx.bytefrog.thirdparty.asm.MethodVisitor;
+import org.objectweb.asm.MethodVisitor;
 
 /** InjectableFilter is an adapter for building bytecode to construct a filter for injection.
   *

filter-injector/src/main/java/com/codedx/bytefrog/filterinjector/filter/ParameterlessFilter.java

@@ -1,10 +1,28 @@
+/* bytefrog: a tracing instrumentation toolset for the JVM. For more information, see
+ * <https://github.com/codedx/bytefrog>
+ *
+ * Copyright (C) 2014-2017 Code Dx, Inc. <https://codedx.com/>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.codedx.bytefrog.filterinjector.filter;
 
 import com.codedx.bytefrog.util.ClassLoaderUtil;
 
-import com.codedx.bytefrog.thirdparty.asm.MethodVisitor;
-import com.codedx.bytefrog.thirdparty.asm.Opcodes;
-import com.codedx.bytefrog.thirdparty.asm.Type;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
 
 /** An InjectableFilter adapter for filters with a parameterless constructor.
   *
@@ -24,9 +42,7 @@ public ParameterlessFilter(Type filterType, String name, String displayName) {
 	}
 
 	public boolean isAvailable(final ClassLoader cl) {
-		return
-			ClassLoaderUtil.isAvailable(cl, filterType.getClassName()) ||
-			ClassLoaderUtil.injectClass(cl, filterType);
+		return ClassLoaderUtil.injectClass(cl, filterType);
 	}
 
 	public void constructFilter(final MethodVisitor mv) {

instrumentation/src/main/java/com/codedx/bytefrog/instrumentation/BytecodeUtil.java

@@ -1,7 +1,25 @@
+/* bytefrog: a tracing instrumentation toolset for the JVM. For more information, see
+ * <https://github.com/codedx/bytefrog>
+ *
+ * Copyright (C) 2014-2017 Code Dx, Inc. <https://codedx.com/>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.codedx.bytefrog.instrumentation;
 
-import com.codedx.bytefrog.thirdparty.asm.MethodVisitor;
-import com.codedx.bytefrog.thirdparty.asm.Opcodes;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
 
 /** Some basic bytecode helper utilities
   *

instrumentation/src/main/java/com/codedx/bytefrog/instrumentation/ClassInspector.java

@@ -1,19 +1,39 @@
+/* bytefrog: a tracing instrumentation toolset for the JVM. For more information, see
+ * <https://github.com/codedx/bytefrog>
+ *
+ * Copyright (C) 2014-2017 Code Dx, Inc. <https://codedx.com/>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.codedx.bytefrog.instrumentation;
 
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;
 
-import com.codedx.bytefrog.thirdparty.asm.ClassVisitor;
-import com.codedx.bytefrog.thirdparty.asm.MethodVisitor;
-import com.codedx.bytefrog.thirdparty.asm.Opcodes;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
 
-/** Simple class visitor that collects inspection data from MethodInspector.
+/** Simple class visitor that collects inspection data from MethodInspector. This includes
+  * the ability to map line level information from the provided source map
   *
   * @author robertf
   */
 public class ClassInspector extends ClassVisitor {
 	private String fileName = null;
+	private LineLevelMapper llm = null;
 	private LinkedList<MethodInspector> inspectors = new LinkedList<>();
 
 	public ClassInspector() {
@@ -26,6 +46,7 @@ public ClassInspector() {
 
 	@Override public void visitSource(String source, String debug) {
 		this.fileName = source;
+		if (debug != null) llm = LineLevelMapper.parse(source, debug);
 		super.visitSource(source, debug);
 	}
 
@@ -38,11 +59,14 @@ public ClassInspector() {
 	/** Describes the results from pre-instrumentation inspection of a class. */
 	public static class Result {
 		private final String fileName;
+		private final LineLevelMapper lineLevelMapper;
 
 		public String getFileName() { return fileName; }
+		public LineLevelMapper getLineLevelMapper() { return lineLevelMapper; }
 
-		public Result(String fileName, LinkedList<MethodInspector> inspectors) {
+		public Result(String fileName, LineLevelMapper lineLevelMapper, LinkedList<MethodInspector> inspectors) {
 			this.fileName = fileName;
+			this.lineLevelMapper = lineLevelMapper;
 
 			for (MethodInspector mi : inspectors) {
 				final MethodInspector.Result inspection = mi.getResult(this);
@@ -63,6 +87,6 @@ public MethodInspector.Result lookupMethod(String name, String desc) {
 	}
 
 	public Result getResult() {
-		return new Result(fileName, inspectors);
+		return new Result(fileName, llm, inspectors);
 	}
 }