commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject svn commit: r910464 [36/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/ apido...
Date Thu, 29 May 2014 22:55:01 GMT
Modified: websites/production/commons/content/proper/commons-weaver/xref/org/apache/commons/weaver/normalizer/Normalizer.html
==============================================================================
--- websites/production/commons/content/proper/commons-weaver/xref/org/apache/commons/weaver/normalizer/Normalizer.html (original)
+++ websites/production/commons/content/proper/commons-weaver/xref/org/apache/commons/weaver/normalizer/Normalizer.html Thu May 29 22:54:45 2014
@@ -93,485 +93,525 @@
 <a class="jxr_linenumber" name="L85" href="#L85">85</a>          }
 <a class="jxr_linenumber" name="L86" href="#L86">86</a>      }
 <a class="jxr_linenumber" name="L87" href="#L87">87</a>  
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">WriteClass</a> <strong class="jxr_keyword">extends</strong> ClassVisitor {
-<a class="jxr_linenumber" name="L89" href="#L89">89</a>          <strong class="jxr_keyword">private</strong> String className;
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>  
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>          <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">WriteClass</a>() {
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>              <strong class="jxr_keyword">super</strong>(Opcodes.ASM4, <strong class="jxr_keyword">new</strong> ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS));
-<a class="jxr_linenumber" name="L93" href="#L93">93</a>          }
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>  
-<a class="jxr_linenumber" name="L95" href="#L95">95</a>          <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">WriteClass</a>(<strong class="jxr_keyword">final</strong> ClassReader reader) {
-<a class="jxr_linenumber" name="L96" href="#L96">96</a>              <strong class="jxr_keyword">super</strong>(Opcodes.ASM4, <strong class="jxr_keyword">new</strong> ClassWriter(reader, 0));
-<a class="jxr_linenumber" name="L97" href="#L97">97</a>          }
-<a class="jxr_linenumber" name="L98" href="#L98">98</a>  
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>          @Override
-<a class="jxr_linenumber" name="L100" href="#L100">100</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> visit(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> version, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> access, <strong class="jxr_keyword">final</strong> String name, <strong class="jxr_keyword">final</strong> String signature,
-<a class="jxr_linenumber" name="L101" href="#L101">101</a>             <strong class="jxr_keyword">final</strong> String superName, <strong class="jxr_keyword">final</strong> String[] intrfces) {
-<a class="jxr_linenumber" name="L102" href="#L102">102</a>             <strong class="jxr_keyword">super</strong>.visit(version, access, name, signature, superName, intrfces);
-<a class="jxr_linenumber" name="L103" href="#L103">103</a>             className = name;
-<a class="jxr_linenumber" name="L104" href="#L104">104</a>         }
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> 
-<a class="jxr_linenumber" name="L106" href="#L106">106</a>         @Override
-<a class="jxr_linenumber" name="L107" href="#L107">107</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> visitEnd() {
-<a class="jxr_linenumber" name="L108" href="#L108">108</a>             <strong class="jxr_keyword">super</strong>.visitEnd();
-<a class="jxr_linenumber" name="L109" href="#L109">109</a>             <strong class="jxr_keyword">final</strong> byte[] bytecode = ((ClassWriter) cv).toByteArray();
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> 
-<a class="jxr_linenumber" name="L111" href="#L111">111</a>             <strong class="jxr_keyword">final</strong> DataSource classfile = env.getClassfile(className);
-<a class="jxr_linenumber" name="L112" href="#L112">112</a>             env.debug(<span class="jxr_string">"Writing class %s to %s"</span>, className, classfile.getName());
-<a class="jxr_linenumber" name="L113" href="#L113">113</a>             OutputStream outputStream = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L114" href="#L114">114</a>             <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L115" href="#L115">115</a>                 outputStream = classfile.getOutputStream();
-<a class="jxr_linenumber" name="L116" href="#L116">116</a>                 IOUtils.write(bytecode, outputStream);
-<a class="jxr_linenumber" name="L117" href="#L117">117</a>             } <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> IOException e) {
-<a class="jxr_linenumber" name="L118" href="#L118">118</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> RuntimeException(e);
-<a class="jxr_linenumber" name="L119" href="#L119">119</a>             } <strong class="jxr_keyword">finally</strong> {
-<a class="jxr_linenumber" name="L120" href="#L120">120</a>                 IOUtils.closeQuietly(outputStream);
-<a class="jxr_linenumber" name="L121" href="#L121">121</a>             }
-<a class="jxr_linenumber" name="L122" href="#L122">122</a>         }
-<a class="jxr_linenumber" name="L123" href="#L123">123</a>     }
-<a class="jxr_linenumber" name="L124" href="#L124">124</a> 
-<a class="jxr_linenumber" name="L125" href="#L125">125</a>     <strong class="jxr_keyword">private</strong> enum <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">IneligibilityReason</a> {
-<a class="jxr_linenumber" name="L126" href="#L126">126</a>         NOT_ANONYMOUS, TOO_MANY_CONSTRUCTORS, IMPLEMENTS_METHODS, TOO_BUSY_CONSTRUCTOR;
-<a class="jxr_linenumber" name="L127" href="#L127">127</a>     }
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>      <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>  <em class="jxr_javadoccomment">     * Necessary to resolve supertypes against WeaveEnvironment ClassLoader</em>
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>  <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">CustomClassWriter</a> <strong class="jxr_keyword">extends</strong> ClassWriter {
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>          <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">CustomClassWriter</a>(<strong class="jxr_keyword">int</strong> flags) {
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>              <strong class="jxr_keyword">super</strong>(flags);
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>          }
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>  
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>          <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">CustomClassWriter</a>(ClassReader classReader, <strong class="jxr_keyword">int</strong> flags) {
+<a class="jxr_linenumber" name="L97" href="#L97">97</a>              <strong class="jxr_keyword">super</strong>(classReader, flags);
+<a class="jxr_linenumber" name="L98" href="#L98">98</a>          }
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>  
+<a class="jxr_linenumber" name="L100" href="#L100">100</a>         @Override
+<a class="jxr_linenumber" name="L101" href="#L101">101</a>         <strong class="jxr_keyword">protected</strong> String getCommonSuperClass(String type1, String type2) {
+<a class="jxr_linenumber" name="L102" href="#L102">102</a>             Class&lt;?&gt; c;
+<a class="jxr_linenumber" name="L103" href="#L103">103</a>             Class&lt;?&gt; d;
+<a class="jxr_linenumber" name="L104" href="#L104">104</a>             <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L105" href="#L105">105</a>                 c = Class.forName(type1.replace('/', '.'), false, env.classLoader);
+<a class="jxr_linenumber" name="L106" href="#L106">106</a>                 d = Class.forName(type2.replace('/', '.'), false, env.classLoader);
+<a class="jxr_linenumber" name="L107" href="#L107">107</a>             } <strong class="jxr_keyword">catch</strong> (Exception e) {
+<a class="jxr_linenumber" name="L108" href="#L108">108</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> RuntimeException(e.toString());
+<a class="jxr_linenumber" name="L109" href="#L109">109</a>             }
+<a class="jxr_linenumber" name="L110" href="#L110">110</a>             <strong class="jxr_keyword">if</strong> (c.isAssignableFrom(d)) {
+<a class="jxr_linenumber" name="L111" href="#L111">111</a>                 <strong class="jxr_keyword">return</strong> type1;
+<a class="jxr_linenumber" name="L112" href="#L112">112</a>             }
+<a class="jxr_linenumber" name="L113" href="#L113">113</a>             <strong class="jxr_keyword">if</strong> (d.isAssignableFrom(c)) {
+<a class="jxr_linenumber" name="L114" href="#L114">114</a>                 <strong class="jxr_keyword">return</strong> type2;
+<a class="jxr_linenumber" name="L115" href="#L115">115</a>             }
+<a class="jxr_linenumber" name="L116" href="#L116">116</a>             <strong class="jxr_keyword">if</strong> (c.isInterface() || d.isInterface()) {
+<a class="jxr_linenumber" name="L117" href="#L117">117</a>                 <strong class="jxr_keyword">return</strong> <span class="jxr_string">"java/lang/Object"</span>;
+<a class="jxr_linenumber" name="L118" href="#L118">118</a>             }
+<a class="jxr_linenumber" name="L119" href="#L119">119</a>             <strong class="jxr_keyword">do</strong> {
+<a class="jxr_linenumber" name="L120" href="#L120">120</a>                 c = c.getSuperclass();
+<a class="jxr_linenumber" name="L121" href="#L121">121</a>             } <strong class="jxr_keyword">while</strong> (!c.isAssignableFrom(d));
+<a class="jxr_linenumber" name="L122" href="#L122">122</a>             <strong class="jxr_keyword">return</strong> c.getName().replace('.', '/');
+<a class="jxr_linenumber" name="L123" href="#L123">123</a>         }
+<a class="jxr_linenumber" name="L124" href="#L124">124</a>     }
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> 
+<a class="jxr_linenumber" name="L126" href="#L126">126</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">WriteClass</a> <strong class="jxr_keyword">extends</strong> ClassVisitor {
+<a class="jxr_linenumber" name="L127" href="#L127">127</a>         <strong class="jxr_keyword">private</strong> String className;
 <a class="jxr_linenumber" name="L128" href="#L128">128</a> 
-<a class="jxr_linenumber" name="L129" href="#L129">129</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> <em class="jxr_javadoccomment">     * Configuration prefix for this {@link Weaver}.</em>
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L132" href="#L132">132</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String CONFIG_WEAVER = <span class="jxr_string">"normalizer."</span>;
-<a class="jxr_linenumber" name="L133" href="#L133">133</a> 
-<a class="jxr_linenumber" name="L134" href="#L134">134</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> <em class="jxr_javadoccomment">     * Property name referencing a comma-delimited list of types whose subclasses/implementations should be normalized,</em>
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> <em class="jxr_javadoccomment">     * e.g. {@code javax.enterprise.util.TypeLiteral}.</em>
-<a class="jxr_linenumber" name="L137" href="#L137">137</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L138" href="#L138">138</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String CONFIG_SUPER_TYPES = CONFIG_WEAVER + <span class="jxr_string">"superTypes"</span>;
-<a class="jxr_linenumber" name="L139" href="#L139">139</a> 
-<a class="jxr_linenumber" name="L140" href="#L140">140</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> <em class="jxr_javadoccomment">     * Property name referencing a package name to which merged types should be added.</em>
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L143" href="#L143">143</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String CONFIG_TARGET_PACKAGE = CONFIG_WEAVER + <span class="jxr_string">"targetPackage"</span>;
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> 
-<a class="jxr_linenumber" name="L145" href="#L145">145</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Charset UTF8 = Charset.forName(CharEncoding.UTF_8);
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> 
-<a class="jxr_linenumber" name="L147" href="#L147">147</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/weaver/model/WeaveEnvironment.html">WeaveEnvironment</a> env;
+<a class="jxr_linenumber" name="L129" href="#L129">129</a>         <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">WriteClass</a>() {
+<a class="jxr_linenumber" name="L130" href="#L130">130</a>             <strong class="jxr_keyword">super</strong>(Opcodes.ASM5, <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">CustomClassWriter</a>(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS));
+<a class="jxr_linenumber" name="L131" href="#L131">131</a>         }
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> 
+<a class="jxr_linenumber" name="L133" href="#L133">133</a>         <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">WriteClass</a>(<strong class="jxr_keyword">final</strong> ClassReader reader) {
+<a class="jxr_linenumber" name="L134" href="#L134">134</a>             <strong class="jxr_keyword">super</strong>(Opcodes.ASM5, <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">CustomClassWriter</a>(reader, 0));
+<a class="jxr_linenumber" name="L135" href="#L135">135</a>         }
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> 
+<a class="jxr_linenumber" name="L137" href="#L137">137</a>         @Override
+<a class="jxr_linenumber" name="L138" href="#L138">138</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> visit(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> version, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> access, <strong class="jxr_keyword">final</strong> String name, <strong class="jxr_keyword">final</strong> String signature,
+<a class="jxr_linenumber" name="L139" href="#L139">139</a>             <strong class="jxr_keyword">final</strong> String superName, <strong class="jxr_keyword">final</strong> String[] intrfces) {
+<a class="jxr_linenumber" name="L140" href="#L140">140</a>             <strong class="jxr_keyword">super</strong>.visit(version, access, name, signature, superName, intrfces);
+<a class="jxr_linenumber" name="L141" href="#L141">141</a>             className = name;
+<a class="jxr_linenumber" name="L142" href="#L142">142</a>         }
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> 
+<a class="jxr_linenumber" name="L144" href="#L144">144</a>         @Override
+<a class="jxr_linenumber" name="L145" href="#L145">145</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> visitEnd() {
+<a class="jxr_linenumber" name="L146" href="#L146">146</a>             <strong class="jxr_keyword">super</strong>.visitEnd();
+<a class="jxr_linenumber" name="L147" href="#L147">147</a>             <strong class="jxr_keyword">final</strong> byte[] bytecode = ((ClassWriter) cv).toByteArray();
 <a class="jxr_linenumber" name="L148" href="#L148">148</a> 
-<a class="jxr_linenumber" name="L149" href="#L149">149</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Set&lt;Class&lt;?&gt;&gt; normalizeTypes;
-<a class="jxr_linenumber" name="L150" href="#L150">150</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String targetPackage;
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> 
-<a class="jxr_linenumber" name="L152" href="#L152">152</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> <em class="jxr_javadoccomment">     * Create a new {@link Normalizer} instance.</em>
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> <em class="jxr_javadoccomment">     * @param env {@link WeaveEnvironment}</em>
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L156" href="#L156">156</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">Normalizer</a>(<strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/weaver/model/WeaveEnvironment.html">WeaveEnvironment</a> env) {
-<a class="jxr_linenumber" name="L157" href="#L157">157</a>         <strong class="jxr_keyword">this</strong>.env = env;
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> 
-<a class="jxr_linenumber" name="L159" href="#L159">159</a>         <strong class="jxr_keyword">this</strong>.targetPackage =
-<a class="jxr_linenumber" name="L160" href="#L160">160</a>             Utils.validatePackageName(Validate.notBlank(env.config.getProperty(CONFIG_TARGET_PACKAGE),
-<a class="jxr_linenumber" name="L161" href="#L161">161</a>                 <span class="jxr_string">"missing target package name"</span>));
-<a class="jxr_linenumber" name="L162" href="#L162">162</a>         <strong class="jxr_keyword">this</strong>.normalizeTypes =
-<a class="jxr_linenumber" name="L163" href="#L163">163</a>             Utils.parseTypes(
-<a class="jxr_linenumber" name="L164" href="#L164">164</a>                 Validate.notEmpty(env.config.getProperty(CONFIG_SUPER_TYPES), <span class="jxr_string">"no types specified for normalization"</span>),
-<a class="jxr_linenumber" name="L165" href="#L165">165</a>                 env.classLoader);
-<a class="jxr_linenumber" name="L166" href="#L166">166</a>     }
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> 
-<a class="jxr_linenumber" name="L168" href="#L168">168</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L169" href="#L169">169</a> <em class="jxr_javadoccomment">     * Normalize the classes found using the specified {@link Scanner}.</em>
-<a class="jxr_linenumber" name="L170" href="#L170">170</a> <em class="jxr_javadoccomment">     * @param scanner to scan with</em>
-<a class="jxr_linenumber" name="L171" href="#L171">171</a> <em class="jxr_javadoccomment">     * @return whether any work was done</em>
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L173" href="#L173">173</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> normalize(<strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/weaver/model/Scanner.html">Scanner</a> scanner) {
-<a class="jxr_linenumber" name="L174" href="#L174">174</a>         <strong class="jxr_keyword">boolean</strong> result = false;
-<a class="jxr_linenumber" name="L175" href="#L175">175</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> Class&lt;?&gt; supertype : normalizeTypes) {
-<a class="jxr_linenumber" name="L176" href="#L176">176</a>             <strong class="jxr_keyword">final</strong> Set&lt;Class&lt;?&gt;&gt; subtypes = getBroadlyEligibleSubclasses(supertype, scanner);
-<a class="jxr_linenumber" name="L177" href="#L177">177</a>             <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L178" href="#L178">178</a>                 <strong class="jxr_keyword">final</strong> Map&lt;Pair&lt;String, String&gt;, Set&lt;ClassWrapper&gt;&gt; segregatedSubtypes = segregate(subtypes);
-<a class="jxr_linenumber" name="L179" href="#L179">179</a>                 <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> Map.Entry&lt;Pair&lt;String, String&gt;, Set&lt;ClassWrapper&gt;&gt; entry : segregatedSubtypes.entrySet()) {
-<a class="jxr_linenumber" name="L180" href="#L180">180</a>                     <strong class="jxr_keyword">final</strong> Set&lt;ClassWrapper&gt; likeTypes = entry.getValue();
-<a class="jxr_linenumber" name="L181" href="#L181">181</a>                     <strong class="jxr_keyword">if</strong> (likeTypes.size() &gt; 1) {
-<a class="jxr_linenumber" name="L182" href="#L182">182</a>                         result = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L183" href="#L183">183</a>                         rewrite(entry.getKey(), likeTypes);
-<a class="jxr_linenumber" name="L184" href="#L184">184</a>                     }
-<a class="jxr_linenumber" name="L185" href="#L185">185</a>                 }
-<a class="jxr_linenumber" name="L186" href="#L186">186</a>             } <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> RuntimeException e) {
-<a class="jxr_linenumber" name="L187" href="#L187">187</a>                 <strong class="jxr_keyword">throw</strong> e;
-<a class="jxr_linenumber" name="L188" href="#L188">188</a>             } <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> Exception e) {
-<a class="jxr_linenumber" name="L189" href="#L189">189</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> RuntimeException(e);
-<a class="jxr_linenumber" name="L190" href="#L190">190</a>             }
-<a class="jxr_linenumber" name="L191" href="#L191">191</a>         }
-<a class="jxr_linenumber" name="L192" href="#L192">192</a>         <strong class="jxr_keyword">return</strong> result;
-<a class="jxr_linenumber" name="L193" href="#L193">193</a>     }
-<a class="jxr_linenumber" name="L194" href="#L194">194</a> 
-<a class="jxr_linenumber" name="L195" href="#L195">195</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L196" href="#L196">196</a> <em class="jxr_javadoccomment">     * Map a set of classes by their enclosing class.</em>
-<a class="jxr_linenumber" name="L197" href="#L197">197</a> <em class="jxr_javadoccomment">     * @param sort values</em>
-<a class="jxr_linenumber" name="L198" href="#L198">198</a> <em class="jxr_javadoccomment">     * @return {@link Map} of enclosing classname to {@link Map} of internal name to {@link ClassWrapper}</em>
-<a class="jxr_linenumber" name="L199" href="#L199">199</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L200" href="#L200">200</a>     <strong class="jxr_keyword">private</strong> Map&lt;String, Map&lt;String, ClassWrapper&gt;&gt; byEnclosingClass(<strong class="jxr_keyword">final</strong> Set&lt;ClassWrapper&gt; sort) {
-<a class="jxr_linenumber" name="L201" href="#L201">201</a>         <strong class="jxr_keyword">final</strong> Map&lt;String, Map&lt;String, ClassWrapper&gt;&gt; result = <strong class="jxr_keyword">new</strong> HashMap&lt;String, Map&lt;String, ClassWrapper&gt;&gt;();
-<a class="jxr_linenumber" name="L202" href="#L202">202</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> ClassWrapper wrapper : sort) {
-<a class="jxr_linenumber" name="L203" href="#L203">203</a>             <strong class="jxr_keyword">final</strong> String <strong class="jxr_keyword">outer</strong> = wrapper.wrapped.getEnclosingClass().getName();
-<a class="jxr_linenumber" name="L204" href="#L204">204</a>             Map&lt;String, ClassWrapper&gt; map = result.get(<strong class="jxr_keyword">outer</strong>);
-<a class="jxr_linenumber" name="L205" href="#L205">205</a>             <strong class="jxr_keyword">if</strong> (map == <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L206" href="#L206">206</a>                 map = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String, Normalizer.ClassWrapper&gt;();
-<a class="jxr_linenumber" name="L207" href="#L207">207</a>                 result.put(<strong class="jxr_keyword">outer</strong>, map);
-<a class="jxr_linenumber" name="L208" href="#L208">208</a>             }
-<a class="jxr_linenumber" name="L209" href="#L209">209</a>             map.put(wrapper.wrapped.getName().replace('.', '/'), wrapper);
-<a class="jxr_linenumber" name="L210" href="#L210">210</a>         }
-<a class="jxr_linenumber" name="L211" href="#L211">211</a>         <strong class="jxr_keyword">return</strong> result;
-<a class="jxr_linenumber" name="L212" href="#L212">212</a>     }
-<a class="jxr_linenumber" name="L213" href="#L213">213</a> 
-<a class="jxr_linenumber" name="L214" href="#L214">214</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L215" href="#L215">215</a> <em class="jxr_javadoccomment">     * Rewrite classes as indicated by one entry of {@link #segregate(Iterable)}.</em>
-<a class="jxr_linenumber" name="L216" href="#L216">216</a> <em class="jxr_javadoccomment">     * @param key {@link String} {@link Pair} indicating supertype and constructor signature</em>
-<a class="jxr_linenumber" name="L217" href="#L217">217</a> <em class="jxr_javadoccomment">     * @param toMerge matching classes</em>
-<a class="jxr_linenumber" name="L218" href="#L218">218</a> <em class="jxr_javadoccomment">     * @throws IOException on I/O error</em>
-<a class="jxr_linenumber" name="L219" href="#L219">219</a> <em class="jxr_javadoccomment">     * @throws ClassNotFoundException if class not found</em>
-<a class="jxr_linenumber" name="L220" href="#L220">220</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L221" href="#L221">221</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> rewrite(<strong class="jxr_keyword">final</strong> Pair&lt;String, String&gt; key, <strong class="jxr_keyword">final</strong> Set&lt;ClassWrapper&gt; toMerge) <strong class="jxr_keyword">throws</strong> IOException,
-<a class="jxr_linenumber" name="L222" href="#L222">222</a>         ClassNotFoundException {
-<a class="jxr_linenumber" name="L223" href="#L223">223</a>         <strong class="jxr_keyword">final</strong> String target = copy(key, toMerge.iterator().next());
-<a class="jxr_linenumber" name="L224" href="#L224">224</a>         env.info(<span class="jxr_string">"Merging %s identical %s implementations with constructor %s to type %s"</span>, toMerge.size(),
-<a class="jxr_linenumber" name="L225" href="#L225">225</a>             key.getLeft(), key.getRight(), target);
-<a class="jxr_linenumber" name="L226" href="#L226">226</a> 
-<a class="jxr_linenumber" name="L227" href="#L227">227</a>         <strong class="jxr_keyword">final</strong> Map&lt;String, Map&lt;String, ClassWrapper&gt;&gt; byEnclosingClass = byEnclosingClass(toMerge);
-<a class="jxr_linenumber" name="L228" href="#L228">228</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> Map.Entry&lt;String, Map&lt;String, ClassWrapper&gt;&gt; entry : byEnclosingClass.entrySet()) {
-<a class="jxr_linenumber" name="L229" href="#L229">229</a>             <strong class="jxr_keyword">final</strong> String <strong class="jxr_keyword">outer</strong> = entry.getKey();
-<a class="jxr_linenumber" name="L230" href="#L230">230</a>             env.debug(<span class="jxr_string">"Normalizing %s inner classes of %s"</span>, entry.getValue().size(), <strong class="jxr_keyword">outer</strong>);
-<a class="jxr_linenumber" name="L231" href="#L231">231</a>             <strong class="jxr_keyword">final</strong> Map&lt;String, String&gt; classMap = <strong class="jxr_keyword">new</strong> HashMap&lt;String, String&gt;();
-<a class="jxr_linenumber" name="L232" href="#L232">232</a>             <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> String merged : entry.getValue().keySet()) {
-<a class="jxr_linenumber" name="L233" href="#L233">233</a>                 classMap.put(merged, target);
-<a class="jxr_linenumber" name="L234" href="#L234">234</a>             }
-<a class="jxr_linenumber" name="L235" href="#L235">235</a>             <strong class="jxr_keyword">final</strong> Remapper remapper = <strong class="jxr_keyword">new</strong> SimpleRemapper(classMap);
-<a class="jxr_linenumber" name="L236" href="#L236">236</a> 
-<a class="jxr_linenumber" name="L237" href="#L237">237</a>             InputStream enclosingBytecode = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L238" href="#L238">238</a>             <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L239" href="#L239">239</a>                 enclosingBytecode = env.getClassfile(<strong class="jxr_keyword">outer</strong>).getInputStream();
-<a class="jxr_linenumber" name="L240" href="#L240">240</a>                 <strong class="jxr_keyword">final</strong> ClassReader reader = <strong class="jxr_keyword">new</strong> ClassReader(enclosingBytecode);
-<a class="jxr_linenumber" name="L241" href="#L241">241</a> 
-<a class="jxr_linenumber" name="L242" href="#L242">242</a>                 <strong class="jxr_keyword">final</strong> ClassVisitor cv = <em class="jxr_comment">// NOPMD</em>
-<a class="jxr_linenumber" name="L243" href="#L243">243</a>                         <strong class="jxr_keyword">new</strong> RemappingClassAdapter(<strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">WriteClass</a>(reader), remapper) {
-<a class="jxr_linenumber" name="L244" href="#L244">244</a> 
-<a class="jxr_linenumber" name="L245" href="#L245">245</a>                     @Override
-<a class="jxr_linenumber" name="L246" href="#L246">246</a>                     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> visitInnerClass(<strong class="jxr_keyword">final</strong> String name, <strong class="jxr_keyword">final</strong> String outerName, <strong class="jxr_keyword">final</strong> String innerName,
-<a class="jxr_linenumber" name="L247" href="#L247">247</a>                         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> access) {
-<a class="jxr_linenumber" name="L248" href="#L248">248</a>                         <strong class="jxr_keyword">if</strong> (!classMap.containsKey(name)) {
-<a class="jxr_linenumber" name="L249" href="#L249">249</a>                             <strong class="jxr_keyword">super</strong>.visitInnerClass(name, outerName, innerName, access);
-<a class="jxr_linenumber" name="L250" href="#L250">250</a>                         }
-<a class="jxr_linenumber" name="L251" href="#L251">251</a>                     }
-<a class="jxr_linenumber" name="L252" href="#L252">252</a> 
-<a class="jxr_linenumber" name="L253" href="#L253">253</a>                     @Override
-<a class="jxr_linenumber" name="L254" href="#L254">254</a>                     <strong class="jxr_keyword">public</strong> MethodVisitor visitMethod(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> access, <strong class="jxr_keyword">final</strong> String name, <strong class="jxr_keyword">final</strong> String desc,
-<a class="jxr_linenumber" name="L255" href="#L255">255</a>                         <strong class="jxr_keyword">final</strong> String signature, <strong class="jxr_keyword">final</strong> String[] exceptions) {
-<a class="jxr_linenumber" name="L256" href="#L256">256</a>                         <strong class="jxr_keyword">final</strong> MethodVisitor mv = <em class="jxr_comment">// NOPMD</em>
-<a class="jxr_linenumber" name="L257" href="#L257">257</a>                                 <strong class="jxr_keyword">super</strong>.visitMethod(access, name, desc, signature, exceptions);
-<a class="jxr_linenumber" name="L258" href="#L258">258</a>                         <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> MethodVisitor(Opcodes.ASM4, mv) {
-<a class="jxr_linenumber" name="L259" href="#L259">259</a>                             @Override
-<a class="jxr_linenumber" name="L260" href="#L260">260</a>                             <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> visitMethodInsn(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> opcode, <strong class="jxr_keyword">final</strong> String owner, <strong class="jxr_keyword">final</strong> String name,
-<a class="jxr_linenumber" name="L261" href="#L261">261</a>                                 <strong class="jxr_keyword">final</strong> String desc) {
-<a class="jxr_linenumber" name="L262" href="#L262">262</a>                                 String useDescriptor = desc;
-<a class="jxr_linenumber" name="L263" href="#L263">263</a>                                 <strong class="jxr_keyword">if</strong> (INIT.equals(name)) {
-<a class="jxr_linenumber" name="L264" href="#L264">264</a>                                     <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">ClassWrapper</a> wrapper = entry.getValue().get(owner);
-<a class="jxr_linenumber" name="L265" href="#L265">265</a>                                     <strong class="jxr_keyword">if</strong> (wrapper != <strong class="jxr_keyword">null</strong> &amp;&amp; wrapper.mustRewriteConstructor) {
-<a class="jxr_linenumber" name="L266" href="#L266">266</a>                                         <em class="jxr_comment">// simply replace first argument type with OBJECT_TYPE:</em>
-<a class="jxr_linenumber" name="L267" href="#L267">267</a>                                         <strong class="jxr_keyword">final</strong> Type[] args = Type.getArgumentTypes(desc);
-<a class="jxr_linenumber" name="L268" href="#L268">268</a>                                         args[0] = OBJECT_TYPE;
-<a class="jxr_linenumber" name="L269" href="#L269">269</a>                                         useDescriptor = <strong class="jxr_keyword">new</strong> Method(INIT, Type.VOID_TYPE, args).getDescriptor();
-<a class="jxr_linenumber" name="L270" href="#L270">270</a>                                     }
-<a class="jxr_linenumber" name="L271" href="#L271">271</a>                                 }
-<a class="jxr_linenumber" name="L272" href="#L272">272</a>                                 <strong class="jxr_keyword">super</strong>.visitMethodInsn(opcode, owner, name, useDescriptor);
-<a class="jxr_linenumber" name="L273" href="#L273">273</a>                             }
-<a class="jxr_linenumber" name="L274" href="#L274">274</a>                         };
-<a class="jxr_linenumber" name="L275" href="#L275">275</a>                     }
-<a class="jxr_linenumber" name="L276" href="#L276">276</a>                 };
-<a class="jxr_linenumber" name="L277" href="#L277">277</a> 
-<a class="jxr_linenumber" name="L278" href="#L278">278</a>                 reader.accept(cv, 0);
-<a class="jxr_linenumber" name="L279" href="#L279">279</a>             } <strong class="jxr_keyword">finally</strong> {
-<a class="jxr_linenumber" name="L280" href="#L280">280</a>                 IOUtils.closeQuietly(enclosingBytecode);
-<a class="jxr_linenumber" name="L281" href="#L281">281</a>             }
-<a class="jxr_linenumber" name="L282" href="#L282">282</a>             <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> String merged : entry.getValue().keySet()) {
-<a class="jxr_linenumber" name="L283" href="#L283">283</a>                 <strong class="jxr_keyword">if</strong> (env.deleteClassfile(merged)) {
-<a class="jxr_linenumber" name="L284" href="#L284">284</a>                     env.debug(<span class="jxr_string">"Deleted class %s"</span>, merged);
-<a class="jxr_linenumber" name="L285" href="#L285">285</a>                 } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L286" href="#L286">286</a>                     env.warn(<span class="jxr_string">"Unable to delete class %s"</span>, merged);
-<a class="jxr_linenumber" name="L287" href="#L287">287</a>                 }
-<a class="jxr_linenumber" name="L288" href="#L288">288</a>             }
-<a class="jxr_linenumber" name="L289" href="#L289">289</a>         }
+<a class="jxr_linenumber" name="L149" href="#L149">149</a>             <strong class="jxr_keyword">final</strong> DataSource classfile = env.getClassfile(className);
+<a class="jxr_linenumber" name="L150" href="#L150">150</a>             env.debug(<span class="jxr_string">"Writing class %s to %s"</span>, className, classfile.getName());
+<a class="jxr_linenumber" name="L151" href="#L151">151</a>             OutputStream outputStream = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L152" href="#L152">152</a>             <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L153" href="#L153">153</a>                 outputStream = classfile.getOutputStream();
+<a class="jxr_linenumber" name="L154" href="#L154">154</a>                 IOUtils.write(bytecode, outputStream);
+<a class="jxr_linenumber" name="L155" href="#L155">155</a>             } <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> IOException e) {
+<a class="jxr_linenumber" name="L156" href="#L156">156</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> RuntimeException(e);
+<a class="jxr_linenumber" name="L157" href="#L157">157</a>             } <strong class="jxr_keyword">finally</strong> {
+<a class="jxr_linenumber" name="L158" href="#L158">158</a>                 IOUtils.closeQuietly(outputStream);
+<a class="jxr_linenumber" name="L159" href="#L159">159</a>             }
+<a class="jxr_linenumber" name="L160" href="#L160">160</a>         }
+<a class="jxr_linenumber" name="L161" href="#L161">161</a>     }
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> 
+<a class="jxr_linenumber" name="L163" href="#L163">163</a>     <strong class="jxr_keyword">private</strong> enum <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">IneligibilityReason</a> {
+<a class="jxr_linenumber" name="L164" href="#L164">164</a>         NOT_ANONYMOUS, TOO_MANY_CONSTRUCTORS, IMPLEMENTS_METHODS, TOO_BUSY_CONSTRUCTOR;
+<a class="jxr_linenumber" name="L165" href="#L165">165</a>     }
+<a class="jxr_linenumber" name="L166" href="#L166">166</a> 
+<a class="jxr_linenumber" name="L167" href="#L167">167</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L168" href="#L168">168</a> <em class="jxr_javadoccomment">     * Configuration prefix for this {@link Weaver}.</em>
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L170" href="#L170">170</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String CONFIG_WEAVER = <span class="jxr_string">"normalizer."</span>;
+<a class="jxr_linenumber" name="L171" href="#L171">171</a> 
+<a class="jxr_linenumber" name="L172" href="#L172">172</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> <em class="jxr_javadoccomment">     * Property name referencing a comma-delimited list of types whose subclasses/implementations should be normalized,</em>
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> <em class="jxr_javadoccomment">     * e.g. {@code javax.enterprise.util.TypeLiteral}.</em>
+<a class="jxr_linenumber" name="L175" href="#L175">175</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L176" href="#L176">176</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String CONFIG_SUPER_TYPES = CONFIG_WEAVER + <span class="jxr_string">"superTypes"</span>;
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> 
+<a class="jxr_linenumber" name="L178" href="#L178">178</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L179" href="#L179">179</a> <em class="jxr_javadoccomment">     * Property name referencing a package name to which merged types should be added.</em>
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L181" href="#L181">181</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String CONFIG_TARGET_PACKAGE = CONFIG_WEAVER + <span class="jxr_string">"targetPackage"</span>;
+<a class="jxr_linenumber" name="L182" href="#L182">182</a> 
+<a class="jxr_linenumber" name="L183" href="#L183">183</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Charset UTF8 = Charset.forName(CharEncoding.UTF_8);
+<a class="jxr_linenumber" name="L184" href="#L184">184</a> 
+<a class="jxr_linenumber" name="L185" href="#L185">185</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/weaver/model/WeaveEnvironment.html">WeaveEnvironment</a> env;
+<a class="jxr_linenumber" name="L186" href="#L186">186</a> 
+<a class="jxr_linenumber" name="L187" href="#L187">187</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Set&lt;Class&lt;?&gt;&gt; normalizeTypes;
+<a class="jxr_linenumber" name="L188" href="#L188">188</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String targetPackage;
+<a class="jxr_linenumber" name="L189" href="#L189">189</a> 
+<a class="jxr_linenumber" name="L190" href="#L190">190</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L191" href="#L191">191</a> <em class="jxr_javadoccomment">     * Create a new {@link Normalizer} instance.</em>
+<a class="jxr_linenumber" name="L192" href="#L192">192</a> <em class="jxr_javadoccomment">     * @param env {@link WeaveEnvironment}</em>
+<a class="jxr_linenumber" name="L193" href="#L193">193</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L194" href="#L194">194</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">Normalizer</a>(<strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/weaver/model/WeaveEnvironment.html">WeaveEnvironment</a> env) {
+<a class="jxr_linenumber" name="L195" href="#L195">195</a>         <strong class="jxr_keyword">this</strong>.env = env;
+<a class="jxr_linenumber" name="L196" href="#L196">196</a> 
+<a class="jxr_linenumber" name="L197" href="#L197">197</a>         <strong class="jxr_keyword">this</strong>.targetPackage =
+<a class="jxr_linenumber" name="L198" href="#L198">198</a>             Utils.validatePackageName(Validate.notBlank(env.config.getProperty(CONFIG_TARGET_PACKAGE),
+<a class="jxr_linenumber" name="L199" href="#L199">199</a>                 <span class="jxr_string">"missing target package name"</span>));
+<a class="jxr_linenumber" name="L200" href="#L200">200</a>         <strong class="jxr_keyword">this</strong>.normalizeTypes =
+<a class="jxr_linenumber" name="L201" href="#L201">201</a>             Utils.parseTypes(
+<a class="jxr_linenumber" name="L202" href="#L202">202</a>                 Validate.notEmpty(env.config.getProperty(CONFIG_SUPER_TYPES), <span class="jxr_string">"no types specified for normalization"</span>),
+<a class="jxr_linenumber" name="L203" href="#L203">203</a>                 env.classLoader);
+<a class="jxr_linenumber" name="L204" href="#L204">204</a>     }
+<a class="jxr_linenumber" name="L205" href="#L205">205</a> 
+<a class="jxr_linenumber" name="L206" href="#L206">206</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L207" href="#L207">207</a> <em class="jxr_javadoccomment">     * Normalize the classes found using the specified {@link Scanner}.</em>
+<a class="jxr_linenumber" name="L208" href="#L208">208</a> <em class="jxr_javadoccomment">     * @param scanner to scan with</em>
+<a class="jxr_linenumber" name="L209" href="#L209">209</a> <em class="jxr_javadoccomment">     * @return whether any work was done</em>
+<a class="jxr_linenumber" name="L210" href="#L210">210</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L211" href="#L211">211</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> normalize(<strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/weaver/model/Scanner.html">Scanner</a> scanner) {
+<a class="jxr_linenumber" name="L212" href="#L212">212</a>         <strong class="jxr_keyword">boolean</strong> result = false;
+<a class="jxr_linenumber" name="L213" href="#L213">213</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> Class&lt;?&gt; supertype : normalizeTypes) {
+<a class="jxr_linenumber" name="L214" href="#L214">214</a>             <strong class="jxr_keyword">final</strong> Set&lt;Class&lt;?&gt;&gt; subtypes = getBroadlyEligibleSubclasses(supertype, scanner);
+<a class="jxr_linenumber" name="L215" href="#L215">215</a>             <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L216" href="#L216">216</a>                 <strong class="jxr_keyword">final</strong> Map&lt;Pair&lt;String, String&gt;, Set&lt;ClassWrapper&gt;&gt; segregatedSubtypes = segregate(subtypes);
+<a class="jxr_linenumber" name="L217" href="#L217">217</a>                 <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> Map.Entry&lt;Pair&lt;String, String&gt;, Set&lt;ClassWrapper&gt;&gt; entry : segregatedSubtypes.entrySet()) {
+<a class="jxr_linenumber" name="L218" href="#L218">218</a>                     <strong class="jxr_keyword">final</strong> Set&lt;ClassWrapper&gt; likeTypes = entry.getValue();
+<a class="jxr_linenumber" name="L219" href="#L219">219</a>                     <strong class="jxr_keyword">if</strong> (likeTypes.size() &gt; 1) {
+<a class="jxr_linenumber" name="L220" href="#L220">220</a>                         result = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L221" href="#L221">221</a>                         rewrite(entry.getKey(), likeTypes);
+<a class="jxr_linenumber" name="L222" href="#L222">222</a>                     }
+<a class="jxr_linenumber" name="L223" href="#L223">223</a>                 }
+<a class="jxr_linenumber" name="L224" href="#L224">224</a>             } <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> RuntimeException e) {
+<a class="jxr_linenumber" name="L225" href="#L225">225</a>                 <strong class="jxr_keyword">throw</strong> e;
+<a class="jxr_linenumber" name="L226" href="#L226">226</a>             } <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> Exception e) {
+<a class="jxr_linenumber" name="L227" href="#L227">227</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> RuntimeException(e);
+<a class="jxr_linenumber" name="L228" href="#L228">228</a>             }
+<a class="jxr_linenumber" name="L229" href="#L229">229</a>         }
+<a class="jxr_linenumber" name="L230" href="#L230">230</a>         <strong class="jxr_keyword">return</strong> result;
+<a class="jxr_linenumber" name="L231" href="#L231">231</a>     }
+<a class="jxr_linenumber" name="L232" href="#L232">232</a> 
+<a class="jxr_linenumber" name="L233" href="#L233">233</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L234" href="#L234">234</a> <em class="jxr_javadoccomment">     * Map a set of classes by their enclosing class.</em>
+<a class="jxr_linenumber" name="L235" href="#L235">235</a> <em class="jxr_javadoccomment">     * @param sort values</em>
+<a class="jxr_linenumber" name="L236" href="#L236">236</a> <em class="jxr_javadoccomment">     * @return {@link Map} of enclosing classname to {@link Map} of internal name to {@link ClassWrapper}</em>
+<a class="jxr_linenumber" name="L237" href="#L237">237</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L238" href="#L238">238</a>     <strong class="jxr_keyword">private</strong> Map&lt;String, Map&lt;String, ClassWrapper&gt;&gt; byEnclosingClass(<strong class="jxr_keyword">final</strong> Set&lt;ClassWrapper&gt; sort) {
+<a class="jxr_linenumber" name="L239" href="#L239">239</a>         <strong class="jxr_keyword">final</strong> Map&lt;String, Map&lt;String, ClassWrapper&gt;&gt; result = <strong class="jxr_keyword">new</strong> HashMap&lt;String, Map&lt;String, ClassWrapper&gt;&gt;();
+<a class="jxr_linenumber" name="L240" href="#L240">240</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> ClassWrapper wrapper : sort) {
+<a class="jxr_linenumber" name="L241" href="#L241">241</a>             <strong class="jxr_keyword">final</strong> String <strong class="jxr_keyword">outer</strong> = wrapper.wrapped.getEnclosingClass().getName();
+<a class="jxr_linenumber" name="L242" href="#L242">242</a>             Map&lt;String, ClassWrapper&gt; map = result.get(<strong class="jxr_keyword">outer</strong>);
+<a class="jxr_linenumber" name="L243" href="#L243">243</a>             <strong class="jxr_keyword">if</strong> (map == <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L244" href="#L244">244</a>                 map = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String, Normalizer.ClassWrapper&gt;();
+<a class="jxr_linenumber" name="L245" href="#L245">245</a>                 result.put(<strong class="jxr_keyword">outer</strong>, map);
+<a class="jxr_linenumber" name="L246" href="#L246">246</a>             }
+<a class="jxr_linenumber" name="L247" href="#L247">247</a>             map.put(wrapper.wrapped.getName().replace('.', '/'), wrapper);
+<a class="jxr_linenumber" name="L248" href="#L248">248</a>         }
+<a class="jxr_linenumber" name="L249" href="#L249">249</a>         <strong class="jxr_keyword">return</strong> result;
+<a class="jxr_linenumber" name="L250" href="#L250">250</a>     }
+<a class="jxr_linenumber" name="L251" href="#L251">251</a> 
+<a class="jxr_linenumber" name="L252" href="#L252">252</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L253" href="#L253">253</a> <em class="jxr_javadoccomment">     * Rewrite classes as indicated by one entry of {@link #segregate(Iterable)}.</em>
+<a class="jxr_linenumber" name="L254" href="#L254">254</a> <em class="jxr_javadoccomment">     * @param key {@link String} {@link Pair} indicating supertype and constructor signature</em>
+<a class="jxr_linenumber" name="L255" href="#L255">255</a> <em class="jxr_javadoccomment">     * @param toMerge matching classes</em>
+<a class="jxr_linenumber" name="L256" href="#L256">256</a> <em class="jxr_javadoccomment">     * @throws IOException on I/O error</em>
+<a class="jxr_linenumber" name="L257" href="#L257">257</a> <em class="jxr_javadoccomment">     * @throws ClassNotFoundException if class not found</em>
+<a class="jxr_linenumber" name="L258" href="#L258">258</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L259" href="#L259">259</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> rewrite(<strong class="jxr_keyword">final</strong> Pair&lt;String, String&gt; key, <strong class="jxr_keyword">final</strong> Set&lt;ClassWrapper&gt; toMerge) <strong class="jxr_keyword">throws</strong> IOException,
+<a class="jxr_linenumber" name="L260" href="#L260">260</a>         ClassNotFoundException {
+<a class="jxr_linenumber" name="L261" href="#L261">261</a>         <strong class="jxr_keyword">final</strong> String target = copy(key, toMerge.iterator().next());
+<a class="jxr_linenumber" name="L262" href="#L262">262</a>         env.info(<span class="jxr_string">"Merging %s identical %s implementations with constructor %s to type %s"</span>, toMerge.size(),
+<a class="jxr_linenumber" name="L263" href="#L263">263</a>             key.getLeft(), key.getRight(), target);
+<a class="jxr_linenumber" name="L264" href="#L264">264</a> 
+<a class="jxr_linenumber" name="L265" href="#L265">265</a>         <strong class="jxr_keyword">final</strong> Map&lt;String, Map&lt;String, ClassWrapper&gt;&gt; byEnclosingClass = byEnclosingClass(toMerge);
+<a class="jxr_linenumber" name="L266" href="#L266">266</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> Map.Entry&lt;String, Map&lt;String, ClassWrapper&gt;&gt; entry : byEnclosingClass.entrySet()) {
+<a class="jxr_linenumber" name="L267" href="#L267">267</a>             <strong class="jxr_keyword">final</strong> String <strong class="jxr_keyword">outer</strong> = entry.getKey();
+<a class="jxr_linenumber" name="L268" href="#L268">268</a>             env.debug(<span class="jxr_string">"Normalizing %s inner classes of %s"</span>, entry.getValue().size(), <strong class="jxr_keyword">outer</strong>);
+<a class="jxr_linenumber" name="L269" href="#L269">269</a>             <strong class="jxr_keyword">final</strong> Map&lt;String, String&gt; classMap = <strong class="jxr_keyword">new</strong> HashMap&lt;String, String&gt;();
+<a class="jxr_linenumber" name="L270" href="#L270">270</a>             <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> String merged : entry.getValue().keySet()) {
+<a class="jxr_linenumber" name="L271" href="#L271">271</a>                 classMap.put(merged, target);
+<a class="jxr_linenumber" name="L272" href="#L272">272</a>             }
+<a class="jxr_linenumber" name="L273" href="#L273">273</a>             <strong class="jxr_keyword">final</strong> Remapper remapper = <strong class="jxr_keyword">new</strong> SimpleRemapper(classMap);
+<a class="jxr_linenumber" name="L274" href="#L274">274</a> 
+<a class="jxr_linenumber" name="L275" href="#L275">275</a>             InputStream enclosingBytecode = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L276" href="#L276">276</a>             <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L277" href="#L277">277</a>                 enclosingBytecode = env.getClassfile(<strong class="jxr_keyword">outer</strong>).getInputStream();
+<a class="jxr_linenumber" name="L278" href="#L278">278</a>                 <strong class="jxr_keyword">final</strong> ClassReader reader = <strong class="jxr_keyword">new</strong> ClassReader(enclosingBytecode);
+<a class="jxr_linenumber" name="L279" href="#L279">279</a> 
+<a class="jxr_linenumber" name="L280" href="#L280">280</a>                 <strong class="jxr_keyword">final</strong> ClassVisitor cv = <em class="jxr_comment">// NOPMD</em>
+<a class="jxr_linenumber" name="L281" href="#L281">281</a>                         <strong class="jxr_keyword">new</strong> RemappingClassAdapter(<strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">WriteClass</a>(reader), remapper) {
+<a class="jxr_linenumber" name="L282" href="#L282">282</a> 
+<a class="jxr_linenumber" name="L283" href="#L283">283</a>                     @Override
+<a class="jxr_linenumber" name="L284" href="#L284">284</a>                     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> visitInnerClass(<strong class="jxr_keyword">final</strong> String name, <strong class="jxr_keyword">final</strong> String outerName, <strong class="jxr_keyword">final</strong> String innerName,
+<a class="jxr_linenumber" name="L285" href="#L285">285</a>                         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> access) {
+<a class="jxr_linenumber" name="L286" href="#L286">286</a>                         <strong class="jxr_keyword">if</strong> (!classMap.containsKey(name)) {
+<a class="jxr_linenumber" name="L287" href="#L287">287</a>                             <strong class="jxr_keyword">super</strong>.visitInnerClass(name, outerName, innerName, access);
+<a class="jxr_linenumber" name="L288" href="#L288">288</a>                         }
+<a class="jxr_linenumber" name="L289" href="#L289">289</a>                     }
 <a class="jxr_linenumber" name="L290" href="#L290">290</a> 
-<a class="jxr_linenumber" name="L291" href="#L291">291</a>     }
-<a class="jxr_linenumber" name="L292" href="#L292">292</a> 
-<a class="jxr_linenumber" name="L293" href="#L293">293</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L294" href="#L294">294</a> <em class="jxr_javadoccomment">     * &lt;p&gt;Find subclasses/implementors of {code supertype} that:</em>
-<a class="jxr_linenumber" name="L295" href="#L295">295</a> <em class="jxr_javadoccomment">     * &lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L296" href="#L296">296</a> <em class="jxr_javadoccomment">     * &lt;li&gt;are anonymous&lt;/li&gt;</em>
-<a class="jxr_linenumber" name="L297" href="#L297">297</a> <em class="jxr_javadoccomment">     * &lt;li&gt;declare a single constructor (probably redundant in the case of an anonymous class)&lt;/li&gt;</em>
-<a class="jxr_linenumber" name="L298" href="#L298">298</a> <em class="jxr_javadoccomment">     * &lt;li&gt;do not implement any methods&lt;/li&gt;</em>
-<a class="jxr_linenumber" name="L299" href="#L299">299</a> <em class="jxr_javadoccomment">     * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L300" href="#L300">300</a> <em class="jxr_javadoccomment">     * &lt;/p&gt;&lt;p&gt;</em>
-<a class="jxr_linenumber" name="L301" href="#L301">301</a> <em class="jxr_javadoccomment">     * Considered "broadly" eligible because the instructions in the implemented constructor may remove the class from</em>
-<a class="jxr_linenumber" name="L302" href="#L302">302</a> <em class="jxr_javadoccomment">     * consideration later on.</em>
-<a class="jxr_linenumber" name="L303" href="#L303">303</a> <em class="jxr_javadoccomment">     * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L304" href="#L304">304</a> <em class="jxr_javadoccomment">     * @param supertype whose subtypes are sought</em>
-<a class="jxr_linenumber" name="L305" href="#L305">305</a> <em class="jxr_javadoccomment">     * @param scanner to use</em>
-<a class="jxr_linenumber" name="L306" href="#L306">306</a> <em class="jxr_javadoccomment">     * @return {@link Set} of {@link Class}</em>
-<a class="jxr_linenumber" name="L307" href="#L307">307</a> <em class="jxr_javadoccomment">     * @see #segregate(Iterable)</em>
-<a class="jxr_linenumber" name="L308" href="#L308">308</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L309" href="#L309">309</a>     <strong class="jxr_keyword">private</strong> Set&lt;Class&lt;?&gt;&gt; getBroadlyEligibleSubclasses(<strong class="jxr_keyword">final</strong> Class&lt;?&gt; supertype, <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/weaver/model/Scanner.html">Scanner</a> scanner) {
-<a class="jxr_linenumber" name="L310" href="#L310">310</a>         <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/weaver/model/ScanResult.html">ScanResult</a> scanResult = scanner.scan(<strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/commons/weaver/model/ScanRequest.html">ScanRequest</a>().addSupertypes(supertype));
-<a class="jxr_linenumber" name="L311" href="#L311">311</a>         <strong class="jxr_keyword">final</strong> Set&lt;Class&lt;?&gt;&gt; result = <strong class="jxr_keyword">new</strong> LinkedHashSet&lt;Class&lt;?&gt;&gt;();
-<a class="jxr_linenumber" name="L312" href="#L312">312</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> WeavableClass&lt;?&gt; cls : scanResult.getClasses()) {
-<a class="jxr_linenumber" name="L313" href="#L313">313</a>             <strong class="jxr_keyword">final</strong> Class&lt;?&gt; subtype = cls.getTarget();
-<a class="jxr_linenumber" name="L314" href="#L314">314</a>             <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">IneligibilityReason</a> reason;
-<a class="jxr_linenumber" name="L315" href="#L315">315</a>             <strong class="jxr_keyword">if</strong> (!subtype.isAnonymousClass()) {
-<a class="jxr_linenumber" name="L316" href="#L316">316</a>                 reason = IneligibilityReason.NOT_ANONYMOUS;
-<a class="jxr_linenumber" name="L317" href="#L317">317</a>             } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (subtype.getDeclaredConstructors().length != 1) {
-<a class="jxr_linenumber" name="L318" href="#L318">318</a>                 reason = IneligibilityReason.TOO_MANY_CONSTRUCTORS;
-<a class="jxr_linenumber" name="L319" href="#L319">319</a>             } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (subtype.getDeclaredMethods().length &gt; 0) {
-<a class="jxr_linenumber" name="L320" href="#L320">320</a>                 reason = IneligibilityReason.IMPLEMENTS_METHODS;
-<a class="jxr_linenumber" name="L321" href="#L321">321</a>             } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L322" href="#L322">322</a>                 result.add(subtype);
-<a class="jxr_linenumber" name="L323" href="#L323">323</a>                 <strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="L324" href="#L324">324</a>             }
-<a class="jxr_linenumber" name="L325" href="#L325">325</a>             env.debug(<span class="jxr_string">"Removed %s from consideration due to %s"</span>, subtype, reason);
-<a class="jxr_linenumber" name="L326" href="#L326">326</a>         }
-<a class="jxr_linenumber" name="L327" href="#L327">327</a>         <strong class="jxr_keyword">return</strong> result;
-<a class="jxr_linenumber" name="L328" href="#L328">328</a>     }
+<a class="jxr_linenumber" name="L291" href="#L291">291</a>                     @Override
+<a class="jxr_linenumber" name="L292" href="#L292">292</a>                     <strong class="jxr_keyword">public</strong> MethodVisitor visitMethod(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> access, <strong class="jxr_keyword">final</strong> String name, <strong class="jxr_keyword">final</strong> String desc,
+<a class="jxr_linenumber" name="L293" href="#L293">293</a>                         <strong class="jxr_keyword">final</strong> String signature, <strong class="jxr_keyword">final</strong> String[] exceptions) {
+<a class="jxr_linenumber" name="L294" href="#L294">294</a>                         <strong class="jxr_keyword">final</strong> MethodVisitor mv = <em class="jxr_comment">// NOPMD</em>
+<a class="jxr_linenumber" name="L295" href="#L295">295</a>                                 <strong class="jxr_keyword">super</strong>.visitMethod(access, name, desc, signature, exceptions);
+<a class="jxr_linenumber" name="L296" href="#L296">296</a>                         <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> MethodVisitor(Opcodes.ASM5, mv) {
+<a class="jxr_linenumber" name="L297" href="#L297">297</a> 
+<a class="jxr_linenumber" name="L298" href="#L298">298</a>                             @Override
+<a class="jxr_linenumber" name="L299" href="#L299">299</a>                             <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> visitMethodInsn(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> opcode, <strong class="jxr_keyword">final</strong> String owner, <strong class="jxr_keyword">final</strong> String name,
+<a class="jxr_linenumber" name="L300" href="#L300">300</a>                                 <strong class="jxr_keyword">final</strong> String desc, <strong class="jxr_keyword">boolean</strong> itf) {
+<a class="jxr_linenumber" name="L301" href="#L301">301</a>                                 String useDescriptor = desc;
+<a class="jxr_linenumber" name="L302" href="#L302">302</a>                                 <strong class="jxr_keyword">if</strong> (INIT.equals(name)) {
+<a class="jxr_linenumber" name="L303" href="#L303">303</a>                                     <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">ClassWrapper</a> wrapper = entry.getValue().get(owner);
+<a class="jxr_linenumber" name="L304" href="#L304">304</a>                                     <strong class="jxr_keyword">if</strong> (wrapper != <strong class="jxr_keyword">null</strong> &amp;&amp; wrapper.mustRewriteConstructor) {
+<a class="jxr_linenumber" name="L305" href="#L305">305</a>                                         <em class="jxr_comment">// simply replace first argument type with OBJECT_TYPE:</em>
+<a class="jxr_linenumber" name="L306" href="#L306">306</a>                                         <strong class="jxr_keyword">final</strong> Type[] args = Type.getArgumentTypes(desc);
+<a class="jxr_linenumber" name="L307" href="#L307">307</a>                                         args[0] = OBJECT_TYPE;
+<a class="jxr_linenumber" name="L308" href="#L308">308</a>                                         useDescriptor = <strong class="jxr_keyword">new</strong> Method(INIT, Type.VOID_TYPE, args).getDescriptor();
+<a class="jxr_linenumber" name="L309" href="#L309">309</a>                                     }
+<a class="jxr_linenumber" name="L310" href="#L310">310</a>                                 }
+<a class="jxr_linenumber" name="L311" href="#L311">311</a>                                 <strong class="jxr_keyword">super</strong>.visitMethodInsn(opcode, owner, name, useDescriptor, itf);
+<a class="jxr_linenumber" name="L312" href="#L312">312</a>                             }
+<a class="jxr_linenumber" name="L313" href="#L313">313</a>                         };
+<a class="jxr_linenumber" name="L314" href="#L314">314</a>                     }
+<a class="jxr_linenumber" name="L315" href="#L315">315</a>                 };
+<a class="jxr_linenumber" name="L316" href="#L316">316</a> 
+<a class="jxr_linenumber" name="L317" href="#L317">317</a>                 reader.accept(cv, 0);
+<a class="jxr_linenumber" name="L318" href="#L318">318</a>             } <strong class="jxr_keyword">finally</strong> {
+<a class="jxr_linenumber" name="L319" href="#L319">319</a>                 IOUtils.closeQuietly(enclosingBytecode);
+<a class="jxr_linenumber" name="L320" href="#L320">320</a>             }
+<a class="jxr_linenumber" name="L321" href="#L321">321</a>             <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> String merged : entry.getValue().keySet()) {
+<a class="jxr_linenumber" name="L322" href="#L322">322</a>                 <strong class="jxr_keyword">if</strong> (env.deleteClassfile(merged)) {
+<a class="jxr_linenumber" name="L323" href="#L323">323</a>                     env.debug(<span class="jxr_string">"Deleted class %s"</span>, merged);
+<a class="jxr_linenumber" name="L324" href="#L324">324</a>                 } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="L325" href="#L325">325</a>                     env.warn(<span class="jxr_string">"Unable to delete class %s"</span>, merged);
+<a class="jxr_linenumber" name="L326" href="#L326">326</a>                 }
+<a class="jxr_linenumber" name="L327" href="#L327">327</a>             }
+<a class="jxr_linenumber" name="L328" href="#L328">328</a>         }
 <a class="jxr_linenumber" name="L329" href="#L329">329</a> 
-<a class="jxr_linenumber" name="L330" href="#L330">330</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L331" href="#L331">331</a> <em class="jxr_javadoccomment">     * &lt;p&gt;Segregate a number of classes (presumed subclasses/implementors of a</em>
-<a class="jxr_linenumber" name="L332" href="#L332">332</a> <em class="jxr_javadoccomment">     * common supertype/interface). The keys of the map consist of the important</em>
-<a class="jxr_linenumber" name="L333" href="#L333">333</a> <em class="jxr_javadoccomment">     * parts for identifying similar anonymous types: the "signature" and the</em>
-<a class="jxr_linenumber" name="L334" href="#L334">334</a> <em class="jxr_javadoccomment">     * invoked superclass constructor. For our purposes, the signature consists</em>
-<a class="jxr_linenumber" name="L335" href="#L335">335</a> <em class="jxr_javadoccomment">     * of the first applicable item of:</em>
-<a class="jxr_linenumber" name="L336" href="#L336">336</a> <em class="jxr_javadoccomment">     * &lt;ol&gt;</em>
-<a class="jxr_linenumber" name="L337" href="#L337">337</a> <em class="jxr_javadoccomment">     * &lt;li&gt;The generic signature of the class&lt;/li&gt;</em>
-<a class="jxr_linenumber" name="L338" href="#L338">338</a> <em class="jxr_javadoccomment">     * &lt;li&gt;The sole implemented interface&lt;/li&gt;</em>
-<a class="jxr_linenumber" name="L339" href="#L339">339</a> <em class="jxr_javadoccomment">     * &lt;li&gt;The superclass&lt;/li&gt;</em>
-<a class="jxr_linenumber" name="L340" href="#L340">340</a> <em class="jxr_javadoccomment">     * &lt;/ol&gt;</em>
-<a class="jxr_linenumber" name="L341" href="#L341">341</a> <em class="jxr_javadoccomment">     * &lt;/p&gt;&lt;p&gt;</em>
-<a class="jxr_linenumber" name="L342" href="#L342">342</a> <em class="jxr_javadoccomment">     * The class will be considered ineligible if its constructor is too "busy" as its side effects cannot be</em>
-<a class="jxr_linenumber" name="L343" href="#L343">343</a> <em class="jxr_javadoccomment">     * anticipated; the normalizer will err on the side of caution.</em>
-<a class="jxr_linenumber" name="L344" href="#L344">344</a> <em class="jxr_javadoccomment">     * &lt;/p&gt;&lt;p&gt;</em>
-<a class="jxr_linenumber" name="L345" href="#L345">345</a> <em class="jxr_javadoccomment">     * Further, we will here avail ourselves of the opportunity to discard any types we have already normalized.</em>
-<a class="jxr_linenumber" name="L346" href="#L346">346</a> <em class="jxr_javadoccomment">     * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L347" href="#L347">347</a> <em class="jxr_javadoccomment">     * @param subtypes</em>
-<a class="jxr_linenumber" name="L348" href="#L348">348</a> <em class="jxr_javadoccomment">     * @return Map of Pair&lt;String, String&gt; to Set of Classes</em>
-<a class="jxr_linenumber" name="L349" href="#L349">349</a> <em class="jxr_javadoccomment">     * @throws IOException</em>
-<a class="jxr_linenumber" name="L350" href="#L350">350</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L351" href="#L351">351</a>     <strong class="jxr_keyword">private</strong> Map&lt;Pair&lt;String, String&gt;, Set&lt;ClassWrapper&gt;&gt; segregate(<strong class="jxr_keyword">final</strong> Iterable&lt;Class&lt;?&gt;&gt; subtypes)
-<a class="jxr_linenumber" name="L352" href="#L352">352</a>         <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="L353" href="#L353">353</a>         <strong class="jxr_keyword">final</strong> Map&lt;Pair&lt;String, String&gt;, Set&lt;ClassWrapper&gt;&gt; classMap =
-<a class="jxr_linenumber" name="L354" href="#L354">354</a>             <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;Pair&lt;String, String&gt;, Set&lt;ClassWrapper&gt;&gt;();
-<a class="jxr_linenumber" name="L355" href="#L355">355</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> Class&lt;?&gt; subtype : subtypes) {
-<a class="jxr_linenumber" name="L356" href="#L356">356</a>             <strong class="jxr_keyword">final</strong> MutablePair&lt;String, String&gt; key = <strong class="jxr_keyword">new</strong> MutablePair&lt;String, String&gt;();
-<a class="jxr_linenumber" name="L357" href="#L357">357</a>             <strong class="jxr_keyword">final</strong> MutableBoolean ignore = <strong class="jxr_keyword">new</strong> MutableBoolean(false);
-<a class="jxr_linenumber" name="L358" href="#L358">358</a>             <strong class="jxr_keyword">final</strong> MutableBoolean valid = <strong class="jxr_keyword">new</strong> MutableBoolean(<strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="L359" href="#L359">359</a>             <strong class="jxr_keyword">final</strong> MutableBoolean mustRewriteConstructor = <strong class="jxr_keyword">new</strong> MutableBoolean();
-<a class="jxr_linenumber" name="L360" href="#L360">360</a>             InputStream bytecode = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L361" href="#L361">361</a> 
-<a class="jxr_linenumber" name="L362" href="#L362">362</a>             <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L363" href="#L363">363</a>                 bytecode = env.getClassfile(subtype).getInputStream();
-<a class="jxr_linenumber" name="L364" href="#L364">364</a>                 <strong class="jxr_keyword">new</strong> ClassReader(bytecode).accept(<strong class="jxr_keyword">new</strong> ClassVisitor(Opcodes.ASM4) {
-<a class="jxr_linenumber" name="L365" href="#L365">365</a>                     String superName;
-<a class="jxr_linenumber" name="L366" href="#L366">366</a> 
-<a class="jxr_linenumber" name="L367" href="#L367">367</a>                     @Override
-<a class="jxr_linenumber" name="L368" href="#L368">368</a>                     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> visit(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> version, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> access, <strong class="jxr_keyword">final</strong> String name, <strong class="jxr_keyword">final</strong> String signature,
-<a class="jxr_linenumber" name="L369" href="#L369">369</a>                         <strong class="jxr_keyword">final</strong> String superName, <strong class="jxr_keyword">final</strong> String[] interfaces) {
-<a class="jxr_linenumber" name="L370" href="#L370">370</a>                         <strong class="jxr_keyword">super</strong>.visit(version, access, name, signature, superName, interfaces);
-<a class="jxr_linenumber" name="L371" href="#L371">371</a>                         <strong class="jxr_keyword">this</strong>.superName = superName;
-<a class="jxr_linenumber" name="L372" href="#L372">372</a>                         <strong class="jxr_keyword">final</strong> String left;
-<a class="jxr_linenumber" name="L373" href="#L373">373</a>                         <strong class="jxr_keyword">if</strong> (signature != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L374" href="#L374">374</a>                             left = signature;
-<a class="jxr_linenumber" name="L375" href="#L375">375</a>                         } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (ArrayUtils.getLength(interfaces) == 1) {
-<a class="jxr_linenumber" name="L376" href="#L376">376</a>                             left = interfaces[0];
-<a class="jxr_linenumber" name="L377" href="#L377">377</a>                         } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L378" href="#L378">378</a>                             left = superName;
-<a class="jxr_linenumber" name="L379" href="#L379">379</a>                         }
-<a class="jxr_linenumber" name="L380" href="#L380">380</a>                         key.setLeft(left);
-<a class="jxr_linenumber" name="L381" href="#L381">381</a>                     }
-<a class="jxr_linenumber" name="L382" href="#L382">382</a> 
-<a class="jxr_linenumber" name="L383" href="#L383">383</a>                     @Override
-<a class="jxr_linenumber" name="L384" href="#L384">384</a>                     <strong class="jxr_keyword">public</strong> AnnotationVisitor visitAnnotation(<strong class="jxr_keyword">final</strong> String desc, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> visible) {
-<a class="jxr_linenumber" name="L385" href="#L385">385</a>                         <strong class="jxr_keyword">if</strong> (Type.getType(Marker.<strong class="jxr_keyword">class</strong>).getDescriptor().equals(desc)) {
-<a class="jxr_linenumber" name="L386" href="#L386">386</a>                             ignore.setValue(<strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="L387" href="#L387">387</a>                         }
-<a class="jxr_linenumber" name="L388" href="#L388">388</a>                         <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L389" href="#L389">389</a>                     }
-<a class="jxr_linenumber" name="L390" href="#L390">390</a> 
-<a class="jxr_linenumber" name="L391" href="#L391">391</a>                     @Override
-<a class="jxr_linenumber" name="L392" href="#L392">392</a>                     <strong class="jxr_keyword">public</strong> MethodVisitor visitMethod(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> access, <strong class="jxr_keyword">final</strong> String name, <strong class="jxr_keyword">final</strong> String desc,
-<a class="jxr_linenumber" name="L393" href="#L393">393</a>                         <strong class="jxr_keyword">final</strong> String signature, <strong class="jxr_keyword">final</strong> String[] exceptions) {
-<a class="jxr_linenumber" name="L394" href="#L394">394</a>                         <strong class="jxr_keyword">if</strong> (INIT.equals(name)) {
-<a class="jxr_linenumber" name="L395" href="#L395">395</a>                             <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> MethodVisitor(Opcodes.ASM4) {
-<a class="jxr_linenumber" name="L396" href="#L396">396</a>                                 @Override
-<a class="jxr_linenumber" name="L397" href="#L397">397</a>                                 <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> visitMethodInsn(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> opcode, <strong class="jxr_keyword">final</strong> String owner, <strong class="jxr_keyword">final</strong> String name,
-<a class="jxr_linenumber" name="L398" href="#L398">398</a>                                     <strong class="jxr_keyword">final</strong> String desc) {
-<a class="jxr_linenumber" name="L399" href="#L399">399</a>                                     <strong class="jxr_keyword">if</strong> (INIT.equals(name) &amp;&amp; owner.equals(superName)) {
-<a class="jxr_linenumber" name="L400" href="#L400">400</a>                                         key.setRight(desc);
-<a class="jxr_linenumber" name="L401" href="#L401">401</a>                                     } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L402" href="#L402">402</a>                                         valid.setValue(false);
-<a class="jxr_linenumber" name="L403" href="#L403">403</a>                                     }
-<a class="jxr_linenumber" name="L404" href="#L404">404</a>                                 }
+<a class="jxr_linenumber" name="L330" href="#L330">330</a>     }
+<a class="jxr_linenumber" name="L331" href="#L331">331</a> 
+<a class="jxr_linenumber" name="L332" href="#L332">332</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L333" href="#L333">333</a> <em class="jxr_javadoccomment">     * &lt;p&gt;Find subclasses/implementors of {code supertype} that:</em>
+<a class="jxr_linenumber" name="L334" href="#L334">334</a> <em class="jxr_javadoccomment">     * &lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L335" href="#L335">335</a> <em class="jxr_javadoccomment">     * &lt;li&gt;are anonymous&lt;/li&gt;</em>
+<a class="jxr_linenumber" name="L336" href="#L336">336</a> <em class="jxr_javadoccomment">     * &lt;li&gt;declare a single constructor (probably redundant in the case of an anonymous class)&lt;/li&gt;</em>
+<a class="jxr_linenumber" name="L337" href="#L337">337</a> <em class="jxr_javadoccomment">     * &lt;li&gt;do not implement any methods&lt;/li&gt;</em>
+<a class="jxr_linenumber" name="L338" href="#L338">338</a> <em class="jxr_javadoccomment">     * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L339" href="#L339">339</a> <em class="jxr_javadoccomment">     * &lt;/p&gt;&lt;p&gt;</em>
+<a class="jxr_linenumber" name="L340" href="#L340">340</a> <em class="jxr_javadoccomment">     * Considered "broadly" eligible because the instructions in the implemented constructor may remove the class from</em>
+<a class="jxr_linenumber" name="L341" href="#L341">341</a> <em class="jxr_javadoccomment">     * consideration later on.</em>
+<a class="jxr_linenumber" name="L342" href="#L342">342</a> <em class="jxr_javadoccomment">     * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L343" href="#L343">343</a> <em class="jxr_javadoccomment">     * @param supertype whose subtypes are sought</em>
+<a class="jxr_linenumber" name="L344" href="#L344">344</a> <em class="jxr_javadoccomment">     * @param scanner to use</em>
+<a class="jxr_linenumber" name="L345" href="#L345">345</a> <em class="jxr_javadoccomment">     * @return {@link Set} of {@link Class}</em>
+<a class="jxr_linenumber" name="L346" href="#L346">346</a> <em class="jxr_javadoccomment">     * @see #segregate(Iterable)</em>
+<a class="jxr_linenumber" name="L347" href="#L347">347</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L348" href="#L348">348</a>     <strong class="jxr_keyword">private</strong> Set&lt;Class&lt;?&gt;&gt; getBroadlyEligibleSubclasses(<strong class="jxr_keyword">final</strong> Class&lt;?&gt; supertype, <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/weaver/model/Scanner.html">Scanner</a> scanner) {
+<a class="jxr_linenumber" name="L349" href="#L349">349</a>         <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/weaver/model/ScanResult.html">ScanResult</a> scanResult = scanner.scan(<strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/commons/weaver/model/ScanRequest.html">ScanRequest</a>().addSupertypes(supertype));
+<a class="jxr_linenumber" name="L350" href="#L350">350</a>         <strong class="jxr_keyword">final</strong> Set&lt;Class&lt;?&gt;&gt; result = <strong class="jxr_keyword">new</strong> LinkedHashSet&lt;Class&lt;?&gt;&gt;();
+<a class="jxr_linenumber" name="L351" href="#L351">351</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> WeavableClass&lt;?&gt; cls : scanResult.getClasses()) {
+<a class="jxr_linenumber" name="L352" href="#L352">352</a>             <strong class="jxr_keyword">final</strong> Class&lt;?&gt; subtype = cls.getTarget();
+<a class="jxr_linenumber" name="L353" href="#L353">353</a>             <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/weaver/normalizer/Normalizer.html">IneligibilityReason</a> reason;
+<a class="jxr_linenumber" name="L354" href="#L354">354</a>             <strong class="jxr_keyword">if</strong> (!subtype.isAnonymousClass()) {
+<a class="jxr_linenumber" name="L355" href="#L355">355</a>                 reason = IneligibilityReason.NOT_ANONYMOUS;
+<a class="jxr_linenumber" name="L356" href="#L356">356</a>             } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (subtype.getDeclaredConstructors().length != 1) {
+<a class="jxr_linenumber" name="L357" href="#L357">357</a>                 reason = IneligibilityReason.TOO_MANY_CONSTRUCTORS;
+<a class="jxr_linenumber" name="L358" href="#L358">358</a>             } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (subtype.getDeclaredMethods().length &gt; 0) {
+<a class="jxr_linenumber" name="L359" href="#L359">359</a>                 reason = IneligibilityReason.IMPLEMENTS_METHODS;
+<a class="jxr_linenumber" name="L360" href="#L360">360</a>             } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="L361" href="#L361">361</a>                 result.add(subtype);
+<a class="jxr_linenumber" name="L362" href="#L362">362</a>                 <strong class="jxr_keyword">continue</strong>;
+<a class="jxr_linenumber" name="L363" href="#L363">363</a>             }
+<a class="jxr_linenumber" name="L364" href="#L364">364</a>             env.debug(<span class="jxr_string">"Removed %s from consideration due to %s"</span>, subtype, reason);
+<a class="jxr_linenumber" name="L365" href="#L365">365</a>         }
+<a class="jxr_linenumber" name="L366" href="#L366">366</a>         <strong class="jxr_keyword">return</strong> result;
+<a class="jxr_linenumber" name="L367" href="#L367">367</a>     }
+<a class="jxr_linenumber" name="L368" href="#L368">368</a> 
+<a class="jxr_linenumber" name="L369" href="#L369">369</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L370" href="#L370">370</a> <em class="jxr_javadoccomment">     * &lt;p&gt;Segregate a number of classes (presumed subclasses/implementors of a</em>
+<a class="jxr_linenumber" name="L371" href="#L371">371</a> <em class="jxr_javadoccomment">     * common supertype/interface). The keys of the map consist of the important</em>
+<a class="jxr_linenumber" name="L372" href="#L372">372</a> <em class="jxr_javadoccomment">     * parts for identifying similar anonymous types: the "signature" and the</em>
+<a class="jxr_linenumber" name="L373" href="#L373">373</a> <em class="jxr_javadoccomment">     * invoked superclass constructor. For our purposes, the signature consists</em>
+<a class="jxr_linenumber" name="L374" href="#L374">374</a> <em class="jxr_javadoccomment">     * of the first applicable item of:</em>
+<a class="jxr_linenumber" name="L375" href="#L375">375</a> <em class="jxr_javadoccomment">     * &lt;ol&gt;</em>
+<a class="jxr_linenumber" name="L376" href="#L376">376</a> <em class="jxr_javadoccomment">     * &lt;li&gt;The generic signature of the class&lt;/li&gt;</em>
+<a class="jxr_linenumber" name="L377" href="#L377">377</a> <em class="jxr_javadoccomment">     * &lt;li&gt;The sole implemented interface&lt;/li&gt;</em>
+<a class="jxr_linenumber" name="L378" href="#L378">378</a> <em class="jxr_javadoccomment">     * &lt;li&gt;The superclass&lt;/li&gt;</em>
+<a class="jxr_linenumber" name="L379" href="#L379">379</a> <em class="jxr_javadoccomment">     * &lt;/ol&gt;</em>
+<a class="jxr_linenumber" name="L380" href="#L380">380</a> <em class="jxr_javadoccomment">     * &lt;/p&gt;&lt;p&gt;</em>
+<a class="jxr_linenumber" name="L381" href="#L381">381</a> <em class="jxr_javadoccomment">     * The class will be considered ineligible if its constructor is too "busy" as its side effects cannot be</em>
+<a class="jxr_linenumber" name="L382" href="#L382">382</a> <em class="jxr_javadoccomment">     * anticipated; the normalizer will err on the side of caution.</em>
+<a class="jxr_linenumber" name="L383" href="#L383">383</a> <em class="jxr_javadoccomment">     * &lt;/p&gt;&lt;p&gt;</em>

[... 388 lines stripped ...]


Mime
View raw message