commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject svn commit: r910464 [5/38] - in /websites/production/commons/content/proper/commons-weaver: ./ apidocs/ apidocs/class-use/ apidocs/org/apache/commons/weaver/ apidocs/org/apache/commons/weaver/ant/ apidocs/org/apache/commons/weaver/ant/class-use/ apidoc...
Date Thu, 29 May 2014 22:55:01 GMT
Modified: websites/production/commons/content/proper/commons-weaver/apidocs/src-html/org/apache/commons/weaver/normalizer/Normalizer.html
==============================================================================
--- websites/production/commons/content/proper/commons-weaver/apidocs/src-html/org/apache/commons/weaver/normalizer/Normalizer.html (original)
+++ websites/production/commons/content/proper/commons-weaver/apidocs/src-html/org/apache/commons/weaver/normalizer/Normalizer.html Thu May 29 22:54:45 2014
@@ -93,485 +93,525 @@
 <span class="sourceLineNo">085</span>        }<a name="line.85"></a>
 <span class="sourceLineNo">086</span>    }<a name="line.86"></a>
 <span class="sourceLineNo">087</span><a name="line.87"></a>
-<span class="sourceLineNo">088</span>    private class WriteClass extends ClassVisitor {<a name="line.88"></a>
-<span class="sourceLineNo">089</span>        private String className;<a name="line.89"></a>
-<span class="sourceLineNo">090</span><a name="line.90"></a>
-<span class="sourceLineNo">091</span>        WriteClass() {<a name="line.91"></a>
-<span class="sourceLineNo">092</span>            super(Opcodes.ASM4, new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS));<a name="line.92"></a>
-<span class="sourceLineNo">093</span>        }<a name="line.93"></a>
-<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span>        WriteClass(final ClassReader reader) {<a name="line.95"></a>
-<span class="sourceLineNo">096</span>            super(Opcodes.ASM4, new ClassWriter(reader, 0));<a name="line.96"></a>
-<span class="sourceLineNo">097</span>        }<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span>        @Override<a name="line.99"></a>
-<span class="sourceLineNo">100</span>        public void visit(final int version, final int access, final String name, final String signature,<a name="line.100"></a>
-<span class="sourceLineNo">101</span>            final String superName, final String[] intrfces) {<a name="line.101"></a>
-<span class="sourceLineNo">102</span>            super.visit(version, access, name, signature, superName, intrfces);<a name="line.102"></a>
-<span class="sourceLineNo">103</span>            className = name;<a name="line.103"></a>
-<span class="sourceLineNo">104</span>        }<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span>        @Override<a name="line.106"></a>
-<span class="sourceLineNo">107</span>        public void visitEnd() {<a name="line.107"></a>
-<span class="sourceLineNo">108</span>            super.visitEnd();<a name="line.108"></a>
-<span class="sourceLineNo">109</span>            final byte[] bytecode = ((ClassWriter) cv).toByteArray();<a name="line.109"></a>
-<span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span>            final DataSource classfile = env.getClassfile(className);<a name="line.111"></a>
-<span class="sourceLineNo">112</span>            env.debug("Writing class %s to %s", className, classfile.getName());<a name="line.112"></a>
-<span class="sourceLineNo">113</span>            OutputStream outputStream = null;<a name="line.113"></a>
-<span class="sourceLineNo">114</span>            try {<a name="line.114"></a>
-<span class="sourceLineNo">115</span>                outputStream = classfile.getOutputStream();<a name="line.115"></a>
-<span class="sourceLineNo">116</span>                IOUtils.write(bytecode, outputStream);<a name="line.116"></a>
-<span class="sourceLineNo">117</span>            } catch (final IOException e) {<a name="line.117"></a>
-<span class="sourceLineNo">118</span>                throw new RuntimeException(e);<a name="line.118"></a>
-<span class="sourceLineNo">119</span>            } finally {<a name="line.119"></a>
-<span class="sourceLineNo">120</span>                IOUtils.closeQuietly(outputStream);<a name="line.120"></a>
-<span class="sourceLineNo">121</span>            }<a name="line.121"></a>
-<span class="sourceLineNo">122</span>        }<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    }<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span>    private enum IneligibilityReason {<a name="line.125"></a>
-<span class="sourceLineNo">126</span>        NOT_ANONYMOUS, TOO_MANY_CONSTRUCTORS, IMPLEMENTS_METHODS, TOO_BUSY_CONSTRUCTOR;<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    }<a name="line.127"></a>
+<span class="sourceLineNo">088</span>    /**<a name="line.88"></a>
+<span class="sourceLineNo">089</span>     * Necessary to resolve supertypes against WeaveEnvironment ClassLoader<a name="line.89"></a>
+<span class="sourceLineNo">090</span>     */<a name="line.90"></a>
+<span class="sourceLineNo">091</span>    private final class CustomClassWriter extends ClassWriter {<a name="line.91"></a>
+<span class="sourceLineNo">092</span>        CustomClassWriter(int flags) {<a name="line.92"></a>
+<span class="sourceLineNo">093</span>            super(flags);<a name="line.93"></a>
+<span class="sourceLineNo">094</span>        }<a name="line.94"></a>
+<span class="sourceLineNo">095</span><a name="line.95"></a>
+<span class="sourceLineNo">096</span>        CustomClassWriter(ClassReader classReader, int flags) {<a name="line.96"></a>
+<span class="sourceLineNo">097</span>            super(classReader, flags);<a name="line.97"></a>
+<span class="sourceLineNo">098</span>        }<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span>        @Override<a name="line.100"></a>
+<span class="sourceLineNo">101</span>        protected String getCommonSuperClass(String type1, String type2) {<a name="line.101"></a>
+<span class="sourceLineNo">102</span>            Class&lt;?&gt; c;<a name="line.102"></a>
+<span class="sourceLineNo">103</span>            Class&lt;?&gt; d;<a name="line.103"></a>
+<span class="sourceLineNo">104</span>            try {<a name="line.104"></a>
+<span class="sourceLineNo">105</span>                c = Class.forName(type1.replace('/', '.'), false, env.classLoader);<a name="line.105"></a>
+<span class="sourceLineNo">106</span>                d = Class.forName(type2.replace('/', '.'), false, env.classLoader);<a name="line.106"></a>
+<span class="sourceLineNo">107</span>            } catch (Exception e) {<a name="line.107"></a>
+<span class="sourceLineNo">108</span>                throw new RuntimeException(e.toString());<a name="line.108"></a>
+<span class="sourceLineNo">109</span>            }<a name="line.109"></a>
+<span class="sourceLineNo">110</span>            if (c.isAssignableFrom(d)) {<a name="line.110"></a>
+<span class="sourceLineNo">111</span>                return type1;<a name="line.111"></a>
+<span class="sourceLineNo">112</span>            }<a name="line.112"></a>
+<span class="sourceLineNo">113</span>            if (d.isAssignableFrom(c)) {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>                return type2;<a name="line.114"></a>
+<span class="sourceLineNo">115</span>            }<a name="line.115"></a>
+<span class="sourceLineNo">116</span>            if (c.isInterface() || d.isInterface()) {<a name="line.116"></a>
+<span class="sourceLineNo">117</span>                return "java/lang/Object";<a name="line.117"></a>
+<span class="sourceLineNo">118</span>            }<a name="line.118"></a>
+<span class="sourceLineNo">119</span>            do {<a name="line.119"></a>
+<span class="sourceLineNo">120</span>                c = c.getSuperclass();<a name="line.120"></a>
+<span class="sourceLineNo">121</span>            } while (!c.isAssignableFrom(d));<a name="line.121"></a>
+<span class="sourceLineNo">122</span>            return c.getName().replace('.', '/');<a name="line.122"></a>
+<span class="sourceLineNo">123</span>        }<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    }<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span>    private class WriteClass extends ClassVisitor {<a name="line.126"></a>
+<span class="sourceLineNo">127</span>        private String className;<a name="line.127"></a>
 <span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span>    /**<a name="line.129"></a>
-<span class="sourceLineNo">130</span>     * Configuration prefix for this {@link Weaver}.<a name="line.130"></a>
-<span class="sourceLineNo">131</span>     */<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    public static final String CONFIG_WEAVER = "normalizer.";<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span>    /**<a name="line.134"></a>
-<span class="sourceLineNo">135</span>     * Property name referencing a comma-delimited list of types whose subclasses/implementations should be normalized,<a name="line.135"></a>
-<span class="sourceLineNo">136</span>     * e.g. {@code javax.enterprise.util.TypeLiteral}.<a name="line.136"></a>
-<span class="sourceLineNo">137</span>     */<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    public static final String CONFIG_SUPER_TYPES = CONFIG_WEAVER + "superTypes";<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span>    /**<a name="line.140"></a>
-<span class="sourceLineNo">141</span>     * Property name referencing a package name to which merged types should be added.<a name="line.141"></a>
-<span class="sourceLineNo">142</span>     */<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    public static final String CONFIG_TARGET_PACKAGE = CONFIG_WEAVER + "targetPackage";<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span>    private static final Charset UTF8 = Charset.forName(CharEncoding.UTF_8);<a name="line.145"></a>
-<span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span>    private final WeaveEnvironment env;<a name="line.147"></a>
+<span class="sourceLineNo">129</span>        WriteClass() {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>            super(Opcodes.ASM5, new CustomClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS));<a name="line.130"></a>
+<span class="sourceLineNo">131</span>        }<a name="line.131"></a>
+<span class="sourceLineNo">132</span><a name="line.132"></a>
+<span class="sourceLineNo">133</span>        WriteClass(final ClassReader reader) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span>            super(Opcodes.ASM5, new CustomClassWriter(reader, 0));<a name="line.134"></a>
+<span class="sourceLineNo">135</span>        }<a name="line.135"></a>
+<span class="sourceLineNo">136</span><a name="line.136"></a>
+<span class="sourceLineNo">137</span>        @Override<a name="line.137"></a>
+<span class="sourceLineNo">138</span>        public void visit(final int version, final int access, final String name, final String signature,<a name="line.138"></a>
+<span class="sourceLineNo">139</span>            final String superName, final String[] intrfces) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span>            super.visit(version, access, name, signature, superName, intrfces);<a name="line.140"></a>
+<span class="sourceLineNo">141</span>            className = name;<a name="line.141"></a>
+<span class="sourceLineNo">142</span>        }<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span>        @Override<a name="line.144"></a>
+<span class="sourceLineNo">145</span>        public void visitEnd() {<a name="line.145"></a>
+<span class="sourceLineNo">146</span>            super.visitEnd();<a name="line.146"></a>
+<span class="sourceLineNo">147</span>            final byte[] bytecode = ((ClassWriter) cv).toByteArray();<a name="line.147"></a>
 <span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span>    private final Set&lt;Class&lt;?&gt;&gt; normalizeTypes;<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    private final String targetPackage;<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span>    /**<a name="line.152"></a>
-<span class="sourceLineNo">153</span>     * Create a new {@link Normalizer} instance.<a name="line.153"></a>
-<span class="sourceLineNo">154</span>     * @param env {@link WeaveEnvironment}<a name="line.154"></a>
-<span class="sourceLineNo">155</span>     */<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    public Normalizer(final WeaveEnvironment env) {<a name="line.156"></a>
-<span class="sourceLineNo">157</span>        this.env = env;<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span>        this.targetPackage =<a name="line.159"></a>
-<span class="sourceLineNo">160</span>            Utils.validatePackageName(Validate.notBlank(env.config.getProperty(CONFIG_TARGET_PACKAGE),<a name="line.160"></a>
-<span class="sourceLineNo">161</span>                "missing target package name"));<a name="line.161"></a>
-<span class="sourceLineNo">162</span>        this.normalizeTypes =<a name="line.162"></a>
-<span class="sourceLineNo">163</span>            Utils.parseTypes(<a name="line.163"></a>
-<span class="sourceLineNo">164</span>                Validate.notEmpty(env.config.getProperty(CONFIG_SUPER_TYPES), "no types specified for normalization"),<a name="line.164"></a>
-<span class="sourceLineNo">165</span>                env.classLoader);<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    }<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>    /**<a name="line.168"></a>
-<span class="sourceLineNo">169</span>     * Normalize the classes found using the specified {@link Scanner}.<a name="line.169"></a>
-<span class="sourceLineNo">170</span>     * @param scanner to scan with<a name="line.170"></a>
-<span class="sourceLineNo">171</span>     * @return whether any work was done<a name="line.171"></a>
-<span class="sourceLineNo">172</span>     */<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    public boolean normalize(final Scanner scanner) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span>        boolean result = false;<a name="line.174"></a>
-<span class="sourceLineNo">175</span>        for (final Class&lt;?&gt; supertype : normalizeTypes) {<a name="line.175"></a>
-<span class="sourceLineNo">176</span>            final Set&lt;Class&lt;?&gt;&gt; subtypes = getBroadlyEligibleSubclasses(supertype, scanner);<a name="line.176"></a>
-<span class="sourceLineNo">177</span>            try {<a name="line.177"></a>
-<span class="sourceLineNo">178</span>                final Map&lt;Pair&lt;String, String&gt;, Set&lt;ClassWrapper&gt;&gt; segregatedSubtypes = segregate(subtypes);<a name="line.178"></a>
-<span class="sourceLineNo">179</span>                for (final Map.Entry&lt;Pair&lt;String, String&gt;, Set&lt;ClassWrapper&gt;&gt; entry : segregatedSubtypes.entrySet()) {<a name="line.179"></a>
-<span class="sourceLineNo">180</span>                    final Set&lt;ClassWrapper&gt; likeTypes = entry.getValue();<a name="line.180"></a>
-<span class="sourceLineNo">181</span>                    if (likeTypes.size() &gt; 1) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span>                        result = true;<a name="line.182"></a>
-<span class="sourceLineNo">183</span>                        rewrite(entry.getKey(), likeTypes);<a name="line.183"></a>
-<span class="sourceLineNo">184</span>                    }<a name="line.184"></a>
-<span class="sourceLineNo">185</span>                }<a name="line.185"></a>
-<span class="sourceLineNo">186</span>            } catch (final RuntimeException e) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>                throw e;<a name="line.187"></a>
-<span class="sourceLineNo">188</span>            } catch (final Exception e) {<a name="line.188"></a>
-<span class="sourceLineNo">189</span>                throw new RuntimeException(e);<a name="line.189"></a>
-<span class="sourceLineNo">190</span>            }<a name="line.190"></a>
-<span class="sourceLineNo">191</span>        }<a name="line.191"></a>
-<span class="sourceLineNo">192</span>        return result;<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    }<a name="line.193"></a>
-<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span>    /**<a name="line.195"></a>
-<span class="sourceLineNo">196</span>     * Map a set of classes by their enclosing class.<a name="line.196"></a>
-<span class="sourceLineNo">197</span>     * @param sort values<a name="line.197"></a>
-<span class="sourceLineNo">198</span>     * @return {@link Map} of enclosing classname to {@link Map} of internal name to {@link ClassWrapper}<a name="line.198"></a>
-<span class="sourceLineNo">199</span>     */<a name="line.199"></a>
-<span class="sourceLineNo">200</span>    private Map&lt;String, Map&lt;String, ClassWrapper&gt;&gt; byEnclosingClass(final Set&lt;ClassWrapper&gt; sort) {<a name="line.200"></a>
-<span class="sourceLineNo">201</span>        final Map&lt;String, Map&lt;String, ClassWrapper&gt;&gt; result = new HashMap&lt;String, Map&lt;String, ClassWrapper&gt;&gt;();<a name="line.201"></a>
-<span class="sourceLineNo">202</span>        for (final ClassWrapper wrapper : sort) {<a name="line.202"></a>
-<span class="sourceLineNo">203</span>            final String outer = wrapper.wrapped.getEnclosingClass().getName();<a name="line.203"></a>
-<span class="sourceLineNo">204</span>            Map&lt;String, ClassWrapper&gt; map = result.get(outer);<a name="line.204"></a>
-<span class="sourceLineNo">205</span>            if (map == null) {<a name="line.205"></a>
-<span class="sourceLineNo">206</span>                map = new LinkedHashMap&lt;String, Normalizer.ClassWrapper&gt;();<a name="line.206"></a>
-<span class="sourceLineNo">207</span>                result.put(outer, map);<a name="line.207"></a>
-<span class="sourceLineNo">208</span>            }<a name="line.208"></a>
-<span class="sourceLineNo">209</span>            map.put(wrapper.wrapped.getName().replace('.', '/'), wrapper);<a name="line.209"></a>
-<span class="sourceLineNo">210</span>        }<a name="line.210"></a>
-<span class="sourceLineNo">211</span>        return result;<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    }<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span>    /**<a name="line.214"></a>
-<span class="sourceLineNo">215</span>     * Rewrite classes as indicated by one entry of {@link #segregate(Iterable)}.<a name="line.215"></a>
-<span class="sourceLineNo">216</span>     * @param key {@link String} {@link Pair} indicating supertype and constructor signature<a name="line.216"></a>
-<span class="sourceLineNo">217</span>     * @param toMerge matching classes<a name="line.217"></a>
-<span class="sourceLineNo">218</span>     * @throws IOException on I/O error<a name="line.218"></a>
-<span class="sourceLineNo">219</span>     * @throws ClassNotFoundException if class not found<a name="line.219"></a>
-<span class="sourceLineNo">220</span>     */<a name="line.220"></a>
-<span class="sourceLineNo">221</span>    private void rewrite(final Pair&lt;String, String&gt; key, final Set&lt;ClassWrapper&gt; toMerge) throws IOException,<a name="line.221"></a>
-<span class="sourceLineNo">222</span>        ClassNotFoundException {<a name="line.222"></a>
-<span class="sourceLineNo">223</span>        final String target = copy(key, toMerge.iterator().next());<a name="line.223"></a>
-<span class="sourceLineNo">224</span>        env.info("Merging %s identical %s implementations with constructor %s to type %s", toMerge.size(),<a name="line.224"></a>
-<span class="sourceLineNo">225</span>            key.getLeft(), key.getRight(), target);<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span>        final Map&lt;String, Map&lt;String, ClassWrapper&gt;&gt; byEnclosingClass = byEnclosingClass(toMerge);<a name="line.227"></a>
-<span class="sourceLineNo">228</span>        for (final Map.Entry&lt;String, Map&lt;String, ClassWrapper&gt;&gt; entry : byEnclosingClass.entrySet()) {<a name="line.228"></a>
-<span class="sourceLineNo">229</span>            final String outer = entry.getKey();<a name="line.229"></a>
-<span class="sourceLineNo">230</span>            env.debug("Normalizing %s inner classes of %s", entry.getValue().size(), outer);<a name="line.230"></a>
-<span class="sourceLineNo">231</span>            final Map&lt;String, String&gt; classMap = new HashMap&lt;String, String&gt;();<a name="line.231"></a>
-<span class="sourceLineNo">232</span>            for (final String merged : entry.getValue().keySet()) {<a name="line.232"></a>
-<span class="sourceLineNo">233</span>                classMap.put(merged, target);<a name="line.233"></a>
-<span class="sourceLineNo">234</span>            }<a name="line.234"></a>
-<span class="sourceLineNo">235</span>            final Remapper remapper = new SimpleRemapper(classMap);<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span>            InputStream enclosingBytecode = null;<a name="line.237"></a>
-<span class="sourceLineNo">238</span>            try {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>                enclosingBytecode = env.getClassfile(outer).getInputStream();<a name="line.239"></a>
-<span class="sourceLineNo">240</span>                final ClassReader reader = new ClassReader(enclosingBytecode);<a name="line.240"></a>
-<span class="sourceLineNo">241</span><a name="line.241"></a>
-<span class="sourceLineNo">242</span>                final ClassVisitor cv = // NOPMD<a name="line.242"></a>
-<span class="sourceLineNo">243</span>                        new RemappingClassAdapter(new WriteClass(reader), remapper) {<a name="line.243"></a>
-<span class="sourceLineNo">244</span><a name="line.244"></a>
-<span class="sourceLineNo">245</span>                    @Override<a name="line.245"></a>
-<span class="sourceLineNo">246</span>                    public void visitInnerClass(final String name, final String outerName, final String innerName,<a name="line.246"></a>
-<span class="sourceLineNo">247</span>                        final int access) {<a name="line.247"></a>
-<span class="sourceLineNo">248</span>                        if (!classMap.containsKey(name)) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span>                            super.visitInnerClass(name, outerName, innerName, access);<a name="line.249"></a>
-<span class="sourceLineNo">250</span>                        }<a name="line.250"></a>
-<span class="sourceLineNo">251</span>                    }<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span>                    @Override<a name="line.253"></a>
-<span class="sourceLineNo">254</span>                    public MethodVisitor visitMethod(final int access, final String name, final String desc,<a name="line.254"></a>
-<span class="sourceLineNo">255</span>                        final String signature, final String[] exceptions) {<a name="line.255"></a>
-<span class="sourceLineNo">256</span>                        final MethodVisitor mv = // NOPMD<a name="line.256"></a>
-<span class="sourceLineNo">257</span>                                super.visitMethod(access, name, desc, signature, exceptions);<a name="line.257"></a>
-<span class="sourceLineNo">258</span>                        return new MethodVisitor(Opcodes.ASM4, mv) {<a name="line.258"></a>
-<span class="sourceLineNo">259</span>                            @Override<a name="line.259"></a>
-<span class="sourceLineNo">260</span>                            public void visitMethodInsn(final int opcode, final String owner, final String name,<a name="line.260"></a>
-<span class="sourceLineNo">261</span>                                final String desc) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span>                                String useDescriptor = desc;<a name="line.262"></a>
-<span class="sourceLineNo">263</span>                                if (INIT.equals(name)) {<a name="line.263"></a>
-<span class="sourceLineNo">264</span>                                    final ClassWrapper wrapper = entry.getValue().get(owner);<a name="line.264"></a>
-<span class="sourceLineNo">265</span>                                    if (wrapper != null &amp;&amp; wrapper.mustRewriteConstructor) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span>                                        // simply replace first argument type with OBJECT_TYPE:<a name="line.266"></a>
-<span class="sourceLineNo">267</span>                                        final Type[] args = Type.getArgumentTypes(desc);<a name="line.267"></a>
-<span class="sourceLineNo">268</span>                                        args[0] = OBJECT_TYPE;<a name="line.268"></a>
-<span class="sourceLineNo">269</span>                                        useDescriptor = new Method(INIT, Type.VOID_TYPE, args).getDescriptor();<a name="line.269"></a>
-<span class="sourceLineNo">270</span>                                    }<a name="line.270"></a>
-<span class="sourceLineNo">271</span>                                }<a name="line.271"></a>
-<span class="sourceLineNo">272</span>                                super.visitMethodInsn(opcode, owner, name, useDescriptor);<a name="line.272"></a>
-<span class="sourceLineNo">273</span>                            }<a name="line.273"></a>
-<span class="sourceLineNo">274</span>                        };<a name="line.274"></a>
-<span class="sourceLineNo">275</span>                    }<a name="line.275"></a>
-<span class="sourceLineNo">276</span>                };<a name="line.276"></a>
-<span class="sourceLineNo">277</span><a name="line.277"></a>
-<span class="sourceLineNo">278</span>                reader.accept(cv, 0);<a name="line.278"></a>
-<span class="sourceLineNo">279</span>            } finally {<a name="line.279"></a>
-<span class="sourceLineNo">280</span>                IOUtils.closeQuietly(enclosingBytecode);<a name="line.280"></a>
-<span class="sourceLineNo">281</span>            }<a name="line.281"></a>
-<span class="sourceLineNo">282</span>            for (final String merged : entry.getValue().keySet()) {<a name="line.282"></a>
-<span class="sourceLineNo">283</span>                if (env.deleteClassfile(merged)) {<a name="line.283"></a>
-<span class="sourceLineNo">284</span>                    env.debug("Deleted class %s", merged);<a name="line.284"></a>
-<span class="sourceLineNo">285</span>                } else {<a name="line.285"></a>
-<span class="sourceLineNo">286</span>                    env.warn("Unable to delete class %s", merged);<a name="line.286"></a>
-<span class="sourceLineNo">287</span>                }<a name="line.287"></a>
-<span class="sourceLineNo">288</span>            }<a name="line.288"></a>
-<span class="sourceLineNo">289</span>        }<a name="line.289"></a>
+<span class="sourceLineNo">149</span>            final DataSource classfile = env.getClassfile(className);<a name="line.149"></a>
+<span class="sourceLineNo">150</span>            env.debug("Writing class %s to %s", className, classfile.getName());<a name="line.150"></a>
+<span class="sourceLineNo">151</span>            OutputStream outputStream = null;<a name="line.151"></a>
+<span class="sourceLineNo">152</span>            try {<a name="line.152"></a>
+<span class="sourceLineNo">153</span>                outputStream = classfile.getOutputStream();<a name="line.153"></a>
+<span class="sourceLineNo">154</span>                IOUtils.write(bytecode, outputStream);<a name="line.154"></a>
+<span class="sourceLineNo">155</span>            } catch (final IOException e) {<a name="line.155"></a>
+<span class="sourceLineNo">156</span>                throw new RuntimeException(e);<a name="line.156"></a>
+<span class="sourceLineNo">157</span>            } finally {<a name="line.157"></a>
+<span class="sourceLineNo">158</span>                IOUtils.closeQuietly(outputStream);<a name="line.158"></a>
+<span class="sourceLineNo">159</span>            }<a name="line.159"></a>
+<span class="sourceLineNo">160</span>        }<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    }<a name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span>    private enum IneligibilityReason {<a name="line.163"></a>
+<span class="sourceLineNo">164</span>        NOT_ANONYMOUS, TOO_MANY_CONSTRUCTORS, IMPLEMENTS_METHODS, TOO_BUSY_CONSTRUCTOR;<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    }<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span>    /**<a name="line.167"></a>
+<span class="sourceLineNo">168</span>     * Configuration prefix for this {@link Weaver}.<a name="line.168"></a>
+<span class="sourceLineNo">169</span>     */<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    public static final String CONFIG_WEAVER = "normalizer.";<a name="line.170"></a>
+<span class="sourceLineNo">171</span><a name="line.171"></a>
+<span class="sourceLineNo">172</span>    /**<a name="line.172"></a>
+<span class="sourceLineNo">173</span>     * Property name referencing a comma-delimited list of types whose subclasses/implementations should be normalized,<a name="line.173"></a>
+<span class="sourceLineNo">174</span>     * e.g. {@code javax.enterprise.util.TypeLiteral}.<a name="line.174"></a>
+<span class="sourceLineNo">175</span>     */<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    public static final String CONFIG_SUPER_TYPES = CONFIG_WEAVER + "superTypes";<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span>    /**<a name="line.178"></a>
+<span class="sourceLineNo">179</span>     * Property name referencing a package name to which merged types should be added.<a name="line.179"></a>
+<span class="sourceLineNo">180</span>     */<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    public static final String CONFIG_TARGET_PACKAGE = CONFIG_WEAVER + "targetPackage";<a name="line.181"></a>
+<span class="sourceLineNo">182</span><a name="line.182"></a>
+<span class="sourceLineNo">183</span>    private static final Charset UTF8 = Charset.forName(CharEncoding.UTF_8);<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span>    private final WeaveEnvironment env;<a name="line.185"></a>
+<span class="sourceLineNo">186</span><a name="line.186"></a>
+<span class="sourceLineNo">187</span>    private final Set&lt;Class&lt;?&gt;&gt; normalizeTypes;<a name="line.187"></a>
+<span class="sourceLineNo">188</span>    private final String targetPackage;<a name="line.188"></a>
+<span class="sourceLineNo">189</span><a name="line.189"></a>
+<span class="sourceLineNo">190</span>    /**<a name="line.190"></a>
+<span class="sourceLineNo">191</span>     * Create a new {@link Normalizer} instance.<a name="line.191"></a>
+<span class="sourceLineNo">192</span>     * @param env {@link WeaveEnvironment}<a name="line.192"></a>
+<span class="sourceLineNo">193</span>     */<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    public Normalizer(final WeaveEnvironment env) {<a name="line.194"></a>
+<span class="sourceLineNo">195</span>        this.env = env;<a name="line.195"></a>
+<span class="sourceLineNo">196</span><a name="line.196"></a>
+<span class="sourceLineNo">197</span>        this.targetPackage =<a name="line.197"></a>
+<span class="sourceLineNo">198</span>            Utils.validatePackageName(Validate.notBlank(env.config.getProperty(CONFIG_TARGET_PACKAGE),<a name="line.198"></a>
+<span class="sourceLineNo">199</span>                "missing target package name"));<a name="line.199"></a>
+<span class="sourceLineNo">200</span>        this.normalizeTypes =<a name="line.200"></a>
+<span class="sourceLineNo">201</span>            Utils.parseTypes(<a name="line.201"></a>
+<span class="sourceLineNo">202</span>                Validate.notEmpty(env.config.getProperty(CONFIG_SUPER_TYPES), "no types specified for normalization"),<a name="line.202"></a>
+<span class="sourceLineNo">203</span>                env.classLoader);<a name="line.203"></a>
+<span class="sourceLineNo">204</span>    }<a name="line.204"></a>
+<span class="sourceLineNo">205</span><a name="line.205"></a>
+<span class="sourceLineNo">206</span>    /**<a name="line.206"></a>
+<span class="sourceLineNo">207</span>     * Normalize the classes found using the specified {@link Scanner}.<a name="line.207"></a>
+<span class="sourceLineNo">208</span>     * @param scanner to scan with<a name="line.208"></a>
+<span class="sourceLineNo">209</span>     * @return whether any work was done<a name="line.209"></a>
+<span class="sourceLineNo">210</span>     */<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    public boolean normalize(final Scanner scanner) {<a name="line.211"></a>
+<span class="sourceLineNo">212</span>        boolean result = false;<a name="line.212"></a>
+<span class="sourceLineNo">213</span>        for (final Class&lt;?&gt; supertype : normalizeTypes) {<a name="line.213"></a>
+<span class="sourceLineNo">214</span>            final Set&lt;Class&lt;?&gt;&gt; subtypes = getBroadlyEligibleSubclasses(supertype, scanner);<a name="line.214"></a>
+<span class="sourceLineNo">215</span>            try {<a name="line.215"></a>
+<span class="sourceLineNo">216</span>                final Map&lt;Pair&lt;String, String&gt;, Set&lt;ClassWrapper&gt;&gt; segregatedSubtypes = segregate(subtypes);<a name="line.216"></a>
+<span class="sourceLineNo">217</span>                for (final Map.Entry&lt;Pair&lt;String, String&gt;, Set&lt;ClassWrapper&gt;&gt; entry : segregatedSubtypes.entrySet()) {<a name="line.217"></a>
+<span class="sourceLineNo">218</span>                    final Set&lt;ClassWrapper&gt; likeTypes = entry.getValue();<a name="line.218"></a>
+<span class="sourceLineNo">219</span>                    if (likeTypes.size() &gt; 1) {<a name="line.219"></a>
+<span class="sourceLineNo">220</span>                        result = true;<a name="line.220"></a>
+<span class="sourceLineNo">221</span>                        rewrite(entry.getKey(), likeTypes);<a name="line.221"></a>
+<span class="sourceLineNo">222</span>                    }<a name="line.222"></a>
+<span class="sourceLineNo">223</span>                }<a name="line.223"></a>
+<span class="sourceLineNo">224</span>            } catch (final RuntimeException e) {<a name="line.224"></a>
+<span class="sourceLineNo">225</span>                throw e;<a name="line.225"></a>
+<span class="sourceLineNo">226</span>            } catch (final Exception e) {<a name="line.226"></a>
+<span class="sourceLineNo">227</span>                throw new RuntimeException(e);<a name="line.227"></a>
+<span class="sourceLineNo">228</span>            }<a name="line.228"></a>
+<span class="sourceLineNo">229</span>        }<a name="line.229"></a>
+<span class="sourceLineNo">230</span>        return result;<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    }<a name="line.231"></a>
+<span class="sourceLineNo">232</span><a name="line.232"></a>
+<span class="sourceLineNo">233</span>    /**<a name="line.233"></a>
+<span class="sourceLineNo">234</span>     * Map a set of classes by their enclosing class.<a name="line.234"></a>
+<span class="sourceLineNo">235</span>     * @param sort values<a name="line.235"></a>
+<span class="sourceLineNo">236</span>     * @return {@link Map} of enclosing classname to {@link Map} of internal name to {@link ClassWrapper}<a name="line.236"></a>
+<span class="sourceLineNo">237</span>     */<a name="line.237"></a>
+<span class="sourceLineNo">238</span>    private Map&lt;String, Map&lt;String, ClassWrapper&gt;&gt; byEnclosingClass(final Set&lt;ClassWrapper&gt; sort) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span>        final Map&lt;String, Map&lt;String, ClassWrapper&gt;&gt; result = new HashMap&lt;String, Map&lt;String, ClassWrapper&gt;&gt;();<a name="line.239"></a>
+<span class="sourceLineNo">240</span>        for (final ClassWrapper wrapper : sort) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span>            final String outer = wrapper.wrapped.getEnclosingClass().getName();<a name="line.241"></a>
+<span class="sourceLineNo">242</span>            Map&lt;String, ClassWrapper&gt; map = result.get(outer);<a name="line.242"></a>
+<span class="sourceLineNo">243</span>            if (map == null) {<a name="line.243"></a>
+<span class="sourceLineNo">244</span>                map = new LinkedHashMap&lt;String, Normalizer.ClassWrapper&gt;();<a name="line.244"></a>
+<span class="sourceLineNo">245</span>                result.put(outer, map);<a name="line.245"></a>
+<span class="sourceLineNo">246</span>            }<a name="line.246"></a>
+<span class="sourceLineNo">247</span>            map.put(wrapper.wrapped.getName().replace('.', '/'), wrapper);<a name="line.247"></a>
+<span class="sourceLineNo">248</span>        }<a name="line.248"></a>
+<span class="sourceLineNo">249</span>        return result;<a name="line.249"></a>
+<span class="sourceLineNo">250</span>    }<a name="line.250"></a>
+<span class="sourceLineNo">251</span><a name="line.251"></a>
+<span class="sourceLineNo">252</span>    /**<a name="line.252"></a>
+<span class="sourceLineNo">253</span>     * Rewrite classes as indicated by one entry of {@link #segregate(Iterable)}.<a name="line.253"></a>
+<span class="sourceLineNo">254</span>     * @param key {@link String} {@link Pair} indicating supertype and constructor signature<a name="line.254"></a>
+<span class="sourceLineNo">255</span>     * @param toMerge matching classes<a name="line.255"></a>
+<span class="sourceLineNo">256</span>     * @throws IOException on I/O error<a name="line.256"></a>
+<span class="sourceLineNo">257</span>     * @throws ClassNotFoundException if class not found<a name="line.257"></a>
+<span class="sourceLineNo">258</span>     */<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    private void rewrite(final Pair&lt;String, String&gt; key, final Set&lt;ClassWrapper&gt; toMerge) throws IOException,<a name="line.259"></a>
+<span class="sourceLineNo">260</span>        ClassNotFoundException {<a name="line.260"></a>
+<span class="sourceLineNo">261</span>        final String target = copy(key, toMerge.iterator().next());<a name="line.261"></a>
+<span class="sourceLineNo">262</span>        env.info("Merging %s identical %s implementations with constructor %s to type %s", toMerge.size(),<a name="line.262"></a>
+<span class="sourceLineNo">263</span>            key.getLeft(), key.getRight(), target);<a name="line.263"></a>
+<span class="sourceLineNo">264</span><a name="line.264"></a>
+<span class="sourceLineNo">265</span>        final Map&lt;String, Map&lt;String, ClassWrapper&gt;&gt; byEnclosingClass = byEnclosingClass(toMerge);<a name="line.265"></a>
+<span class="sourceLineNo">266</span>        for (final Map.Entry&lt;String, Map&lt;String, ClassWrapper&gt;&gt; entry : byEnclosingClass.entrySet()) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span>            final String outer = entry.getKey();<a name="line.267"></a>
+<span class="sourceLineNo">268</span>            env.debug("Normalizing %s inner classes of %s", entry.getValue().size(), outer);<a name="line.268"></a>
+<span class="sourceLineNo">269</span>            final Map&lt;String, String&gt; classMap = new HashMap&lt;String, String&gt;();<a name="line.269"></a>
+<span class="sourceLineNo">270</span>            for (final String merged : entry.getValue().keySet()) {<a name="line.270"></a>
+<span class="sourceLineNo">271</span>                classMap.put(merged, target);<a name="line.271"></a>
+<span class="sourceLineNo">272</span>            }<a name="line.272"></a>
+<span class="sourceLineNo">273</span>            final Remapper remapper = new SimpleRemapper(classMap);<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span>            InputStream enclosingBytecode = null;<a name="line.275"></a>
+<span class="sourceLineNo">276</span>            try {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>                enclosingBytecode = env.getClassfile(outer).getInputStream();<a name="line.277"></a>
+<span class="sourceLineNo">278</span>                final ClassReader reader = new ClassReader(enclosingBytecode);<a name="line.278"></a>
+<span class="sourceLineNo">279</span><a name="line.279"></a>
+<span class="sourceLineNo">280</span>                final ClassVisitor cv = // NOPMD<a name="line.280"></a>
+<span class="sourceLineNo">281</span>                        new RemappingClassAdapter(new WriteClass(reader), remapper) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span><a name="line.282"></a>
+<span class="sourceLineNo">283</span>                    @Override<a name="line.283"></a>
+<span class="sourceLineNo">284</span>                    public void visitInnerClass(final String name, final String outerName, final String innerName,<a name="line.284"></a>
+<span class="sourceLineNo">285</span>                        final int access) {<a name="line.285"></a>
+<span class="sourceLineNo">286</span>                        if (!classMap.containsKey(name)) {<a name="line.286"></a>
+<span class="sourceLineNo">287</span>                            super.visitInnerClass(name, outerName, innerName, access);<a name="line.287"></a>
+<span class="sourceLineNo">288</span>                        }<a name="line.288"></a>
+<span class="sourceLineNo">289</span>                    }<a name="line.289"></a>
 <span class="sourceLineNo">290</span><a name="line.290"></a>
-<span class="sourceLineNo">291</span>    }<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span>    /**<a name="line.293"></a>
-<span class="sourceLineNo">294</span>     * &lt;p&gt;Find subclasses/implementors of {code supertype} that:<a name="line.294"></a>
-<span class="sourceLineNo">295</span>     * &lt;ul&gt;<a name="line.295"></a>
-<span class="sourceLineNo">296</span>     * &lt;li&gt;are anonymous&lt;/li&gt;<a name="line.296"></a>
-<span class="sourceLineNo">297</span>     * &lt;li&gt;declare a single constructor (probably redundant in the case of an anonymous class)&lt;/li&gt;<a name="line.297"></a>
-<span class="sourceLineNo">298</span>     * &lt;li&gt;do not implement any methods&lt;/li&gt;<a name="line.298"></a>
-<span class="sourceLineNo">299</span>     * &lt;/ul&gt;<a name="line.299"></a>
-<span class="sourceLineNo">300</span>     * &lt;/p&gt;&lt;p&gt;<a name="line.300"></a>
-<span class="sourceLineNo">301</span>     * Considered "broadly" eligible because the instructions in the implemented constructor may remove the class from<a name="line.301"></a>
-<span class="sourceLineNo">302</span>     * consideration later on.<a name="line.302"></a>
-<span class="sourceLineNo">303</span>     * &lt;/p&gt;<a name="line.303"></a>
-<span class="sourceLineNo">304</span>     * @param supertype whose subtypes are sought<a name="line.304"></a>
-<span class="sourceLineNo">305</span>     * @param scanner to use<a name="line.305"></a>
-<span class="sourceLineNo">306</span>     * @return {@link Set} of {@link Class}<a name="line.306"></a>
-<span class="sourceLineNo">307</span>     * @see #segregate(Iterable)<a name="line.307"></a>
-<span class="sourceLineNo">308</span>     */<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    private Set&lt;Class&lt;?&gt;&gt; getBroadlyEligibleSubclasses(final Class&lt;?&gt; supertype, final Scanner scanner) {<a name="line.309"></a>
-<span class="sourceLineNo">310</span>        final ScanResult scanResult = scanner.scan(new ScanRequest().addSupertypes(supertype));<a name="line.310"></a>
-<span class="sourceLineNo">311</span>        final Set&lt;Class&lt;?&gt;&gt; result = new LinkedHashSet&lt;Class&lt;?&gt;&gt;();<a name="line.311"></a>
-<span class="sourceLineNo">312</span>        for (final WeavableClass&lt;?&gt; cls : scanResult.getClasses()) {<a name="line.312"></a>
-<span class="sourceLineNo">313</span>            final Class&lt;?&gt; subtype = cls.getTarget();<a name="line.313"></a>
-<span class="sourceLineNo">314</span>            final IneligibilityReason reason;<a name="line.314"></a>
-<span class="sourceLineNo">315</span>            if (!subtype.isAnonymousClass()) {<a name="line.315"></a>
-<span class="sourceLineNo">316</span>                reason = IneligibilityReason.NOT_ANONYMOUS;<a name="line.316"></a>
-<span class="sourceLineNo">317</span>            } else if (subtype.getDeclaredConstructors().length != 1) {<a name="line.317"></a>
-<span class="sourceLineNo">318</span>                reason = IneligibilityReason.TOO_MANY_CONSTRUCTORS;<a name="line.318"></a>
-<span class="sourceLineNo">319</span>            } else if (subtype.getDeclaredMethods().length &gt; 0) {<a name="line.319"></a>
-<span class="sourceLineNo">320</span>                reason = IneligibilityReason.IMPLEMENTS_METHODS;<a name="line.320"></a>
-<span class="sourceLineNo">321</span>            } else {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>                result.add(subtype);<a name="line.322"></a>
-<span class="sourceLineNo">323</span>                continue;<a name="line.323"></a>
-<span class="sourceLineNo">324</span>            }<a name="line.324"></a>
-<span class="sourceLineNo">325</span>            env.debug("Removed %s from consideration due to %s", subtype, reason);<a name="line.325"></a>
-<span class="sourceLineNo">326</span>        }<a name="line.326"></a>
-<span class="sourceLineNo">327</span>        return result;<a name="line.327"></a>
-<span class="sourceLineNo">328</span>    }<a name="line.328"></a>
+<span class="sourceLineNo">291</span>                    @Override<a name="line.291"></a>
+<span class="sourceLineNo">292</span>                    public MethodVisitor visitMethod(final int access, final String name, final String desc,<a name="line.292"></a>
+<span class="sourceLineNo">293</span>                        final String signature, final String[] exceptions) {<a name="line.293"></a>
+<span class="sourceLineNo">294</span>                        final MethodVisitor mv = // NOPMD<a name="line.294"></a>
+<span class="sourceLineNo">295</span>                                super.visitMethod(access, name, desc, signature, exceptions);<a name="line.295"></a>
+<span class="sourceLineNo">296</span>                        return new MethodVisitor(Opcodes.ASM5, mv) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span><a name="line.297"></a>
+<span class="sourceLineNo">298</span>                            @Override<a name="line.298"></a>
+<span class="sourceLineNo">299</span>                            public void visitMethodInsn(final int opcode, final String owner, final String name,<a name="line.299"></a>
+<span class="sourceLineNo">300</span>                                final String desc, boolean itf) {<a name="line.300"></a>
+<span class="sourceLineNo">301</span>                                String useDescriptor = desc;<a name="line.301"></a>
+<span class="sourceLineNo">302</span>                                if (INIT.equals(name)) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span>                                    final ClassWrapper wrapper = entry.getValue().get(owner);<a name="line.303"></a>
+<span class="sourceLineNo">304</span>                                    if (wrapper != null &amp;&amp; wrapper.mustRewriteConstructor) {<a name="line.304"></a>
+<span class="sourceLineNo">305</span>                                        // simply replace first argument type with OBJECT_TYPE:<a name="line.305"></a>
+<span class="sourceLineNo">306</span>                                        final Type[] args = Type.getArgumentTypes(desc);<a name="line.306"></a>
+<span class="sourceLineNo">307</span>                                        args[0] = OBJECT_TYPE;<a name="line.307"></a>
+<span class="sourceLineNo">308</span>                                        useDescriptor = new Method(INIT, Type.VOID_TYPE, args).getDescriptor();<a name="line.308"></a>
+<span class="sourceLineNo">309</span>                                    }<a name="line.309"></a>
+<span class="sourceLineNo">310</span>                                }<a name="line.310"></a>
+<span class="sourceLineNo">311</span>                                super.visitMethodInsn(opcode, owner, name, useDescriptor, itf);<a name="line.311"></a>
+<span class="sourceLineNo">312</span>                            }<a name="line.312"></a>
+<span class="sourceLineNo">313</span>                        };<a name="line.313"></a>
+<span class="sourceLineNo">314</span>                    }<a name="line.314"></a>
+<span class="sourceLineNo">315</span>                };<a name="line.315"></a>
+<span class="sourceLineNo">316</span><a name="line.316"></a>
+<span class="sourceLineNo">317</span>                reader.accept(cv, 0);<a name="line.317"></a>
+<span class="sourceLineNo">318</span>            } finally {<a name="line.318"></a>
+<span class="sourceLineNo">319</span>                IOUtils.closeQuietly(enclosingBytecode);<a name="line.319"></a>
+<span class="sourceLineNo">320</span>            }<a name="line.320"></a>
+<span class="sourceLineNo">321</span>            for (final String merged : entry.getValue().keySet()) {<a name="line.321"></a>
+<span class="sourceLineNo">322</span>                if (env.deleteClassfile(merged)) {<a name="line.322"></a>
+<span class="sourceLineNo">323</span>                    env.debug("Deleted class %s", merged);<a name="line.323"></a>
+<span class="sourceLineNo">324</span>                } else {<a name="line.324"></a>
+<span class="sourceLineNo">325</span>                    env.warn("Unable to delete class %s", merged);<a name="line.325"></a>
+<span class="sourceLineNo">326</span>                }<a name="line.326"></a>
+<span class="sourceLineNo">327</span>            }<a name="line.327"></a>
+<span class="sourceLineNo">328</span>        }<a name="line.328"></a>
 <span class="sourceLineNo">329</span><a name="line.329"></a>
-<span class="sourceLineNo">330</span>    /**<a name="line.330"></a>
-<span class="sourceLineNo">331</span>     * &lt;p&gt;Segregate a number of classes (presumed subclasses/implementors of a<a name="line.331"></a>
-<span class="sourceLineNo">332</span>     * common supertype/interface). The keys of the map consist of the important<a name="line.332"></a>
-<span class="sourceLineNo">333</span>     * parts for identifying similar anonymous types: the "signature" and the<a name="line.333"></a>
-<span class="sourceLineNo">334</span>     * invoked superclass constructor. For our purposes, the signature consists<a name="line.334"></a>
-<span class="sourceLineNo">335</span>     * of the first applicable item of:<a name="line.335"></a>
-<span class="sourceLineNo">336</span>     * &lt;ol&gt;<a name="line.336"></a>
-<span class="sourceLineNo">337</span>     * &lt;li&gt;The generic signature of the class&lt;/li&gt;<a name="line.337"></a>
-<span class="sourceLineNo">338</span>     * &lt;li&gt;The sole implemented interface&lt;/li&gt;<a name="line.338"></a>
-<span class="sourceLineNo">339</span>     * &lt;li&gt;The superclass&lt;/li&gt;<a name="line.339"></a>
-<span class="sourceLineNo">340</span>     * &lt;/ol&gt;<a name="line.340"></a>
-<span class="sourceLineNo">341</span>     * &lt;/p&gt;&lt;p&gt;<a name="line.341"></a>
-<span class="sourceLineNo">342</span>     * The class will be considered ineligible if its constructor is too "busy" as its side effects cannot be<a name="line.342"></a>
-<span class="sourceLineNo">343</span>     * anticipated; the normalizer will err on the side of caution.<a name="line.343"></a>
-<span class="sourceLineNo">344</span>     * &lt;/p&gt;&lt;p&gt;<a name="line.344"></a>
-<span class="sourceLineNo">345</span>     * Further, we will here avail ourselves of the opportunity to discard any types we have already normalized.<a name="line.345"></a>
-<span class="sourceLineNo">346</span>     * &lt;/p&gt;<a name="line.346"></a>
-<span class="sourceLineNo">347</span>     * @param subtypes<a name="line.347"></a>
-<span class="sourceLineNo">348</span>     * @return Map of Pair&lt;String, String&gt; to Set of Classes<a name="line.348"></a>
-<span class="sourceLineNo">349</span>     * @throws IOException<a name="line.349"></a>
-<span class="sourceLineNo">350</span>     */<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    private Map&lt;Pair&lt;String, String&gt;, Set&lt;ClassWrapper&gt;&gt; segregate(final Iterable&lt;Class&lt;?&gt;&gt; subtypes)<a name="line.351"></a>
-<span class="sourceLineNo">352</span>        throws IOException {<a name="line.352"></a>
-<span class="sourceLineNo">353</span>        final Map&lt;Pair&lt;String, String&gt;, Set&lt;ClassWrapper&gt;&gt; classMap =<a name="line.353"></a>
-<span class="sourceLineNo">354</span>            new LinkedHashMap&lt;Pair&lt;String, String&gt;, Set&lt;ClassWrapper&gt;&gt;();<a name="line.354"></a>
-<span class="sourceLineNo">355</span>        for (final Class&lt;?&gt; subtype : subtypes) {<a name="line.355"></a>
-<span class="sourceLineNo">356</span>            final MutablePair&lt;String, String&gt; key = new MutablePair&lt;String, String&gt;();<a name="line.356"></a>
-<span class="sourceLineNo">357</span>            final MutableBoolean ignore = new MutableBoolean(false);<a name="line.357"></a>
-<span class="sourceLineNo">358</span>            final MutableBoolean valid = new MutableBoolean(true);<a name="line.358"></a>
-<span class="sourceLineNo">359</span>            final MutableBoolean mustRewriteConstructor = new MutableBoolean();<a name="line.359"></a>
-<span class="sourceLineNo">360</span>            InputStream bytecode = null;<a name="line.360"></a>
-<span class="sourceLineNo">361</span><a name="line.361"></a>
-<span class="sourceLineNo">362</span>            try {<a name="line.362"></a>
-<span class="sourceLineNo">363</span>                bytecode = env.getClassfile(subtype).getInputStream();<a name="line.363"></a>
-<span class="sourceLineNo">364</span>                new ClassReader(bytecode).accept(new ClassVisitor(Opcodes.ASM4) {<a name="line.364"></a>
-<span class="sourceLineNo">365</span>                    String superName;<a name="line.365"></a>
-<span class="sourceLineNo">366</span><a name="line.366"></a>
-<span class="sourceLineNo">367</span>                    @Override<a name="line.367"></a>
-<span class="sourceLineNo">368</span>                    public void visit(final int version, final int access, final String name, final String signature,<a name="line.368"></a>
-<span class="sourceLineNo">369</span>                        final String superName, final String[] interfaces) {<a name="line.369"></a>
-<span class="sourceLineNo">370</span>                        super.visit(version, access, name, signature, superName, interfaces);<a name="line.370"></a>
-<span class="sourceLineNo">371</span>                        this.superName = superName;<a name="line.371"></a>
-<span class="sourceLineNo">372</span>                        final String left;<a name="line.372"></a>
-<span class="sourceLineNo">373</span>                        if (signature != null) {<a name="line.373"></a>
-<span class="sourceLineNo">374</span>                            left = signature;<a name="line.374"></a>
-<span class="sourceLineNo">375</span>                        } else if (ArrayUtils.getLength(interfaces) == 1) {<a name="line.375"></a>
-<span class="sourceLineNo">376</span>                            left = interfaces[0];<a name="line.376"></a>
-<span class="sourceLineNo">377</span>                        } else {<a name="line.377"></a>
-<span class="sourceLineNo">378</span>                            left = superName;<a name="line.378"></a>
-<span class="sourceLineNo">379</span>                        }<a name="line.379"></a>
-<span class="sourceLineNo">380</span>                        key.setLeft(left);<a name="line.380"></a>
-<span class="sourceLineNo">381</span>                    }<a name="line.381"></a>
-<span class="sourceLineNo">382</span><a name="line.382"></a>
-<span class="sourceLineNo">383</span>                    @Override<a name="line.383"></a>
-<span class="sourceLineNo">384</span>                    public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {<a name="line.384"></a>
-<span class="sourceLineNo">385</span>                        if (Type.getType(Marker.class).getDescriptor().equals(desc)) {<a name="line.385"></a>
-<span class="sourceLineNo">386</span>                            ignore.setValue(true);<a name="line.386"></a>
-<span class="sourceLineNo">387</span>                        }<a name="line.387"></a>
-<span class="sourceLineNo">388</span>                        return null;<a name="line.388"></a>
-<span class="sourceLineNo">389</span>                    }<a name="line.389"></a>
-<span class="sourceLineNo">390</span><a name="line.390"></a>
-<span class="sourceLineNo">391</span>                    @Override<a name="line.391"></a>
-<span class="sourceLineNo">392</span>                    public MethodVisitor visitMethod(final int access, final String name, final String desc,<a name="line.392"></a>
-<span class="sourceLineNo">393</span>                        final String signature, final String[] exceptions) {<a name="line.393"></a>
-<span class="sourceLineNo">394</span>                        if (INIT.equals(name)) {<a name="line.394"></a>
-<span class="sourceLineNo">395</span>                            return new MethodVisitor(Opcodes.ASM4) {<a name="line.395"></a>
-<span class="sourceLineNo">396</span>                                @Override<a name="line.396"></a>
-<span class="sourceLineNo">397</span>                                public void visitMethodInsn(final int opcode, final String owner, final String name,<a name="line.397"></a>
-<span class="sourceLineNo">398</span>                                    final String desc) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span>                                    if (INIT.equals(name) &amp;&amp; owner.equals(superName)) {<a name="line.399"></a>
-<span class="sourceLineNo">400</span>                                        key.setRight(desc);<a name="line.400"></a>
-<span class="sourceLineNo">401</span>                                    } else {<a name="line.401"></a>
-<span class="sourceLineNo">402</span>                                        valid.setValue(false);<a name="line.402"></a>
-<span class="sourceLineNo">403</span>                                    }<a name="line.403"></a>
-<span class="sourceLineNo">404</span>                                }<a name="line.404"></a>
+<span class="sourceLineNo">330</span>    }<a name="line.330"></a>
+<span class="sourceLineNo">331</span><a name="line.331"></a>
+<span class="sourceLineNo">332</span>    /**<a name="line.332"></a>
+<span class="sourceLineNo">333</span>     * &lt;p&gt;Find subclasses/implementors of {code supertype} that:<a name="line.333"></a>
+<span class="sourceLineNo">334</span>     * &lt;ul&gt;<a name="line.334"></a>
+<span class="sourceLineNo">335</span>     * &lt;li&gt;are anonymous&lt;/li&gt;<a name="line.335"></a>
+<span class="sourceLineNo">336</span>     * &lt;li&gt;declare a single constructor (probably redundant in the case of an anonymous class)&lt;/li&gt;<a name="line.336"></a>
+<span class="sourceLineNo">337</span>     * &lt;li&gt;do not implement any methods&lt;/li&gt;<a name="line.337"></a>
+<span class="sourceLineNo">338</span>     * &lt;/ul&gt;<a name="line.338"></a>
+<span class="sourceLineNo">339</span>     * &lt;/p&gt;&lt;p&gt;<a name="line.339"></a>
+<span class="sourceLineNo">340</span>     * Considered "broadly" eligible because the instructions in the implemented constructor may remove the class from<a name="line.340"></a>
+<span class="sourceLineNo">341</span>     * consideration later on.<a name="line.341"></a>
+<span class="sourceLineNo">342</span>     * &lt;/p&gt;<a name="line.342"></a>
+<span class="sourceLineNo">343</span>     * @param supertype whose subtypes are sought<a name="line.343"></a>
+<span class="sourceLineNo">344</span>     * @param scanner to use<a name="line.344"></a>
+<span class="sourceLineNo">345</span>     * @return {@link Set} of {@link Class}<a name="line.345"></a>
+<span class="sourceLineNo">346</span>     * @see #segregate(Iterable)<a name="line.346"></a>
+<span class="sourceLineNo">347</span>     */<a name="line.347"></a>
+<span class="sourceLineNo">348</span>    private Set&lt;Class&lt;?&gt;&gt; getBroadlyEligibleSubclasses(final Class&lt;?&gt; supertype, final Scanner scanner) {<a name="line.348"></a>
+<span class="sourceLineNo">349</span>        final ScanResult scanResult = scanner.scan(new ScanRequest().addSupertypes(supertype));<a name="line.349"></a>
+<span class="sourceLineNo">350</span>        final Set&lt;Class&lt;?&gt;&gt; result = new LinkedHashSet&lt;Class&lt;?&gt;&gt;();<a name="line.350"></a>
+<span class="sourceLineNo">351</span>        for (final WeavableClass&lt;?&gt; cls : scanResult.getClasses()) {<a name="line.351"></a>
+<span class="sourceLineNo">352</span>            final Class&lt;?&gt; subtype = cls.getTarget();<a name="line.352"></a>
+<span class="sourceLineNo">353</span>            final IneligibilityReason reason;<a name="line.353"></a>
+<span class="sourceLineNo">354</span>            if (!subtype.isAnonymousClass()) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span>                reason = IneligibilityReason.NOT_ANONYMOUS;<a name="line.355"></a>
+<span class="sourceLineNo">356</span>            } else if (subtype.getDeclaredConstructors().length != 1) {<a name="line.356"></a>
+<span class="sourceLineNo">357</span>                reason = IneligibilityReason.TOO_MANY_CONSTRUCTORS;<a name="line.357"></a>
+<span class="sourceLineNo">358</span>            } else if (subtype.getDeclaredMethods().length &gt; 0) {<a name="line.358"></a>
+<span class="sourceLineNo">359</span>                reason = IneligibilityReason.IMPLEMENTS_METHODS;<a name="line.359"></a>
+<span class="sourceLineNo">360</span>            } else {<a name="line.360"></a>
+<span class="sourceLineNo">361</span>                result.add(subtype);<a name="line.361"></a>
+<span class="sourceLineNo">362</span>                continue;<a name="line.362"></a>
+<span class="sourceLineNo">363</span>            }<a name="line.363"></a>
+<span class="sourceLineNo">364</span>            env.debug("Removed %s from consideration due to %s", subtype, reason);<a name="line.364"></a>
+<span class="sourceLineNo">365</span>        }<a name="line.365"></a>
+<span class="sourceLineNo">366</span>        return result;<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    }<a name="line.367"></a>
+<span class="sourceLineNo">368</span><a name="line.368"></a>
+<span class="sourceLineNo">369</span>    /**<a name="line.369"></a>
+<span class="sourceLineNo">370</span>     * &lt;p&gt;Segregate a number of classes (presumed subclasses/implementors of a<a name="line.370"></a>
+<span class="sourceLineNo">371</span>     * common supertype/interface). The keys of the map consist of the important<a name="line.371"></a>
+<span class="sourceLineNo">372</span>     * parts for identifying similar anonymous types: the "signature" and the<a name="line.372"></a>
+<span class="sourceLineNo">373</span>     * invoked superclass constructor. For our purposes, the signature consists<a name="line.373"></a>
+<span class="sourceLineNo">374</span>     * of the first applicable item of:<a name="line.374"></a>
+<span class="sourceLineNo">375</span>     * &lt;ol&gt;<a name="line.375"></a>
+<span class="sourceLineNo">376</span>     * &lt;li&gt;The generic signature of the class&lt;/li&gt;<a name="line.376"></a>
+<span class="sourceLineNo">377</span>     * &lt;li&gt;The sole implemented interface&lt;/li&gt;<a name="line.377"></a>
+<span class="sourceLineNo">378</span>     * &lt;li&gt;The superclass&lt;/li&gt;<a name="line.378"></a>
+<span class="sourceLineNo">379</span>     * &lt;/ol&gt;<a name="line.379"></a>
+<span class="sourceLineNo">380</span>     * &lt;/p&gt;&lt;p&gt;<a name="line.380"></a>
+<span class="sourceLineNo">381</span>     * The class will be considered ineligible if its constructor is too "busy" as its side effects cannot be<a name="line.381"></a>
+<span class="sourceLineNo">382</span>     * anticipated; the normalizer will err on the side of caution.<a name="line.382"></a>
+<span class="sourceLineNo">383</span>     * &lt;/p&gt;&lt;p&gt;<a name="line.383"></a>
+<span class="sourceLineNo">384</span>     * Further, we will here avail ourselves of the opportunity to discard any types we have already normalized.<a name="line.384"></a>
+<span class="sourceLineNo">385</span>     * &lt;/p&gt;<a name="line.385"></a>
+<span class="sourceLineNo">386</span>     * @param subtypes<a name="line.386"></a>
+<span class="sourceLineNo">387</span>     * @return Map of Pair&lt;String, String&gt; to Set of Classes<a name="line.387"></a>
+<span class="sourceLineNo">388</span>     * @throws IOException<a name="line.388"></a>
+<span class="sourceLineNo">389</span>     */<a name="line.389"></a>
+<span class="sourceLineNo">390</span>    private Map&lt;Pair&lt;String, String&gt;, Set&lt;ClassWrapper&gt;&gt; segregate(final Iterable&lt;Class&lt;?&gt;&gt; subtypes)<a name="line.390"></a>
+<span class="sourceLineNo">391</span>        throws IOException {<a name="line.391"></a>
+<span class="sourceLineNo">392</span>        final Map&lt;Pair&lt;String, String&gt;, Set&lt;ClassWrapper&gt;&gt; classMap =<a name="line.392"></a>
+<span class="sourceLineNo">393</span>            new LinkedHashMap&lt;Pair&lt;String, String&gt;, Set&lt;ClassWrapper&gt;&gt;();<a name="line.393"></a>
+<span class="sourceLineNo">394</span>        for (final Class&lt;?&gt; subtype : subtypes) {<a name="line.394"></a>
+<span class="sourceLineNo">395</span>            final MutablePair&lt;String, String&gt; key = new MutablePair&lt;String, String&gt;();<a name="line.395"></a>
+<span class="sourceLineNo">396</span>            final MutableBoolean ignore = new MutableBoolean(false);<a name="line.396"></a>
+<span class="sourceLineNo">397</span>            final MutableBoolean valid = new MutableBoolean(true);<a name="line.397"></a>
+<span class="sourceLineNo">398</span>            final MutableBoolean mustRewriteConstructor = new MutableBoolean();<a name="line.398"></a>
+<span class="sourceLineNo">399</span>            InputStream bytecode = null;<a name="line.399"></a>
+<span class="sourceLineNo">400</span><a name="line.400"></a>
+<span class="sourceLineNo">401</span>            try {<a name="line.401"></a>
+<span class="sourceLineNo">402</span>                bytecode = env.getClassfile(subtype).getInputStream();<a name="line.402"></a>
+<span class="sourceLineNo">403</span>                new ClassReader(bytecode).accept(new ClassVisitor(Opcodes.ASM5) {<a name="line.403"></a>
+<span class="sourceLineNo">404</span>                    String superName;<a name="line.404"></a>
 <span class="sourceLineNo">405</span><a name="line.405"></a>
-<span class="sourceLineNo">406</span>                                @Override<a name="line.406"></a>
-<span class="sourceLineNo">407</span>                                public void visitFieldInsn(final int opcode, final String owner, final String name,<a name="line.407"></a>
-<span class="sourceLineNo">408</span>                                    final String desc) {<a name="line.408"></a>
-<span class="sourceLineNo">409</span>                                    if ("this$0".equals(name) &amp;&amp; opcode == Opcodes.PUTFIELD) {<a name="line.409"></a>
-<span class="sourceLineNo">410</span>                                        mustRewriteConstructor.setValue(true);<a name="line.410"></a>
-<span class="sourceLineNo">411</span>                                        return;<a name="line.411"></a>
-<span class="sourceLineNo">412</span>                                    }<a name="line.412"></a>
-<span class="sourceLineNo">413</span>                                    valid.setValue(false);<a name="line.413"></a>
-<span class="sourceLineNo">414</span>                                }<a name="line.414"></a>
-<span class="sourceLineNo">415</span>                            };<a name="line.415"></a>
-<span class="sourceLineNo">416</span>                        }<a name="line.416"></a>
-<span class="sourceLineNo">417</span>                        return null;<a name="line.417"></a>
-<span class="sourceLineNo">418</span>                    }<a name="line.418"></a>
-<span class="sourceLineNo">419</span>                }, 0);<a name="line.419"></a>
-<span class="sourceLineNo">420</span>            } finally {<a name="line.420"></a>
-<span class="sourceLineNo">421</span>                IOUtils.closeQuietly(bytecode);<a name="line.421"></a>
-<span class="sourceLineNo">422</span>            }<a name="line.422"></a>
-<span class="sourceLineNo">423</span>            if (ignore.booleanValue()) {<a name="line.423"></a>
-<span class="sourceLineNo">424</span>                continue;<a name="line.424"></a>
-<span class="sourceLineNo">425</span>            }<a name="line.425"></a>
-<span class="sourceLineNo">426</span>            if (valid.booleanValue()) {<a name="line.426"></a>
-<span class="sourceLineNo">427</span>                Set&lt;ClassWrapper&gt; set = classMap.get(key);<a name="line.427"></a>
-<span class="sourceLineNo">428</span>                if (set == null) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span>                    set = new LinkedHashSet&lt;ClassWrapper&gt;();<a name="line.429"></a>
-<span class="sourceLineNo">430</span>                    classMap.put(key, set);<a name="line.430"></a>
-<span class="sourceLineNo">431</span>                }<a name="line.431"></a>
-<span class="sourceLineNo">432</span>                set.add(new ClassWrapper(subtype, mustRewriteConstructor.booleanValue()));<a name="line.432"></a>
-<span class="sourceLineNo">433</span>            } else {<a name="line.433"></a>
-<span class="sourceLineNo">434</span>                env.debug("%s is ineligible for normalization due to %s", subtype,<a name="line.434"></a>
-<span class="sourceLineNo">435</span>                    IneligibilityReason.TOO_BUSY_CONSTRUCTOR);<a name="line.435"></a>
-<span class="sourceLineNo">436</span>            }<a name="line.436"></a>
-<span class="sourceLineNo">437</span>        }<a name="line.437"></a>
-<span class="sourceLineNo">438</span>        return classMap;<a name="line.438"></a>
-<span class="sourceLineNo">439</span>    }<a name="line.439"></a>
-<span class="sourceLineNo">440</span><a name="line.440"></a>
-<span class="sourceLineNo">441</span>    /**<a name="line.441"></a>
-<span class="sourceLineNo">442</span>     * Create the normalized version of a given class in the configured target package. The {@link Normalizer} will<a name="line.442"></a>
-<span class="sourceLineNo">443</span>     * gladly do so in a package from which the normalized class will not actually be able to reference any types upon<a name="line.443"></a>
-<span class="sourceLineNo">444</span>     * which it relies; in such a situation you must specify the target package as the package of the supertype.<a name="line.444"></a>
-<span class="sourceLineNo">445</span>     * @param key used to generate the normalized classname.<a name="line.445"></a>
-<span class="sourceLineNo">446</span>     * @param classWrapper<a name="line.446"></a>
-<span class="sourceLineNo">447</span>     * @return the generated classname.<a name="line.447"></a>
-<span class="sourceLineNo">448</span>     * @throws IOException<a name="line.448"></a>
-<span class="sourceLineNo">449</span>     * @throws ClassNotFoundException<a name="line.449"></a>
-<span class="sourceLineNo">450</span>     */<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    private String copy(final Pair&lt;String, String&gt; key, final ClassWrapper classWrapper) throws IOException,<a name="line.451"></a>
-<span class="sourceLineNo">452</span>        ClassNotFoundException {<a name="line.452"></a>
-<span class="sourceLineNo">453</span>        final MessageDigest md5;<a name="line.453"></a>
-<span class="sourceLineNo">454</span>        try {<a name="line.454"></a>
-<span class="sourceLineNo">455</span>            md5 = MessageDigest.getInstance("MD5");<a name="line.455"></a>
-<span class="sourceLineNo">456</span>        } catch (final NoSuchAlgorithmException e) {<a name="line.456"></a>
-<span class="sourceLineNo">457</span>            throw new RuntimeException(e);<a name="line.457"></a>
-<span class="sourceLineNo">458</span>        }<a name="line.458"></a>
-<span class="sourceLineNo">459</span>        md5.update(key.getLeft().getBytes(UTF8));<a name="line.459"></a>
-<span class="sourceLineNo">460</span>        md5.update(key.getRight().getBytes(UTF8));<a name="line.460"></a>
-<span class="sourceLineNo">461</span><a name="line.461"></a>
-<span class="sourceLineNo">462</span>        final long digest = Conversion.byteArrayToLong(md5.digest(), 0, 0L, 0, Long.SIZE / Byte.SIZE);<a name="line.462"></a>
-<span class="sourceLineNo">463</span><a name="line.463"></a>
-<span class="sourceLineNo">464</span>        final String result = MessageFormat.format("{0}/$normalized{1,number,0;_0}", targetPackage, digest);<a name="line.464"></a>
-<span class="sourceLineNo">465</span><a name="line.465"></a>
-<span class="sourceLineNo">466</span>        env.debug("Copying class %s to %s", classWrapper.wrapped.getName(), result);<a name="line.466"></a>
-<span class="sourceLineNo">467</span><a name="line.467"></a>
-<span class="sourceLineNo">468</span>        InputStream bytecode = null;<a name="line.468"></a>
-<span class="sourceLineNo">469</span><a name="line.469"></a>
-<span class="sourceLineNo">470</span>        try {<a name="line.470"></a>
-<span class="sourceLineNo">471</span>            bytecode = env.getClassfile(classWrapper.wrapped).getInputStream();<a name="line.471"></a>
-<span class="sourceLineNo">472</span>            final ClassReader reader = new ClassReader(bytecode);<a name="line.472"></a>
-<span class="sourceLineNo">473</span><a name="line.473"></a>
-<span class="sourceLineNo">474</span>            final ClassVisitor writeClass = new WriteClass();<a name="line.474"></a>
-<span class="sourceLineNo">475</span><a name="line.475"></a>
-<span class="sourceLineNo">476</span>            // we're doing most of this by hand; we only read the original class to hijack signature, ctor exceptions,<a name="line.476"></a>
-<span class="sourceLineNo">477</span>            // etc.:<a name="line.477"></a>
-<span class="sourceLineNo">478</span><a name="line.478"></a>
-<span class="sourceLineNo">479</span>            reader.accept(new ClassVisitor(Opcodes.ASM4) {<a name="line.479"></a>
-<span class="sourceLineNo">480</span>                Type supertype;<a name="line.480"></a>
-<span class="sourceLineNo">481</span><a name="line.481"></a>
-<span class="sourceLineNo">482</span>                @Override<a name="line.482"></a>
-<span class="sourceLineNo">483</span>                public void visit(final int version, final int access, final String name, final String signature,<a name="line.483"></a>
-<span class="sourceLineNo">484</span>                    final String superName, final String[] interfaces) {<a name="line.484"></a>
-<span class="sourceLineNo">485</span>                    supertype = Type.getObjectType(superName);<a name="line.485"></a>
-<span class="sourceLineNo">486</span>                    writeClass.visit(version, Opcodes.ACC_PUBLIC, result, signature, superName, interfaces);<a name="line.486"></a>
-<span class="sourceLineNo">487</span><a name="line.487"></a>
-<span class="sourceLineNo">488</span>                    visitAnnotation(Type.getType(Marker.class).getDescriptor(), false);<a name="line.488"></a>
-<span class="sourceLineNo">489</span>                }<a name="line.489"></a>
-<span class="sourceLineNo">490</span><a name="line.490"></a>
-<span class="sourceLineNo">491</span>                @Override<a name="line.491"></a>
-<span class="sourceLineNo">492</span>                public MethodVisitor visitMethod(final int access, final String name, final String desc,<a name="line.492"></a>
-<span class="sourceLineNo">493</span>                    final String signature, final String[] exceptions) {<a name="line.493"></a>
-<span class="sourceLineNo">494</span>                    if (INIT.equals(name)) {<a name="line.494"></a>
-<span class="sourceLineNo">495</span><a name="line.495"></a>
-<span class="sourceLineNo">496</span>                        final Method staticCtor = new Method(INIT, key.getRight());<a name="line.496"></a>
-<span class="sourceLineNo">497</span>                        final Type[] argumentTypes = staticCtor.getArgumentTypes();<a name="line.497"></a>
-<span class="sourceLineNo">498</span>                        final Type[] exceptionTypes = toObjectTypes(exceptions);<a name="line.498"></a>
-<span class="sourceLineNo">499</span><a name="line.499"></a>
-<span class="sourceLineNo">500</span>                        {<a name="line.500"></a>
-<span class="sourceLineNo">501</span>                            final GeneratorAdapter mgen =<a name="line.501"></a>
-<span class="sourceLineNo">502</span>                                new GeneratorAdapter(Opcodes.ACC_PUBLIC, staticCtor, signature, exceptionTypes,<a name="line.502"></a>
-<span class="sourceLineNo">503</span>                                    writeClass);<a name="line.503"></a>
-<span class="sourceLineNo">504</span>                            mgen.visitCode();<a name="line.504"></a>
-<span class="sourceLineNo">505</span>                            mgen.loadThis();<a name="line.505"></a>
-<span class="sourceLineNo">506</span>                            for (int i = 0; i &lt; argumentTypes.length; i++) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span>                                mgen.loadArg(i);<a name="line.507"></a>
-<span class="sourceLineNo">508</span>                            }<a name="line.508"></a>
-<span class="sourceLineNo">509</span>                            mgen.invokeConstructor(supertype, staticCtor);<a name="line.509"></a>
-<span class="sourceLineNo">510</span>                            mgen.returnValue();<a name="line.510"></a>
-<span class="sourceLineNo">511</span>                            mgen.endMethod();<a name="line.511"></a>
-<span class="sourceLineNo">512</span>                        }<a name="line.512"></a>
-<span class="sourceLineNo">513</span>                        /*<a name="line.513"></a>
-<span class="sourceLineNo">514</span>                         * now declare a dummy constructor that will match, and discard,<a name="line.514"></a>
-<span class="sourceLineNo">515</span>                         * any originally inner-class bound constructor i.e. that set up a this$0 field.<a name="line.515"></a>
-<span class="sourceLineNo">516</span>                         * By doing this we can avoid playing with the stack that originally<a name="line.516"></a>
-<span class="sourceLineNo">517</span>                         * invoked such a constructor and simply rewrite the method<a name="line.517"></a>
-<span class="sourceLineNo">518</span>                         */<a name="line.518"></a>
-<span class="sourceLineNo">519</span>                        {<a name="line.519"></a>
-<span class="sourceLineNo">520</span>                            final Method instanceCtor =<a name="line.520"></a>
-<span class="sourceLineNo">521</span>                                new Method(INIT, Type.VOID_TYPE, ArrayUtils.add(argumentTypes, 0, OBJECT_TYPE));<a name="line.521"></a>
-<span class="sourceLineNo">522</span>                            final GeneratorAdapter mgen =<a name="line.522"></a>
-<span class="sourceLineNo">523</span>                                new GeneratorAdapter(Opcodes.ACC_PUBLIC, instanceCtor, signature, exceptionTypes,<a name="line.523"></a>
-<span class="sourceLineNo">524</span>                                    writeClass);<a name="line.524"></a>
-<span class="sourceLineNo">525</span>                            mgen.visitCode();<a name="line.525"></a>
-<span class="sourceLineNo">526</span>                            mgen.loadThis();<a name="line.526"></a>
-<span class="sourceLineNo">527</span>                            for (int i = 0; i &lt; argumentTypes.length; i++) {<a name="line.527"></a>
-<span class="sourceLineNo">528</span>                                mgen.loadArg(i + 1);<a name="line.528"></a>
-<span class="sourceLineNo">529</span>                            }<a name="line.529"></a>
-<span class="sourceLineNo">530</span>                            mgen.invokeConstructor(supertype, staticCtor);<a name="line.530"></a>
-<span class="sourceLineNo">531</span>                            mgen.returnValue();<a name="line.531"></a>
-<span class="sourceLineNo">532</span>                            mgen.endMethod();<a name="line.532"></a>
-<span class="sourceLineNo">533</span>                        }<a name="line.533"></a>
-<span class="sourceLineNo">534</span>                        return null;<a name="line.534"></a>
-<span class="sourceLineNo">535</span>                    }<a name="line.535"></a>
-<span class="sourceLineNo">536</span>                    return null;<a name="line.536"></a>
-<span class="sourceLineNo">537</span>                }<a name="line.537"></a>
-<span class="sourceLineNo">538</span><a name="line.538"></a>
-<span class="sourceLineNo">539</span>                @Override<a name="line.539"></a>
-<span class="sourceLineNo">540</span>                public void visitEnd() {<a name="line.540"></a>
-<span class="sourceLineNo">541</span>                    writeClass.visitEnd();<a name="line.541"></a>
-<span class="sourceLineNo">542</span>                }<a name="line.542"></a>
-<span class="sourceLineNo">543</span>            }, 0);<a name="line.543"></a>
-<span class="sourceLineNo">544</span>        } finally {<a name="line.544"></a>
-<span class="sourceLineNo">545</span>            IOUtils.closeQuietly(bytecode);<a name="line.545"></a>
-<span class="sourceLineNo">546</span>        }<a name="line.546"></a>
-<span class="sourceLineNo">547</span>        return result;<a name="line.547"></a>
-<span class="sourceLineNo">548</span>    }<a name="line.548"></a>
-<span class="sourceLineNo">549</span><a name="line.549"></a>
-<span class="sourceLineNo">550</span>    /**<a name="line.550"></a>
-<span class="sourceLineNo">551</span>     * Translate internal names to Java type names.<a name="line.551"></a>
-<span class="sourceLineNo">552</span>     * @param types to translate<a name="line.552"></a>
-<span class="sourceLineNo">553</span>     * @return {@link Type}[]<a name="line.553"></a>
-<span class="sourceLineNo">554</span>     * @see Type#getObjectType(String)<a name="line.554"></a>
-<span class="sourceLineNo">555</span>     */<a name="line.555"></a>
-<span class="sourceLineNo">556</span>    private static Type[] toObjectTypes(final String[] types) {<a name="line.556"></a>
-<span class="sourceLineNo">557</span>        if (types == null) {<a name="line.557"></a>
-<span class="sourceLineNo">558</span>            return null;<a name="line.558"></a>
-<span class="sourceLineNo">559</span>        }<a name="line.559"></a>
-<span class="sourceLineNo">560</span>        final Type[] result = new Type[types.length];<a name="line.560"></a>
-<span class="sourceLineNo">561</span>        for (int i = 0; i &lt; types.length; i++) {<a name="line.561"></a>
-<span class="sourceLineNo">562</span>            result[i] = Type.getObjectType(types[i]);<a name="line.562"></a>
-<span class="sourceLineNo">563</span>        }<a name="line.563"></a>
-<span class="sourceLineNo">564</span>        return result;<a name="line.564"></a>
-<span class="sourceLineNo">565</span>    }<a name="line.565"></a>
-<span class="sourceLineNo">566</span>}<a name="line.566"></a>
+<span class="sourceLineNo">406</span>                    @Override<a name="line.406"></a>
+<span class="sourceLineNo">407</span>                    public void visit(final int version, final int access, final String name, final String signature,<a name="line.407"></a>
+<span class="sourceLineNo">408</span>                        final String superName, final String[] interfaces) {<a name="line.408"></a>
+<span class="sourceLineNo">409</span>                        super.visit(version, access, name, signature, superName, interfaces);<a name="line.409"></a>
+<span class="sourceLineNo">410</span>                        this.superName = superName;<a name="line.410"></a>
+<span class="sourceLineNo">411</span>                        final String left;<a name="line.411"></a>
+<span class="sourceLineNo">412</span>                        if (signature != null) {<a name="line.412"></a>
+<span class="sourceLineNo">413</span>                            left = signature;<a name="line.413"></a>
+<span class="sourceLineNo">414</span>                        } else if (ArrayUtils.getLength(interfaces) == 1) {<a name="line.414"></a>
+<span class="sourceLineNo">415</span>                            left = interfaces[0];<a name="line.415"></a>
+<span class="sourceLineNo">416</span>                        } else {<a name="line.416"></a>
+<span class="sourceLineNo">417</span>                            left = superName;<a name="line.417"></a>
+<span class="sourceLineNo">418</span>                        }<a name="line.418"></a>
+<span class="sourceLineNo">419</span>                        key.setLeft(left);<a name="line.419"></a>
+<span class="sourceLineNo">420</span>                    }<a name="line.420"></a>
+<span class="sourceLineNo">421</span><a name="line.421"></a>
+<span class="sourceLineNo">422</span>                    @Override<a name="line.422"></a>
+<span class="sourceLineNo">423</span>                    public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {<a name="line.423"></a>
+<span class="sourceLineNo">424</span>                        if (Type.getType(Marker.class).getDescriptor().equals(desc)) {<a name="line.424"></a>
+<span class="sourceLineNo">425</span>                            ignore.setValue(true);<a name="line.425"></a>
+<span class="sourceLineNo">426</span>                        }<a name="line.426"></a>
+<span class="sourceLineNo">427</span>                        return null;<a name="line.427"></a>
+<span class="sourceLineNo">428</span>                    }<a name="line.428"></a>
+<span class="sourceLineNo">429</span><a name="line.429"></a>
+<span class="sourceLineNo">430</span>                    @Override<a name="line.430"></a>
+<span class="sourceLineNo">431</span>                    public MethodVisitor visitMethod(final int access, final String name, final String desc,<a name="line.431"></a>
+<span class="sourceLineNo">432</span>                        final String signature, final String[] exceptions) {<a name="line.432"></a>
+<span class="sourceLineNo">433</span>                        if (INIT.equals(name)) {<a name="line.433"></a>
+<span class="sourceLineNo">434</span>                            return new MethodVisitor(Opcodes.ASM5) {<a name="line.434"></a>
+<span class="sourceLineNo">435</span>                                @Override<a name="line.435"></a>
+<span class="sourceLineNo">436</span>                                public void visitMethodInsn(final int opcode, final String owner, final String name,<a name="line.436"></a>
+<span class="sourceLineNo">437</span>                                    final String desc, final boolean itf) {<a name="line.437"></a>
+<span class="sourceLineNo">438</span>                                    if (INIT.equals(name) &amp;&amp; owner.equals(superName)) {<a name="line.438"></a>
+<span class="sourceLineNo">439</span>                                        key.setRight(desc);<a name="line.439"></a>
+<span class="sourceLineNo">440</span>                                    } else {<a name="line.440"></a>
+<span class="sourceLineNo">441</span>                                        valid.setValue(false);<a name="line.441"></a>
+<span class="sourceLineNo">442</span>                                    }<a name="line.442"></a>
+<span class="sourceLineNo">443</span>                                }<a name="line.443"></a>
+<span class="sourceLineNo">444</span><a name="line.444"></a>
+<span class="sourceLineNo">445</span>                                @Override<a name="line.445"></a>

[... 165 lines stripped ...]


Mime
View raw message