Regeneration from plexi d75ff38
diff --git a/coverage/com.google.enterprise.adaptor.Acl.html b/coverage/com.google.enterprise.adaptor.Acl.html
index 84b5008..e3d1c63 100644
--- a/coverage/com.google.enterprise.adaptor.Acl.html
+++ b/coverage/com.google.enterprise.adaptor.Acl.html
@@ -90,7 +90,7 @@
<td class="src"><pre class="src"> <span class="comment"> * trimmed by the GSA.</span></pre></td></tr>
<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 32</td> <td class="nbHitsCovered"> 792</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">class</span> Acl {</pre></td></tr>
+<tr> <td class="numLineCover"> 32</td> <td class="nbHitsCovered"> 904</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">class</span> Acl {</pre></td></tr>
<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
@@ -153,23 +153,23 @@
<td class="src"><pre class="src"> Set<UserPrincipal> permitUsers, Set<UserPrincipal> denyUsers,</pre></td></tr>
<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> DocId inheritFrom, String inheritFromFragment,</pre></td></tr>
-<tr> <td class="numLineCover"> 66</td> <td class="nbHitsCovered"> 139</td> <td class="src"><pre class="src"> InheritanceType inheritType, <span class="keyword">boolean</span> caseSensitive) {</pre></td></tr>
-<tr> <td class="numLineCover"> 67</td> <td class="nbHitsCovered"><a title="Line 67: Conditional coverage 100% (2/2)."> 139</a></td> <td class="src"><pre class="src"> <a title="Line 67: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!caseSensitive) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 66</td> <td class="nbHitsCovered"> 141</td> <td class="src"><pre class="src"> InheritanceType inheritType, <span class="keyword">boolean</span> caseSensitive) {</pre></td></tr>
+<tr> <td class="numLineCover"> 67</td> <td class="nbHitsCovered"><a title="Line 67: Conditional coverage 100% (2/2)."> 141</a></td> <td class="src"><pre class="src"> <a title="Line 67: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!caseSensitive) {</a></pre></td></tr>
<tr> <td class="numLineCover"> 68</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> permitGroups = Collections.unmodifiableSet(cmpWrap(permitGroups));</pre></td></tr>
<tr> <td class="numLineCover"> 69</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> denyGroups = Collections.unmodifiableSet(cmpWrap(denyGroups));</pre></td></tr>
<tr> <td class="numLineCover"> 70</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> permitUsers = Collections.unmodifiableSet(cmpWrap(permitUsers));</pre></td></tr>
<tr> <td class="numLineCover"> 71</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> denyUsers = Collections.unmodifiableSet(cmpWrap(denyUsers));</pre></td></tr>
<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 73</td> <td class="nbHitsCovered"> 139</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.permitGroups = permitGroups;</pre></td></tr>
-<tr> <td class="numLineCover"> 74</td> <td class="nbHitsCovered"> 139</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.denyGroups = denyGroups;</pre></td></tr>
-<tr> <td class="numLineCover"> 75</td> <td class="nbHitsCovered"> 139</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.permitUsers = permitUsers;</pre></td></tr>
-<tr> <td class="numLineCover"> 76</td> <td class="nbHitsCovered"> 139</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.denyUsers = denyUsers;</pre></td></tr>
-<tr> <td class="numLineCover"> 77</td> <td class="nbHitsCovered"> 139</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.inheritFrom = inheritFrom;</pre></td></tr>
-<tr> <td class="numLineCover"> 78</td> <td class="nbHitsCovered"> 139</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.inheritFromFragment = inheritFromFragment;</pre></td></tr>
-<tr> <td class="numLineCover"> 79</td> <td class="nbHitsCovered"> 139</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.inheritType = inheritType;</pre></td></tr>
-<tr> <td class="numLineCover"> 80</td> <td class="nbHitsCovered"> 139</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.caseSensitive = caseSensitive;</pre></td></tr>
-<tr> <td class="numLineCover"> 81</td> <td class="nbHitsCovered"> 139</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 73</td> <td class="nbHitsCovered"> 141</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.permitGroups = permitGroups;</pre></td></tr>
+<tr> <td class="numLineCover"> 74</td> <td class="nbHitsCovered"> 141</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.denyGroups = denyGroups;</pre></td></tr>
+<tr> <td class="numLineCover"> 75</td> <td class="nbHitsCovered"> 141</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.permitUsers = permitUsers;</pre></td></tr>
+<tr> <td class="numLineCover"> 76</td> <td class="nbHitsCovered"> 141</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.denyUsers = denyUsers;</pre></td></tr>
+<tr> <td class="numLineCover"> 77</td> <td class="nbHitsCovered"> 141</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.inheritFrom = inheritFrom;</pre></td></tr>
+<tr> <td class="numLineCover"> 78</td> <td class="nbHitsCovered"> 141</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.inheritFromFragment = inheritFromFragment;</pre></td></tr>
+<tr> <td class="numLineCover"> 79</td> <td class="nbHitsCovered"> 141</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.inheritType = inheritType;</pre></td></tr>
+<tr> <td class="numLineCover"> 80</td> <td class="nbHitsCovered"> 141</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.caseSensitive = caseSensitive;</pre></td></tr>
+<tr> <td class="numLineCover"> 81</td> <td class="nbHitsCovered"> 141</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
@@ -181,27 +181,27 @@
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 89</td> <td class="nbHitsCovered"> 362</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">class</span> CaseInsensitiveCmp<P <span class="keyword">extends</span> Principal></pre></td></tr>
+<tr> <td class="numLineCover"> 89</td> <td class="nbHitsCovered"> 397</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">class</span> CaseInsensitiveCmp<P <span class="keyword">extends</span> Principal></pre></td></tr>
<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">implements</span> Comparator<P> {</pre></td></tr>
<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/** Does not differentiate between UserPrincipal and GroupPrincipal */</span></pre></td></tr>
<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> compare(P p1, P p2) {</pre></td></tr>
-<tr> <td class="numLineCover"> 93</td> <td class="nbHitsCovered"> 198</td> <td class="src"><pre class="src"> String ns1 = p1.getNamespace().toLowerCase(CASE_LOCALE);</pre></td></tr>
-<tr> <td class="numLineCover"> 94</td> <td class="nbHitsCovered"> 198</td> <td class="src"><pre class="src"> String ns2 = p2.getNamespace().toLowerCase(CASE_LOCALE);</pre></td></tr>
-<tr> <td class="numLineCover"> 95</td> <td class="nbHitsCovered"> 198</td> <td class="src"><pre class="src"> <span class="keyword">int</span> nscmp = ns1.compareTo(ns2);</pre></td></tr>
-<tr> <td class="numLineCover"> 96</td> <td class="nbHitsCovered"><a title="Line 96: Conditional coverage 100% (2/2)."> 198</a></td> <td class="src"><pre class="src"> <a title="Line 96: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (0 != nscmp) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 97</td> <td class="nbHitsCovered"> 81</td> <td class="src"><pre class="src"> <span class="keyword">return</span> nscmp;</pre></td></tr>
+<tr> <td class="numLineCover"> 93</td> <td class="nbHitsCovered"> 233</td> <td class="src"><pre class="src"> String ns1 = p1.getNamespace().toLowerCase(CASE_LOCALE);</pre></td></tr>
+<tr> <td class="numLineCover"> 94</td> <td class="nbHitsCovered"> 233</td> <td class="src"><pre class="src"> String ns2 = p2.getNamespace().toLowerCase(CASE_LOCALE);</pre></td></tr>
+<tr> <td class="numLineCover"> 95</td> <td class="nbHitsCovered"> 233</td> <td class="src"><pre class="src"> <span class="keyword">int</span> nscmp = ns1.compareTo(ns2);</pre></td></tr>
+<tr> <td class="numLineCover"> 96</td> <td class="nbHitsCovered"><a title="Line 96: Conditional coverage 100% (2/2)."> 233</a></td> <td class="src"><pre class="src"> <a title="Line 96: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (0 != nscmp) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 97</td> <td class="nbHitsCovered"> 96</td> <td class="src"><pre class="src"> <span class="keyword">return</span> nscmp;</pre></td></tr>
<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// OK, same namespace</span></pre></td></tr>
<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 101</td> <td class="nbHitsCovered"> 117</td> <td class="src"><pre class="src"> String n1 = p1.getName().toLowerCase(CASE_LOCALE);</pre></td></tr>
-<tr> <td class="numLineCover"> 102</td> <td class="nbHitsCovered"> 117</td> <td class="src"><pre class="src"> String n2 = p2.getName().toLowerCase(CASE_LOCALE);</pre></td></tr>
-<tr> <td class="numLineCover"> 103</td> <td class="nbHitsCovered"> 117</td> <td class="src"><pre class="src"> <span class="keyword">return</span> n1.compareTo(n2);</pre></td></tr>
+<tr> <td class="numLineCover"> 101</td> <td class="nbHitsCovered"> 137</td> <td class="src"><pre class="src"> String n1 = p1.getName().toLowerCase(CASE_LOCALE);</pre></td></tr>
+<tr> <td class="numLineCover"> 102</td> <td class="nbHitsCovered"> 137</td> <td class="src"><pre class="src"> String n2 = p2.getName().toLowerCase(CASE_LOCALE);</pre></td></tr>
+<tr> <td class="numLineCover"> 103</td> <td class="nbHitsCovered"> 137</td> <td class="src"><pre class="src"> <span class="keyword">return</span> n1.compareTo(n2);</pre></td></tr>
<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
@@ -223,7 +223,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> Set<GroupPrincipal> getPermitGroups() {</pre></td></tr>
-<tr> <td class="numLineCover"> 115</td> <td class="nbHitsCovered"> 70</td> <td class="src"><pre class="src"> <span class="keyword">return</span> permitGroups;</pre></td></tr>
+<tr> <td class="numLineCover"> 115</td> <td class="nbHitsCovered"> 72</td> <td class="src"><pre class="src"> <span class="keyword">return</span> permitGroups;</pre></td></tr>
<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
@@ -236,7 +236,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> Set<GroupPrincipal> getDenyGroups() {</pre></td></tr>
-<tr> <td class="numLineCover"> 122</td> <td class="nbHitsCovered"> 68</td> <td class="src"><pre class="src"> <span class="keyword">return</span> denyGroups;</pre></td></tr>
+<tr> <td class="numLineCover"> 122</td> <td class="nbHitsCovered"> 70</td> <td class="src"><pre class="src"> <span class="keyword">return</span> denyGroups;</pre></td></tr>
<tr> <td class="numLine"> 123</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
@@ -249,7 +249,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 128</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> Set<UserPrincipal> getPermitUsers() {</pre></td></tr>
-<tr> <td class="numLineCover"> 129</td> <td class="nbHitsCovered"> 71</td> <td class="src"><pre class="src"> <span class="keyword">return</span> permitUsers;</pre></td></tr>
+<tr> <td class="numLineCover"> 129</td> <td class="nbHitsCovered"> 73</td> <td class="src"><pre class="src"> <span class="keyword">return</span> permitUsers;</pre></td></tr>
<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
@@ -262,7 +262,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 135</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> Set<UserPrincipal> getDenyUsers() {</pre></td></tr>
-<tr> <td class="numLineCover"> 136</td> <td class="nbHitsCovered"> 69</td> <td class="src"><pre class="src"> <span class="keyword">return</span> denyUsers;</pre></td></tr>
+<tr> <td class="numLineCover"> 136</td> <td class="nbHitsCovered"> 71</td> <td class="src"><pre class="src"> <span class="keyword">return</span> denyUsers;</pre></td></tr>
<tr> <td class="numLine"> 137</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
@@ -275,7 +275,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 142</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> Set<Principal> getPermits() {</pre></td></tr>
-<tr> <td class="numLineCover"> 143</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Sets.union(permitUsers, permitGroups);</pre></td></tr>
+<tr> <td class="numLineCover"> 143</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Sets.union(permitUsers, permitGroups);</pre></td></tr>
<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
@@ -288,7 +288,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> Set<Principal> getDenies() {</pre></td></tr>
-<tr> <td class="numLineCover"> 150</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Sets.union(denyUsers, denyGroups);</pre></td></tr>
+<tr> <td class="numLineCover"> 150</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Sets.union(denyUsers, denyGroups);</pre></td></tr>
<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 152</td> <td class="nbHits"> </td>
@@ -309,7 +309,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> DocId getInheritFrom() {</pre></td></tr>
-<tr> <td class="numLineCover"> 161</td> <td class="nbHitsCovered"> 264</td> <td class="src"><pre class="src"> <span class="keyword">return</span> inheritFrom;</pre></td></tr>
+<tr> <td class="numLineCover"> 161</td> <td class="nbHitsCovered"> 266</td> <td class="src"><pre class="src"> <span class="keyword">return</span> inheritFrom;</pre></td></tr>
<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
@@ -328,7 +328,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> String getInheritFromFragment() {</pre></td></tr>
-<tr> <td class="numLineCover"> 171</td> <td class="nbHitsCovered"> 53</td> <td class="src"><pre class="src"> <span class="keyword">return</span> inheritFromFragment;</pre></td></tr>
+<tr> <td class="numLineCover"> 171</td> <td class="nbHitsCovered"> 54</td> <td class="src"><pre class="src"> <span class="keyword">return</span> inheritFromFragment;</pre></td></tr>
<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
@@ -349,7 +349,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 181</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> InheritanceType getInheritanceType() {</pre></td></tr>
-<tr> <td class="numLineCover"> 182</td> <td class="nbHitsCovered"> 127</td> <td class="src"><pre class="src"> <span class="keyword">return</span> inheritType;</pre></td></tr>
+<tr> <td class="numLineCover"> 182</td> <td class="nbHitsCovered"> 129</td> <td class="src"><pre class="src"> <span class="keyword">return</span> inheritType;</pre></td></tr>
<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 184</td> <td class="nbHits"> </td>
@@ -362,7 +362,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isEverythingCaseSensitive() {</pre></td></tr>
-<tr> <td class="numLineCover"> 189</td> <td class="nbHitsCovered"> 62</td> <td class="src"><pre class="src"> <span class="keyword">return</span> caseSensitive;</pre></td></tr>
+<tr> <td class="numLineCover"> 189</td> <td class="nbHitsCovered"> 63</td> <td class="src"><pre class="src"> <span class="keyword">return</span> caseSensitive;</pre></td></tr>
<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 191</td> <td class="nbHits"> </td>
@@ -375,7 +375,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isEverythingCaseInsensitive() {</pre></td></tr>
-<tr> <td class="numLineCover"> 196</td> <td class="nbHitsCovered"><a title="Line 196: Conditional coverage 100% (2/2)."> 6</a></td> <td class="src"><pre class="src"> <a title="Line 196: Conditional coverage 100% (2/2)."> <span class="keyword">return</span> !caseSensitive;</a></pre></td></tr>
+<tr> <td class="numLineCover"> 196</td> <td class="nbHitsCovered"><a title="Line 196: Conditional coverage 100% (2/2)."> 7</a></td> <td class="src"><pre class="src"> <a title="Line 196: Conditional coverage 100% (2/2)."> <span class="keyword">return</span> !caseSensitive;</a></pre></td></tr>
<tr> <td class="numLine"> 197</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 198</td> <td class="nbHits"> </td>
@@ -988,16 +988,16 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 559</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">class</span> Builder {</pre></td></tr>
-<tr> <td class="numLineCover"> 560</td> <td class="nbHitsCovered"> 129</td> <td class="src"><pre class="src"> <span class="keyword">private</span> Set<GroupPrincipal> permitGroups = Collections.emptySet();</pre></td></tr>
-<tr> <td class="numLineCover"> 561</td> <td class="nbHitsCovered"> 129</td> <td class="src"><pre class="src"> <span class="keyword">private</span> Set<GroupPrincipal> denyGroups = Collections.emptySet();</pre></td></tr>
-<tr> <td class="numLineCover"> 562</td> <td class="nbHitsCovered"> 129</td> <td class="src"><pre class="src"> <span class="keyword">private</span> Set<UserPrincipal> permitUsers = Collections.emptySet();</pre></td></tr>
-<tr> <td class="numLineCover"> 563</td> <td class="nbHitsCovered"> 129</td> <td class="src"><pre class="src"> <span class="keyword">private</span> Set<UserPrincipal> denyUsers = Collections.emptySet();</pre></td></tr>
+<tr> <td class="numLineCover"> 560</td> <td class="nbHitsCovered"> 131</td> <td class="src"><pre class="src"> <span class="keyword">private</span> Set<GroupPrincipal> permitGroups = Collections.emptySet();</pre></td></tr>
+<tr> <td class="numLineCover"> 561</td> <td class="nbHitsCovered"> 131</td> <td class="src"><pre class="src"> <span class="keyword">private</span> Set<GroupPrincipal> denyGroups = Collections.emptySet();</pre></td></tr>
+<tr> <td class="numLineCover"> 562</td> <td class="nbHitsCovered"> 131</td> <td class="src"><pre class="src"> <span class="keyword">private</span> Set<UserPrincipal> permitUsers = Collections.emptySet();</pre></td></tr>
+<tr> <td class="numLineCover"> 563</td> <td class="nbHitsCovered"> 131</td> <td class="src"><pre class="src"> <span class="keyword">private</span> Set<UserPrincipal> denyUsers = Collections.emptySet();</pre></td></tr>
<tr> <td class="numLine"> 564</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> DocId inheritFrom;</pre></td></tr>
<tr> <td class="numLine"> 565</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> String inheritFromFragment;</pre></td></tr>
-<tr> <td class="numLineCover"> 566</td> <td class="nbHitsCovered"> 129</td> <td class="src"><pre class="src"> <span class="keyword">private</span> InheritanceType inheritType = InheritanceType.LEAF_NODE;</pre></td></tr>
-<tr> <td class="numLineCover"> 567</td> <td class="nbHitsCovered"> 129</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> caseSensitive = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 566</td> <td class="nbHitsCovered"> 131</td> <td class="src"><pre class="src"> <span class="keyword">private</span> InheritanceType inheritType = InheritanceType.LEAF_NODE;</pre></td></tr>
+<tr> <td class="numLineCover"> 567</td> <td class="nbHitsCovered"> 131</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> caseSensitive = <span class="keyword">true</span>;</pre></td></tr>
<tr> <td class="numLine"> 568</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 569</td> <td class="nbHits"> </td>
@@ -1008,7 +1008,7 @@
<td class="src"><pre class="src"> <span class="comment"> * null}, and inheritType is {@link InheritanceType#LEAF_NODE}.</span></pre></td></tr>
<tr> <td class="numLine"> 572</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 573</td> <td class="nbHitsCovered"> 174</td> <td class="src"><pre class="src"> <span class="keyword">public</span> Builder() {}</pre></td></tr>
+<tr> <td class="numLineCover"> 573</td> <td class="nbHitsCovered"> 176</td> <td class="src"><pre class="src"> <span class="keyword">public</span> Builder() {}</pre></td></tr>
<tr> <td class="numLine"> 574</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 575</td> <td class="nbHits"> </td>
@@ -1019,28 +1019,28 @@
<td class="src"><pre class="src"> <span class="comment"> * acl}.</span></pre></td></tr>
<tr> <td class="numLine"> 578</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 579</td> <td class="nbHitsCovered"> 42</td> <td class="src"><pre class="src"> <span class="keyword">public</span> Builder(Acl acl) {</pre></td></tr>
-<tr> <td class="numLineCover"> 580</td> <td class="nbHitsCovered"> 42</td> <td class="src"><pre class="src"> permitGroups = sanitizeSet(acl.getPermitGroups());</pre></td></tr>
-<tr> <td class="numLineCover"> 581</td> <td class="nbHitsCovered"> 42</td> <td class="src"><pre class="src"> denyGroups = sanitizeSet(acl.getDenyGroups());</pre></td></tr>
-<tr> <td class="numLineCover"> 582</td> <td class="nbHitsCovered"> 42</td> <td class="src"><pre class="src"> permitUsers = sanitizeSet(acl.getPermitUsers());</pre></td></tr>
-<tr> <td class="numLineCover"> 583</td> <td class="nbHitsCovered"> 42</td> <td class="src"><pre class="src"> denyUsers = sanitizeSet(acl.getDenyUsers());</pre></td></tr>
-<tr> <td class="numLineCover"> 584</td> <td class="nbHitsCovered"> 42</td> <td class="src"><pre class="src"> inheritFrom = acl.getInheritFrom();</pre></td></tr>
-<tr> <td class="numLineCover"> 585</td> <td class="nbHitsCovered"> 42</td> <td class="src"><pre class="src"> inheritFromFragment = acl.getInheritFromFragment();</pre></td></tr>
-<tr> <td class="numLineCover"> 586</td> <td class="nbHitsCovered"> 42</td> <td class="src"><pre class="src"> inheritType = acl.getInheritanceType();</pre></td></tr>
-<tr> <td class="numLineCover"> 587</td> <td class="nbHitsCovered"> 42</td> <td class="src"><pre class="src"> caseSensitive = acl.isEverythingCaseSensitive();</pre></td></tr>
-<tr> <td class="numLineCover"> 588</td> <td class="nbHitsCovered"> 42</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 579</td> <td class="nbHitsCovered"> 43</td> <td class="src"><pre class="src"> <span class="keyword">public</span> Builder(Acl acl) {</pre></td></tr>
+<tr> <td class="numLineCover"> 580</td> <td class="nbHitsCovered"> 43</td> <td class="src"><pre class="src"> permitGroups = sanitizeSet(acl.getPermitGroups());</pre></td></tr>
+<tr> <td class="numLineCover"> 581</td> <td class="nbHitsCovered"> 43</td> <td class="src"><pre class="src"> denyGroups = sanitizeSet(acl.getDenyGroups());</pre></td></tr>
+<tr> <td class="numLineCover"> 582</td> <td class="nbHitsCovered"> 43</td> <td class="src"><pre class="src"> permitUsers = sanitizeSet(acl.getPermitUsers());</pre></td></tr>
+<tr> <td class="numLineCover"> 583</td> <td class="nbHitsCovered"> 43</td> <td class="src"><pre class="src"> denyUsers = sanitizeSet(acl.getDenyUsers());</pre></td></tr>
+<tr> <td class="numLineCover"> 584</td> <td class="nbHitsCovered"> 43</td> <td class="src"><pre class="src"> inheritFrom = acl.getInheritFrom();</pre></td></tr>
+<tr> <td class="numLineCover"> 585</td> <td class="nbHitsCovered"> 43</td> <td class="src"><pre class="src"> inheritFromFragment = acl.getInheritFromFragment();</pre></td></tr>
+<tr> <td class="numLineCover"> 586</td> <td class="nbHitsCovered"> 43</td> <td class="src"><pre class="src"> inheritType = acl.getInheritanceType();</pre></td></tr>
+<tr> <td class="numLineCover"> 587</td> <td class="nbHitsCovered"> 43</td> <td class="src"><pre class="src"> caseSensitive = acl.isEverythingCaseSensitive();</pre></td></tr>
+<tr> <td class="numLineCover"> 588</td> <td class="nbHitsCovered"> 43</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 589</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 590</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <P <span class="keyword">extends</span> Principal> Set<P> sanitizeSet(Collection<P> set) {</pre></td></tr>
-<tr> <td class="numLineCover"> 591</td> <td class="nbHitsCovered"><a title="Line 591: Conditional coverage 100% (2/2)."> 407</a></td> <td class="src"><pre class="src"> <a title="Line 591: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (set.isEmpty()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 592</td> <td class="nbHitsCovered"> 206</td> <td class="src"><pre class="src"> Collections.emptySet();</pre></td></tr>
+<tr> <td class="numLineCover"> 591</td> <td class="nbHitsCovered"><a title="Line 591: Conditional coverage 100% (2/2)."> 416</a></td> <td class="src"><pre class="src"> <a title="Line 591: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (set.isEmpty()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 592</td> <td class="nbHitsCovered"> 212</td> <td class="src"><pre class="src"> Collections.emptySet();</pre></td></tr>
<tr> <td class="numLine"> 593</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 594</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// Check all the values to make sure they are valid.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 595</td> <td class="nbHitsCovered"><a title="Line 595: Conditional coverage 100% (2/2)."> 407</a></td> <td class="src"><pre class="src"> <a title="Line 595: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (P item : set) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 596</td> <td class="nbHitsCovered"><a title="Line 596: Conditional coverage 100% (2/2)."> 347</a></td> <td class="src"><pre class="src"> <a title="Line 596: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (item == <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 595</td> <td class="nbHitsCovered"><a title="Line 595: Conditional coverage 100% (2/2)."> 416</a></td> <td class="src"><pre class="src"> <a title="Line 595: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (P item : set) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 596</td> <td class="nbHitsCovered"><a title="Line 596: Conditional coverage 100% (2/2)."> 353</a></td> <td class="src"><pre class="src"> <a title="Line 596: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (item == <span class="keyword">null</span>) {</a></pre></td></tr>
<tr> <td class="numLineCover"> 597</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> NullPointerException(<span class="string">"Entries in set may not be null"</span>);</pre></td></tr>
<tr> <td class="numLine"> 598</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
@@ -1048,7 +1048,7 @@
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 600</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// Use TreeSets so that sets have predictable order when serializing.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 601</td> <td class="nbHitsCovered"> 406</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Collections.unmodifiableSet(<span class="keyword">new</span> TreeSet<P>(set));</pre></td></tr>
+<tr> <td class="numLineCover"> 601</td> <td class="nbHitsCovered"> 415</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Collections.unmodifiableSet(<span class="keyword">new</span> TreeSet<P>(set));</pre></td></tr>
<tr> <td class="numLine"> 602</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 603</td> <td class="nbHits"> </td>
@@ -1061,7 +1061,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 607</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> Acl build() {</pre></td></tr>
-<tr> <td class="numLineCover"> 608</td> <td class="nbHitsCovered"> 139</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> Acl(permitGroups, denyGroups, permitUsers, denyUsers,</pre></td></tr>
+<tr> <td class="numLineCover"> 608</td> <td class="nbHitsCovered"> 141</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> Acl(permitGroups, denyGroups, permitUsers, denyUsers,</pre></td></tr>
<tr> <td class="numLine"> 609</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> inheritFrom, inheritFromFragment, inheritType, caseSensitive);</pre></td></tr>
<tr> <td class="numLine"> 610</td> <td class="nbHits"> </td>
@@ -1140,8 +1140,8 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 649</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> Builder setPermitUsers(Collection<UserPrincipal> permitUsers) {</pre></td></tr>
-<tr> <td class="numLineCover"> 650</td> <td class="nbHitsCovered"> 55</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.permitUsers = sanitizeSet(permitUsers);</pre></td></tr>
-<tr> <td class="numLineCover"> 651</td> <td class="nbHitsCovered"> 54</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 650</td> <td class="nbHitsCovered"> 56</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.permitUsers = sanitizeSet(permitUsers);</pre></td></tr>
+<tr> <td class="numLineCover"> 651</td> <td class="nbHitsCovered"> 55</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>;</pre></td></tr>
<tr> <td class="numLine"> 652</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 653</td> <td class="nbHits"> </td>
@@ -1192,23 +1192,23 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 677</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> Builder setPermits(Collection<Principal> permits) {</pre></td></tr>
-<tr> <td class="numLineCover"> 678</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> Collection<GroupPrincipal> groups = <span class="keyword">new</span> ArrayList<GroupPrincipal>();</pre></td></tr>
-<tr> <td class="numLineCover"> 679</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> Collection<UserPrincipal> users = <span class="keyword">new</span> ArrayList<UserPrincipal>();</pre></td></tr>
-<tr> <td class="numLineCover"> 680</td> <td class="nbHitsCovered"><a title="Line 680: Conditional coverage 100% (2/2)."> 10</a></td> <td class="src"><pre class="src"> <a title="Line 680: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Principal principal : permits) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 681</td> <td class="nbHitsCovered"><a title="Line 681: Conditional coverage 100% (2/2)."> 48</a></td> <td class="src"><pre class="src"> <a title="Line 681: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (principal.isGroup()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 682</td> <td class="nbHitsCovered"> 37</td> <td class="src"><pre class="src"> groups.add((GroupPrincipal) principal);</pre></td></tr>
+<tr> <td class="numLineCover"> 678</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> Collection<GroupPrincipal> groups = <span class="keyword">new</span> ArrayList<GroupPrincipal>();</pre></td></tr>
+<tr> <td class="numLineCover"> 679</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> Collection<UserPrincipal> users = <span class="keyword">new</span> ArrayList<UserPrincipal>();</pre></td></tr>
+<tr> <td class="numLineCover"> 680</td> <td class="nbHitsCovered"><a title="Line 680: Conditional coverage 100% (2/2)."> 11</a></td> <td class="src"><pre class="src"> <a title="Line 680: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Principal principal : permits) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 681</td> <td class="nbHitsCovered"><a title="Line 681: Conditional coverage 100% (2/2)."> 51</a></td> <td class="src"><pre class="src"> <a title="Line 681: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (principal.isGroup()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 682</td> <td class="nbHitsCovered"> 39</td> <td class="src"><pre class="src"> groups.add((GroupPrincipal) principal);</pre></td></tr>
<tr> <td class="numLine"> 683</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 684</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> users.add((UserPrincipal) principal);</pre></td></tr>
+<tr> <td class="numLineCover"> 684</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> users.add((UserPrincipal) principal);</pre></td></tr>
<tr> <td class="numLine"> 685</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 686</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 687</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> Set<GroupPrincipal> sanitizedGroups = sanitizeSet(groups);</pre></td></tr>
-<tr> <td class="numLineCover"> 688</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> Set<UserPrincipal> sanitizedUsers = sanitizeSet(users);</pre></td></tr>
-<tr> <td class="numLineCover"> 689</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.permitGroups = sanitizedGroups;</pre></td></tr>
-<tr> <td class="numLineCover"> 690</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.permitUsers = sanitizedUsers;</pre></td></tr>
-<tr> <td class="numLineCover"> 691</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 687</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> Set<GroupPrincipal> sanitizedGroups = sanitizeSet(groups);</pre></td></tr>
+<tr> <td class="numLineCover"> 688</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> Set<UserPrincipal> sanitizedUsers = sanitizeSet(users);</pre></td></tr>
+<tr> <td class="numLineCover"> 689</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.permitGroups = sanitizedGroups;</pre></td></tr>
+<tr> <td class="numLineCover"> 690</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.permitUsers = sanitizedUsers;</pre></td></tr>
+<tr> <td class="numLineCover"> 691</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>;</pre></td></tr>
<tr> <td class="numLine"> 692</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 693</td> <td class="nbHits"> </td>
@@ -1233,11 +1233,11 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 703</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> Builder setDenies(Collection<Principal> denies) {</pre></td></tr>
-<tr> <td class="numLineCover"> 704</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> Collection<GroupPrincipal> groups = <span class="keyword">new</span> ArrayList<GroupPrincipal>();</pre></td></tr>
-<tr> <td class="numLineCover"> 705</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> Collection<UserPrincipal> users = <span class="keyword">new</span> ArrayList<UserPrincipal>();</pre></td></tr>
-<tr> <td class="numLineCover"> 706</td> <td class="nbHitsCovered"><a title="Line 706: Conditional coverage 100% (2/2)."> 11</a></td> <td class="src"><pre class="src"> <a title="Line 706: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Principal principal : denies) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 707</td> <td class="nbHitsCovered"><a title="Line 707: Conditional coverage 100% (2/2)."> 27</a></td> <td class="src"><pre class="src"> <a title="Line 707: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (principal.isGroup()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 708</td> <td class="nbHitsCovered"> 17</td> <td class="src"><pre class="src"> groups.add((GroupPrincipal) principal);</pre></td></tr>
+<tr> <td class="numLineCover"> 704</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> Collection<GroupPrincipal> groups = <span class="keyword">new</span> ArrayList<GroupPrincipal>();</pre></td></tr>
+<tr> <td class="numLineCover"> 705</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> Collection<UserPrincipal> users = <span class="keyword">new</span> ArrayList<UserPrincipal>();</pre></td></tr>
+<tr> <td class="numLineCover"> 706</td> <td class="nbHitsCovered"><a title="Line 706: Conditional coverage 100% (2/2)."> 12</a></td> <td class="src"><pre class="src"> <a title="Line 706: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Principal principal : denies) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 707</td> <td class="nbHitsCovered"><a title="Line 707: Conditional coverage 100% (2/2)."> 28</a></td> <td class="src"><pre class="src"> <a title="Line 707: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (principal.isGroup()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 708</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> groups.add((GroupPrincipal) principal);</pre></td></tr>
<tr> <td class="numLine"> 709</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
<tr> <td class="numLineCover"> 710</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> users.add((UserPrincipal) principal);</pre></td></tr>
@@ -1245,11 +1245,11 @@
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 712</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 713</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> Set<GroupPrincipal> sanitizedGroups = sanitizeSet(groups);</pre></td></tr>
-<tr> <td class="numLineCover"> 714</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> Set<UserPrincipal> sanitizedUsers = sanitizeSet(users);</pre></td></tr>
-<tr> <td class="numLineCover"> 715</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.denyGroups = sanitizedGroups;</pre></td></tr>
-<tr> <td class="numLineCover"> 716</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.denyUsers = sanitizedUsers;</pre></td></tr>
-<tr> <td class="numLineCover"> 717</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 713</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> Set<GroupPrincipal> sanitizedGroups = sanitizeSet(groups);</pre></td></tr>
+<tr> <td class="numLineCover"> 714</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> Set<UserPrincipal> sanitizedUsers = sanitizeSet(users);</pre></td></tr>
+<tr> <td class="numLineCover"> 715</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.denyGroups = sanitizedGroups;</pre></td></tr>
+<tr> <td class="numLineCover"> 716</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.denyUsers = sanitizedUsers;</pre></td></tr>
+<tr> <td class="numLineCover"> 717</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>;</pre></td></tr>
<tr> <td class="numLine"> 718</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 719</td> <td class="nbHits"> </td>
diff --git a/coverage/com.google.enterprise.adaptor.AclTransform.html b/coverage/com.google.enterprise.adaptor.AclTransform.html
index a3b5747..dfb59b7 100644
--- a/coverage/com.google.enterprise.adaptor.AclTransform.html
+++ b/coverage/com.google.enterprise.adaptor.AclTransform.html
@@ -12,9 +12,9 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="com.google.enterprise.adaptor.AclTransform.html">AclTransform</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">23/23</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">12/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.1875;</span>3.188</td></tr>
- <tr><td><a href="com.google.enterprise.adaptor.AclTransform.html">AclTransform$MatchData</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">1</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:96px"><span class="text">31/32</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">2</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:95px"><span class="text">40/42</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.1875;</span>3.188</td></tr>
- <tr><td><a href="com.google.enterprise.adaptor.AclTransform.html">AclTransform$Rule</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">15/15</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">12/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.1875;</span>3.188</td></tr>
+ <tr><td><a href="com.google.enterprise.adaptor.AclTransform.html">AclTransform</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">30/30</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">16/16</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.0526315789473686;</span>3.053</td></tr>
+ <tr><td><a href="com.google.enterprise.adaptor.AclTransform.html">AclTransform$MatchData</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">1</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:96px"><span class="text">31/32</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">2</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:95px"><span class="text">40/42</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.0526315789473686;</span>3.053</td></tr>
+ <tr><td><a href="com.google.enterprise.adaptor.AclTransform.html">AclTransform$Rule</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">15/15</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">12/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.0526315789473686;</span>3.053</td></tr>
</table>
<div class="separator"> </div>
@@ -73,26 +73,26 @@
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> List<Rule> rules;</pre></td></tr>
<tr> <td class="numLine"> 27</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 28</td> <td class="nbHitsCovered"> 158</td> <td class="src"><pre class="src"> <span class="keyword">public</span> AclTransform(List<Rule> rules) {</pre></td></tr>
-<tr> <td class="numLineCover"> 29</td> <td class="nbHitsCovered"> 158</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.rules = Collections.unmodifiableList(<span class="keyword">new</span> ArrayList<Rule>(rules));</pre></td></tr>
-<tr> <td class="numLineCover"> 30</td> <td class="nbHitsCovered"> 158</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 28</td> <td class="nbHitsCovered"> 186</td> <td class="src"><pre class="src"> <span class="keyword">public</span> AclTransform(List<Rule> rules) {</pre></td></tr>
+<tr> <td class="numLineCover"> 29</td> <td class="nbHitsCovered"> 186</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.rules = Collections.unmodifiableList(<span class="keyword">new</span> ArrayList<Rule>(rules));</pre></td></tr>
+<tr> <td class="numLineCover"> 30</td> <td class="nbHitsCovered"> 186</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 32</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> Acl transform(Acl acl) {</pre></td></tr>
-<tr> <td class="numLineCover"> 33</td> <td class="nbHitsCovered"><a title="Line 33: Conditional coverage 100% (2/2)."> 51</a></td> <td class="src"><pre class="src"> <a title="Line 33: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (acl == <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 33</td> <td class="nbHitsCovered"><a title="Line 33: Conditional coverage 100% (2/2)."> 57</a></td> <td class="src"><pre class="src"> <a title="Line 33: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (acl == <span class="keyword">null</span>) {</a></pre></td></tr>
<tr> <td class="numLineCover"> 34</td> <td class="nbHitsCovered"> 34</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">null</span>;</pre></td></tr>
<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 36</td> <td class="nbHitsCovered"><a title="Line 36: Conditional coverage 100% (2/2)."> 17</a></td> <td class="src"><pre class="src"> <a title="Line 36: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (rules.isEmpty()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 37</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> <span class="keyword">return</span> acl;</pre></td></tr>
+<tr> <td class="numLineCover"> 36</td> <td class="nbHitsCovered"><a title="Line 36: Conditional coverage 100% (2/2)."> 23</a></td> <td class="src"><pre class="src"> <a title="Line 36: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (rules.isEmpty()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 37</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> <span class="keyword">return</span> acl;</pre></td></tr>
<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 39</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> Acl.Builder(acl)</pre></td></tr>
+<tr> <td class="numLineCover"> 39</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> Acl.Builder(acl)</pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> .setPermits(transform(acl.getPermits()))</pre></td></tr>
+ <td class="src"><pre class="src"> .setPermits(transformInternal(acl.getPermits()))</pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> .setDenies(transform(acl.getDenies()))</pre></td></tr>
+ <td class="src"><pre class="src"> .setDenies(transformInternal(acl.getDenies()))</pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> .build();</pre></td></tr>
<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
@@ -100,234 +100,271 @@
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> Set<Principal> transform(Set<Principal> principals) {</pre></td></tr>
-<tr> <td class="numLineCover"> 46</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> Set<Principal> newPrincipals = <span class="keyword">new</span> TreeSet<Principal>();</pre></td></tr>
-<tr> <td class="numLineCover"> 47</td> <td class="nbHitsCovered"><a title="Line 47: Conditional coverage 100% (2/2)."> 12</a></td> <td class="src"><pre class="src"> <a title="Line 47: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Principal principal : principals) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 48</td> <td class="nbHitsCovered"> 47</td> <td class="src"><pre class="src"> ParsedPrincipal parsed = principal.parse();</pre></td></tr>
-<tr> <td class="numLineCover"> 49</td> <td class="nbHitsCovered"><a title="Line 49: Conditional coverage 100% (2/2)."> 47</a></td> <td class="src"><pre class="src"> <a title="Line 49: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Rule rule : rules) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 50</td> <td class="nbHitsCovered"><a title="Line 50: Conditional coverage 100% (2/2)."> 47</a></td> <td class="src"><pre class="src"> <a title="Line 50: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (rule.match.matches(parsed)) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 51</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> parsed = rule.replace.replace(parsed);</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <T <span class="keyword">extends</span> Principal> Collection<T> transform(</pre></td></tr>
+<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> Collection<T> principals) {</pre></td></tr>
+<tr> <td class="numLineCover"> 47</td> <td class="nbHitsCovered"><a title="Line 47: Conditional coverage 100% (2/2)."> 6</a></td> <td class="src"><pre class="src"> <a title="Line 47: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (rules.isEmpty()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 48</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">return</span> principals;</pre></td></tr>
+<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 50</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> transformInternal(principals);</pre></td></tr>
+<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 54</td> <td class="nbHitsCovered"> 47</td> <td class="src"><pre class="src"> newPrincipals.add(parsed.toPrincipal());</pre></td></tr>
-<tr> <td class="numLineCover"> 55</td> <td class="nbHitsCovered"> 47</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 56</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Collections.unmodifiableSet(newPrincipals);</pre></td></tr>
-<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <T <span class="keyword">extends</span> Principal> T transform(T principal) {</pre></td></tr>
+<tr> <td class="numLineCover"> 54</td> <td class="nbHitsCovered"><a title="Line 54: Conditional coverage 100% (2/2)."> 6</a></td> <td class="src"><pre class="src"> <a title="Line 54: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (rules.isEmpty()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 55</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">return</span> principal;</pre></td></tr>
+<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 57</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> transformInternal(principal);</pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String toString() {</pre></td></tr>
-<tr> <td class="numLineCover"> 61</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="string">"AclTransform(rules="</span> + rules + <span class="string">")"</span>;</pre></td></tr>
-<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <T <span class="keyword">extends</span> Principal> Collection<T> transformInternal(</pre></td></tr>
+<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> Collection<T> principals) {</pre></td></tr>
+<tr> <td class="numLineCover"> 62</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> Collection<T> newPrincipals = <span class="keyword">new</span> ArrayList<T>(principals.size());</pre></td></tr>
+<tr> <td class="numLineCover"> 63</td> <td class="nbHitsCovered"><a title="Line 63: Conditional coverage 100% (2/2)."> 15</a></td> <td class="src"><pre class="src"> <a title="Line 63: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (T principal : principals) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 64</td> <td class="nbHitsCovered"> 49</td> <td class="src"><pre class="src"> newPrincipals.add(transformInternal(principal));</pre></td></tr>
<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> hashCode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 66</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> rules.hashCode();</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 66</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Collections.unmodifiableCollection(newPrincipals);</pre></td></tr>
<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> equals(Object o) {</pre></td></tr>
-<tr> <td class="numLineCover"> 71</td> <td class="nbHitsCovered"><a title="Line 71: Conditional coverage 100% (2/2)."> 6</a></td> <td class="src"><pre class="src"> <a title="Line 71: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!(o <span class="keyword">instanceof</span> AclTransform)) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 72</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
-<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <T <span class="keyword">extends</span> Principal> T transformInternal(T principal) {</pre></td></tr>
+<tr> <td class="numLineCover"> 70</td> <td class="nbHitsCovered"> 50</td> <td class="src"><pre class="src"> ParsedPrincipal parsed = principal.parse();</pre></td></tr>
+<tr> <td class="numLineCover"> 71</td> <td class="nbHitsCovered"><a title="Line 71: Conditional coverage 100% (2/2)."> 50</a></td> <td class="src"><pre class="src"> <a title="Line 71: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Rule rule : rules) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 72</td> <td class="nbHitsCovered"><a title="Line 72: Conditional coverage 100% (2/2)."> 52</a></td> <td class="src"><pre class="src"> <a title="Line 72: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (rule.match.matches(parsed)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 73</td> <td class="nbHitsCovered"> 30</td> <td class="src"><pre class="src"> parsed = rule.replace.replace(parsed);</pre></td></tr>
+<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 74</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> AclTransform a = (AclTransform) o;</pre></td></tr>
-<tr> <td class="numLineCover"> 75</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">return</span> rules.equals(a.rules);</pre></td></tr>
<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 78</td> <td class="nbHitsCovered"> 74</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> <span class="keyword">class</span> Rule {</pre></td></tr>
+ <td class="src"><pre class="src"> @SuppressWarnings(<span class="string">"unchecked"</span>)</pre></td></tr>
+<tr> <td class="numLineCover"> 77</td> <td class="nbHitsCovered"> 50</td> <td class="src"><pre class="src"> T principalNew = (T) parsed.toPrincipal();</pre></td></tr>
+<tr> <td class="numLineCover"> 78</td> <td class="nbHitsCovered"> 50</td> <td class="src"><pre class="src"> <span class="keyword">return</span> principalNew;</pre></td></tr>
<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> MatchData match;</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> MatchData replace;</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 82</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> <span class="keyword">public</span> Rule(MatchData match, MatchData replace) {</pre></td></tr>
-<tr> <td class="numLineCover"> 83</td> <td class="nbHitsCovered"><a title="Line 83: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 20</a></td> <td class="src"><pre class="src"> <a title="Line 83: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (match == <span class="keyword">null</span> || replace == <span class="keyword">null</span>) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 84</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> NullPointerException();</pre></td></tr>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String toString() {</pre></td></tr>
+<tr> <td class="numLineCover"> 83</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="string">"AclTransform(rules="</span> + rules + <span class="string">")"</span>;</pre></td></tr>
+<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 86</td> <td class="nbHitsCovered"><a title="Line 86: Conditional coverage 100% (2/2)."> 18</a></td> <td class="src"><pre class="src"> <a title="Line 86: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (replace.isGroup != <span class="keyword">null</span>) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 87</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalArgumentException(</pre></td></tr>
-<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="string">"isGroup must be null for replacements"</span>);</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> hashCode() {</pre></td></tr>
+<tr> <td class="numLineCover"> 88</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> rules.hashCode();</pre></td></tr>
<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 90</td> <td class="nbHitsCovered"> 17</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.match = match;</pre></td></tr>
-<tr> <td class="numLineCover"> 91</td> <td class="nbHitsCovered"> 17</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.replace = replace;</pre></td></tr>
-<tr> <td class="numLineCover"> 92</td> <td class="nbHitsCovered"> 17</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> equals(Object o) {</pre></td></tr>
+<tr> <td class="numLineCover"> 93</td> <td class="nbHitsCovered"><a title="Line 93: Conditional coverage 100% (2/2)."> 6</a></td> <td class="src"><pre class="src"> <a title="Line 93: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!(o <span class="keyword">instanceof</span> AclTransform)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 94</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String toString() {</pre></td></tr>
-<tr> <td class="numLineCover"> 96</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="string">"Rule(match="</span> + match + <span class="string">",replace="</span> + replace + <span class="string">")"</span>;</pre></td></tr>
-<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 96</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> AclTransform a = (AclTransform) o;</pre></td></tr>
+<tr> <td class="numLineCover"> 97</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">return</span> rules.equals(a.rules);</pre></td></tr>
<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> hashCode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 101</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Arrays.hashCode(<span class="keyword">new</span> Object[] {match, replace});</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 100</td> <td class="nbHitsCovered"> 82</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> <span class="keyword">class</span> Rule {</pre></td></tr>
+<tr> <td class="numLine"> 101</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> MatchData match;</pre></td></tr>
<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> MatchData replace;</pre></td></tr>
<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> equals(Object o) {</pre></td></tr>
-<tr> <td class="numLineCover"> 106</td> <td class="nbHitsCovered"><a title="Line 106: Conditional coverage 100% (2/2)."> 10</a></td> <td class="src"><pre class="src"> <a title="Line 106: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!(o <span class="keyword">instanceof</span> Rule)) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 107</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
-<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 104</td> <td class="nbHitsCovered"> 23</td> <td class="src"><pre class="src"> <span class="keyword">public</span> Rule(MatchData match, MatchData replace) {</pre></td></tr>
+<tr> <td class="numLineCover"> 105</td> <td class="nbHitsCovered"><a title="Line 105: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 23</a></td> <td class="src"><pre class="src"> <a title="Line 105: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (match == <span class="keyword">null</span> || replace == <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 106</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> NullPointerException();</pre></td></tr>
+<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 109</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> Rule r = (Rule) o;</pre></td></tr>
-<tr> <td class="numLineCover"> 110</td> <td class="nbHitsCovered"><a title="Line 110: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 110: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">return</span> match.equals(r.match) && replace.equals(r.replace);</a></pre></td></tr>
+<tr> <td class="numLineCover"> 108</td> <td class="nbHitsCovered"><a title="Line 108: Conditional coverage 100% (2/2)."> 21</a></td> <td class="src"><pre class="src"> <a title="Line 108: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (replace.isGroup != <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 109</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalArgumentException(</pre></td></tr>
+<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="string">"isGroup must be null for replacements"</span>);</pre></td></tr>
<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 114</td> <td class="nbHitsCovered"> 74</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> <span class="keyword">class</span> MatchData {</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 112</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.match = match;</pre></td></tr>
+<tr> <td class="numLineCover"> 113</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.replace = replace;</pre></td></tr>
+<tr> <td class="numLineCover"> 114</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Visible for GsaCommunicationHandler</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">final</span> Boolean isGroup;</pre></td></tr>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> String name;</pre></td></tr>
-<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> String domain;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String toString() {</pre></td></tr>
+<tr> <td class="numLineCover"> 118</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="string">"Rule(match="</span> + match + <span class="string">",replace="</span> + replace + <span class="string">")"</span>;</pre></td></tr>
<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> String namespace;</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * For matching, non-{@code null} fields must be equal on Principal. For</span></pre></td></tr>
-<tr> <td class="numLine"> 123</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * replacing, non-{@code null} fields will get set on Principal.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> hashCode() {</pre></td></tr>
+<tr> <td class="numLineCover"> 123</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Arrays.hashCode(<span class="keyword">new</span> Object[] {match, replace});</pre></td></tr>
<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * {@code isGroup} must be {@code null} for replacements.</span></pre></td></tr>
-<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> MatchData(Boolean isGroup, String name, String domain,</pre></td></tr>
-<tr> <td class="numLineCover"> 127</td> <td class="nbHitsCovered"> 47</td> <td class="src"><pre class="src"> String namespace) {</pre></td></tr>
-<tr> <td class="numLineCover"> 128</td> <td class="nbHitsCovered"> 47</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.isGroup = isGroup;</pre></td></tr>
-<tr> <td class="numLineCover"> 129</td> <td class="nbHitsCovered"> 47</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.name = name;</pre></td></tr>
-<tr> <td class="numLineCover"> 130</td> <td class="nbHitsCovered"> 47</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.domain = domain;</pre></td></tr>
-<tr> <td class="numLineCover"> 131</td> <td class="nbHitsCovered"> 47</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.namespace = namespace;</pre></td></tr>
-<tr> <td class="numLineCover"> 132</td> <td class="nbHitsCovered"> 47</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> matches(ParsedPrincipal principal) {</pre></td></tr>
-<tr> <td class="numLineCover"> 135</td> <td class="nbHitsCovered"> 47</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> matches = <span class="keyword">true</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 136</td> <td class="nbHitsCovered"><a title="Line 136: Conditional coverage 100% (2/2)."> 47</a></td> <td class="src"><pre class="src"> <a title="Line 136: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (isGroup != <span class="keyword">null</span>) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 137</td> <td class="nbHitsUncovered"><a title="Line 137: Conditional coverage 75% (3/4) [each condition: 50%, 100%]."> 18</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 137: Conditional coverage 75% (3/4) [each condition: 50%, 100%]."> matches = matches && isGroup.equals(principal.isGroup);</a></span></pre></td></tr>
-<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 139</td> <td class="nbHitsCovered"><a title="Line 139: Conditional coverage 100% (2/2)."> 47</a></td> <td class="src"><pre class="src"> <a title="Line 139: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (name != <span class="keyword">null</span>) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 140</td> <td class="nbHitsCovered"><a title="Line 140: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 20</a></td> <td class="src"><pre class="src"> <a title="Line 140: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> matches = matches && name.equals(principal.plainName);</a></pre></td></tr>
-<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 142</td> <td class="nbHitsCovered"><a title="Line 142: Conditional coverage 100% (2/2)."> 47</a></td> <td class="src"><pre class="src"> <a title="Line 142: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (domain != <span class="keyword">null</span>) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 143</td> <td class="nbHitsCovered"><a title="Line 143: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 143: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> matches = matches && domain.equals(principal.domain);</a></pre></td></tr>
-<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 145</td> <td class="nbHitsCovered"><a title="Line 145: Conditional coverage 100% (2/2)."> 47</a></td> <td class="src"><pre class="src"> <a title="Line 145: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (namespace != <span class="keyword">null</span>) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 146</td> <td class="nbHitsCovered"><a title="Line 146: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 146: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> matches = matches && namespace.equals(principal.namespace);</a></pre></td></tr>
-<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 148</td> <td class="nbHitsCovered"> 47</td> <td class="src"><pre class="src"> <span class="keyword">return</span> matches;</pre></td></tr>
-<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> ParsedPrincipal replace(ParsedPrincipal principal) {</pre></td></tr>
-<tr> <td class="numLineCover"> 152</td> <td class="nbHitsUncovered"><a title="Line 152: Conditional coverage 50% (1/2)."> 27</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 152: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (isGroup != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 153</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AssertionError();</span></pre></td></tr>
-<tr> <td class="numLine"> 154</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> equals(Object o) {</pre></td></tr>
+<tr> <td class="numLineCover"> 128</td> <td class="nbHitsCovered"><a title="Line 128: Conditional coverage 100% (2/2)."> 10</a></td> <td class="src"><pre class="src"> <a title="Line 128: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!(o <span class="keyword">instanceof</span> Rule)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 129</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 155</td> <td class="nbHitsCovered"><a title="Line 155: Conditional coverage 100% (2/2)."> 27</a></td> <td class="src"><pre class="src"> <a title="Line 155: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (name != <span class="keyword">null</span>) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 156</td> <td class="nbHitsCovered"> 17</td> <td class="src"><pre class="src"> principal = principal.plainName(name);</pre></td></tr>
-<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 158</td> <td class="nbHitsCovered"><a title="Line 158: Conditional coverage 100% (2/2)."> 27</a></td> <td class="src"><pre class="src"> <a title="Line 158: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (domain != <span class="keyword">null</span>) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 159</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> principal = principal.domain(domain);</pre></td></tr>
+<tr> <td class="numLineCover"> 131</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> Rule r = (Rule) o;</pre></td></tr>
+<tr> <td class="numLineCover"> 132</td> <td class="nbHitsCovered"><a title="Line 132: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 132: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">return</span> match.equals(r.match) && replace.equals(r.replace);</a></pre></td></tr>
+<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 135</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 136</td> <td class="nbHitsCovered"> 82</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> <span class="keyword">class</span> MatchData {</pre></td></tr>
+<tr> <td class="numLine"> 137</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// Visible for GsaCommunicationHandler</span></pre></td></tr>
+<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">final</span> Boolean isGroup;</pre></td></tr>
+<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> String name;</pre></td></tr>
+<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> String domain;</pre></td></tr>
+<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> String namespace;</pre></td></tr>
+<tr> <td class="numLine"> 142</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 143</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * For matching, non-{@code null} fields must be equal on Principal. For</span></pre></td></tr>
+<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * replacing, non-{@code null} fields will get set on Principal.</span></pre></td></tr>
+<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * {@code isGroup} must be {@code null} for replacements.</span></pre></td></tr>
+<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> MatchData(Boolean isGroup, String name, String domain,</pre></td></tr>
+<tr> <td class="numLineCover"> 149</td> <td class="nbHitsCovered"> 53</td> <td class="src"><pre class="src"> String namespace) {</pre></td></tr>
+<tr> <td class="numLineCover"> 150</td> <td class="nbHitsCovered"> 53</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.isGroup = isGroup;</pre></td></tr>
+<tr> <td class="numLineCover"> 151</td> <td class="nbHitsCovered"> 53</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.name = name;</pre></td></tr>
+<tr> <td class="numLineCover"> 152</td> <td class="nbHitsCovered"> 53</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.domain = domain;</pre></td></tr>
+<tr> <td class="numLineCover"> 153</td> <td class="nbHitsCovered"> 53</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.namespace = namespace;</pre></td></tr>
+<tr> <td class="numLineCover"> 154</td> <td class="nbHitsCovered"> 53</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> matches(ParsedPrincipal principal) {</pre></td></tr>
+<tr> <td class="numLineCover"> 157</td> <td class="nbHitsCovered"> 52</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> matches = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 158</td> <td class="nbHitsCovered"><a title="Line 158: Conditional coverage 100% (2/2)."> 52</a></td> <td class="src"><pre class="src"> <a title="Line 158: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (isGroup != <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 159</td> <td class="nbHitsUncovered"><a title="Line 159: Conditional coverage 75% (3/4) [each condition: 50%, 100%]."> 18</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 159: Conditional coverage 75% (3/4) [each condition: 50%, 100%]."> matches = matches && isGroup.equals(principal.isGroup);</a></span></pre></td></tr>
<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 161</td> <td class="nbHitsCovered"><a title="Line 161: Conditional coverage 100% (2/2)."> 27</a></td> <td class="src"><pre class="src"> <a title="Line 161: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (namespace != <span class="keyword">null</span>) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 162</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> principal = principal.namespace(namespace);</pre></td></tr>
+<tr> <td class="numLineCover"> 161</td> <td class="nbHitsCovered"><a title="Line 161: Conditional coverage 100% (2/2)."> 52</a></td> <td class="src"><pre class="src"> <a title="Line 161: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (name != <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 162</td> <td class="nbHitsCovered"><a title="Line 162: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 24</a></td> <td class="src"><pre class="src"> <a title="Line 162: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> matches = matches && name.equals(principal.plainName);</a></pre></td></tr>
<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 164</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> <span class="keyword">return</span> principal;</pre></td></tr>
-<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 164</td> <td class="nbHitsCovered"><a title="Line 164: Conditional coverage 100% (2/2)."> 52</a></td> <td class="src"><pre class="src"> <a title="Line 164: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (domain != <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 165</td> <td class="nbHitsCovered"><a title="Line 165: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 165: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> matches = matches && domain.equals(principal.domain);</a></pre></td></tr>
<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 167</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 168</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String toString() {</pre></td></tr>
-<tr> <td class="numLineCover"> 169</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="string">"MatchData(isGroup="</span> + isGroup + <span class="string">",name="</span> + name</pre></td></tr>
-<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> + <span class="string">",domain="</span> + domain + <span class="string">",namespace="</span> + namespace + <span class="string">")"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 167</td> <td class="nbHitsCovered"><a title="Line 167: Conditional coverage 100% (2/2)."> 52</a></td> <td class="src"><pre class="src"> <a title="Line 167: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (namespace != <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 168</td> <td class="nbHitsCovered"><a title="Line 168: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 168: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> matches = matches && namespace.equals(principal.namespace);</a></pre></td></tr>
+<tr> <td class="numLine"> 169</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 170</td> <td class="nbHitsCovered"> 52</td> <td class="src"><pre class="src"> <span class="keyword">return</span> matches;</pre></td></tr>
<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 174</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> hashCode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 175</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Arrays.hashCode(<span class="keyword">new</span> Object[] {isGroup, name, domain, namespace});</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> ParsedPrincipal replace(ParsedPrincipal principal) {</pre></td></tr>
+<tr> <td class="numLineCover"> 174</td> <td class="nbHitsUncovered"><a title="Line 174: Conditional coverage 50% (1/2)."> 30</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 174: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (isGroup != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 175</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AssertionError();</span></pre></td></tr>
<tr> <td class="numLine"> 176</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 177</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 178</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 177</td> <td class="nbHitsCovered"><a title="Line 177: Conditional coverage 100% (2/2)."> 30</a></td> <td class="src"><pre class="src"> <a title="Line 177: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (name != <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 178</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> principal = principal.plainName(name);</pre></td></tr>
<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> equals(Object o) {</pre></td></tr>
-<tr> <td class="numLineCover"> 180</td> <td class="nbHitsCovered"><a title="Line 180: Conditional coverage 100% (2/2)."> 26</a></td> <td class="src"><pre class="src"> <a title="Line 180: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!(o <span class="keyword">instanceof</span> MatchData)) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 181</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 180</td> <td class="nbHitsCovered"><a title="Line 180: Conditional coverage 100% (2/2)."> 30</a></td> <td class="src"><pre class="src"> <a title="Line 180: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (domain != <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 181</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> principal = principal.domain(domain);</pre></td></tr>
<tr> <td class="numLine"> 182</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 183</td> <td class="nbHitsCovered"> 25</td> <td class="src"><pre class="src"> MatchData m = (MatchData) o;</pre></td></tr>
-<tr> <td class="numLineCover"> 184</td> <td class="nbHitsCovered"><a title="Line 184: Conditional coverage 100% (8/8) [each condition: 100%, 100%, 100%, 100%]."> 25</a></td> <td class="src"><pre class="src"> <a title="Line 184: Conditional coverage 100% (8/8) [each condition: 100%, 100%, 100%, 100%]."> <span class="keyword">return</span> Objects.equal(isGroup, m.isGroup)</a></pre></td></tr>
+<tr> <td class="numLineCover"> 183</td> <td class="nbHitsCovered"><a title="Line 183: Conditional coverage 100% (2/2)."> 30</a></td> <td class="src"><pre class="src"> <a title="Line 183: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (namespace != <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 184</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> principal = principal.namespace(namespace);</pre></td></tr>
<tr> <td class="numLine"> 185</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> && Objects.equal(name, m.name)</pre></td></tr>
-<tr> <td class="numLine"> 186</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> && Objects.equal(domain, m.domain)</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 186</td> <td class="nbHitsCovered"> 30</td> <td class="src"><pre class="src"> <span class="keyword">return</span> principal;</pre></td></tr>
<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> && Objects.equal(namespace, m.namespace);</pre></td></tr>
-<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 189</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String toString() {</pre></td></tr>
+<tr> <td class="numLineCover"> 191</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="string">"MatchData(isGroup="</span> + isGroup + <span class="string">",name="</span> + name</pre></td></tr>
+<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> + <span class="string">",domain="</span> + domain + <span class="string">",namespace="</span> + namespace + <span class="string">")"</span>;</pre></td></tr>
+<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> hashCode() {</pre></td></tr>
+<tr> <td class="numLineCover"> 197</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Arrays.hashCode(<span class="keyword">new</span> Object[] {isGroup, name, domain, namespace});</pre></td></tr>
+<tr> <td class="numLine"> 198</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 199</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 200</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 201</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> equals(Object o) {</pre></td></tr>
+<tr> <td class="numLineCover"> 202</td> <td class="nbHitsCovered"><a title="Line 202: Conditional coverage 100% (2/2)."> 26</a></td> <td class="src"><pre class="src"> <a title="Line 202: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!(o <span class="keyword">instanceof</span> MatchData)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 203</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLine"> 204</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 205</td> <td class="nbHitsCovered"> 25</td> <td class="src"><pre class="src"> MatchData m = (MatchData) o;</pre></td></tr>
+<tr> <td class="numLineCover"> 206</td> <td class="nbHitsCovered"><a title="Line 206: Conditional coverage 100% (8/8) [each condition: 100%, 100%, 100%, 100%]."> 25</a></td> <td class="src"><pre class="src"> <a title="Line 206: Conditional coverage 100% (8/8) [each condition: 100%, 100%, 100%, 100%]."> <span class="keyword">return</span> Objects.equal(isGroup, m.isGroup)</a></pre></td></tr>
+<tr> <td class="numLine"> 207</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> && Objects.equal(name, m.name)</pre></td></tr>
+<tr> <td class="numLine"> 208</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> && Objects.equal(domain, m.domain)</pre></td></tr>
+<tr> <td class="numLine"> 209</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> && Objects.equal(namespace, m.namespace);</pre></td></tr>
+<tr> <td class="numLine"> 210</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 211</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 212</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
diff --git a/coverage/com.google.enterprise.adaptor.CircularBufferHandler.html b/coverage/com.google.enterprise.adaptor.CircularBufferHandler.html
index 0a9af46..4da260b 100644
--- a/coverage/com.google.enterprise.adaptor.CircularBufferHandler.html
+++ b/coverage/com.google.enterprise.adaptor.CircularBufferHandler.html
@@ -103,17 +103,17 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">synchronized</span> <span class="keyword">void</span> publish(LogRecord record) {</pre></td></tr>
-<tr> <td class="numLineCover"> 48</td> <td class="nbHitsUncovered"><a title="Line 48: Conditional coverage 50% (1/2)."> 136</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 48: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!isLoggable(record)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 48</td> <td class="nbHitsUncovered"><a title="Line 48: Conditional coverage 50% (1/2)."> 135</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 48: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!isLoggable(record)) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 49</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 51</td> <td class="nbHitsCovered"> 136</td> <td class="src"><pre class="src"> buffer[tail] = record;</pre></td></tr>
-<tr> <td class="numLineCover"> 52</td> <td class="nbHitsCovered"> 136</td> <td class="src"><pre class="src"> tail = (tail + 1) % buffer.length;</pre></td></tr>
-<tr> <td class="numLineCover"> 53</td> <td class="nbHitsUncovered"><a title="Line 53: Conditional coverage 50% (1/2)."> 136</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 53: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (head == tail) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 51</td> <td class="nbHitsCovered"> 135</td> <td class="src"><pre class="src"> buffer[tail] = record;</pre></td></tr>
+<tr> <td class="numLineCover"> 52</td> <td class="nbHitsCovered"> 135</td> <td class="src"><pre class="src"> tail = (tail + 1) % buffer.length;</pre></td></tr>
+<tr> <td class="numLineCover"> 53</td> <td class="nbHitsUncovered"><a title="Line 53: Conditional coverage 50% (1/2)."> 135</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 53: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (head == tail) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 54</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> head = (head + 1) % buffer.length;</span></pre></td></tr>
<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 56</td> <td class="nbHitsCovered"> 136</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 56</td> <td class="nbHitsCovered"> 135</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
diff --git a/coverage/com.google.enterprise.adaptor.DocId.html b/coverage/com.google.enterprise.adaptor.DocId.html
index 16ed580..cca96fe 100644
--- a/coverage/com.google.enterprise.adaptor.DocId.html
+++ b/coverage/com.google.enterprise.adaptor.DocId.html
@@ -90,13 +90,13 @@
<td class="src"><pre class="src"> <span class="comment"> * @param id non-{@code null} document identifier</span></pre></td></tr>
<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 38</td> <td class="nbHitsCovered"> 60419</td> <td class="src"><pre class="src"> <span class="keyword">public</span> DocId(String id) {</pre></td></tr>
-<tr> <td class="numLineCover"> 39</td> <td class="nbHitsCovered"><a title="Line 39: Conditional coverage 100% (2/2)."> 60419</a></td> <td class="src"><pre class="src"> <a title="Line 39: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (id == <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 38</td> <td class="nbHitsCovered"> 60420</td> <td class="src"><pre class="src"> <span class="keyword">public</span> DocId(String id) {</pre></td></tr>
+<tr> <td class="numLineCover"> 39</td> <td class="nbHitsCovered"><a title="Line 39: Conditional coverage 100% (2/2)."> 60420</a></td> <td class="src"><pre class="src"> <a title="Line 39: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (id == <span class="keyword">null</span>) {</a></pre></td></tr>
<tr> <td class="numLineCover"> 40</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> NullPointerException();</pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 42</td> <td class="nbHitsCovered"> 60418</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.uniqId = id;</pre></td></tr>
-<tr> <td class="numLineCover"> 43</td> <td class="nbHitsCovered"> 60418</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 42</td> <td class="nbHitsCovered"> 60419</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.uniqId = id;</pre></td></tr>
+<tr> <td class="numLineCover"> 43</td> <td class="nbHitsCovered"> 60419</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
@@ -107,7 +107,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> String getUniqueId() {</pre></td></tr>
-<tr> <td class="numLineCover"> 49</td> <td class="nbHitsCovered"> 30270</td> <td class="src"><pre class="src"> <span class="keyword">return</span> uniqId;</pre></td></tr>
+<tr> <td class="numLineCover"> 49</td> <td class="nbHitsCovered"> 30271</td> <td class="src"><pre class="src"> <span class="keyword">return</span> uniqId;</pre></td></tr>
<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
diff --git a/coverage/com.google.enterprise.adaptor.DocIdSender.html b/coverage/com.google.enterprise.adaptor.DocIdSender.html
index 6151372..a08e9ba 100644
--- a/coverage/com.google.enterprise.adaptor.DocIdSender.html
+++ b/coverage/com.google.enterprise.adaptor.DocIdSender.html
@@ -584,38 +584,38 @@
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 364</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> AclItem(DocId id, Acl acl) {</pre></td></tr>
-<tr> <td class="numLineCover"> 365</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> <span class="keyword">this</span>(id, <span class="keyword">null</span>, acl);</pre></td></tr>
-<tr> <td class="numLineCover"> 366</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 365</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">this</span>(id, <span class="keyword">null</span>, acl);</pre></td></tr>
+<tr> <td class="numLineCover"> 366</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 367</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 368</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> <span class="keyword">public</span> AclItem(DocId id, String docIdFragment, Acl acl) {</pre></td></tr>
-<tr> <td class="numLineCover"> 369</td> <td class="nbHitsCovered"><a title="Line 369: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 14</a></td> <td class="src"><pre class="src"> <a title="Line 369: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (id == <span class="keyword">null</span> || acl == <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 368</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> <span class="keyword">public</span> AclItem(DocId id, String docIdFragment, Acl acl) {</pre></td></tr>
+<tr> <td class="numLineCover"> 369</td> <td class="nbHitsCovered"><a title="Line 369: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 15</a></td> <td class="src"><pre class="src"> <a title="Line 369: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (id == <span class="keyword">null</span> || acl == <span class="keyword">null</span>) {</a></pre></td></tr>
<tr> <td class="numLineCover"> 370</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> NullPointerException(<span class="string">"DocId and Acl must not be null"</span>);</pre></td></tr>
<tr> <td class="numLine"> 371</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 372</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.id = id;</pre></td></tr>
-<tr> <td class="numLineCover"> 373</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.docIdFragment = docIdFragment;</pre></td></tr>
-<tr> <td class="numLineCover"> 374</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.acl = acl;</pre></td></tr>
-<tr> <td class="numLineCover"> 375</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 372</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.id = id;</pre></td></tr>
+<tr> <td class="numLineCover"> 373</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.docIdFragment = docIdFragment;</pre></td></tr>
+<tr> <td class="numLineCover"> 374</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.acl = acl;</pre></td></tr>
+<tr> <td class="numLineCover"> 375</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 376</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 377</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> DocId getDocId() {</pre></td></tr>
-<tr> <td class="numLineCover"> 378</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">return</span> id;</pre></td></tr>
+<tr> <td class="numLineCover"> 378</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> <span class="keyword">return</span> id;</pre></td></tr>
<tr> <td class="numLine"> 379</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 380</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 381</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> String getDocIdFragment() {</pre></td></tr>
-<tr> <td class="numLineCover"> 382</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> <span class="keyword">return</span> docIdFragment;</pre></td></tr>
+<tr> <td class="numLineCover"> 382</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">return</span> docIdFragment;</pre></td></tr>
<tr> <td class="numLine"> 383</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 384</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 385</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> Acl getAcl() {</pre></td></tr>
-<tr> <td class="numLineCover"> 386</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> <span class="keyword">return</span> acl;</pre></td></tr>
+<tr> <td class="numLineCover"> 386</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">return</span> acl;</pre></td></tr>
<tr> <td class="numLine"> 387</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 388</td> <td class="nbHits"> </td>
diff --git a/coverage/com.google.enterprise.adaptor.GroupPrincipal.html b/coverage/com.google.enterprise.adaptor.GroupPrincipal.html
index 2538bb7..195fc76 100644
--- a/coverage/com.google.enterprise.adaptor.GroupPrincipal.html
+++ b/coverage/com.google.enterprise.adaptor.GroupPrincipal.html
@@ -67,14 +67,14 @@
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">final</span> <span class="keyword">class</span> GroupPrincipal <span class="keyword">extends</span> Principal {</pre></td></tr>
<tr> <td class="numLine"> 25</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> GroupPrincipal(String name, String namespace) {</pre></td></tr>
-<tr> <td class="numLineCover"> 26</td> <td class="nbHitsCovered"> 67</td> <td class="src"><pre class="src"> <span class="keyword">super</span>(name, namespace);</pre></td></tr>
-<tr> <td class="numLineCover"> 27</td> <td class="nbHitsCovered"> 66</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 26</td> <td class="nbHitsCovered"> 68</td> <td class="src"><pre class="src"> <span class="keyword">super</span>(name, namespace);</pre></td></tr>
+<tr> <td class="numLineCover"> 27</td> <td class="nbHitsCovered"> 67</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 28</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 29</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> GroupPrincipal(String name) {</pre></td></tr>
-<tr> <td class="numLineCover"> 30</td> <td class="nbHitsCovered"> 161</td> <td class="src"><pre class="src"> <span class="keyword">super</span>(name);</pre></td></tr>
-<tr> <td class="numLineCover"> 31</td> <td class="nbHitsCovered"> 159</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 30</td> <td class="nbHitsCovered"> 162</td> <td class="src"><pre class="src"> <span class="keyword">super</span>(name);</pre></td></tr>
+<tr> <td class="numLineCover"> 31</td> <td class="nbHitsCovered"> 160</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 32</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
@@ -83,7 +83,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isUser() {</pre></td></tr>
-<tr> <td class="numLineCover"> 36</td> <td class="nbHitsCovered"> 963</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 36</td> <td class="nbHitsCovered"> 900</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
@@ -94,7 +94,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isGroup() {</pre></td></tr>
-<tr> <td class="numLineCover"> 42</td> <td class="nbHitsCovered"> 102</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 42</td> <td class="nbHitsCovered"> 106</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">true</span>;</pre></td></tr>
<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
diff --git a/coverage/com.google.enterprise.adaptor.GsaCommunicationHandler.html b/coverage/com.google.enterprise.adaptor.GsaCommunicationHandler.html
index 007dd17..673de93 100644
--- a/coverage/com.google.enterprise.adaptor.GsaCommunicationHandler.html
+++ b/coverage/com.google.enterprise.adaptor.GsaCommunicationHandler.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="com.google.enterprise.adaptor.GsaCommunicationHandler.html">GsaCommunicationHandler</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">53</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:82px"><span class="text">249/302</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">22</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:78px"><span class="text">82/104</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.7555555555555555;</span>3.756</td></tr>
+ <tr><td><a href="com.google.enterprise.adaptor.GsaCommunicationHandler.html">GsaCommunicationHandler</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">53</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:82px"><span class="text">250/303</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">22</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:78px"><span class="text">82/104</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.7555555555555555;</span>3.756</td></tr>
<tr><td><a href="com.google.enterprise.adaptor.GsaCommunicationHandler.html">GsaCommunicationHandler$1</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.7555555555555555;</span>3.756</td></tr>
<tr><td><a href="com.google.enterprise.adaptor.GsaCommunicationHandler.html">GsaCommunicationHandler$AdaptorContextImpl</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">24</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:35px"><span class="text">13/37</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">9</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:10px"><span class="text">1/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.7555555555555555;</span>3.756</td></tr>
<tr><td><a href="com.google.enterprise.adaptor.GsaCommunicationHandler.html">GsaCommunicationHandler$AlreadyRunningRunnable</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">2</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:33px"><span class="text">1/3</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.7555555555555555;</span>3.756</td></tr>
@@ -403,1125 +403,1126 @@
<td class="src"><pre class="src"> config.getGsaHostname(), config.isServerSecure(),</pre></td></tr>
<tr> <td class="numLine"> 216</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> config.getGsaCharacterEncoding());</pre></td></tr>
-<tr> <td class="numLineCover"> 217</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> GsaFeedFileMaker fileMaker = <span class="keyword">new</span> GsaFeedFileMaker(docIdCodec,</pre></td></tr>
-<tr> <td class="numLine"> 218</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> config.isGsa614FeedWorkaroundEnabled(),</pre></td></tr>
+<tr> <td class="numLineCover"> 217</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> AclTransform aclTransform = createAclTransform();</pre></td></tr>
+<tr> <td class="numLineCover"> 218</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> GsaFeedFileMaker fileMaker = <span class="keyword">new</span> GsaFeedFileMaker(docIdCodec, aclTransform,</pre></td></tr>
<tr> <td class="numLine"> 219</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> config.isGsa614FeedWorkaroundEnabled(),</pre></td></tr>
+<tr> <td class="numLine"> 220</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> config.isGsa70AuthMethodWorkaroundEnabled());</pre></td></tr>
-<tr> <td class="numLineCover"> 220</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> docIdSender</pre></td></tr>
-<tr> <td class="numLine"> 221</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> = <span class="keyword">new</span> DocIdSender(fileMaker, fileSender, journal, config, adaptor);</pre></td></tr>
+<tr> <td class="numLineCover"> 221</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> docIdSender</pre></td></tr>
<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> = <span class="keyword">new</span> DocIdSender(fileMaker, fileSender, journal, config, adaptor);</pre></td></tr>
+<tr> <td class="numLine"> 223</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 223</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> dashboard = <span class="keyword">new</span> Dashboard(config, <span class="keyword">this</span>, journal, sessionManager,</pre></td></tr>
-<tr> <td class="numLine"> 224</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> secureValueCodec, adaptor);</pre></td></tr>
+<tr> <td class="numLineCover"> 224</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> dashboard = <span class="keyword">new</span> Dashboard(config, <span class="keyword">this</span>, journal, sessionManager,</pre></td></tr>
<tr> <td class="numLine"> 225</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> secureValueCodec, adaptor);</pre></td></tr>
<tr> <td class="numLine"> 226</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// We are about to start the Adaptor, so anything available through</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 227</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// AdaptorContext or other means must be initialized at this point. Any</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// We are about to start the Adaptor, so anything available through</span></pre></td></tr>
<tr> <td class="numLine"> 228</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// reference to 'adaptor' before this point must be done very carefully to</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// AdaptorContext or other means must be initialized at this point. Any</span></pre></td></tr>
<tr> <td class="numLine"> 229</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// ensure it doesn't call the adaptor until after Adaptor.init() completes.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// reference to 'adaptor' before this point must be done very carefully to</span></pre></td></tr>
<tr> <td class="numLine"> 230</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// ensure it doesn't call the adaptor until after Adaptor.init() completes.</span></pre></td></tr>
+<tr> <td class="numLine"> 231</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 231</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> <span class="keyword">long</span> sleepDurationMillis = 1000;</pre></td></tr>
-<tr> <td class="numLine"> 232</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 232</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> <span class="keyword">long</span> sleepDurationMillis = 1000;</pre></td></tr>
+<tr> <td class="numLine"> 233</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// An hour.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 233</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> <span class="keyword">long</span> maxSleepDurationMillis = 60 * 60 * 1000;</pre></td></tr>
-<tr> <td class="numLine"> 234</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Loop until 1) the adaptor starts successfully, 2) stop() is called, or</span></pre></td></tr>
+<tr> <td class="numLineCover"> 234</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> <span class="keyword">long</span> maxSleepDurationMillis = 60 * 60 * 1000;</pre></td></tr>
<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// 3) Thread.interrupt() is called on this thread (which we don't do).</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// Loop until 1) the adaptor starts successfully, 2) stop() is called, or</span></pre></td></tr>
<tr> <td class="numLine"> 236</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Retrying to start the adaptor is helpful in cases where it needs</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// 3) Thread.interrupt() is called on this thread (which we don't do).</span></pre></td></tr>
<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// initialization data from a repository that is temporarily down; if the</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// Retrying to start the adaptor is helpful in cases where it needs</span></pre></td></tr>
<tr> <td class="numLine"> 238</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// adaptor is running as a service, we don't want to stop starting simply</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// initialization data from a repository that is temporarily down; if the</span></pre></td></tr>
<tr> <td class="numLine"> 239</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// because another computer is down while we start (which would easily be</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// adaptor is running as a service, we don't want to stop starting simply</span></pre></td></tr>
<tr> <td class="numLine"> 240</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// the case after a power failure).</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// because another computer is down while we start (which would easily be</span></pre></td></tr>
<tr> <td class="numLine"> 241</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">while</span> (<span class="keyword">true</span>) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// the case after a power failure).</span></pre></td></tr>
<tr> <td class="numLine"> 242</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">while</span> (<span class="keyword">true</span>) {</pre></td></tr>
+<tr> <td class="numLine"> 243</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 243</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> tryToPutVersionIntoConfig();</pre></td></tr>
-<tr> <td class="numLineCover"> 244</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> String adaptorType = adaptor.getClass().getName();</pre></td></tr>
-<tr> <td class="numLineCover"> 245</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> log.log(Level.INFO, <span class="string">"about to init {0}"</span>, adaptorType); </pre></td></tr>
-<tr> <td class="numLineCover"> 246</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> adaptor.init(<span class="keyword">new</span> AdaptorContextImpl());</pre></td></tr>
-<tr> <td class="numLineCover"> 247</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">break</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 248</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InterruptedException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 249</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> ex;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 250</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (Exception ex) {</pre></td></tr>
-<tr> <td class="numLineCover"> 251</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> log.log(Level.WARNING, <span class="string">"Failed to initialize adaptor"</span>, ex);</pre></td></tr>
-<tr> <td class="numLineCover"> 252</td> <td class="nbHitsCovered"><a title="Line 252: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 252: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (shuttingDownLatch.await(sleepDurationMillis,</a></pre></td></tr>
-<tr> <td class="numLine"> 253</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> TimeUnit.MILLISECONDS)) {</pre></td></tr>
+<tr> <td class="numLineCover"> 244</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> tryToPutVersionIntoConfig();</pre></td></tr>
+<tr> <td class="numLineCover"> 245</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> String adaptorType = adaptor.getClass().getName();</pre></td></tr>
+<tr> <td class="numLineCover"> 246</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> log.log(Level.INFO, <span class="string">"about to init {0}"</span>, adaptorType); </pre></td></tr>
+<tr> <td class="numLineCover"> 247</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> adaptor.init(<span class="keyword">new</span> AdaptorContextImpl());</pre></td></tr>
+<tr> <td class="numLineCover"> 248</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">break</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 249</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InterruptedException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 250</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> ex;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 251</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (Exception ex) {</pre></td></tr>
+<tr> <td class="numLineCover"> 252</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> log.log(Level.WARNING, <span class="string">"Failed to initialize adaptor"</span>, ex);</pre></td></tr>
+<tr> <td class="numLineCover"> 253</td> <td class="nbHitsCovered"><a title="Line 253: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 253: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (shuttingDownLatch.await(sleepDurationMillis,</a></pre></td></tr>
<tr> <td class="numLine"> 254</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> TimeUnit.MILLISECONDS)) {</pre></td></tr>
+<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// Shutdown initiated.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 255</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">break</span>;</pre></td></tr>
-<tr> <td class="numLine"> 256</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 256</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">break</span>;</pre></td></tr>
+<tr> <td class="numLine"> 257</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 257</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> sleepDurationMillis</pre></td></tr>
-<tr> <td class="numLine"> 258</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 258</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> sleepDurationMillis</pre></td></tr>
+<tr> <td class="numLine"> 259</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> = Math.min(sleepDurationMillis * 2, maxSleepDurationMillis);</pre></td></tr>
-<tr> <td class="numLineCover"> 259</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> ensureLatestConfigLoaded();</pre></td></tr>
-<tr> <td class="numLineCover"> 260</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 261</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 260</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> ensureLatestConfigLoaded();</pre></td></tr>
+<tr> <td class="numLineCover"> 261</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 262</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 263</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Since the Adaptor has been started, we can now issue other calls to it.</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 264</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// Since the Adaptor has been started, we can now issue other calls to it.</span></pre></td></tr>
+<tr> <td class="numLine"> 265</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// Usages of 'adaptor' are completely safe after this point.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 265</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> afterInit = <span class="keyword">true</span>;</pre></td></tr>
-<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 266</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> afterInit = <span class="keyword">true</span>;</pre></td></tr>
<tr> <td class="numLine"> 267</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Since we are white-listing particular keys for auto-update, things aren't</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 268</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// ready enough to expose to adaptors.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// Since we are white-listing particular keys for auto-update, things aren't</span></pre></td></tr>
<tr> <td class="numLine"> 269</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/*if (adaptor instanceof ConfigModificationListener) {</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// ready enough to expose to adaptors.</span></pre></td></tr>
<tr> <td class="numLine"> 270</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> config.addConfigModificationListener(</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/*if (adaptor instanceof ConfigModificationListener) {</span></pre></td></tr>
<tr> <td class="numLine"> 271</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> (ConfigModificationListener) adaptor);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> config.addConfigModificationListener(</span></pre></td></tr>
<tr> <td class="numLine"> 272</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> }*/</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> (ConfigModificationListener) adaptor);</span></pre></td></tr>
<tr> <td class="numLine"> 273</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> }*/</span></pre></td></tr>
+<tr> <td class="numLine"> 274</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 274</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> SamlServiceProvider samlServiceProvider = <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 275</td> <td class="nbHitsCovered"><a title="Line 275: Conditional coverage 100% (2/2)."> 13</a></td> <td class="src"><pre class="src"> <a title="Line 275: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (secure) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 276</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> bootstrapOpenSaml();</pre></td></tr>
-<tr> <td class="numLineCover"> 277</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> SamlMetadata metadata = <span class="keyword">new</span> SamlMetadata(config.getServerHostname(),</pre></td></tr>
-<tr> <td class="numLine"> 278</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> config.getServerPort(), config.getGsaHostname(),</pre></td></tr>
+<tr> <td class="numLineCover"> 275</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> SamlServiceProvider samlServiceProvider = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 276</td> <td class="nbHitsCovered"><a title="Line 276: Conditional coverage 100% (2/2)."> 13</a></td> <td class="src"><pre class="src"> <a title="Line 276: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (secure) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 277</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> bootstrapOpenSaml();</pre></td></tr>
+<tr> <td class="numLineCover"> 278</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> SamlMetadata metadata = <span class="keyword">new</span> SamlMetadata(config.getServerHostname(),</pre></td></tr>
<tr> <td class="numLine"> 279</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> config.getGsaSamlEntityId(), config.getServerSamlEntityId());</pre></td></tr>
+ <td class="src"><pre class="src"> config.getServerPort(), config.getGsaHostname(),</pre></td></tr>
<tr> <td class="numLine"> 280</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> config.getGsaSamlEntityId(), config.getServerSamlEntityId());</pre></td></tr>
+<tr> <td class="numLine"> 281</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 281</td> <td class="nbHitsUncovered"><a title="Line 281: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 281: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (authnAuthority != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 282</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.config(<span class="string">"Adaptor-based authentication supported"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 283</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> samlIdentityProvider = <span class="keyword">new</span> SamlIdentityProvider(</span></pre></td></tr>
-<tr> <td class="numLine"> 284</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 282</td> <td class="nbHitsUncovered"><a title="Line 282: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 282: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (authnAuthority != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 283</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.config(<span class="string">"Adaptor-based authentication supported"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 284</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> samlIdentityProvider = <span class="keyword">new</span> SamlIdentityProvider(</span></pre></td></tr>
+<tr> <td class="numLine"> 285</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> authnAuthority, metadata, key);</pre></td></tr>
-<tr> <td class="numLineCover"> 285</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addFilters(scope.createContext(<span class="string">"/samlip"</span>,</span></pre></td></tr>
-<tr> <td class="numLine"> 286</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> samlIdentityProvider.getSingleSignOnHandler()));</pre></td></tr>
+<tr> <td class="numLineCover"> 286</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addFilters(scope.createContext(<span class="string">"/samlip"</span>,</span></pre></td></tr>
<tr> <td class="numLine"> 287</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> samlIdentityProvider.getSingleSignOnHandler()));</pre></td></tr>
+<tr> <td class="numLine"> 288</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 288</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.config(<span class="string">"Adaptor-based authentication not supported"</span>);</pre></td></tr>
-<tr> <td class="numLine"> 289</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 289</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.config(<span class="string">"Adaptor-based authentication not supported"</span>);</pre></td></tr>
+<tr> <td class="numLine"> 290</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 290</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> samlServiceProvider</pre></td></tr>
-<tr> <td class="numLine"> 291</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 291</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> samlServiceProvider</pre></td></tr>
+<tr> <td class="numLine"> 292</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> = <span class="keyword">new</span> SamlServiceProvider(sessionManager, metadata, key);</pre></td></tr>
-<tr> <td class="numLineCover"> 292</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> addFilters(scope.createContext(<span class="string">"/samlassertionconsumer"</span>,</pre></td></tr>
-<tr> <td class="numLine"> 293</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 293</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> addFilters(scope.createContext(<span class="string">"/samlassertionconsumer"</span>,</pre></td></tr>
+<tr> <td class="numLine"> 294</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> samlServiceProvider.getAssertionConsumer()));</pre></td></tr>
-<tr> <td class="numLineCover"> 294</td> <td class="nbHitsUncovered"><a title="Line 294: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 294: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (authzAuthority != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 295</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.config(<span class="string">"Adaptor-based authorization supported"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 296</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addFilters(scope.createContext(<span class="string">"/saml-authz"</span>, <span class="keyword">new</span> SamlBatchAuthzHandler(</span></pre></td></tr>
-<tr> <td class="numLine"> 297</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> authzAuthority, docIdCodec, metadata)));</pre></td></tr>
+<tr> <td class="numLineCover"> 295</td> <td class="nbHitsUncovered"><a title="Line 295: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 295: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (authzAuthority != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 296</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.config(<span class="string">"Adaptor-based authorization supported"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 297</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> addFilters(scope.createContext(<span class="string">"/saml-authz"</span>, <span class="keyword">new</span> SamlBatchAuthzHandler(</span></pre></td></tr>
<tr> <td class="numLine"> 298</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> authzAuthority, docIdCodec, metadata)));</pre></td></tr>
+<tr> <td class="numLine"> 299</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 299</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.config(<span class="string">"Adaptor-based authorization not supported"</span>);</pre></td></tr>
-<tr> <td class="numLine"> 300</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 300</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.config(<span class="string">"Adaptor-based authorization not supported"</span>);</pre></td></tr>
<tr> <td class="numLine"> 301</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 302</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 302</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> Watchdog watchdog = <span class="keyword">new</span> Watchdog(scheduleExecutor);</pre></td></tr>
-<tr> <td class="numLineCover"> 303</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> AsyncDocIdSender asyncDocIdSender = <span class="keyword">new</span> AsyncDocIdSender(docIdSender,</pre></td></tr>
-<tr> <td class="numLine"> 304</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> config.getFeedMaxUrls() <span class="comment">/* batch size */</span>,</pre></td></tr>
+<tr> <td class="numLineCover"> 303</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> Watchdog watchdog = <span class="keyword">new</span> Watchdog(scheduleExecutor);</pre></td></tr>
+<tr> <td class="numLineCover"> 304</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> AsyncDocIdSender asyncDocIdSender = <span class="keyword">new</span> AsyncDocIdSender(docIdSender,</pre></td></tr>
<tr> <td class="numLine"> 305</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> 5 <span class="comment">/* max latency */</span>, TimeUnit.MINUTES,</pre></td></tr>
+ <td class="src"><pre class="src"> config.getFeedMaxUrls() <span class="comment">/* batch size */</span>,</pre></td></tr>
<tr> <td class="numLine"> 306</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> 5 <span class="comment">/* max latency */</span>, TimeUnit.MINUTES,</pre></td></tr>
+<tr> <td class="numLine"> 307</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> 2 * config.getFeedMaxUrls() <span class="comment">/* queue size */</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 307</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> backgroundExecutor.execute(waiter.runnable(asyncDocIdSender.worker()));</pre></td></tr>
-<tr> <td class="numLineCover"> 308</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> DocumentHandler docHandler = <span class="keyword">new</span> DocumentHandler(</pre></td></tr>
-<tr> <td class="numLine"> 309</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> docIdCodec, docIdCodec, journal, adaptor, authzAuthority,</pre></td></tr>
+<tr> <td class="numLineCover"> 308</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> backgroundExecutor.execute(waiter.runnable(asyncDocIdSender.worker()));</pre></td></tr>
+<tr> <td class="numLineCover"> 309</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> DocumentHandler docHandler = <span class="keyword">new</span> DocumentHandler(</pre></td></tr>
<tr> <td class="numLine"> 310</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> config.getGsaHostname(),</pre></td></tr>
+ <td class="src"><pre class="src"> docIdCodec, docIdCodec, journal, adaptor, authzAuthority,</pre></td></tr>
<tr> <td class="numLine"> 311</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> config.getServerFullAccessHosts(),</pre></td></tr>
+ <td class="src"><pre class="src"> config.getGsaHostname(),</pre></td></tr>
<tr> <td class="numLine"> 312</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> samlServiceProvider, createTransformPipeline(), createAclTransform(),</pre></td></tr>
+ <td class="src"><pre class="src"> config.getServerFullAccessHosts(),</pre></td></tr>
<tr> <td class="numLine"> 313</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> config.isServerToUseCompression(), watchdog,</pre></td></tr>
+ <td class="src"><pre class="src"> samlServiceProvider, createTransformPipeline(), aclTransform,</pre></td></tr>
<tr> <td class="numLine"> 314</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> asyncDocIdSender, </pre></td></tr>
+ <td class="src"><pre class="src"> config.isServerToUseCompression(), watchdog,</pre></td></tr>
<tr> <td class="numLine"> 315</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> config.doesGsaAcceptDocControlsHeader(),</pre></td></tr>
+ <td class="src"><pre class="src"> asyncDocIdSender, </pre></td></tr>
<tr> <td class="numLine"> 316</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> config.getAdaptorDocHeaderTimeoutMillis(),</pre></td></tr>
+ <td class="src"><pre class="src"> config.doesGsaAcceptDocControlsHeader(),</pre></td></tr>
<tr> <td class="numLine"> 317</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> config.getAdaptorDocContentTimeoutMillis(),</pre></td></tr>
+ <td class="src"><pre class="src"> config.getAdaptorDocHeaderTimeoutMillis(),</pre></td></tr>
<tr> <td class="numLine"> 318</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> config.getAdaptorDocContentTimeoutMillis(),</pre></td></tr>
+<tr> <td class="numLine"> 319</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> config.getScoringType());</pre></td></tr>
-<tr> <td class="numLineCover"> 319</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> String handlerPath = config.getServerBaseUri().getPath()</pre></td></tr>
-<tr> <td class="numLine"> 320</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 320</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> String handlerPath = config.getServerBaseUri().getPath()</pre></td></tr>
+<tr> <td class="numLine"> 321</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> + config.getServerDocIdPath();</pre></td></tr>
-<tr> <td class="numLineCover"> 321</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> addFilters(scope.createContext(handlerPath, docHandler));</pre></td></tr>
-<tr> <td class="numLine"> 322</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 322</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> addFilters(scope.createContext(handlerPath, docHandler));</pre></td></tr>
<tr> <td class="numLine"> 323</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Start communicating with other services. As a general rule, by this time</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 324</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// we want all services we provide to be up and running. However, note that</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// Start communicating with other services. As a general rule, by this time</span></pre></td></tr>
<tr> <td class="numLine"> 325</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// the adaptor may have started sending feeds as soon as we called init(),</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// we want all services we provide to be up and running. However, note that</span></pre></td></tr>
<tr> <td class="numLine"> 326</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// and that is "okay." In addition, the HttpServer we were provided may not</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// the adaptor may have started sending feeds as soon as we called init(),</span></pre></td></tr>
<tr> <td class="numLine"> 327</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// have been started yet.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// and that is "okay." In addition, the HttpServer we were provided may not</span></pre></td></tr>
<tr> <td class="numLine"> 328</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// have been started yet.</span></pre></td></tr>
+<tr> <td class="numLine"> 329</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 329</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> scheduler = <span class="keyword">new</span> CronScheduler(scheduleExecutor);</pre></td></tr>
-<tr> <td class="numLineCover"> 330</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> sendDocIdsFuture = scheduler.schedule(</pre></td></tr>
-<tr> <td class="numLine"> 331</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> config.getAdaptorFullListingSchedule(),</pre></td></tr>
+<tr> <td class="numLineCover"> 330</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> scheduler = <span class="keyword">new</span> CronScheduler(scheduleExecutor);</pre></td></tr>
+<tr> <td class="numLineCover"> 331</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> sendDocIdsFuture = scheduler.schedule(</pre></td></tr>
<tr> <td class="numLine"> 332</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> config.getAdaptorFullListingSchedule(),</pre></td></tr>
+<tr> <td class="numLine"> 333</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> waiter.runnable(<span class="keyword">new</span> BackgroundRunnable(docIdFullPusher)));</pre></td></tr>
-<tr> <td class="numLineCover"> 333</td> <td class="nbHitsCovered"><a title="Line 333: Conditional coverage 100% (2/2)."> 13</a></td> <td class="src"><pre class="src"> <a title="Line 333: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (config.isAdaptorPushDocIdsOnStartup()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 334</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> log.info(<span class="string">"Pushing once at program start"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 335</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> checkAndScheduleImmediatePushOfDocIds();</pre></td></tr>
-<tr> <td class="numLine"> 336</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 334</td> <td class="nbHitsCovered"><a title="Line 334: Conditional coverage 100% (2/2)."> 13</a></td> <td class="src"><pre class="src"> <a title="Line 334: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (config.isAdaptorPushDocIdsOnStartup()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 335</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> log.info(<span class="string">"Pushing once at program start"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 336</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> checkAndScheduleImmediatePushOfDocIds();</pre></td></tr>
<tr> <td class="numLine"> 337</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 338</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 338</td> <td class="nbHitsCovered"><a title="Line 338: Conditional coverage 100% (2/2)."> 13</a></td> <td class="src"><pre class="src"> <a title="Line 338: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (pollingIncrementalLister != <span class="keyword">null</span>) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 339</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> docIdIncrementalPusher = <span class="keyword">new</span> OneAtATimeRunnable(</pre></td></tr>
-<tr> <td class="numLine"> 340</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">new</span> IncrementalPushRunnable(pollingIncrementalLister),</pre></td></tr>
+<tr> <td class="numLineCover"> 339</td> <td class="nbHitsCovered"><a title="Line 339: Conditional coverage 100% (2/2)."> 13</a></td> <td class="src"><pre class="src"> <a title="Line 339: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (pollingIncrementalLister != <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 340</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> docIdIncrementalPusher = <span class="keyword">new</span> OneAtATimeRunnable(</pre></td></tr>
<tr> <td class="numLine"> 341</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">new</span> AlreadyRunningRunnable());</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">new</span> IncrementalPushRunnable(pollingIncrementalLister),</pre></td></tr>
<tr> <td class="numLine"> 342</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">new</span> AlreadyRunningRunnable());</pre></td></tr>
+<tr> <td class="numLine"> 343</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 343</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> scheduleExecutor.scheduleAtFixedRate(</pre></td></tr>
-<tr> <td class="numLine"> 344</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> waiter.runnable(<span class="keyword">new</span> BackgroundRunnable(docIdIncrementalPusher)),</pre></td></tr>
+<tr> <td class="numLineCover"> 344</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> scheduleExecutor.scheduleAtFixedRate(</pre></td></tr>
<tr> <td class="numLine"> 345</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> 0,</pre></td></tr>
+ <td class="src"><pre class="src"> waiter.runnable(<span class="keyword">new</span> BackgroundRunnable(docIdIncrementalPusher)),</pre></td></tr>
<tr> <td class="numLine"> 346</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> config.getAdaptorIncrementalPollPeriodMillis(),</pre></td></tr>
+ <td class="src"><pre class="src"> 0,</pre></td></tr>
<tr> <td class="numLine"> 347</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> TimeUnit.MILLISECONDS);</pre></td></tr>
+ <td class="src"><pre class="src"> config.getAdaptorIncrementalPollPeriodMillis(),</pre></td></tr>
<tr> <td class="numLine"> 348</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> TimeUnit.MILLISECONDS);</pre></td></tr>
<tr> <td class="numLine"> 349</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 350</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 350</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> dashboard.start(dashboardServer, contextPrefix);</pre></td></tr>
-<tr> <td class="numLine"> 351</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 351</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> dashboard.start(dashboardServer, contextPrefix);</pre></td></tr>
+<tr> <td class="numLine"> 352</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 352</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> shuttingDownLatch = <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 353</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 354</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 353</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> shuttingDownLatch = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 354</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 355</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> tryToPutVersionIntoConfig() <span class="keyword">throws</span> IOException { </pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 356</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> tryToPutVersionIntoConfig() <span class="keyword">throws</span> IOException { </pre></td></tr>
+<tr> <td class="numLine"> 357</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 357</td> <td class="nbHitsUncovered"><a title="Line 357: Conditional coverage 50% (1/2)."> 14</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 357: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (<span class="string">"GENERATE"</span>.equals(config.getGsaVersion())) { <span class="comment">// is not set</span></a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 358</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> GsaVersion ver = GsaVersion.get(config.getGsaHostname());</span></pre></td></tr>
-<tr> <td class="numLineCover"> 359</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> config.overrideKey(<span class="string">"gsa.version"</span>, <span class="string">""</span> + ver);</span></pre></td></tr>
-<tr> <td class="numLine"> 360</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 358</td> <td class="nbHitsUncovered"><a title="Line 358: Conditional coverage 50% (1/2)."> 14</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 358: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (<span class="string">"GENERATE"</span>.equals(config.getGsaVersion())) { <span class="comment">// is not set</span></a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 359</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> GsaVersion ver = GsaVersion.get(config.getGsaHostname());</span></pre></td></tr>
+<tr> <td class="numLineCover"> 360</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> config.overrideKey(<span class="string">"gsa.version"</span>, <span class="string">""</span> + ver);</span></pre></td></tr>
+<tr> <td class="numLine"> 361</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 361</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (FileNotFoundException fne) {</span></pre></td></tr>
-<tr> <td class="numLine"> 362</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 362</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (FileNotFoundException fne) {</span></pre></td></tr>
+<tr> <td class="numLine"> 363</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// we're talking to an older GSA that cannot tell us its version.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 363</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.FINE, <span class="string">"gsa didn't provide version"</span>, fne);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 364</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> config.setValue(<span class="string">"gsa.version"</span>, <span class="string">"7.0.14-114"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 365</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IllegalArgumentException iae) {</span></pre></td></tr>
-<tr> <td class="numLine"> 366</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 364</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.FINE, <span class="string">"gsa didn't provide version"</span>, fne);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 365</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> config.setValue(<span class="string">"gsa.version"</span>, <span class="string">"7.0.14-114"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 366</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IllegalArgumentException iae) {</span></pre></td></tr>
+<tr> <td class="numLine"> 367</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// we're talking to a GSA whose version we don't understand </span></pre></td></tr>
-<tr> <td class="numLineCover"> 367</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.FINE, <span class="string">"gsa provided incomprehensible version"</span>, iae);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 368</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> config.setValue(<span class="string">"gsa.version"</span>, <span class="string">"7.0.14-114"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 369</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> } <span class="comment">// other IOException propagates out</span></pre></td></tr>
-<tr> <td class="numLineCover"> 370</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 371</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 368</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.FINE, <span class="string">"gsa provided incomprehensible version"</span>, iae);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 369</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> config.setValue(<span class="string">"gsa.version"</span>, <span class="string">"7.0.14-114"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 370</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> } <span class="comment">// other IOException propagates out</span></pre></td></tr>
+<tr> <td class="numLineCover"> 371</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 372</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 373</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> TransformPipeline createTransformPipeline() {</pre></td></tr>
-<tr> <td class="numLineCover"> 373</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> <span class="keyword">return</span> createTransformPipeline(config.getTransformPipelineSpec());</pre></td></tr>
-<tr> <td class="numLine"> 374</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 374</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> <span class="keyword">return</span> createTransformPipeline(config.getTransformPipelineSpec());</pre></td></tr>
<tr> <td class="numLine"> 375</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 376</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @VisibleForTesting</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 377</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">static</span> TransformPipeline createTransformPipeline(</pre></td></tr>
-<tr> <td class="numLine"> 378</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> List<Map<String, String>> pipelineConfig) {</pre></td></tr>
-<tr> <td class="numLineCover"> 379</td> <td class="nbHitsCovered"> 21</td> <td class="src"><pre class="src"> List<DocumentTransform> elements = <span class="keyword">new</span> LinkedList<DocumentTransform>();</pre></td></tr>
-<tr> <td class="numLineCover"> 380</td> <td class="nbHitsCovered"> 21</td> <td class="src"><pre class="src"> List<String> names = <span class="keyword">new</span> LinkedList<String>();</pre></td></tr>
-<tr> <td class="numLineCover"> 381</td> <td class="nbHitsCovered"><a title="Line 381: Conditional coverage 100% (2/2)."> 21</a></td> <td class="src"><pre class="src"> <a title="Line 381: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Map<String, String> element : pipelineConfig) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 382</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String name = element.get(<span class="string">"name"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 383</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String confPrefix = <span class="string">"transform.pipeline."</span> + name + <span class="string">"."</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 384</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> String factoryMethodName = element.get(<span class="string">"factoryMethod"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 385</td> <td class="nbHitsCovered"><a title="Line 385: Conditional coverage 100% (2/2)."> 7</a></td> <td class="src"><pre class="src"> <a title="Line 385: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (factoryMethodName == <span class="keyword">null</span>) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 386</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(</pre></td></tr>
-<tr> <td class="numLine"> 387</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="string">"Missing "</span> + confPrefix + <span class="string">"factoryMethod configuration setting"</span>);</pre></td></tr>
-<tr> <td class="numLine"> 388</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 389</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> <span class="keyword">int</span> sepIndex = factoryMethodName.lastIndexOf(<span class="string">"."</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 390</td> <td class="nbHitsCovered"><a title="Line 390: Conditional coverage 100% (2/2)."> 6</a></td> <td class="src"><pre class="src"> <a title="Line 390: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (sepIndex == -1) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 391</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(<span class="string">"Could not separate method name from class "</span></pre></td></tr>
-<tr> <td class="numLine"> 392</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> + <span class="string">"name"</span>);</pre></td></tr>
-<tr> <td class="numLine"> 393</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 394</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> String className = factoryMethodName.substring(0, sepIndex);</pre></td></tr>
-<tr> <td class="numLineCover"> 395</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> String methodName = factoryMethodName.substring(sepIndex + 1);</pre></td></tr>
-<tr> <td class="numLineCover"> 396</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> log.log(Level.FINE, <span class="string">"Split {0} into class {1} and method {2}"</span>,</pre></td></tr>
-<tr> <td class="numLine"> 397</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">new</span> Object[] {factoryMethodName, className, methodName});</pre></td></tr>
-<tr> <td class="numLine"> 398</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> Class<?> klass;</pre></td></tr>
-<tr> <td class="numLine"> 399</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 400</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> klass = Class.forName(className);</pre></td></tr>
-<tr> <td class="numLineCover"> 401</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (ClassNotFoundException ex) {</pre></td></tr>
-<tr> <td class="numLineCover"> 402</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(</pre></td></tr>
-<tr> <td class="numLine"> 403</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="string">"Could not load class for transform "</span> + name, ex);</pre></td></tr>
-<tr> <td class="numLineCover"> 404</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 405</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> Method method;</pre></td></tr>
-<tr> <td class="numLine"> 406</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 407</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> method = klass.getDeclaredMethod(methodName, Map.<span class="keyword">class</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 408</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (NoSuchMethodException ex) {</pre></td></tr>
-<tr> <td class="numLineCover"> 409</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(<span class="string">"Could not find method "</span> + methodName</pre></td></tr>
-<tr> <td class="numLine"> 410</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> + <span class="string">" on class "</span> + className, ex);</pre></td></tr>
-<tr> <td class="numLineCover"> 411</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 412</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> log.log(Level.FINE, <span class="string">"Found method {0}"</span>, <span class="keyword">new</span> Object[] {method});</pre></td></tr>
-<tr> <td class="numLine"> 413</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> Object o;</pre></td></tr>
-<tr> <td class="numLine"> 414</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 415</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> o = method.invoke(<span class="keyword">null</span>, Collections.unmodifiableMap(element));</pre></td></tr>
-<tr> <td class="numLineCover"> 416</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (Exception ex) {</pre></td></tr>
-<tr> <td class="numLineCover"> 417</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(<span class="string">"Failure while running factory method "</span></pre></td></tr>
-<tr> <td class="numLine"> 418</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> + factoryMethodName, ex);</pre></td></tr>
-<tr> <td class="numLineCover"> 419</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 420</td> <td class="nbHitsCovered"><a title="Line 420: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 420: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!(o <span class="keyword">instanceof</span> DocumentTransform)) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 421</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> ClassCastException(o.getClass().getName()</pre></td></tr>
-<tr> <td class="numLine"> 422</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> + <span class="string">" is not an instance of DocumentTransform"</span>);</pre></td></tr>
-<tr> <td class="numLine"> 423</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 424</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> DocumentTransform transform = (DocumentTransform) o;</pre></td></tr>
-<tr> <td class="numLineCover"> 425</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> elements.add(transform);</pre></td></tr>
-<tr> <td class="numLineCover"> 426</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> names.add(name);</pre></td></tr>
-<tr> <td class="numLineCover"> 427</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 428</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// If we created an empty pipeline, then we don't need the pipeline at all.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 429</td> <td class="nbHitsCovered"><a title="Line 429: Conditional coverage 100% (2/2)."> 15</a></td> <td class="src"><pre class="src"> <a title="Line 429: Conditional coverage 100% (2/2)."> <span class="keyword">return</span> elements.size() > 0 ? <span class="keyword">new</span> TransformPipeline(elements, names) : <span class="keyword">null</span>;</a></pre></td></tr>
-<tr> <td class="numLine"> 430</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 431</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 432</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> AclTransform createAclTransform() {</pre></td></tr>
-<tr> <td class="numLineCover"> 433</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> <span class="keyword">return</span> createAclTransform(config.getValuesWithPrefix(<span class="string">"transform.acl."</span>));</pre></td></tr>
-<tr> <td class="numLine"> 434</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 435</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 436</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> @VisibleForTesting</pre></td></tr>
+<tr> <td class="numLine"> 378</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">static</span> TransformPipeline createTransformPipeline(</pre></td></tr>
+<tr> <td class="numLine"> 379</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> List<Map<String, String>> pipelineConfig) {</pre></td></tr>
+<tr> <td class="numLineCover"> 380</td> <td class="nbHitsCovered"> 21</td> <td class="src"><pre class="src"> List<DocumentTransform> elements = <span class="keyword">new</span> LinkedList<DocumentTransform>();</pre></td></tr>
+<tr> <td class="numLineCover"> 381</td> <td class="nbHitsCovered"> 21</td> <td class="src"><pre class="src"> List<String> names = <span class="keyword">new</span> LinkedList<String>();</pre></td></tr>
+<tr> <td class="numLineCover"> 382</td> <td class="nbHitsCovered"><a title="Line 382: Conditional coverage 100% (2/2)."> 21</a></td> <td class="src"><pre class="src"> <a title="Line 382: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Map<String, String> element : pipelineConfig) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 383</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String name = element.get(<span class="string">"name"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 384</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String confPrefix = <span class="string">"transform.pipeline."</span> + name + <span class="string">"."</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 385</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> String factoryMethodName = element.get(<span class="string">"factoryMethod"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 386</td> <td class="nbHitsCovered"><a title="Line 386: Conditional coverage 100% (2/2)."> 7</a></td> <td class="src"><pre class="src"> <a title="Line 386: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (factoryMethodName == <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 387</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(</pre></td></tr>
+<tr> <td class="numLine"> 388</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="string">"Missing "</span> + confPrefix + <span class="string">"factoryMethod configuration setting"</span>);</pre></td></tr>
+<tr> <td class="numLine"> 389</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 390</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> <span class="keyword">int</span> sepIndex = factoryMethodName.lastIndexOf(<span class="string">"."</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 391</td> <td class="nbHitsCovered"><a title="Line 391: Conditional coverage 100% (2/2)."> 6</a></td> <td class="src"><pre class="src"> <a title="Line 391: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (sepIndex == -1) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 392</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(<span class="string">"Could not separate method name from class "</span></pre></td></tr>
+<tr> <td class="numLine"> 393</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> + <span class="string">"name"</span>);</pre></td></tr>
+<tr> <td class="numLine"> 394</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 395</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> String className = factoryMethodName.substring(0, sepIndex);</pre></td></tr>
+<tr> <td class="numLineCover"> 396</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> String methodName = factoryMethodName.substring(sepIndex + 1);</pre></td></tr>
+<tr> <td class="numLineCover"> 397</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> log.log(Level.FINE, <span class="string">"Split {0} into class {1} and method {2}"</span>,</pre></td></tr>
+<tr> <td class="numLine"> 398</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">new</span> Object[] {factoryMethodName, className, methodName});</pre></td></tr>
+<tr> <td class="numLine"> 399</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> Class<?> klass;</pre></td></tr>
+<tr> <td class="numLine"> 400</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 401</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> klass = Class.forName(className);</pre></td></tr>
+<tr> <td class="numLineCover"> 402</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (ClassNotFoundException ex) {</pre></td></tr>
+<tr> <td class="numLineCover"> 403</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(</pre></td></tr>
+<tr> <td class="numLine"> 404</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="string">"Could not load class for transform "</span> + name, ex);</pre></td></tr>
+<tr> <td class="numLineCover"> 405</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 406</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> Method method;</pre></td></tr>
+<tr> <td class="numLine"> 407</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 408</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> method = klass.getDeclaredMethod(methodName, Map.<span class="keyword">class</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 409</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (NoSuchMethodException ex) {</pre></td></tr>
+<tr> <td class="numLineCover"> 410</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(<span class="string">"Could not find method "</span> + methodName</pre></td></tr>
+<tr> <td class="numLine"> 411</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> + <span class="string">" on class "</span> + className, ex);</pre></td></tr>
+<tr> <td class="numLineCover"> 412</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 413</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> log.log(Level.FINE, <span class="string">"Found method {0}"</span>, <span class="keyword">new</span> Object[] {method});</pre></td></tr>
+<tr> <td class="numLine"> 414</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> Object o;</pre></td></tr>
+<tr> <td class="numLine"> 415</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 416</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> o = method.invoke(<span class="keyword">null</span>, Collections.unmodifiableMap(element));</pre></td></tr>
+<tr> <td class="numLineCover"> 417</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (Exception ex) {</pre></td></tr>
+<tr> <td class="numLineCover"> 418</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(<span class="string">"Failure while running factory method "</span></pre></td></tr>
+<tr> <td class="numLine"> 419</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> + factoryMethodName, ex);</pre></td></tr>
+<tr> <td class="numLineCover"> 420</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 421</td> <td class="nbHitsCovered"><a title="Line 421: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 421: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!(o <span class="keyword">instanceof</span> DocumentTransform)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 422</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> ClassCastException(o.getClass().getName()</pre></td></tr>
+<tr> <td class="numLine"> 423</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> + <span class="string">" is not an instance of DocumentTransform"</span>);</pre></td></tr>
+<tr> <td class="numLine"> 424</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 425</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> DocumentTransform transform = (DocumentTransform) o;</pre></td></tr>
+<tr> <td class="numLineCover"> 426</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> elements.add(transform);</pre></td></tr>
+<tr> <td class="numLineCover"> 427</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> names.add(name);</pre></td></tr>
+<tr> <td class="numLineCover"> 428</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 429</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// If we created an empty pipeline, then we don't need the pipeline at all.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 430</td> <td class="nbHitsCovered"><a title="Line 430: Conditional coverage 100% (2/2)."> 15</a></td> <td class="src"><pre class="src"> <a title="Line 430: Conditional coverage 100% (2/2)."> <span class="keyword">return</span> elements.size() > 0 ? <span class="keyword">new</span> TransformPipeline(elements, names) : <span class="keyword">null</span>;</a></pre></td></tr>
+<tr> <td class="numLine"> 431</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 432</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 433</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> AclTransform createAclTransform() {</pre></td></tr>
+<tr> <td class="numLineCover"> 434</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> <span class="keyword">return</span> createAclTransform(config.getValuesWithPrefix(<span class="string">"transform.acl."</span>));</pre></td></tr>
+<tr> <td class="numLine"> 435</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 436</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 437</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @VisibleForTesting</pre></td></tr>
+<tr> <td class="numLine"> 438</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">static</span> AclTransform createAclTransform(Map<String, String> aclConfigRaw) {</pre></td></tr>
-<tr> <td class="numLineCover"> 438</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> Map<Integer, String> aclConfig = <span class="keyword">new</span> TreeMap<Integer, String>();</pre></td></tr>
-<tr> <td class="numLineCover"> 439</td> <td class="nbHitsCovered"><a title="Line 439: Conditional coverage 100% (2/2)."> 15</a></td> <td class="src"><pre class="src"> <a title="Line 439: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Map.Entry<String, String> me : aclConfigRaw.entrySet()) {</a></pre></td></tr>
-<tr> <td class="numLine"> 440</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 439</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> Map<Integer, String> aclConfig = <span class="keyword">new</span> TreeMap<Integer, String>();</pre></td></tr>
+<tr> <td class="numLineCover"> 440</td> <td class="nbHitsCovered"><a title="Line 440: Conditional coverage 100% (2/2)."> 15</a></td> <td class="src"><pre class="src"> <a title="Line 440: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Map.Entry<String, String> me : aclConfigRaw.entrySet()) {</a></pre></td></tr>
+<tr> <td class="numLine"> 441</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 441</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> aclConfig.put(Integer.parseInt(me.getKey()), me.getValue());</pre></td></tr>
-<tr> <td class="numLineCover"> 442</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (NumberFormatException ex) {</pre></td></tr>
-<tr> <td class="numLine"> 443</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 442</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> aclConfig.put(Integer.parseInt(me.getKey()), me.getValue());</pre></td></tr>
+<tr> <td class="numLineCover"> 443</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (NumberFormatException ex) {</pre></td></tr>
+<tr> <td class="numLine"> 444</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// Don't insert into map.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 444</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.log(Level.FINE, <span class="string">"Ignorning transform.acl.{0} because {0} is not an "</span></pre></td></tr>
-<tr> <td class="numLine"> 445</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 445</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.log(Level.FINE, <span class="string">"Ignorning transform.acl.{0} because {0} is not an "</span></pre></td></tr>
+<tr> <td class="numLine"> 446</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> + <span class="string">"integer"</span>, me.getKey());</pre></td></tr>
-<tr> <td class="numLineCover"> 446</td> <td class="nbHitsCovered"> 17</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 447</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 447</td> <td class="nbHitsCovered"> 17</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 448</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 449</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 449</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> List<AclTransform.Rule> rules = <span class="keyword">new</span> LinkedList<AclTransform.Rule>();</pre></td></tr>
-<tr> <td class="numLineCover"> 450</td> <td class="nbHitsCovered"><a title="Line 450: Conditional coverage 100% (2/2)."> 15</a></td> <td class="src"><pre class="src"> <a title="Line 450: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (String value : aclConfig.values()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 451</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> String[] parts = value.split(<span class="string">";"</span>, 2);</pre></td></tr>
-<tr> <td class="numLineCover"> 452</td> <td class="nbHitsCovered"><a title="Line 452: Conditional coverage 100% (2/2)."> 8</a></td> <td class="src"><pre class="src"> <a title="Line 452: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (parts.length != 2) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 453</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.log(Level.WARNING, <span class="string">"Could not find semicolon in acl transform: {0}"</span>,</pre></td></tr>
-<tr> <td class="numLine"> 454</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 450</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> List<AclTransform.Rule> rules = <span class="keyword">new</span> LinkedList<AclTransform.Rule>();</pre></td></tr>
+<tr> <td class="numLineCover"> 451</td> <td class="nbHitsCovered"><a title="Line 451: Conditional coverage 100% (2/2)."> 15</a></td> <td class="src"><pre class="src"> <a title="Line 451: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (String value : aclConfig.values()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 452</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> String[] parts = value.split(<span class="string">";"</span>, 2);</pre></td></tr>
+<tr> <td class="numLineCover"> 453</td> <td class="nbHitsCovered"><a title="Line 453: Conditional coverage 100% (2/2)."> 8</a></td> <td class="src"><pre class="src"> <a title="Line 453: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (parts.length != 2) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 454</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.log(Level.WARNING, <span class="string">"Could not find semicolon in acl transform: {0}"</span>,</pre></td></tr>
+<tr> <td class="numLine"> 455</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> value);</pre></td></tr>
-<tr> <td class="numLineCover"> 455</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">continue</span>;</pre></td></tr>
-<tr> <td class="numLine"> 456</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 456</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">continue</span>;</pre></td></tr>
+<tr> <td class="numLine"> 457</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 457</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> AclTransform.MatchData search = parseAclTransformMatchData(parts[0]);</pre></td></tr>
-<tr> <td class="numLineCover"> 458</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> AclTransform.MatchData replace = parseAclTransformMatchData(parts[1]);</pre></td></tr>
-<tr> <td class="numLineCover"> 459</td> <td class="nbHitsUncovered"><a title="Line 459: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> 7</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 459: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> <span class="keyword">if</span> (search == <span class="keyword">null</span> || replace == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 460</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> log.log(Level.WARNING,</pre></td></tr>
-<tr> <td class="numLine"> 461</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 458</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> AclTransform.MatchData search = parseAclTransformMatchData(parts[0]);</pre></td></tr>
+<tr> <td class="numLineCover"> 459</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> AclTransform.MatchData replace = parseAclTransformMatchData(parts[1]);</pre></td></tr>
+<tr> <td class="numLineCover"> 460</td> <td class="nbHitsUncovered"><a title="Line 460: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> 7</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 460: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> <span class="keyword">if</span> (search == <span class="keyword">null</span> || replace == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 461</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> log.log(Level.WARNING,</pre></td></tr>
+<tr> <td class="numLine"> 462</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="string">"Could not parse acl transform rule: {0}"</span>, value);</pre></td></tr>
-<tr> <td class="numLineCover"> 462</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">continue</span>;</pre></td></tr>
-<tr> <td class="numLine"> 463</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 463</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">continue</span>;</pre></td></tr>
+<tr> <td class="numLine"> 464</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 464</td> <td class="nbHitsCovered"><a title="Line 464: Conditional coverage 100% (2/2)."> 4</a></td> <td class="src"><pre class="src"> <a title="Line 464: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (replace.isGroup != <span class="keyword">null</span>) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 465</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.log(Level.WARNING,</pre></td></tr>
-<tr> <td class="numLine"> 466</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 465</td> <td class="nbHitsCovered"><a title="Line 465: Conditional coverage 100% (2/2)."> 4</a></td> <td class="src"><pre class="src"> <a title="Line 465: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (replace.isGroup != <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 466</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.log(Level.WARNING,</pre></td></tr>
+<tr> <td class="numLine"> 467</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="string">"Replacement cannot change type. Failed in rule: {0}"</span>, value);</pre></td></tr>
-<tr> <td class="numLineCover"> 467</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">continue</span>;</pre></td></tr>
-<tr> <td class="numLine"> 468</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 468</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">continue</span>;</pre></td></tr>
+<tr> <td class="numLine"> 469</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 469</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> rules.add(<span class="keyword">new</span> AclTransform.Rule(search, replace));</pre></td></tr>
-<tr> <td class="numLineCover"> 470</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 471</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> AclTransform(rules);</pre></td></tr>
-<tr> <td class="numLine"> 472</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 470</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> rules.add(<span class="keyword">new</span> AclTransform.Rule(search, replace));</pre></td></tr>
+<tr> <td class="numLineCover"> 471</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 472</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> AclTransform(rules);</pre></td></tr>
<tr> <td class="numLine"> 473</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 474</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 475</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> AclTransform.MatchData parseAclTransformMatchData(String s) {</pre></td></tr>
-<tr> <td class="numLineCover"> 475</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> String[] decls = s.split(<span class="string">","</span>, -1);</pre></td></tr>
-<tr> <td class="numLineCover"> 476</td> <td class="nbHitsCovered"><a title="Line 476: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 14</a></td> <td class="src"><pre class="src"> <a title="Line 476: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (decls.length == 1 && decls[0].trim().equals(<span class="string">""</span>)) {</a></pre></td></tr>
-<tr> <td class="numLine"> 477</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 476</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> String[] decls = s.split(<span class="string">","</span>, -1);</pre></td></tr>
+<tr> <td class="numLineCover"> 477</td> <td class="nbHitsCovered"><a title="Line 477: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 14</a></td> <td class="src"><pre class="src"> <a title="Line 477: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (decls.length == 1 && decls[0].trim().equals(<span class="string">""</span>)) {</a></pre></td></tr>
+<tr> <td class="numLine"> 478</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// No declarations are required</span></pre></td></tr>
-<tr> <td class="numLineCover"> 478</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> AclTransform.MatchData(<span class="keyword">null</span>, <span class="keyword">null</span>, <span class="keyword">null</span>, <span class="keyword">null</span>);</pre></td></tr>
-<tr> <td class="numLine"> 479</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 479</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> AclTransform.MatchData(<span class="keyword">null</span>, <span class="keyword">null</span>, <span class="keyword">null</span>, <span class="keyword">null</span>);</pre></td></tr>
+<tr> <td class="numLine"> 480</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 480</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> Boolean isGroup = <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 481</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> String name = <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 482</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> String domain = <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 483</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> String namespace = <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 484</td> <td class="nbHitsCovered"><a title="Line 484: Conditional coverage 100% (2/2)."> 25</a></td> <td class="src"><pre class="src"> <a title="Line 484: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (String decl : decls) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 485</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> String parts[] = decl.split(<span class="string">"="</span>, 2);</pre></td></tr>
-<tr> <td class="numLineCover"> 486</td> <td class="nbHitsCovered"><a title="Line 486: Conditional coverage 100% (2/2)."> 15</a></td> <td class="src"><pre class="src"> <a title="Line 486: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (parts.length != 2) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 487</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.log(Level.WARNING,</pre></td></tr>
-<tr> <td class="numLine"> 488</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="string">"Could not find \"=\" in \"{0}\" as part of \"{1}\""</span>,</pre></td></tr>
+<tr> <td class="numLineCover"> 481</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> Boolean isGroup = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 482</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> String name = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 483</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> String domain = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 484</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> String namespace = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 485</td> <td class="nbHitsCovered"><a title="Line 485: Conditional coverage 100% (2/2)."> 25</a></td> <td class="src"><pre class="src"> <a title="Line 485: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (String decl : decls) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 486</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> String parts[] = decl.split(<span class="string">"="</span>, 2);</pre></td></tr>
+<tr> <td class="numLineCover"> 487</td> <td class="nbHitsCovered"><a title="Line 487: Conditional coverage 100% (2/2)."> 15</a></td> <td class="src"><pre class="src"> <a title="Line 487: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (parts.length != 2) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 488</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.log(Level.WARNING,</pre></td></tr>
<tr> <td class="numLine"> 489</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="string">"Could not find \"=\" in \"{0}\" as part of \"{1}\""</span>,</pre></td></tr>
+<tr> <td class="numLine"> 490</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">new</span> Object[] {decl, s});</pre></td></tr>
-<tr> <td class="numLineCover"> 490</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLine"> 491</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 491</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLine"> 492</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 492</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> String key = parts[0].trim();</pre></td></tr>
-<tr> <td class="numLineCover"> 493</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> String value = parts[1];</pre></td></tr>
-<tr> <td class="numLineCover"> 494</td> <td class="nbHitsCovered"><a title="Line 494: Conditional coverage 100% (2/2)."> 14</a></td> <td class="src"><pre class="src"> <a title="Line 494: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (key.equals(<span class="string">"type"</span>)) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 495</td> <td class="nbHitsCovered"><a title="Line 495: Conditional coverage 100% (2/2)."> 4</a></td> <td class="src"><pre class="src"> <a title="Line 495: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (value.equals(<span class="string">"group"</span>)) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 496</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> isGroup = <span class="keyword">true</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 497</td> <td class="nbHitsCovered"><a title="Line 497: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 497: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (value.equals(<span class="string">"user"</span>)) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 498</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> isGroup = <span class="keyword">false</span>;</pre></td></tr>
-<tr> <td class="numLine"> 499</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 493</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> String key = parts[0].trim();</pre></td></tr>
+<tr> <td class="numLineCover"> 494</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> String value = parts[1];</pre></td></tr>
+<tr> <td class="numLineCover"> 495</td> <td class="nbHitsCovered"><a title="Line 495: Conditional coverage 100% (2/2)."> 14</a></td> <td class="src"><pre class="src"> <a title="Line 495: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (key.equals(<span class="string">"type"</span>)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 496</td> <td class="nbHitsCovered"><a title="Line 496: Conditional coverage 100% (2/2)."> 4</a></td> <td class="src"><pre class="src"> <a title="Line 496: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (value.equals(<span class="string">"group"</span>)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 497</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> isGroup = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 498</td> <td class="nbHitsCovered"><a title="Line 498: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 498: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (value.equals(<span class="string">"user"</span>)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 499</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> isGroup = <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLine"> 500</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 500</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.log(Level.WARNING, <span class="string">"Unknown type \"{0}\" as part of \"{1}\""</span>,</pre></td></tr>
-<tr> <td class="numLine"> 501</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 501</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.log(Level.WARNING, <span class="string">"Unknown type \"{0}\" as part of \"{1}\""</span>,</pre></td></tr>
+<tr> <td class="numLine"> 502</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">new</span> Object[] {value, s});</pre></td></tr>
-<tr> <td class="numLineCover"> 502</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLine"> 503</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 503</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLine"> 504</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 504</td> <td class="nbHitsCovered"><a title="Line 504: Conditional coverage 100% (2/2)."> 10</a></td> <td class="src"><pre class="src"> <a title="Line 504: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.equals(<span class="string">"name"</span>)) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 505</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> name = value;</pre></td></tr>
-<tr> <td class="numLineCover"> 506</td> <td class="nbHitsCovered"><a title="Line 506: Conditional coverage 100% (2/2)."> 4</a></td> <td class="src"><pre class="src"> <a title="Line 506: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.equals(<span class="string">"domain"</span>)) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 507</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> domain = value;</pre></td></tr>
-<tr> <td class="numLineCover"> 508</td> <td class="nbHitsCovered"><a title="Line 508: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 508: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.equals(<span class="string">"namespace"</span>)) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 509</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> namespace = value;</pre></td></tr>
-<tr> <td class="numLine"> 510</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 505</td> <td class="nbHitsCovered"><a title="Line 505: Conditional coverage 100% (2/2)."> 10</a></td> <td class="src"><pre class="src"> <a title="Line 505: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.equals(<span class="string">"name"</span>)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 506</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> name = value;</pre></td></tr>
+<tr> <td class="numLineCover"> 507</td> <td class="nbHitsCovered"><a title="Line 507: Conditional coverage 100% (2/2)."> 4</a></td> <td class="src"><pre class="src"> <a title="Line 507: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.equals(<span class="string">"domain"</span>)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 508</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> domain = value;</pre></td></tr>
+<tr> <td class="numLineCover"> 509</td> <td class="nbHitsCovered"><a title="Line 509: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 509: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (key.equals(<span class="string">"namespace"</span>)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 510</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> namespace = value;</pre></td></tr>
+<tr> <td class="numLine"> 511</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 511</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.log(Level.WARNING, <span class="string">"Unknown key \"{0}\" as part of \"{1}\""</span>,</pre></td></tr>
-<tr> <td class="numLine"> 512</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 512</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.log(Level.WARNING, <span class="string">"Unknown key \"{0}\" as part of \"{1}\""</span>,</pre></td></tr>
+<tr> <td class="numLine"> 513</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">new</span> Object[] {key, s});</pre></td></tr>
-<tr> <td class="numLineCover"> 513</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLine"> 514</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 514</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">null</span>;</pre></td></tr>
<tr> <td class="numLine"> 515</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 516</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 516</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> AclTransform.MatchData(isGroup, name, domain, namespace);</pre></td></tr>
-<tr> <td class="numLine"> 517</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 517</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> AclTransform.MatchData(isGroup, name, domain, namespace);</pre></td></tr>
<tr> <td class="numLine"> 518</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 519</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 520</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Retrieve our default KeyPair from the default keystore. The key should have</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 521</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * the same password as the keystore.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Retrieve our default KeyPair from the default keystore. The key should have</span></pre></td></tr>
<tr> <td class="numLine"> 522</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * the same password as the keystore.</span></pre></td></tr>
<tr> <td class="numLine"> 523</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 524</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> KeyPair getKeyPair(String alias) <span class="keyword">throws</span> IOException {</pre></td></tr>
-<tr> <td class="numLineCover"> 524</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String keystoreKey = <span class="string">"javax.net.ssl.keyStore"</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 525</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String keystorePasswordKey = <span class="string">"javax.net.ssl.keyStorePassword"</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 526</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> String keystore = System.getProperty(keystoreKey);</pre></td></tr>
-<tr> <td class="numLineCover"> 527</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> String keystoreType = System.getProperty(<span class="string">"javax.net.ssl.keyStoreType"</span>,</pre></td></tr>
-<tr> <td class="numLine"> 528</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 525</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String keystoreKey = <span class="string">"javax.net.ssl.keyStore"</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 526</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> <span class="keyword">final</span> String keystorePasswordKey = <span class="string">"javax.net.ssl.keyStorePassword"</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 527</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> String keystore = System.getProperty(keystoreKey);</pre></td></tr>
+<tr> <td class="numLineCover"> 528</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> String keystoreType = System.getProperty(<span class="string">"javax.net.ssl.keyStoreType"</span>,</pre></td></tr>
+<tr> <td class="numLine"> 529</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> KeyStore.getDefaultType());</pre></td></tr>
-<tr> <td class="numLineCover"> 529</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> String keystorePassword = System.getProperty(keystorePasswordKey);</pre></td></tr>
-<tr> <td class="numLine"> 530</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 530</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> String keystorePassword = System.getProperty(keystorePasswordKey);</pre></td></tr>
+<tr> <td class="numLine"> 531</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 531</td> <td class="nbHitsUncovered"><a title="Line 531: Conditional coverage 50% (1/2)."> 13</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 531: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (keystore == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 532</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> NullPointerException(<span class="string">"You must set "</span> + keystoreKey);</span></pre></td></tr>
-<tr> <td class="numLine"> 533</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 532</td> <td class="nbHitsUncovered"><a title="Line 532: Conditional coverage 50% (1/2)."> 13</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 532: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (keystore == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 533</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> NullPointerException(<span class="string">"You must set "</span> + keystoreKey);</span></pre></td></tr>
+<tr> <td class="numLine"> 534</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 534</td> <td class="nbHitsUncovered"><a title="Line 534: Conditional coverage 50% (1/2)."> 13</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 534: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (keystorePassword == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 535</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> NullPointerException(<span class="string">"You must set "</span> + keystorePasswordKey);</span></pre></td></tr>
-<tr> <td class="numLine"> 536</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 535</td> <td class="nbHitsUncovered"><a title="Line 535: Conditional coverage 50% (1/2)."> 13</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 535: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (keystorePassword == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 536</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> NullPointerException(<span class="string">"You must set "</span> + keystorePasswordKey);</span></pre></td></tr>
<tr> <td class="numLine"> 537</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 538</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 538</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> <span class="keyword">return</span> getKeyPair(alias, keystore, keystoreType, keystorePassword);</pre></td></tr>
-<tr> <td class="numLine"> 539</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 539</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> <span class="keyword">return</span> getKeyPair(alias, keystore, keystoreType, keystorePassword);</pre></td></tr>
<tr> <td class="numLine"> 540</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 541</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">static</span> KeyPair getKeyPair(String alias, String keystoreFile,</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 542</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> String keystoreType, String keystorePasswordStr) <span class="keyword">throws</span> IOException {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">static</span> KeyPair getKeyPair(String alias, String keystoreFile,</pre></td></tr>
<tr> <td class="numLine"> 543</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> PrivateKey privateKey;</pre></td></tr>
+ <td class="src"><pre class="src"> String keystoreType, String keystorePasswordStr) <span class="keyword">throws</span> IOException {</pre></td></tr>
<tr> <td class="numLine"> 544</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> PublicKey publicKey;</pre></td></tr>
+ <td class="src"><pre class="src"> PrivateKey privateKey;</pre></td></tr>
<tr> <td class="numLine"> 545</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> PublicKey publicKey;</pre></td></tr>
+<tr> <td class="numLine"> 546</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 546</td> <td class="nbHitsCovered"> 17</td> <td class="src"><pre class="src"> KeyStore ks = KeyStore.getInstance(keystoreType);</pre></td></tr>
-<tr> <td class="numLineCover"> 547</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> InputStream ksis = <span class="keyword">new</span> FileInputStream(keystoreFile);</pre></td></tr>
-<tr> <td class="numLineCover"> 548</td> <td class="nbHitsUncovered"><a title="Line 548: Conditional coverage 50% (1/2)."> 15</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 548: Conditional coverage 50% (1/2)."> <span class="keyword">char</span>[] keystorePassword = keystorePasswordStr == <span class="keyword">null</span> ? <span class="keyword">null</span></a></span></pre></td></tr>
-<tr> <td class="numLine"> 549</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> : keystorePasswordStr.toCharArray();</pre></td></tr>
+<tr> <td class="numLineCover"> 547</td> <td class="nbHitsCovered"> 17</td> <td class="src"><pre class="src"> KeyStore ks = KeyStore.getInstance(keystoreType);</pre></td></tr>
+<tr> <td class="numLineCover"> 548</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> InputStream ksis = <span class="keyword">new</span> FileInputStream(keystoreFile);</pre></td></tr>
+<tr> <td class="numLineCover"> 549</td> <td class="nbHitsUncovered"><a title="Line 549: Conditional coverage 50% (1/2)."> 15</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 549: Conditional coverage 50% (1/2)."> <span class="keyword">char</span>[] keystorePassword = keystorePasswordStr == <span class="keyword">null</span> ? <span class="keyword">null</span></a></span></pre></td></tr>
<tr> <td class="numLine"> 550</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> : keystorePasswordStr.toCharArray();</pre></td></tr>
+<tr> <td class="numLine"> 551</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 551</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> ks.load(ksis, keystorePassword);</pre></td></tr>
-<tr> <td class="numLineCover"> 552</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NoSuchAlgorithmException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 553</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 554</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (CertificateException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 555</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(ex);</span></pre></td></tr>
-<tr> <td class="numLine"> 556</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 552</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> ks.load(ksis, keystorePassword);</pre></td></tr>
+<tr> <td class="numLineCover"> 553</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NoSuchAlgorithmException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 554</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 555</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (CertificateException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 556</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(ex);</span></pre></td></tr>
+<tr> <td class="numLine"> 557</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 557</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> ksis.close();</pre></td></tr>
-<tr> <td class="numLineCover"> 558</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 559</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> Key key = <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLine"> 560</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 558</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> ksis.close();</pre></td></tr>
+<tr> <td class="numLineCover"> 559</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 560</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> Key key = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLine"> 561</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 561</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> key = ks.getKey(alias, keystorePassword);</pre></td></tr>
-<tr> <td class="numLineCover"> 562</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NoSuchAlgorithmException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 563</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 564</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (UnrecoverableKeyException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 565</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 566</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 567</td> <td class="nbHitsCovered"><a title="Line 567: Conditional coverage 100% (2/2)."> 15</a></td> <td class="src"><pre class="src"> <a title="Line 567: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (key == <span class="keyword">null</span>) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 568</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(<span class="string">"Could not find key for alias '"</span></pre></td></tr>
-<tr> <td class="numLine"> 569</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> + alias + <span class="string">"'"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 562</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> key = ks.getKey(alias, keystorePassword);</pre></td></tr>
+<tr> <td class="numLineCover"> 563</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NoSuchAlgorithmException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 564</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 565</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (UnrecoverableKeyException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 566</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 567</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 568</td> <td class="nbHitsCovered"><a title="Line 568: Conditional coverage 100% (2/2)."> 15</a></td> <td class="src"><pre class="src"> <a title="Line 568: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (key == <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 569</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(<span class="string">"Could not find key for alias '"</span></pre></td></tr>
<tr> <td class="numLine"> 570</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> + alias + <span class="string">"'"</span>);</pre></td></tr>
+<tr> <td class="numLine"> 571</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 571</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> privateKey = (PrivateKey) key;</pre></td></tr>
-<tr> <td class="numLineCover"> 572</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> publicKey = ks.getCertificate(alias).getPublicKey();</pre></td></tr>
-<tr> <td class="numLineCover"> 573</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (KeyStoreException ex) {</pre></td></tr>
-<tr> <td class="numLineCover"> 574</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(ex);</pre></td></tr>
-<tr> <td class="numLineCover"> 575</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 576</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> KeyPair(publicKey, privateKey);</pre></td></tr>
-<tr> <td class="numLine"> 577</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 572</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> privateKey = (PrivateKey) key;</pre></td></tr>
+<tr> <td class="numLineCover"> 573</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> publicKey = ks.getCertificate(alias).getPublicKey();</pre></td></tr>
+<tr> <td class="numLineCover"> 574</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (KeyStoreException ex) {</pre></td></tr>
+<tr> <td class="numLineCover"> 575</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(ex);</pre></td></tr>
+<tr> <td class="numLineCover"> 576</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 577</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> KeyPair(publicKey, privateKey);</pre></td></tr>
<tr> <td class="numLine"> 578</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 579</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Useful as a separate method during testing.</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 580</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">static</span> <span class="keyword">void</span> bootstrapOpenSaml() {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// Useful as a separate method during testing.</span></pre></td></tr>
<tr> <td class="numLine"> 581</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">static</span> <span class="keyword">void</span> bootstrapOpenSaml() {</pre></td></tr>
+<tr> <td class="numLine"> 582</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 582</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> DefaultBootstrap.bootstrap();</pre></td></tr>
-<tr> <td class="numLineCover"> 583</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (ConfigurationException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 584</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 585</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 586</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 587</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 583</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> DefaultBootstrap.bootstrap();</pre></td></tr>
+<tr> <td class="numLineCover"> 584</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (ConfigurationException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 585</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 586</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 587</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 588</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 589</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Stop the current services, allowing up to {@code maxDelay} seconds for</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 590</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * things to shutdown.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Stop the current services, allowing up to {@code maxDelay} seconds for</span></pre></td></tr>
<tr> <td class="numLine"> 591</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * things to shutdown.</span></pre></td></tr>
<tr> <td class="numLine"> 592</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> stop(<span class="keyword">long</span> time, TimeUnit unit) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 593</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> stop(<span class="keyword">long</span> time, TimeUnit unit) {</pre></td></tr>
+<tr> <td class="numLine"> 594</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// Prevent new start()s.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 594</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> shutdownCount.incrementAndGet();</pre></td></tr>
-<tr> <td class="numLine"> 595</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 595</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> shutdownCount.incrementAndGet();</pre></td></tr>
+<tr> <td class="numLine"> 596</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 596</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> CountDownLatch latch = shuttingDownLatch;</pre></td></tr>
-<tr> <td class="numLineCover"> 597</td> <td class="nbHitsCovered"><a title="Line 597: Conditional coverage 100% (2/2)."> 27</a></td> <td class="src"><pre class="src"> <a title="Line 597: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (latch != <span class="keyword">null</span>) {</a></pre></td></tr>
-<tr> <td class="numLine"> 598</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 597</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> CountDownLatch latch = shuttingDownLatch;</pre></td></tr>
+<tr> <td class="numLineCover"> 598</td> <td class="nbHitsCovered"><a title="Line 598: Conditional coverage 100% (2/2)."> 27</a></td> <td class="src"><pre class="src"> <a title="Line 598: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (latch != <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLine"> 599</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// Cause existing start() to begin cancelling.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 599</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> latch.countDown();</pre></td></tr>
-<tr> <td class="numLine"> 600</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 600</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> latch.countDown();</pre></td></tr>
+<tr> <td class="numLine"> 601</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 601</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> realStop(time, unit);</pre></td></tr>
-<tr> <td class="numLine"> 602</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 602</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> realStop(time, unit);</pre></td></tr>
<tr> <td class="numLine"> 603</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Permit new start()s.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 604</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> shutdownCount.decrementAndGet();</pre></td></tr>
-<tr> <td class="numLineCover"> 605</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 606</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 607</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 608</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">synchronized</span> <span class="keyword">void</span> realStop(<span class="keyword">long</span> time, TimeUnit unit) {</pre></td></tr>
-<tr> <td class="numLineCover"> 609</td> <td class="nbHitsCovered"><a title="Line 609: Conditional coverage 100% (2/2)."> 27</a></td> <td class="src"><pre class="src"> <a title="Line 609: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (scope != <span class="keyword">null</span>) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 610</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> scope.close();</pre></td></tr>
-<tr> <td class="numLine"> 611</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 612</td> <td class="nbHitsCovered"><a title="Line 612: Conditional coverage 100% (2/2)."> 27</a></td> <td class="src"><pre class="src"> <a title="Line 612: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (dashboard != <span class="keyword">null</span>) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 613</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> dashboard.clearStatusSources();</pre></td></tr>
-<tr> <td class="numLineCover"> 614</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> dashboard.stop();</pre></td></tr>
-<tr> <td class="numLine"> 615</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 616</td> <td class="nbHitsCovered"><a title="Line 616: Conditional coverage 100% (2/2)."> 27</a></td> <td class="src"><pre class="src"> <a title="Line 616: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (scheduleExecutor != <span class="keyword">null</span>) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 617</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> scheduleExecutor.shutdownNow();</pre></td></tr>
-<tr> <td class="numLine"> 618</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 619</td> <td class="nbHitsCovered"><a title="Line 619: Conditional coverage 100% (2/2)."> 27</a></td> <td class="src"><pre class="src"> <a title="Line 619: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (backgroundExecutor != <span class="keyword">null</span>) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 620</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> backgroundExecutor.shutdownNow();</pre></td></tr>
-<tr> <td class="numLine"> 621</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 622</td> <td class="nbHitsCovered"><a title="Line 622: Conditional coverage 100% (2/2)."> 27</a></td> <td class="src"><pre class="src"> <a title="Line 622: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (waiter != <span class="keyword">null</span>) {</a></pre></td></tr>
-<tr> <td class="numLine"> 623</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 624</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> waiter.shutdown(time, unit);</pre></td></tr>
-<tr> <td class="numLineCover"> 625</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InterruptedException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 626</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Thread.currentThread().interrupt();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 627</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 628</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 629</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 630</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> adaptor.destroy();</pre></td></tr>
-<tr> <td class="numLine"> 631</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLine"> 632</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Wait until after adaptor.destroy() to set things to null, so that the</span></pre></td></tr>
-<tr> <td class="numLine"> 633</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// AdaptorContext is usable until the very end.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 634</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> sendDocIdsFuture = <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 635</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> scheduler = <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 636</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> scope = <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 637</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> dashboard = <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 638</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> scheduleExecutor = <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 639</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> backgroundExecutor = <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 640</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> waiter = <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 641</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> sessionManager = <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 642</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> docIdCodec = <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 643</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> afterInit = <span class="keyword">false</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 644</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> pollingIncrementalLister = <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 645</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> authnAuthority = <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 646</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> authzAuthority = <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 647</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 648</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 649</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 604</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// Permit new start()s.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 605</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> shutdownCount.decrementAndGet();</pre></td></tr>
+<tr> <td class="numLineCover"> 606</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 607</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 608</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 650</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 651</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Ensure there is a push running right now. This schedules a new push if one</span></pre></td></tr>
-<tr> <td class="numLine"> 652</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * is not already running. Returns {@code true} if it starts a new push, and</span></pre></td></tr>
-<tr> <td class="numLine"> 653</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * {@code false} otherwise.</span></pre></td></tr>
-<tr> <td class="numLine"> 654</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 655</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> checkAndScheduleImmediatePushOfDocIds() {</pre></td></tr>
-<tr> <td class="numLineCover"> 656</td> <td class="nbHitsUncovered"><a title="Line 656: Conditional coverage 50% (1/2)."> 10</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 656: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (docIdFullPusher.isRunning()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 657</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 658</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 609</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">synchronized</span> <span class="keyword">void</span> realStop(<span class="keyword">long</span> time, TimeUnit unit) {</pre></td></tr>
+<tr> <td class="numLineCover"> 610</td> <td class="nbHitsCovered"><a title="Line 610: Conditional coverage 100% (2/2)."> 27</a></td> <td class="src"><pre class="src"> <a title="Line 610: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (scope != <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 611</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> scope.close();</pre></td></tr>
+<tr> <td class="numLine"> 612</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 659</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// This check-then-execute permits a race between checking and starting the</span></pre></td></tr>
-<tr> <td class="numLine"> 660</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// runnable, but it shouldn't be a major issue since the caller wanted a</span></pre></td></tr>
-<tr> <td class="numLine"> 661</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// push to start right now, and one "just started."</span></pre></td></tr>
-<tr> <td class="numLineCover"> 662</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> backgroundExecutor.execute(waiter.runnable(docIdFullPusher));</pre></td></tr>
-<tr> <td class="numLineCover"> 663</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">true</span>;</pre></td></tr>
-<tr> <td class="numLine"> 664</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 665</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 666</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 667</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Perform an push of incremental changes. This works only for adaptors that</span></pre></td></tr>
-<tr> <td class="numLine"> 668</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * support incremental polling (implements {@link PollingIncrementalLister}.</span></pre></td></tr>
-<tr> <td class="numLine"> 669</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 670</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">synchronized</span> <span class="keyword">boolean</span> checkAndScheduleIncrementalPushOfDocIds() {</pre></td></tr>
-<tr> <td class="numLineCover"> 671</td> <td class="nbHitsUncovered"><a title="Line 671: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 671: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (docIdIncrementalPusher == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 672</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(</span></pre></td></tr>
-<tr> <td class="numLine"> 673</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="string">"This adaptor does not support incremental push"</span>);</pre></td></tr>
-<tr> <td class="numLine"> 674</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 613</td> <td class="nbHitsCovered"><a title="Line 613: Conditional coverage 100% (2/2)."> 27</a></td> <td class="src"><pre class="src"> <a title="Line 613: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (dashboard != <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 614</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> dashboard.clearStatusSources();</pre></td></tr>
+<tr> <td class="numLineCover"> 615</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> dashboard.stop();</pre></td></tr>
+<tr> <td class="numLine"> 616</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 675</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 676</td> <td class="nbHitsUncovered"><a title="Line 676: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 676: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (docIdIncrementalPusher.isRunning()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 677</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 678</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 617</td> <td class="nbHitsCovered"><a title="Line 617: Conditional coverage 100% (2/2)."> 27</a></td> <td class="src"><pre class="src"> <a title="Line 617: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (scheduleExecutor != <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 618</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> scheduleExecutor.shutdownNow();</pre></td></tr>
+<tr> <td class="numLine"> 619</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 679</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// This permits a race between checking and starting the runnable, but it</span></pre></td></tr>
-<tr> <td class="numLine"> 680</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// shouldn't be a major issue since the caller wanted a push to start right</span></pre></td></tr>
-<tr> <td class="numLine"> 681</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// now, and one "just started."</span></pre></td></tr>
-<tr> <td class="numLineCover"> 682</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> backgroundExecutor.execute(waiter.runnable(docIdIncrementalPusher));</span></pre></td></tr>
-<tr> <td class="numLineCover"> 683</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 684</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 685</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 686</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">boolean</span> isAdaptorIncremental() {</pre></td></tr>
-<tr> <td class="numLineCover"> 687</td> <td class="nbHitsCovered"><a title="Line 687: Conditional coverage 100% (2/2)."> 13</a></td> <td class="src"><pre class="src"> <a title="Line 687: Conditional coverage 100% (2/2)."> <span class="keyword">return</span> pollingIncrementalLister != <span class="keyword">null</span>;</a></pre></td></tr>
-<tr> <td class="numLine"> 688</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 689</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 690</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">boolean</span> ensureLatestConfigLoaded() {</pre></td></tr>
-<tr> <td class="numLine"> 691</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 620</td> <td class="nbHitsCovered"><a title="Line 620: Conditional coverage 100% (2/2)."> 27</a></td> <td class="src"><pre class="src"> <a title="Line 620: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (backgroundExecutor != <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 621</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> backgroundExecutor.shutdownNow();</pre></td></tr>
+<tr> <td class="numLine"> 622</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 623</td> <td class="nbHitsCovered"><a title="Line 623: Conditional coverage 100% (2/2)."> 27</a></td> <td class="src"><pre class="src"> <a title="Line 623: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (waiter != <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLine"> 624</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 625</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> waiter.shutdown(time, unit);</pre></td></tr>
+<tr> <td class="numLineCover"> 626</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InterruptedException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 627</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Thread.currentThread().interrupt();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 628</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 629</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 630</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 692</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> config.ensureLatestConfigLoaded();</pre></td></tr>
-<tr> <td class="numLineCover"> 693</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Exception ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 694</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.WARNING, <span class="string">"Error while trying to reload configuration"</span>,</span></pre></td></tr>
-<tr> <td class="numLine"> 695</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 631</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> adaptor.destroy();</pre></td></tr>
+<tr> <td class="numLine"> 632</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLine"> 633</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// Wait until after adaptor.destroy() to set things to null, so that the</span></pre></td></tr>
+<tr> <td class="numLine"> 634</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// AdaptorContext is usable until the very end.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 635</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> sendDocIdsFuture = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 636</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> scheduler = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 637</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> scope = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 638</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> dashboard = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 639</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> scheduleExecutor = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 640</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> backgroundExecutor = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 641</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> waiter = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 642</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> sessionManager = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 643</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> docIdCodec = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 644</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> afterInit = <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 645</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> pollingIncrementalLister = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 646</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> authnAuthority = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 647</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> authzAuthority = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 648</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 649</td> <td class="nbHitsCovered"> 27</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 650</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 651</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 652</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Ensure there is a push running right now. This schedules a new push if one</span></pre></td></tr>
+<tr> <td class="numLine"> 653</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * is not already running. Returns {@code true} if it starts a new push, and</span></pre></td></tr>
+<tr> <td class="numLine"> 654</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * {@code false} otherwise.</span></pre></td></tr>
+<tr> <td class="numLine"> 655</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 656</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> checkAndScheduleImmediatePushOfDocIds() {</pre></td></tr>
+<tr> <td class="numLineCover"> 657</td> <td class="nbHitsUncovered"><a title="Line 657: Conditional coverage 50% (1/2)."> 10</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 657: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (docIdFullPusher.isRunning()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 658</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 659</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 660</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// This check-then-execute permits a race between checking and starting the</span></pre></td></tr>
+<tr> <td class="numLine"> 661</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// runnable, but it shouldn't be a major issue since the caller wanted a</span></pre></td></tr>
+<tr> <td class="numLine"> 662</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// push to start right now, and one "just started."</span></pre></td></tr>
+<tr> <td class="numLineCover"> 663</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> backgroundExecutor.execute(waiter.runnable(docIdFullPusher));</pre></td></tr>
+<tr> <td class="numLineCover"> 664</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLine"> 665</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 666</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 667</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 668</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Perform an push of incremental changes. This works only for adaptors that</span></pre></td></tr>
+<tr> <td class="numLine"> 669</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * support incremental polling (implements {@link PollingIncrementalLister}.</span></pre></td></tr>
+<tr> <td class="numLine"> 670</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 671</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">synchronized</span> <span class="keyword">boolean</span> checkAndScheduleIncrementalPushOfDocIds() {</pre></td></tr>
+<tr> <td class="numLineCover"> 672</td> <td class="nbHitsUncovered"><a title="Line 672: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 672: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (docIdIncrementalPusher == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 673</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(</span></pre></td></tr>
+<tr> <td class="numLine"> 674</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="string">"This adaptor does not support incremental push"</span>);</pre></td></tr>
+<tr> <td class="numLine"> 675</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 676</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 677</td> <td class="nbHitsUncovered"><a title="Line 677: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 677: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (docIdIncrementalPusher.isRunning()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 678</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 679</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 680</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// This permits a race between checking and starting the runnable, but it</span></pre></td></tr>
+<tr> <td class="numLine"> 681</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// shouldn't be a major issue since the caller wanted a push to start right</span></pre></td></tr>
+<tr> <td class="numLine"> 682</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// now, and one "just started."</span></pre></td></tr>
+<tr> <td class="numLineCover"> 683</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> backgroundExecutor.execute(waiter.runnable(docIdIncrementalPusher));</span></pre></td></tr>
+<tr> <td class="numLineCover"> 684</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">true</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 685</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 686</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 687</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">boolean</span> isAdaptorIncremental() {</pre></td></tr>
+<tr> <td class="numLineCover"> 688</td> <td class="nbHitsCovered"><a title="Line 688: Conditional coverage 100% (2/2)."> 13</a></td> <td class="src"><pre class="src"> <a title="Line 688: Conditional coverage 100% (2/2)."> <span class="keyword">return</span> pollingIncrementalLister != <span class="keyword">null</span>;</a></pre></td></tr>
+<tr> <td class="numLine"> 689</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 690</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 691</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">boolean</span> ensureLatestConfigLoaded() {</pre></td></tr>
+<tr> <td class="numLine"> 692</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 693</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> config.ensureLatestConfigLoaded();</pre></td></tr>
+<tr> <td class="numLineCover"> 694</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Exception ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 695</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.WARNING, <span class="string">"Error while trying to reload configuration"</span>,</span></pre></td></tr>
+<tr> <td class="numLine"> 696</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> ex);</pre></td></tr>
-<tr> <td class="numLineCover"> 696</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 697</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 697</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">false</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 698</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 699</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 700</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/** The adaptor instance being used. */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 701</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/** The adaptor instance being used. */</span></pre></td></tr>
+<tr> <td class="numLine"> 702</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> Adaptor getAdaptor() {</pre></td></tr>
-<tr> <td class="numLineCover"> 702</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> adaptor;</pre></td></tr>
-<tr> <td class="numLine"> 703</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 703</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> adaptor;</pre></td></tr>
<tr> <td class="numLine"> 704</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 705</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 706</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> HttpContext addFilters(HttpContext context) {</pre></td></tr>
-<tr> <td class="numLineCover"> 706</td> <td class="nbHitsCovered"> 53</td> <td class="src"><pre class="src"> context.getFilters().add(waiter.filter());</pre></td></tr>
-<tr> <td class="numLineCover"> 707</td> <td class="nbHitsCovered"> 53</td> <td class="src"><pre class="src"> context.getFilters().addAll(commonFilters);</pre></td></tr>
-<tr> <td class="numLineCover"> 708</td> <td class="nbHitsCovered"> 53</td> <td class="src"><pre class="src"> <span class="keyword">return</span> context;</pre></td></tr>
-<tr> <td class="numLine"> 709</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 707</td> <td class="nbHitsCovered"> 53</td> <td class="src"><pre class="src"> context.getFilters().add(waiter.filter());</pre></td></tr>
+<tr> <td class="numLineCover"> 708</td> <td class="nbHitsCovered"> 53</td> <td class="src"><pre class="src"> context.getFilters().addAll(commonFilters);</pre></td></tr>
+<tr> <td class="numLineCover"> 709</td> <td class="nbHitsCovered"> 53</td> <td class="src"><pre class="src"> <span class="keyword">return</span> context;</pre></td></tr>
<tr> <td class="numLine"> 710</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 711</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 712</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Runnable that calls {@link DocIdSender#pushDocIds}.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 713</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Runnable that calls {@link DocIdSender#pushDocIds}.</span></pre></td></tr>
+<tr> <td class="numLine"> 714</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 714</td> <td class="nbHitsCovered"> 72</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">class</span> PushRunnable <span class="keyword">implements</span> Runnable {</pre></td></tr>
-<tr> <td class="numLineCover"> 715</td> <td class="nbHitsCovered"> 36</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">volatile</span> ExceptionHandler handler</pre></td></tr>
-<tr> <td class="numLine"> 716</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> = ExceptionHandlers.defaultHandler();</pre></td></tr>
+<tr> <td class="numLineCover"> 715</td> <td class="nbHitsCovered"> 72</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">class</span> PushRunnable <span class="keyword">implements</span> Runnable {</pre></td></tr>
+<tr> <td class="numLineCover"> 716</td> <td class="nbHitsCovered"> 36</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">volatile</span> ExceptionHandler handler</pre></td></tr>
<tr> <td class="numLine"> 717</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 718</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 719</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> run() {</pre></td></tr>
-<tr> <td class="numLine"> 720</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 721</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> docIdSender.pushFullDocIdsFromAdaptor(handler);</pre></td></tr>
-<tr> <td class="numLineCover"> 722</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (InterruptedException ex) {</pre></td></tr>
-<tr> <td class="numLineCover"> 723</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> Thread.currentThread().interrupt();</pre></td></tr>
-<tr> <td class="numLineCover"> 724</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 725</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 726</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 727</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setGetDocIdsErrorHandler(ExceptionHandler handler) {</pre></td></tr>
-<tr> <td class="numLineCover"> 728</td> <td class="nbHitsUncovered"><a title="Line 728: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 728: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (handler == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 729</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> NullPointerException();</span></pre></td></tr>
-<tr> <td class="numLine"> 730</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 731</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.handler = handler;</pre></td></tr>
-<tr> <td class="numLineCover"> 732</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 733</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 734</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> ExceptionHandler getGetDocIdsErrorHandler() {</pre></td></tr>
-<tr> <td class="numLineCover"> 735</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> handler;</pre></td></tr>
-<tr> <td class="numLine"> 736</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 737</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 738</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 739</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 740</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Runnable that performs incremental feed push.</span></pre></td></tr>
-<tr> <td class="numLine"> 741</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 742</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">class</span> IncrementalPushRunnable <span class="keyword">implements</span> Runnable {</pre></td></tr>
-<tr> <td class="numLineCover"> 743</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">volatile</span> ExceptionHandler handler</pre></td></tr>
-<tr> <td class="numLine"> 744</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> = ExceptionHandlers.defaultHandler();</pre></td></tr>
-<tr> <td class="numLine"> 745</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> PollingIncrementalLister adaptor;</pre></td></tr>
-<tr> <td class="numLine"> 746</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 718</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 747</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">public</span> IncrementalPushRunnable(PollingIncrementalLister adaptor) {</pre></td></tr>
-<tr> <td class="numLineCover"> 748</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.adaptor = adaptor;</pre></td></tr>
-<tr> <td class="numLineCover"> 749</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 750</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 751</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 719</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 752</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 720</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> run() {</pre></td></tr>
-<tr> <td class="numLine"> 753</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 721</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 754</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> docIdSender.pushIncrementalDocIdsFromAdaptor(</pre></td></tr>
-<tr> <td class="numLine"> 755</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> pollingIncrementalLister, handler);</pre></td></tr>
-<tr> <td class="numLineCover"> 756</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InterruptedException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 757</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Thread.currentThread().interrupt();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 758</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Exception ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 759</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.WARNING, <span class="string">"Exception during incremental polling"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 760</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 761</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 762</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 722</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> docIdSender.pushFullDocIdsFromAdaptor(handler);</pre></td></tr>
+<tr> <td class="numLineCover"> 723</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (InterruptedException ex) {</pre></td></tr>
+<tr> <td class="numLineCover"> 724</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> Thread.currentThread().interrupt();</pre></td></tr>
+<tr> <td class="numLineCover"> 725</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 726</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 727</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 763</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 728</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setGetDocIdsErrorHandler(ExceptionHandler handler) {</pre></td></tr>
-<tr> <td class="numLineCover"> 764</td> <td class="nbHitsUncovered"><a title="Line 764: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 764: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (handler == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 765</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> NullPointerException();</span></pre></td></tr>
-<tr> <td class="numLine"> 766</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 729</td> <td class="nbHitsUncovered"><a title="Line 729: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 729: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (handler == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 730</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> NullPointerException();</span></pre></td></tr>
+<tr> <td class="numLine"> 731</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 767</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.handler = handler;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 768</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 769</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 732</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.handler = handler;</pre></td></tr>
+<tr> <td class="numLineCover"> 733</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 734</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 770</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 735</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> ExceptionHandler getGetDocIdsErrorHandler() {</pre></td></tr>
-<tr> <td class="numLineCover"> 771</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> handler;</span></pre></td></tr>
-<tr> <td class="numLine"> 772</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 736</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> handler;</pre></td></tr>
+<tr> <td class="numLine"> 737</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 738</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 739</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 740</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 741</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Runnable that performs incremental feed push.</span></pre></td></tr>
+<tr> <td class="numLine"> 742</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 743</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">class</span> IncrementalPushRunnable <span class="keyword">implements</span> Runnable {</pre></td></tr>
+<tr> <td class="numLineCover"> 744</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">volatile</span> ExceptionHandler handler</pre></td></tr>
+<tr> <td class="numLine"> 745</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> = ExceptionHandlers.defaultHandler();</pre></td></tr>
+<tr> <td class="numLine"> 746</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> PollingIncrementalLister adaptor;</pre></td></tr>
+<tr> <td class="numLine"> 747</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 748</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">public</span> IncrementalPushRunnable(PollingIncrementalLister adaptor) {</pre></td></tr>
+<tr> <td class="numLineCover"> 749</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.adaptor = adaptor;</pre></td></tr>
+<tr> <td class="numLineCover"> 750</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 751</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 752</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 753</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> run() {</pre></td></tr>
+<tr> <td class="numLine"> 754</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 755</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> docIdSender.pushIncrementalDocIdsFromAdaptor(</pre></td></tr>
+<tr> <td class="numLine"> 756</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> pollingIncrementalLister, handler);</pre></td></tr>
+<tr> <td class="numLineCover"> 757</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InterruptedException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 758</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Thread.currentThread().interrupt();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 759</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Exception ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 760</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.WARNING, <span class="string">"Exception during incremental polling"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 761</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 762</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 763</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 764</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setGetDocIdsErrorHandler(ExceptionHandler handler) {</pre></td></tr>
+<tr> <td class="numLineCover"> 765</td> <td class="nbHitsUncovered"><a title="Line 765: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 765: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (handler == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 766</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> NullPointerException();</span></pre></td></tr>
+<tr> <td class="numLine"> 767</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 768</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">this</span>.handler = handler;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 769</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 770</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 771</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> ExceptionHandler getGetDocIdsErrorHandler() {</pre></td></tr>
+<tr> <td class="numLineCover"> 772</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> handler;</span></pre></td></tr>
<tr> <td class="numLine"> 773</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 774</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 775</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 776</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Runnable that logs an error that {@link PushRunnable} is already executing.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 777</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Runnable that logs an error that {@link PushRunnable} is already executing.</span></pre></td></tr>
+<tr> <td class="numLine"> 778</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 778</td> <td class="nbHitsCovered"> 74</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">class</span> AlreadyRunningRunnable <span class="keyword">implements</span> Runnable {</pre></td></tr>
-<tr> <td class="numLine"> 779</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLineCover"> 779</td> <td class="nbHitsCovered"> 74</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">class</span> AlreadyRunningRunnable <span class="keyword">implements</span> Runnable {</pre></td></tr>
<tr> <td class="numLine"> 780</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 781</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> run() {</pre></td></tr>
-<tr> <td class="numLineCover"> 781</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.warning(<span class="string">"Skipping scheduled push of docIds. The previous invocation "</span></span></pre></td></tr>
-<tr> <td class="numLine"> 782</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 782</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.warning(<span class="string">"Skipping scheduled push of docIds. The previous invocation "</span></span></pre></td></tr>
+<tr> <td class="numLine"> 783</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> + <span class="string">"is still running."</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 783</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 784</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 784</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 785</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 786</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 787</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Runnable that when invoked executes the delegate with {@link</span></pre></td></tr>
-<tr> <td class="numLine"> 788</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * #backgroundExecutor} and then returns before completion. That implies that</span></pre></td></tr>
-<tr> <td class="numLine"> 789</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * uses of this class must ensure they do not add an instance directly to</span></pre></td></tr>
-<tr> <td class="numLine"> 790</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * {@link #backgroundExecutor}, otherwise an odd infinite loop will occur.</span></pre></td></tr>
-<tr> <td class="numLine"> 791</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 792</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">class</span> BackgroundRunnable <span class="keyword">implements</span> Runnable {</pre></td></tr>
-<tr> <td class="numLine"> 793</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> Runnable delegate;</pre></td></tr>
-<tr> <td class="numLine"> 794</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 795</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> <span class="keyword">public</span> BackgroundRunnable(Runnable delegate) {</pre></td></tr>
-<tr> <td class="numLineCover"> 796</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.delegate = delegate;</pre></td></tr>
-<tr> <td class="numLineCover"> 797</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 798</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 799</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 800</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> run() {</pre></td></tr>
-<tr> <td class="numLine"> 801</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Wrap with waiter.runnable() every time instead of in constructor to aid</span></pre></td></tr>
-<tr> <td class="numLine"> 802</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// auditing the code for "ShutdownWaiter correctness."</span></pre></td></tr>
-<tr> <td class="numLineCover"> 803</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> backgroundExecutor.execute(waiter.runnable(delegate));</pre></td></tr>
-<tr> <td class="numLineCover"> 804</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 805</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 806</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 807</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">class</span> GsaConfigModListener <span class="keyword">implements</span> ConfigModificationListener {</pre></td></tr>
-<tr> <td class="numLine"> 808</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 809</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> configModified(ConfigModificationEvent ev) {</pre></td></tr>
-<tr> <td class="numLineCover"> 810</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Set<String> modifiedKeys = ev.getModifiedKeys();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 811</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">synchronized</span> (GsaCommunicationHandler.<span class="keyword">this</span>) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 812</td> <td class="nbHitsUncovered"><a title="Line 812: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 812: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (modifiedKeys.contains(<span class="string">"adaptor.fullListingSchedule"</span>)</a></span></pre></td></tr>
-<tr> <td class="numLine"> 813</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> && sendDocIdsFuture != <span class="keyword">null</span>) {</pre></td></tr>
-<tr> <td class="numLineCover"> 814</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String schedule = ev.getNewConfig().getAdaptorFullListingSchedule();</span></pre></td></tr>
-<tr> <td class="numLine"> 815</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 816</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> scheduler.reschedule(sendDocIdsFuture, schedule);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 817</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IllegalArgumentException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 818</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.WARNING, <span class="string">"Invalid schedule pattern"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 819</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 820</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 821</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 822</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 823</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// List of "safe" keys that can be updated without a restart.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 824</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> List<String> safeKeys = Arrays.asList(<span class="string">"adaptor.fullListingSchedule"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 825</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Set of "unsafe" keys that have been modified.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 826</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Set<String> modifiedKeysRequiringRestart</span></pre></td></tr>
-<tr> <td class="numLine"> 827</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> = <span class="keyword">new</span> HashSet<String>(modifiedKeys);</pre></td></tr>
-<tr> <td class="numLineCover"> 828</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> modifiedKeysRequiringRestart.removeAll(safeKeys);</span></pre></td></tr>
-<tr> <td class="numLine"> 829</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// If there are modified "unsafe" keys, then we restart things to make</span></pre></td></tr>
-<tr> <td class="numLine"> 830</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// sure all the code is up-to-date with the new values.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 831</td> <td class="nbHitsUncovered"><a title="Line 831: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 831: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!modifiedKeysRequiringRestart.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 832</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.warning(<span class="string">"Unsafe configuration keys modified. To ensure a sane "</span></span></pre></td></tr>
-<tr> <td class="numLine"> 833</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> + <span class="string">"state, the adaptor is restarting."</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 834</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> HttpServer existingServer = scope.getHttpServer();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 835</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> HttpServer existingDashboardServer</span></pre></td></tr>
-<tr> <td class="numLine"> 836</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> = dashboard.getScope().getHttpServer();</pre></td></tr>
-<tr> <td class="numLineCover"> 837</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> stop(3, TimeUnit.SECONDS);</span></pre></td></tr>
-<tr> <td class="numLine"> 838</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 839</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> start(existingServer, existingDashboardServer);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 840</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Exception ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 841</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.SEVERE, <span class="string">"Automatic restart failed"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 842</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 843</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 844</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 845</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 846</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 847</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 848</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 849</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * This class is thread-safe.</span></pre></td></tr>
-<tr> <td class="numLine"> 850</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 788</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Runnable that when invoked executes the delegate with {@link</span></pre></td></tr>
+<tr> <td class="numLine"> 789</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * #backgroundExecutor} and then returns before completion. That implies that</span></pre></td></tr>
+<tr> <td class="numLine"> 790</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * uses of this class must ensure they do not add an instance directly to</span></pre></td></tr>
+<tr> <td class="numLine"> 791</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * {@link #backgroundExecutor}, otherwise an odd infinite loop will occur.</span></pre></td></tr>
+<tr> <td class="numLine"> 792</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 851</td> <td class="nbHitsCovered"> 28</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">class</span> AdaptorContextImpl <span class="keyword">implements</span> AdaptorContext {</pre></td></tr>
-<tr> <td class="numLine"> 852</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 853</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> Config getConfig() {</pre></td></tr>
-<tr> <td class="numLineCover"> 854</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> config;</pre></td></tr>
-<tr> <td class="numLine"> 855</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 856</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 793</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">class</span> BackgroundRunnable <span class="keyword">implements</span> Runnable {</pre></td></tr>
+<tr> <td class="numLine"> 794</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> Runnable delegate;</pre></td></tr>
+<tr> <td class="numLine"> 795</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 857</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 858</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> DocIdPusher getDocIdPusher() {</pre></td></tr>
-<tr> <td class="numLineCover"> 859</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> docIdSender;</pre></td></tr>
-<tr> <td class="numLine"> 860</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 861</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 796</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> <span class="keyword">public</span> BackgroundRunnable(Runnable delegate) {</pre></td></tr>
+<tr> <td class="numLineCover"> 797</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.delegate = delegate;</pre></td></tr>
+<tr> <td class="numLineCover"> 798</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 799</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 862</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 800</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 863</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> DocIdEncoder getDocIdEncoder() {</pre></td></tr>
-<tr> <td class="numLineCover"> 864</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> docIdCodec;</pre></td></tr>
-<tr> <td class="numLine"> 865</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 866</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 867</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 868</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> addStatusSource(StatusSource source) {</pre></td></tr>
-<tr> <td class="numLineCover"> 869</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> dashboard.addStatusSource(source);</pre></td></tr>
-<tr> <td class="numLineCover"> 870</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 871</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 872</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 873</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setGetDocIdsFullErrorHandler(ExceptionHandler handler) {</pre></td></tr>
-<tr> <td class="numLineCover"> 874</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> ((PushRunnable) docIdFullPusher.getRunnable())</pre></td></tr>
-<tr> <td class="numLine"> 875</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> .setGetDocIdsErrorHandler(handler);</pre></td></tr>
-<tr> <td class="numLineCover"> 876</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 877</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 878</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 879</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> ExceptionHandler getGetDocIdsFullErrorHandler() {</pre></td></tr>
-<tr> <td class="numLineCover"> 880</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ((PushRunnable) docIdFullPusher.getRunnable())</pre></td></tr>
-<tr> <td class="numLine"> 881</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> .getGetDocIdsErrorHandler();</pre></td></tr>
-<tr> <td class="numLine"> 882</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 883</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 884</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 885</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setGetDocIdsIncrementalErrorHandler(</pre></td></tr>
-<tr> <td class="numLine"> 886</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> ExceptionHandler handler) {</pre></td></tr>
-<tr> <td class="numLineCover"> 887</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ((PushRunnable) docIdFullPusher.getRunnable())</span></pre></td></tr>
-<tr> <td class="numLine"> 888</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> .setGetDocIdsErrorHandler(handler);</pre></td></tr>
-<tr> <td class="numLineCover"> 889</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 890</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 891</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 892</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> ExceptionHandler getGetDocIdsIncrementalErrorHandler() {</pre></td></tr>
-<tr> <td class="numLineCover"> 893</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ((PushRunnable) docIdFullPusher.getRunnable())</span></pre></td></tr>
-<tr> <td class="numLine"> 894</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> .getGetDocIdsErrorHandler();</pre></td></tr>
-<tr> <td class="numLine"> 895</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 896</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 897</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 898</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> SensitiveValueDecoder getSensitiveValueDecoder() {</pre></td></tr>
-<tr> <td class="numLineCover"> 899</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> secureValueCodec;</pre></td></tr>
-<tr> <td class="numLine"> 900</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 901</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 902</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 903</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> HttpContext createHttpContext(String path, HttpHandler handler) {</pre></td></tr>
-<tr> <td class="numLineCover"> 904</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> addFilters(scope.createContext(path, handler));</span></pre></td></tr>
-<tr> <td class="numLine"> 905</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 906</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 907</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 908</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> Session getUserSession(HttpExchange ex, <span class="keyword">boolean</span> create) {</pre></td></tr>
-<tr> <td class="numLineCover"> 909</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Session session = sessionManager.getSession(ex, create);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 910</td> <td class="nbHitsUncovered"><a title="Line 910: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 910: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (session == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 911</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 912</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 913</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String wrappedSessionName = <span class="string">"wrapped-session"</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 914</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> Session nsSession;</pre></td></tr>
-<tr> <td class="numLineCover"> 915</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">synchronized</span> (session) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 916</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nsSession = (Session) session.getAttribute(wrappedSessionName);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 917</td> <td class="nbHitsUncovered"><a title="Line 917: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 917: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (nsSession == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 918</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nsSession = <span class="keyword">new</span> NamespacedSession(session, <span class="string">"adaptor-impl-"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 919</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> session.setAttribute(wrappedSessionName, nsSession);</span></pre></td></tr>
-<tr> <td class="numLine"> 920</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 921</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 922</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> nsSession;</span></pre></td></tr>
-<tr> <td class="numLine"> 923</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 924</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 925</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 926</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setPollingIncrementalLister(PollingIncrementalLister lister) {</pre></td></tr>
-<tr> <td class="numLineCover"> 927</td> <td class="nbHitsUncovered"><a title="Line 927: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 927: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (afterInit) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 928</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(<span class="string">"After init()"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 929</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 930</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> pollingIncrementalLister = lister;</pre></td></tr>
-<tr> <td class="numLineCover"> 931</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 932</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 933</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 934</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setAuthnAuthority(AuthnAuthority authnAuthority) {</pre></td></tr>
-<tr> <td class="numLineCover"> 935</td> <td class="nbHitsUncovered"><a title="Line 935: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 935: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (afterInit) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 936</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(<span class="string">"After init()"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 937</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 938</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> authnAuthority = authnAuthority;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 939</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 940</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 941</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 942</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setAuthzAuthority(AuthzAuthority authzAuthority) {</pre></td></tr>
-<tr> <td class="numLineCover"> 943</td> <td class="nbHitsUncovered"><a title="Line 943: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 943: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (afterInit) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 944</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(<span class="string">"After init()"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 945</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 946</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> authzAuthority = authzAuthority;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 947</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 948</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 801</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> run() {</pre></td></tr>
+<tr> <td class="numLine"> 802</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// Wrap with waiter.runnable() every time instead of in constructor to aid</span></pre></td></tr>
+<tr> <td class="numLine"> 803</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// auditing the code for "ShutdownWaiter correctness."</span></pre></td></tr>
+<tr> <td class="numLineCover"> 804</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> backgroundExecutor.execute(waiter.runnable(delegate));</pre></td></tr>
+<tr> <td class="numLineCover"> 805</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 806</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 807</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 808</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">class</span> GsaConfigModListener <span class="keyword">implements</span> ConfigModificationListener {</pre></td></tr>
+<tr> <td class="numLine"> 809</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 810</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> configModified(ConfigModificationEvent ev) {</pre></td></tr>
+<tr> <td class="numLineCover"> 811</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Set<String> modifiedKeys = ev.getModifiedKeys();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 812</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">synchronized</span> (GsaCommunicationHandler.<span class="keyword">this</span>) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 813</td> <td class="nbHitsUncovered"><a title="Line 813: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 813: Conditional coverage 0% (0/4) [each condition: 0%, 0%]."> <span class="keyword">if</span> (modifiedKeys.contains(<span class="string">"adaptor.fullListingSchedule"</span>)</a></span></pre></td></tr>
+<tr> <td class="numLine"> 814</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> && sendDocIdsFuture != <span class="keyword">null</span>) {</pre></td></tr>
+<tr> <td class="numLineCover"> 815</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> String schedule = ev.getNewConfig().getAdaptorFullListingSchedule();</span></pre></td></tr>
+<tr> <td class="numLine"> 816</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 817</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> scheduler.reschedule(sendDocIdsFuture, schedule);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 818</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IllegalArgumentException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 819</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.WARNING, <span class="string">"Invalid schedule pattern"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 820</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 821</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 822</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 823</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 824</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// List of "safe" keys that can be updated without a restart.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 825</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> List<String> safeKeys = Arrays.asList(<span class="string">"adaptor.fullListingSchedule"</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 826</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// Set of "unsafe" keys that have been modified.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 827</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Set<String> modifiedKeysRequiringRestart</span></pre></td></tr>
+<tr> <td class="numLine"> 828</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> = <span class="keyword">new</span> HashSet<String>(modifiedKeys);</pre></td></tr>
+<tr> <td class="numLineCover"> 829</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> modifiedKeysRequiringRestart.removeAll(safeKeys);</span></pre></td></tr>
+<tr> <td class="numLine"> 830</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// If there are modified "unsafe" keys, then we restart things to make</span></pre></td></tr>
+<tr> <td class="numLine"> 831</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// sure all the code is up-to-date with the new values.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 832</td> <td class="nbHitsUncovered"><a title="Line 832: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 832: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!modifiedKeysRequiringRestart.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 833</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.warning(<span class="string">"Unsafe configuration keys modified. To ensure a sane "</span></span></pre></td></tr>
+<tr> <td class="numLine"> 834</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> + <span class="string">"state, the adaptor is restarting."</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 835</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> HttpServer existingServer = scope.getHttpServer();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 836</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> HttpServer existingDashboardServer</span></pre></td></tr>
+<tr> <td class="numLine"> 837</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> = dashboard.getScope().getHttpServer();</pre></td></tr>
+<tr> <td class="numLineCover"> 838</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> stop(3, TimeUnit.SECONDS);</span></pre></td></tr>
+<tr> <td class="numLine"> 839</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 840</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> start(existingServer, existingDashboardServer);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 841</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Exception ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 842</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.SEVERE, <span class="string">"Automatic restart failed"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 843</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 844</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 845</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 846</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 847</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 848</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 849</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 850</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * This class is thread-safe.</span></pre></td></tr>
+<tr> <td class="numLine"> 851</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 852</td> <td class="nbHitsCovered"> 28</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">class</span> AdaptorContextImpl <span class="keyword">implements</span> AdaptorContext {</pre></td></tr>
+<tr> <td class="numLine"> 853</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 854</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> Config getConfig() {</pre></td></tr>
+<tr> <td class="numLineCover"> 855</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> config;</pre></td></tr>
+<tr> <td class="numLine"> 856</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 857</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 858</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 859</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> DocIdPusher getDocIdPusher() {</pre></td></tr>
+<tr> <td class="numLineCover"> 860</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> docIdSender;</pre></td></tr>
+<tr> <td class="numLine"> 861</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 862</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 863</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 864</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> DocIdEncoder getDocIdEncoder() {</pre></td></tr>
+<tr> <td class="numLineCover"> 865</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> docIdCodec;</pre></td></tr>
+<tr> <td class="numLine"> 866</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 867</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 868</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 869</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> addStatusSource(StatusSource source) {</pre></td></tr>
+<tr> <td class="numLineCover"> 870</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> dashboard.addStatusSource(source);</pre></td></tr>
+<tr> <td class="numLineCover"> 871</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 872</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 873</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 874</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setGetDocIdsFullErrorHandler(ExceptionHandler handler) {</pre></td></tr>
+<tr> <td class="numLineCover"> 875</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> ((PushRunnable) docIdFullPusher.getRunnable())</pre></td></tr>
+<tr> <td class="numLine"> 876</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> .setGetDocIdsErrorHandler(handler);</pre></td></tr>
+<tr> <td class="numLineCover"> 877</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 878</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 879</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 880</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> ExceptionHandler getGetDocIdsFullErrorHandler() {</pre></td></tr>
+<tr> <td class="numLineCover"> 881</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> ((PushRunnable) docIdFullPusher.getRunnable())</pre></td></tr>
+<tr> <td class="numLine"> 882</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> .getGetDocIdsErrorHandler();</pre></td></tr>
+<tr> <td class="numLine"> 883</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 884</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 885</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 886</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setGetDocIdsIncrementalErrorHandler(</pre></td></tr>
+<tr> <td class="numLine"> 887</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> ExceptionHandler handler) {</pre></td></tr>
+<tr> <td class="numLineCover"> 888</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ((PushRunnable) docIdFullPusher.getRunnable())</span></pre></td></tr>
+<tr> <td class="numLine"> 889</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> .setGetDocIdsErrorHandler(handler);</pre></td></tr>
+<tr> <td class="numLineCover"> 890</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 891</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 892</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 893</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> ExceptionHandler getGetDocIdsIncrementalErrorHandler() {</pre></td></tr>
+<tr> <td class="numLineCover"> 894</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> ((PushRunnable) docIdFullPusher.getRunnable())</span></pre></td></tr>
+<tr> <td class="numLine"> 895</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> .getGetDocIdsErrorHandler();</pre></td></tr>
+<tr> <td class="numLine"> 896</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 897</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 898</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 899</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> SensitiveValueDecoder getSensitiveValueDecoder() {</pre></td></tr>
+<tr> <td class="numLineCover"> 900</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> secureValueCodec;</pre></td></tr>
+<tr> <td class="numLine"> 901</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 902</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 903</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 904</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> HttpContext createHttpContext(String path, HttpHandler handler) {</pre></td></tr>
+<tr> <td class="numLineCover"> 905</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> addFilters(scope.createContext(path, handler));</span></pre></td></tr>
+<tr> <td class="numLine"> 906</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 907</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 908</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 909</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> Session getUserSession(HttpExchange ex, <span class="keyword">boolean</span> create) {</pre></td></tr>
+<tr> <td class="numLineCover"> 910</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Session session = sessionManager.getSession(ex, create);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 911</td> <td class="nbHitsUncovered"><a title="Line 911: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 911: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (session == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 912</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 913</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 914</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">final</span> String wrappedSessionName = <span class="string">"wrapped-session"</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 915</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> Session nsSession;</pre></td></tr>
+<tr> <td class="numLineCover"> 916</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">synchronized</span> (session) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 917</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nsSession = (Session) session.getAttribute(wrappedSessionName);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 918</td> <td class="nbHitsUncovered"><a title="Line 918: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 918: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (nsSession == <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 919</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> nsSession = <span class="keyword">new</span> NamespacedSession(session, <span class="string">"adaptor-impl-"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 920</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> session.setAttribute(wrappedSessionName, nsSession);</span></pre></td></tr>
+<tr> <td class="numLine"> 921</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 922</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 923</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> nsSession;</span></pre></td></tr>
+<tr> <td class="numLine"> 924</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 925</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 926</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 927</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setPollingIncrementalLister(PollingIncrementalLister lister) {</pre></td></tr>
+<tr> <td class="numLineCover"> 928</td> <td class="nbHitsUncovered"><a title="Line 928: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 928: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (afterInit) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 929</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(<span class="string">"After init()"</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 930</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 931</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> pollingIncrementalLister = lister;</pre></td></tr>
+<tr> <td class="numLineCover"> 932</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 933</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 934</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 935</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setAuthnAuthority(AuthnAuthority authnAuthority) {</pre></td></tr>
+<tr> <td class="numLineCover"> 936</td> <td class="nbHitsUncovered"><a title="Line 936: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 936: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (afterInit) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 937</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(<span class="string">"After init()"</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 938</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 939</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> authnAuthority = authnAuthority;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 940</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 941</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 942</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 943</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> setAuthzAuthority(AuthzAuthority authzAuthority) {</pre></td></tr>
+<tr> <td class="numLineCover"> 944</td> <td class="nbHitsUncovered"><a title="Line 944: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 944: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (afterInit) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 945</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(<span class="string">"After init()"</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 946</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 947</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> authzAuthority = authzAuthority;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 948</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
<tr> <td class="numLine"> 949</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 950</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
diff --git a/coverage/com.google.enterprise.adaptor.GsaFeedFileMaker.html b/coverage/com.google.enterprise.adaptor.GsaFeedFileMaker.html
index 33995cf..91d094d 100644
--- a/coverage/com.google.enterprise.adaptor.GsaFeedFileMaker.html
+++ b/coverage/com.google.enterprise.adaptor.GsaFeedFileMaker.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="com.google.enterprise.adaptor.GsaFeedFileMaker.html">GsaFeedFileMaker</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">16</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:90px"><span class="text">148/164</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">48/48</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.8666666666666667;</span>3.867</td></tr>
+ <tr><td><a href="com.google.enterprise.adaptor.GsaFeedFileMaker.html">GsaFeedFileMaker</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">16</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:90px"><span class="text">152/168</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">48/48</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.8666666666666667;</span>3.867</td></tr>
<tr><td><a href="com.google.enterprise.adaptor.GsaFeedFileMaker.html">GsaFeedFileMaker$1</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">4/4</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.8666666666666667;</span>3.867</td></tr>
</table>
@@ -112,431 +112,437 @@
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> DocIdEncoder idEncoder;</pre></td></tr>
<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> <span class="keyword">boolean</span> separateClosingRecordTagWorkaround;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> AclTransform aclTransform;</pre></td></tr>
<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> <span class="keyword">boolean</span> useAuthMethodWorkaround;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> <span class="keyword">boolean</span> separateClosingRecordTagWorkaround;</pre></td></tr>
<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> <span class="keyword">boolean</span> useAuthMethodWorkaround;</pre></td></tr>
<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> GsaFeedFileMaker(DocIdEncoder encoder) {</pre></td></tr>
-<tr> <td class="numLineCover"> 54</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> <span class="keyword">this</span>(encoder, <span class="keyword">false</span>, <span class="keyword">false</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 55</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> GsaFeedFileMaker(DocIdEncoder encoder, AclTransform aclTransform) {</pre></td></tr>
+<tr> <td class="numLineCover"> 55</td> <td class="nbHitsCovered"> 28</td> <td class="src"><pre class="src"> <span class="keyword">this</span>(encoder, aclTransform, <span class="keyword">false</span>, <span class="keyword">false</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 56</td> <td class="nbHitsCovered"> 28</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> GsaFeedFileMaker(DocIdEncoder encoder,</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> GsaFeedFileMaker(DocIdEncoder encoder, AclTransform aclTransform,</pre></td></tr>
+<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">boolean</span> separateClosingRecordTagWorkaround,</pre></td></tr>
-<tr> <td class="numLineCover"> 59</td> <td class="nbHitsCovered"> 39</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> useAuthMethodWorkaround) {</pre></td></tr>
-<tr> <td class="numLineCover"> 60</td> <td class="nbHitsCovered"> 39</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.idEncoder = encoder;</pre></td></tr>
-<tr> <td class="numLineCover"> 61</td> <td class="nbHitsCovered"> 39</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.separateClosingRecordTagWorkaround</pre></td></tr>
-<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 60</td> <td class="nbHitsCovered"> 43</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> useAuthMethodWorkaround) {</pre></td></tr>
+<tr> <td class="numLineCover"> 61</td> <td class="nbHitsCovered"> 43</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.idEncoder = encoder;</pre></td></tr>
+<tr> <td class="numLineCover"> 62</td> <td class="nbHitsCovered"> 43</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.aclTransform = aclTransform;</pre></td></tr>
+<tr> <td class="numLineCover"> 63</td> <td class="nbHitsCovered"> 43</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.separateClosingRecordTagWorkaround</pre></td></tr>
+<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> = separateClosingRecordTagWorkaround;</pre></td></tr>
-<tr> <td class="numLineCover"> 63</td> <td class="nbHitsCovered"> 39</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.useAuthMethodWorkaround = useAuthMethodWorkaround;</pre></td></tr>
-<tr> <td class="numLineCover"> 64</td> <td class="nbHitsCovered"> 39</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/** Adds header to document's root.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 65</td> <td class="nbHitsCovered"> 43</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.useAuthMethodWorkaround = useAuthMethodWorkaround;</pre></td></tr>
+<tr> <td class="numLineCover"> 66</td> <td class="nbHitsCovered"> 43</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> @param srcName Used as datasource name. */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> constructMetadataAndUrlFeedFileHead(Document doc,</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/** Adds header to document's root.</span></pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> @param srcName Used as datasource name. */</span></pre></td></tr>
+<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> constructMetadataAndUrlFeedFileHead(Document doc,</pre></td></tr>
+<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> Element root, String srcName) {</pre></td></tr>
-<tr> <td class="numLineCover"> 70</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> Comment comment = doc.createComment(<span class="string">"GSA EasyConnector"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 71</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> root.appendChild(comment);</pre></td></tr>
-<tr> <td class="numLineCover"> 72</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> Element header = doc.createElement(<span class="string">"header"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 73</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> root.appendChild(header);</pre></td></tr>
-<tr> <td class="numLineCover"> 74</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> Element datasource = doc.createElement(<span class="string">"datasource"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 75</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> header.appendChild(datasource);</pre></td></tr>
-<tr> <td class="numLineCover"> 76</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> Element feedtype = doc.createElement(<span class="string">"feedtype"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 77</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> header.appendChild(feedtype);</pre></td></tr>
-<tr> <td class="numLineCover"> 78</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> Text srcText = doc.createTextNode(srcName);</pre></td></tr>
-<tr> <td class="numLineCover"> 79</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> datasource.appendChild(srcText);</pre></td></tr>
-<tr> <td class="numLineCover"> 80</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> Text feedText = doc.createTextNode(<span class="string">"metadata-and-url"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 81</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> feedtype.appendChild(feedText);</pre></td></tr>
-<tr> <td class="numLineCover"> 82</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/** Adds a single record to feed-file-document's group,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 72</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> Comment comment = doc.createComment(<span class="string">"GSA EasyConnector"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 73</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> root.appendChild(comment);</pre></td></tr>
+<tr> <td class="numLineCover"> 74</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> Element header = doc.createElement(<span class="string">"header"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 75</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> root.appendChild(header);</pre></td></tr>
+<tr> <td class="numLineCover"> 76</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> Element datasource = doc.createElement(<span class="string">"datasource"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 77</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> header.appendChild(datasource);</pre></td></tr>
+<tr> <td class="numLineCover"> 78</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> Element feedtype = doc.createElement(<span class="string">"feedtype"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 79</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> header.appendChild(feedtype);</pre></td></tr>
+<tr> <td class="numLineCover"> 80</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> Text srcText = doc.createTextNode(srcName);</pre></td></tr>
+<tr> <td class="numLineCover"> 81</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> datasource.appendChild(srcText);</pre></td></tr>
+<tr> <td class="numLineCover"> 82</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> Text feedText = doc.createTextNode(<span class="string">"metadata-and-url"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 83</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> feedtype.appendChild(feedText);</pre></td></tr>
+<tr> <td class="numLineCover"> 84</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> communicating the information represented by DocId. */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> constructSingleMetadataAndUrlFeedFileRecord(</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/** Adds a single record to feed-file-document's group,</span></pre></td></tr>
<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> communicating the information represented by DocId. */</span></pre></td></tr>
+<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> constructSingleMetadataAndUrlFeedFileRecord(</pre></td></tr>
+<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> Document doc, Element group, DocIdPusher.Record docRecord) {</pre></td></tr>
-<tr> <td class="numLineCover"> 88</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> DocId docForGsa = docRecord.getDocId();</pre></td></tr>
-<tr> <td class="numLineCover"> 89</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> Element record = doc.createElement(<span class="string">"record"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 90</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> group.appendChild(record);</pre></td></tr>
-<tr> <td class="numLineCover"> 91</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> record.setAttribute(<span class="string">"url"</span>, <span class="string">""</span> + idEncoder.encodeDocId(docForGsa));</pre></td></tr>
-<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// We are no longer automatically clearing the displayurl if unset. We are</span></pre></td></tr>
-<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// moving the setting of displayurl to crawl-time and we don't want a lister</span></pre></td></tr>
+<tr> <td class="numLineCover"> 90</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> DocId docForGsa = docRecord.getDocId();</pre></td></tr>
+<tr> <td class="numLineCover"> 91</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> Element record = doc.createElement(<span class="string">"record"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 92</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> group.appendChild(record);</pre></td></tr>
+<tr> <td class="numLineCover"> 93</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> record.setAttribute(<span class="string">"url"</span>, <span class="string">""</span> + idEncoder.encodeDocId(docForGsa));</pre></td></tr>
<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// We are no longer automatically clearing the displayurl if unset. We are</span></pre></td></tr>
+<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// moving the setting of displayurl to crawl-time and we don't want a lister</span></pre></td></tr>
+<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// and retriever to fight.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 95</td> <td class="nbHitsCovered"><a title="Line 95: Conditional coverage 100% (2/2)."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 95: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (<span class="keyword">null</span> != docRecord.getResultLink()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 96</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> record.setAttribute(<span class="string">"displayurl"</span>, <span class="string">""</span> + docRecord.getResultLink());</pre></td></tr>
-<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 97</td> <td class="nbHitsCovered"><a title="Line 97: Conditional coverage 100% (2/2)."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 97: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (<span class="keyword">null</span> != docRecord.getResultLink()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 98</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> record.setAttribute(<span class="string">"displayurl"</span>, <span class="string">""</span> + docRecord.getResultLink());</pre></td></tr>
+<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 98</td> <td class="nbHitsCovered"><a title="Line 98: Conditional coverage 100% (2/2)."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 98: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (docRecord.isToBeDeleted()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 99</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> record.setAttribute(<span class="string">"action"</span>, <span class="string">"delete"</span>);</pre></td></tr>
-<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 100</td> <td class="nbHitsCovered"><a title="Line 100: Conditional coverage 100% (2/2)."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 100: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (docRecord.isToBeDeleted()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 101</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> record.setAttribute(<span class="string">"action"</span>, <span class="string">"delete"</span>);</pre></td></tr>
+<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 101</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> record.setAttribute(<span class="string">"mimetype"</span>, <span class="string">"text/plain"</span>); <span class="comment">// Required but ignored :)</span></pre></td></tr>
-<tr> <td class="numLineCover"> 102</td> <td class="nbHitsCovered"><a title="Line 102: Conditional coverage 100% (2/2)."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 102: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (<span class="keyword">null</span> != docRecord.getLastModified()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 103</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> String dateStr = rfc822Format.get().format(docRecord.getLastModified());</pre></td></tr>
-<tr> <td class="numLineCover"> 104</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> record.setAttribute(<span class="string">"last-modified"</span>, dateStr);</pre></td></tr>
-<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 103</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> record.setAttribute(<span class="string">"mimetype"</span>, <span class="string">"text/plain"</span>); <span class="comment">// Required but ignored :)</span></pre></td></tr>
+<tr> <td class="numLineCover"> 104</td> <td class="nbHitsCovered"><a title="Line 104: Conditional coverage 100% (2/2)."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 104: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (<span class="keyword">null</span> != docRecord.getLastModified()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 105</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> String dateStr = rfc822Format.get().format(docRecord.getLastModified());</pre></td></tr>
+<tr> <td class="numLineCover"> 106</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> record.setAttribute(<span class="string">"last-modified"</span>, dateStr);</pre></td></tr>
+<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 106</td> <td class="nbHitsCovered"><a title="Line 106: Conditional coverage 100% (2/2)."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 106: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (docRecord.isToBeLocked()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 107</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> record.setAttribute(<span class="string">"lock"</span>, <span class="string">"true"</span>);</pre></td></tr>
-<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 108</td> <td class="nbHitsCovered"><a title="Line 108: Conditional coverage 100% (2/2)."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 108: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (docRecord.isToBeLocked()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 109</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> record.setAttribute(<span class="string">"lock"</span>, <span class="string">"true"</span>);</pre></td></tr>
+<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 109</td> <td class="nbHitsCovered"><a title="Line 109: Conditional coverage 100% (2/2)."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 109: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (docRecord.isToBeCrawledImmediately()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 110</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> record.setAttribute(<span class="string">"crawl-immediately"</span>, <span class="string">"true"</span>);</pre></td></tr>
-<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 111</td> <td class="nbHitsCovered"><a title="Line 111: Conditional coverage 100% (2/2)."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 111: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (docRecord.isToBeCrawledImmediately()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 112</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> record.setAttribute(<span class="string">"crawl-immediately"</span>, <span class="string">"true"</span>);</pre></td></tr>
+<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 112</td> <td class="nbHitsCovered"><a title="Line 112: Conditional coverage 100% (2/2)."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 112: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (docRecord.isToBeCrawledOnce()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 113</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> record.setAttribute(<span class="string">"crawl-once"</span>, <span class="string">"true"</span>);</pre></td></tr>
-<tr> <td class="numLine"> 114</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 114</td> <td class="nbHitsCovered"><a title="Line 114: Conditional coverage 100% (2/2)."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 114: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (docRecord.isToBeCrawledOnce()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 115</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> record.setAttribute(<span class="string">"crawl-once"</span>, <span class="string">"true"</span>);</pre></td></tr>
+<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 115</td> <td class="nbHitsCovered"><a title="Line 115: Conditional coverage 100% (2/2)."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 115: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (useAuthMethodWorkaround) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 116</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> record.setAttribute(<span class="string">"authmethod"</span>, <span class="string">"httpsso"</span>);</pre></td></tr>
-<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// TODO(pjo): record.setAttribute(no-follow,);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 117</td> <td class="nbHitsCovered"><a title="Line 117: Conditional coverage 100% (2/2)."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 117: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (useAuthMethodWorkaround) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 118</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> record.setAttribute(<span class="string">"authmethod"</span>, <span class="string">"httpsso"</span>);</pre></td></tr>
<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 120</td> <td class="nbHitsCovered"><a title="Line 120: Conditional coverage 100% (2/2)."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 120: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (separateClosingRecordTagWorkaround) {</a></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// TODO(pjo): record.setAttribute(no-follow,);</span></pre></td></tr>
<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// GSA 6.14 has a feed parsing bug (fixed in patch 2) that fails to parse</span></pre></td></tr>
-<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// self-closing record tags. Thus, here we force record to have a separate</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 122</td> <td class="nbHitsCovered"><a title="Line 122: Conditional coverage 100% (2/2)."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 122: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (separateClosingRecordTagWorkaround) {</a></pre></td></tr>
<tr> <td class="numLine"> 123</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// close tag.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 124</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> record.appendChild(doc.createTextNode(<span class="string">" "</span>));</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// GSA 6.14 has a feed parsing bug (fixed in patch 2) that fails to parse</span></pre></td></tr>
+<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// self-closing record tags. Thus, here we force record to have a separate</span></pre></td></tr>
<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 126</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// close tag.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 126</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> record.appendChild(doc.createTextNode(<span class="string">" "</span>));</pre></td></tr>
<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 128</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 128</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Adds a single ACL tag to the provided group, communicating the named</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * resource's information provided in {@code docAcl}.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Adds a single ACL tag to the provided group, communicating the named</span></pre></td></tr>
<tr> <td class="numLine"> 132</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> constructSingleMetadataAndUrlFeedFileAcl(</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * resource's information provided in {@code docAcl}.</span></pre></td></tr>
<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> constructSingleMetadataAndUrlFeedFileAcl(</pre></td></tr>
+<tr> <td class="numLine"> 135</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> Document doc, Element group, DocIdSender.AclItem docAcl) {</pre></td></tr>
-<tr> <td class="numLineCover"> 134</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> Element aclElement = doc.createElement(<span class="string">"acl"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 135</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> group.appendChild(aclElement);</pre></td></tr>
-<tr> <td class="numLineCover"> 136</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> URI uri = idEncoder.encodeDocId(docAcl.getDocId());</pre></td></tr>
-<tr> <td class="numLine"> 137</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Although it is named "fragment", we put the docIdFragment in the query</span></pre></td></tr>
+<tr> <td class="numLineCover"> 136</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> Element aclElement = doc.createElement(<span class="string">"acl"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 137</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> group.appendChild(aclElement);</pre></td></tr>
+<tr> <td class="numLineCover"> 138</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> URI uri = idEncoder.encodeDocId(docAcl.getDocId());</pre></td></tr>
<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// portion of the URI because the GSA removes fragments when it</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// "normalizes" the identifier.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 141</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> uri = <span class="keyword">new</span> URI(uri.getScheme(), uri.getAuthority(), uri.getPath(),</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// Although it is named "fragment", we put the docIdFragment in the query</span></pre></td></tr>
+<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// portion of the URI because the GSA removes fragments when it</span></pre></td></tr>
<tr> <td class="numLine"> 142</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// "normalizes" the identifier.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 143</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> uri = <span class="keyword">new</span> URI(uri.getScheme(), uri.getAuthority(), uri.getPath(),</pre></td></tr>
+<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> docAcl.getDocIdFragment(), <span class="keyword">null</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 143</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (URISyntaxException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 144</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AssertionError(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 145</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 146</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> aclElement.setAttribute(<span class="string">"url"</span>, uri.toString());</pre></td></tr>
-<tr> <td class="numLineCover"> 147</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> Acl acl = docAcl.getAcl();</pre></td></tr>
-<tr> <td class="numLineCover"> 148</td> <td class="nbHitsCovered"><a title="Line 148: Conditional coverage 100% (2/2)."> 5</a></td> <td class="src"><pre class="src"> <a title="Line 148: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (acl.getInheritFrom() != <span class="keyword">null</span>) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 149</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> URI inheritFrom = idEncoder.encodeDocId(acl.getInheritFrom());</pre></td></tr>
-<tr> <td class="numLine"> 150</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 145</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (URISyntaxException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 146</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AssertionError(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 147</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 148</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> aclElement.setAttribute(<span class="string">"url"</span>, uri.toString());</pre></td></tr>
+<tr> <td class="numLineCover"> 149</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> Acl acl = docAcl.getAcl();</pre></td></tr>
+<tr> <td class="numLineCover"> 150</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> acl = aclTransform.transform(acl);</pre></td></tr>
+<tr> <td class="numLineCover"> 151</td> <td class="nbHitsCovered"><a title="Line 151: Conditional coverage 100% (2/2)."> 6</a></td> <td class="src"><pre class="src"> <a title="Line 151: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (acl.getInheritFrom() != <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 152</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> URI inheritFrom = idEncoder.encodeDocId(acl.getInheritFrom());</pre></td></tr>
+<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Although it is named "fragment", we use a query parameter because the</span></pre></td></tr>
-<tr> <td class="numLine"> 152</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// GSA "normalizes" away fragments.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 153</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> inheritFrom = <span class="keyword">new</span> URI(inheritFrom.getScheme(),</pre></td></tr>
<tr> <td class="numLine"> 154</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> inheritFrom.getAuthority(), inheritFrom.getPath(),</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// Although it is named "fragment", we use a query parameter because the</span></pre></td></tr>
<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// GSA "normalizes" away fragments.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 156</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> inheritFrom = <span class="keyword">new</span> URI(inheritFrom.getScheme(),</pre></td></tr>
+<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> inheritFrom.getAuthority(), inheritFrom.getPath(),</pre></td></tr>
+<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> acl.getInheritFromFragment(), <span class="keyword">null</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 156</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (URISyntaxException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 157</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AssertionError(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 158</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 159</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> aclElement.setAttribute(<span class="string">"inherit-from"</span>, inheritFrom.toString());</pre></td></tr>
-<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 161</td> <td class="nbHitsCovered"><a title="Line 161: Conditional coverage 100% (2/2)."> 5</a></td> <td class="src"><pre class="src"> <a title="Line 161: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (acl.getInheritanceType() != Acl.InheritanceType.LEAF_NODE) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 162</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> aclElement.setAttribute(<span class="string">"inheritance-type"</span>,</pre></td></tr>
+<tr> <td class="numLineCover"> 159</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (URISyntaxException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 160</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AssertionError(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 161</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 162</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> aclElement.setAttribute(<span class="string">"inherit-from"</span>, inheritFrom.toString());</pre></td></tr>
<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 164</td> <td class="nbHitsCovered"><a title="Line 164: Conditional coverage 100% (2/2)."> 6</a></td> <td class="src"><pre class="src"> <a title="Line 164: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (acl.getInheritanceType() != Acl.InheritanceType.LEAF_NODE) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 165</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> aclElement.setAttribute(<span class="string">"inheritance-type"</span>,</pre></td></tr>
+<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> acl.getInheritanceType().getCommonForm());</pre></td></tr>
-<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 167</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 165</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> noCase = acl.isEverythingCaseInsensitive();</pre></td></tr>
-<tr> <td class="numLineCover"> 166</td> <td class="nbHitsCovered"><a title="Line 166: Conditional coverage 100% (2/2)."> 5</a></td> <td class="src"><pre class="src"> <a title="Line 166: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (UserPrincipal permitUser : acl.getPermitUsers()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 167</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> constructMetadataAndUrlPrincipal(doc, aclElement, <span class="string">"permit"</span>,</pre></td></tr>
-<tr> <td class="numLine"> 168</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 168</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> noCase = acl.isEverythingCaseInsensitive();</pre></td></tr>
+<tr> <td class="numLineCover"> 169</td> <td class="nbHitsCovered"><a title="Line 169: Conditional coverage 100% (2/2)."> 6</a></td> <td class="src"><pre class="src"> <a title="Line 169: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (UserPrincipal permitUser : acl.getPermitUsers()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 170</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> constructMetadataAndUrlPrincipal(doc, aclElement, <span class="string">"permit"</span>,</pre></td></tr>
+<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> permitUser, noCase);</pre></td></tr>
-<tr> <td class="numLine"> 169</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 170</td> <td class="nbHitsCovered"><a title="Line 170: Conditional coverage 100% (2/2)."> 5</a></td> <td class="src"><pre class="src"> <a title="Line 170: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (GroupPrincipal permitGroup : acl.getPermitGroups()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 171</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> constructMetadataAndUrlPrincipal(doc, aclElement, <span class="string">"permit"</span>,</pre></td></tr>
<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 173</td> <td class="nbHitsCovered"><a title="Line 173: Conditional coverage 100% (2/2)."> 6</a></td> <td class="src"><pre class="src"> <a title="Line 173: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (GroupPrincipal permitGroup : acl.getPermitGroups()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 174</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> constructMetadataAndUrlPrincipal(doc, aclElement, <span class="string">"permit"</span>,</pre></td></tr>
+<tr> <td class="numLine"> 175</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> permitGroup, noCase);</pre></td></tr>
-<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 174</td> <td class="nbHitsCovered"><a title="Line 174: Conditional coverage 100% (2/2)."> 5</a></td> <td class="src"><pre class="src"> <a title="Line 174: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (UserPrincipal denyUser : acl.getDenyUsers()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 175</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> constructMetadataAndUrlPrincipal(doc, aclElement, <span class="string">"deny"</span>,</pre></td></tr>
<tr> <td class="numLine"> 176</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 177</td> <td class="nbHitsCovered"><a title="Line 177: Conditional coverage 100% (2/2)."> 6</a></td> <td class="src"><pre class="src"> <a title="Line 177: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (UserPrincipal denyUser : acl.getDenyUsers()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 178</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> constructMetadataAndUrlPrincipal(doc, aclElement, <span class="string">"deny"</span>,</pre></td></tr>
+<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> denyUser, noCase);</pre></td></tr>
-<tr> <td class="numLine"> 177</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 178</td> <td class="nbHitsCovered"><a title="Line 178: Conditional coverage 100% (2/2)."> 5</a></td> <td class="src"><pre class="src"> <a title="Line 178: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (GroupPrincipal denyGroup : acl.getDenyGroups()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 179</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> constructMetadataAndUrlPrincipal(doc, aclElement, <span class="string">"deny"</span>,</pre></td></tr>
<tr> <td class="numLine"> 180</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> denyGroup, noCase);</pre></td></tr>
-<tr> <td class="numLine"> 181</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 182</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 181</td> <td class="nbHitsCovered"><a title="Line 181: Conditional coverage 100% (2/2)."> 6</a></td> <td class="src"><pre class="src"> <a title="Line 181: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (GroupPrincipal denyGroup : acl.getDenyGroups()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 182</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> constructMetadataAndUrlPrincipal(doc, aclElement, <span class="string">"deny"</span>,</pre></td></tr>
<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> denyGroup, noCase);</pre></td></tr>
<tr> <td class="numLine"> 184</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 185</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 186</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> constructMetadataAndUrlPrincipal(Document doc, Element acl,</pre></td></tr>
-<tr> <td class="numLine"> 185</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> String access, Principal principal, <span class="keyword">boolean</span> everythingCaseInsensitive) {</pre></td></tr>
-<tr> <td class="numLineCover"> 186</td> <td class="nbHitsCovered"><a title="Line 186: Conditional coverage 100% (2/2)."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 186: Conditional coverage 100% (2/2)."> String scope = principal.isUser() ? <span class="string">"user"</span> : <span class="string">"group"</span>;</a></pre></td></tr>
-<tr> <td class="numLineCover"> 187</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> Element principalElement = doc.createElement(<span class="string">"principal"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 188</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> principalElement.setAttribute(<span class="string">"scope"</span>, scope);</pre></td></tr>
-<tr> <td class="numLineCover"> 189</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> principalElement.setAttribute(<span class="string">"access"</span>, access);</pre></td></tr>
-<tr> <td class="numLineCover"> 190</td> <td class="nbHitsCovered"><a title="Line 190: Conditional coverage 100% (2/2)."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 190: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!Principal.DEFAULT_NAMESPACE.equals(principal.getNamespace())) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 191</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> principalElement.setAttribute(<span class="string">"namespace"</span>, principal.getNamespace());</pre></td></tr>
-<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 193</td> <td class="nbHitsCovered"><a title="Line 193: Conditional coverage 100% (2/2)."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 193: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (everythingCaseInsensitive) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 194</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> principalElement.setAttribute(</pre></td></tr>
+<tr> <td class="numLineCover"> 189</td> <td class="nbHitsCovered"><a title="Line 189: Conditional coverage 100% (2/2)."> 10</a></td> <td class="src"><pre class="src"> <a title="Line 189: Conditional coverage 100% (2/2)."> String scope = principal.isUser() ? <span class="string">"user"</span> : <span class="string">"group"</span>;</a></pre></td></tr>
+<tr> <td class="numLineCover"> 190</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> Element principalElement = doc.createElement(<span class="string">"principal"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 191</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> principalElement.setAttribute(<span class="string">"scope"</span>, scope);</pre></td></tr>
+<tr> <td class="numLineCover"> 192</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> principalElement.setAttribute(<span class="string">"access"</span>, access);</pre></td></tr>
+<tr> <td class="numLineCover"> 193</td> <td class="nbHitsCovered"><a title="Line 193: Conditional coverage 100% (2/2)."> 10</a></td> <td class="src"><pre class="src"> <a title="Line 193: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!Principal.DEFAULT_NAMESPACE.equals(principal.getNamespace())) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 194</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> principalElement.setAttribute(<span class="string">"namespace"</span>, principal.getNamespace());</pre></td></tr>
<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 196</td> <td class="nbHitsCovered"><a title="Line 196: Conditional coverage 100% (2/2)."> 10</a></td> <td class="src"><pre class="src"> <a title="Line 196: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (everythingCaseInsensitive) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 197</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> principalElement.setAttribute(</pre></td></tr>
+<tr> <td class="numLine"> 198</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="string">"case-sensitivity-type"</span>, <span class="string">"everything-case-insensitive"</span>);</pre></td></tr>
-<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 199</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 197</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> principalElement.appendChild(doc.createTextNode(principal.getName()));</pre></td></tr>
-<tr> <td class="numLineCover"> 198</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> acl.appendChild(principalElement);</pre></td></tr>
-<tr> <td class="numLineCover"> 199</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 200</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 201</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/** Adds all the DocIds into feed-file-document one record</span></pre></td></tr>
-<tr> <td class="numLine"> 202</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> at a time. */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 200</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> principalElement.appendChild(doc.createTextNode(principal.getName()));</pre></td></tr>
+<tr> <td class="numLineCover"> 201</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> acl.appendChild(principalElement);</pre></td></tr>
+<tr> <td class="numLineCover"> 202</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 203</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> constructMetadataAndUrlFeedFileBody(Document doc,</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 204</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/** Adds all the DocIds into feed-file-document one record</span></pre></td></tr>
+<tr> <td class="numLine"> 205</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> at a time. */</span></pre></td></tr>
+<tr> <td class="numLine"> 206</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> constructMetadataAndUrlFeedFileBody(Document doc,</pre></td></tr>
+<tr> <td class="numLine"> 207</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> Element root, List<? <span class="keyword">extends</span> DocIdSender.Item> items) {</pre></td></tr>
-<tr> <td class="numLineCover"> 205</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> Element group = doc.createElement(<span class="string">"group"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 206</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> root.appendChild(group);</pre></td></tr>
-<tr> <td class="numLineCover"> 207</td> <td class="nbHitsCovered"><a title="Line 207: Conditional coverage 100% (2/2)."> 8</a></td> <td class="src"><pre class="src"> <a title="Line 207: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (DocIdSender.Item item : items) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 208</td> <td class="nbHitsCovered"><a title="Line 208: Conditional coverage 100% (2/2)."> 15</a></td> <td class="src"><pre class="src"> <a title="Line 208: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (item <span class="keyword">instanceof</span> DocIdPusher.Record) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 209</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> constructSingleMetadataAndUrlFeedFileRecord(doc, group,</pre></td></tr>
-<tr> <td class="numLine"> 210</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> (DocIdPusher.Record) item);</pre></td></tr>
-<tr> <td class="numLineCover"> 211</td> <td class="nbHitsCovered"><a title="Line 211: Conditional coverage 100% (2/2)."> 6</a></td> <td class="src"><pre class="src"> <a title="Line 211: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (item <span class="keyword">instanceof</span> DocIdSender.AclItem) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 212</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> constructSingleMetadataAndUrlFeedFileAcl(doc, group,</pre></td></tr>
+<tr> <td class="numLineCover"> 208</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> Element group = doc.createElement(<span class="string">"group"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 209</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> root.appendChild(group);</pre></td></tr>
+<tr> <td class="numLineCover"> 210</td> <td class="nbHitsCovered"><a title="Line 210: Conditional coverage 100% (2/2)."> 9</a></td> <td class="src"><pre class="src"> <a title="Line 210: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (DocIdSender.Item item : items) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 211</td> <td class="nbHitsCovered"><a title="Line 211: Conditional coverage 100% (2/2)."> 16</a></td> <td class="src"><pre class="src"> <a title="Line 211: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (item <span class="keyword">instanceof</span> DocIdPusher.Record) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 212</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> constructSingleMetadataAndUrlFeedFileRecord(doc, group,</pre></td></tr>
<tr> <td class="numLine"> 213</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> (DocIdSender.AclItem) item);</pre></td></tr>
-<tr> <td class="numLine"> 214</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 215</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalArgumentException(<span class="string">"Unable to process class: "</span></pre></td></tr>
+ <td class="src"><pre class="src"> (DocIdPusher.Record) item);</pre></td></tr>
+<tr> <td class="numLineCover"> 214</td> <td class="nbHitsCovered"><a title="Line 214: Conditional coverage 100% (2/2)."> 7</a></td> <td class="src"><pre class="src"> <a title="Line 214: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (item <span class="keyword">instanceof</span> DocIdSender.AclItem) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 215</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> constructSingleMetadataAndUrlFeedFileAcl(doc, group,</pre></td></tr>
<tr> <td class="numLine"> 216</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> + item.getClass().getName());</pre></td></tr>
+ <td class="src"><pre class="src"> (DocIdSender.AclItem) item);</pre></td></tr>
<tr> <td class="numLine"> 217</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 218</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 219</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 220</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 221</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/** Puts all DocId into metadata-and-url GSA feed file. */</span></pre></td></tr>
-<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> constructMetadataAndUrlFeedFile(Document doc,</pre></td></tr>
-<tr> <td class="numLine"> 223</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> String srcName, List<? <span class="keyword">extends</span> DocIdSender.Item> items) {</pre></td></tr>
-<tr> <td class="numLineCover"> 224</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> Element root = doc.createElement(<span class="string">"gsafeed"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 225</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> doc.appendChild(root);</pre></td></tr>
-<tr> <td class="numLineCover"> 226</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> constructMetadataAndUrlFeedFileHead(doc, root, srcName);</pre></td></tr>
-<tr> <td class="numLineCover"> 227</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> constructMetadataAndUrlFeedFileBody(doc, root, items);</pre></td></tr>
-<tr> <td class="numLineCover"> 228</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 229</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 230</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/** Makes a Java String from the XML feed-file-document passed in. */</span></pre></td></tr>
-<tr> <td class="numLine"> 231</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> String documentToString(Document doc)</pre></td></tr>
-<tr> <td class="numLine"> 232</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">throws</span> TransformerConfigurationException, TransformerException {</pre></td></tr>
-<tr> <td class="numLineCover"> 233</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> TransformerFactory transfac = TransformerFactory.newInstance();</pre></td></tr>
-<tr> <td class="numLineCover"> 234</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> Transformer trans = transfac.newTransformer();</pre></td></tr>
-<tr> <td class="numLineCover"> 235</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> String doctype = <span class="string">"-//Google//DTD GSA Feeds//EN"</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 236</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> trans.setOutputProperty(OutputKeys.DOCTYPE_PUBLIC, doctype);</pre></td></tr>
-<tr> <td class="numLineCover"> 237</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> trans.setOutputProperty(OutputKeys.DOCTYPE_SYSTEM, <span class="string">""</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 238</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> trans.setOutputProperty(OutputKeys.INDENT, <span class="string">"yes"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 239</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> trans.setOutputProperty(OutputKeys.STANDALONE, <span class="string">"no"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 240</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> StringWriter sw = <span class="keyword">new</span> StringWriter();</pre></td></tr>
-<tr> <td class="numLineCover"> 241</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> StreamResult result = <span class="keyword">new</span> StreamResult(sw);</pre></td></tr>
-<tr> <td class="numLineCover"> 242</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> DOMSource source = <span class="keyword">new</span> DOMSource(doc);</pre></td></tr>
-<tr> <td class="numLineCover"> 243</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> trans.transform(source, result);</pre></td></tr>
-<tr> <td class="numLineCover"> 244</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> String xmlString = <span class="string">""</span> + sw;</pre></td></tr>
-<tr> <td class="numLineCover"> 245</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> <span class="keyword">return</span> xmlString;</pre></td></tr>
-<tr> <td class="numLine"> 246</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 247</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 248</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/** Makes a metadata-and-url feed file from upto </span></pre></td></tr>
-<tr> <td class="numLine"> 249</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> provided DocIds and source name. Is used by</span></pre></td></tr>
-<tr> <td class="numLine"> 250</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> GsaCommunicationHandler.pushDocIds(). */</span></pre></td></tr>
-<tr> <td class="numLine"> 251</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String makeMetadataAndUrlXml(String srcName,</pre></td></tr>
-<tr> <td class="numLine"> 252</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> List<? <span class="keyword">extends</span> DocIdSender.Item> items) {</pre></td></tr>
-<tr> <td class="numLine"> 253</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 254</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> DocumentBuilderFactory dbfac = DocumentBuilderFactory.newInstance();</pre></td></tr>
-<tr> <td class="numLineCover"> 255</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> DocumentBuilder docBuilder = dbfac.newDocumentBuilder();</pre></td></tr>
-<tr> <td class="numLineCover"> 256</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> Document doc = docBuilder.newDocument();</pre></td></tr>
-<tr> <td class="numLineCover"> 257</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> constructMetadataAndUrlFeedFile(doc, srcName, items);</pre></td></tr>
-<tr> <td class="numLineCover"> 258</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> String xmlString = documentToString(doc); </pre></td></tr>
-<tr> <td class="numLineCover"> 259</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">return</span> xmlString;</pre></td></tr>
-<tr> <td class="numLineCover"> 260</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (TransformerConfigurationException tce) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 261</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(tce);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 262</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (TransformerException te) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 263</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(te);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 264</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (ParserConfigurationException pce) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 265</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(pce);</span></pre></td></tr>
-<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 267</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 268</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 269</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/** Creates single group definition of group principal key and members. */</span></pre></td></tr>
-<tr> <td class="numLine"> 270</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> constructSingleMembership(Document doc, Element root,</pre></td></tr>
-<tr> <td class="numLine"> 271</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> GroupPrincipal groupPrincipal, Collection<Principal> members,</pre></td></tr>
-<tr> <td class="numLine"> 272</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">boolean</span> caseSensitiveMembers) {</pre></td></tr>
-<tr> <td class="numLineCover"> 273</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> Element groupWithDef = doc.createElement(<span class="string">"membership"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 274</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> root.appendChild(groupWithDef);</pre></td></tr>
-<tr> <td class="numLineCover"> 275</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> Element groupKey = doc.createElement(<span class="string">"principal"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 276</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> groupWithDef.appendChild(groupKey);</pre></td></tr>
-<tr> <td class="numLineCover"> 277</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> groupKey.setAttribute(<span class="string">"namespace"</span>, groupPrincipal.getNamespace());</pre></td></tr>
-<tr> <td class="numLineCover"> 278</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> groupKey.setAttribute(<span class="string">"scope"</span>, <span class="string">"GROUP"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 279</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> groupKey.appendChild(doc.createTextNode(groupPrincipal.getName()));</pre></td></tr>
-<tr> <td class="numLineCover"> 280</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> Element groupDef = doc.createElement(<span class="string">"members"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 281</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> groupWithDef.appendChild(groupDef);</pre></td></tr>
-<tr> <td class="numLineCover"> 282</td> <td class="nbHitsCovered"><a title="Line 282: Conditional coverage 100% (2/2)."> 4</a></td> <td class="src"><pre class="src"> <a title="Line 282: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Principal member : members) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 283</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> Element groupDefElement = doc.createElement(<span class="string">"principal"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 284</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> groupDefElement.setAttribute(<span class="string">"namespace"</span>, member.getNamespace());</pre></td></tr>
-<tr> <td class="numLineCover"> 285</td> <td class="nbHitsCovered"><a title="Line 285: Conditional coverage 100% (2/2)."> 7</a></td> <td class="src"><pre class="src"> <a title="Line 285: Conditional coverage 100% (2/2)."> String scope = member.isUser() ? <span class="string">"USER"</span> : <span class="string">"GROUP"</span>;</a></pre></td></tr>
-<tr> <td class="numLineCover"> 286</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> groupDefElement.setAttribute(<span class="string">"scope"</span>, scope);</pre></td></tr>
-<tr> <td class="numLineCover"> 287</td> <td class="nbHitsCovered"><a title="Line 287: Conditional coverage 100% (2/2)."> 7</a></td> <td class="src"><pre class="src"> <a title="Line 287: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (caseSensitiveMembers) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 288</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> groupDefElement.setAttribute(</pre></td></tr>
-<tr> <td class="numLine"> 289</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="string">"case-sensitivity-type"</span>, <span class="string">"EVERYTHING_CASE_SENSITIVE"</span>);</pre></td></tr>
-<tr> <td class="numLine"> 290</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 291</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> groupDefElement.setAttribute(</pre></td></tr>
-<tr> <td class="numLine"> 292</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="string">"case-sensitivity-type"</span>, <span class="string">"EVERYTHING_CASE_INSENSITIVE"</span>);</pre></td></tr>
-<tr> <td class="numLine"> 293</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 218</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalArgumentException(<span class="string">"Unable to process class: "</span></pre></td></tr>
+<tr> <td class="numLine"> 219</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> + item.getClass().getName());</pre></td></tr>
+<tr> <td class="numLine"> 220</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 294</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> groupDefElement.appendChild(doc.createTextNode(member.getName()));</pre></td></tr>
-<tr> <td class="numLineCover"> 295</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> groupDef.appendChild(groupDefElement);</pre></td></tr>
-<tr> <td class="numLineCover"> 296</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 297</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 298</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 299</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/** Adds all the groups' definitions into body. */</span></pre></td></tr>
-<tr> <td class="numLine"> 300</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <T <span class="keyword">extends</span> Collection<Principal>> <span class="keyword">void</span></pre></td></tr>
-<tr> <td class="numLine"> 301</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> constructGroupsDefinitionsFileBody(Document doc, Element root,</pre></td></tr>
-<tr> <td class="numLine"> 302</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> Collection<Map.Entry<GroupPrincipal, T>> items,</pre></td></tr>
-<tr> <td class="numLine"> 303</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">boolean</span> caseSensitiveMembers) {</pre></td></tr>
-<tr> <td class="numLineCover"> 304</td> <td class="nbHitsCovered"><a title="Line 304: Conditional coverage 100% (2/2)."> 4</a></td> <td class="src"><pre class="src"> <a title="Line 304: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Map.Entry<GroupPrincipal, T> group : items) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 305</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> constructSingleMembership(doc, root, group.getKey(), group.getValue(),</pre></td></tr>
-<tr> <td class="numLine"> 306</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> caseSensitiveMembers);</pre></td></tr>
-<tr> <td class="numLine"> 307</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 221</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 308</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 309</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 222</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 223</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 310</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/** Puts all groups' definitions into document. */</span></pre></td></tr>
-<tr> <td class="numLine"> 311</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <T <span class="keyword">extends</span> Collection<Principal>> <span class="keyword">void</span></pre></td></tr>
-<tr> <td class="numLine"> 312</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> constructGroupsDefinitionsFeedFile(Document doc,</pre></td></tr>
-<tr> <td class="numLine"> 313</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> Collection<Map.Entry<GroupPrincipal, T>> items,</pre></td></tr>
-<tr> <td class="numLine"> 314</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">boolean</span> caseSensitiveMembers) {</pre></td></tr>
-<tr> <td class="numLineCover"> 315</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> Element root = doc.createElement(<span class="string">"xmlgroups"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 316</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> doc.appendChild(root);</pre></td></tr>
-<tr> <td class="numLineCover"> 317</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> Comment comment = doc.createComment(<span class="string">"GSA EasyConnector"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 318</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> root.appendChild(comment);</pre></td></tr>
-<tr> <td class="numLineCover"> 319</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> constructGroupsDefinitionsFileBody(doc, root, items, caseSensitiveMembers);</pre></td></tr>
-<tr> <td class="numLineCover"> 320</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 321</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 224</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/** Puts all DocId into metadata-and-url GSA feed file. */</span></pre></td></tr>
+<tr> <td class="numLine"> 225</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> constructMetadataAndUrlFeedFile(Document doc,</pre></td></tr>
+<tr> <td class="numLine"> 226</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> String srcName, List<? <span class="keyword">extends</span> DocIdSender.Item> items) {</pre></td></tr>
+<tr> <td class="numLineCover"> 227</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> Element root = doc.createElement(<span class="string">"gsafeed"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 228</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> doc.appendChild(root);</pre></td></tr>
+<tr> <td class="numLineCover"> 229</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> constructMetadataAndUrlFeedFileHead(doc, root, srcName);</pre></td></tr>
+<tr> <td class="numLineCover"> 230</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> constructMetadataAndUrlFeedFileBody(doc, root, items);</pre></td></tr>
+<tr> <td class="numLineCover"> 231</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 232</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 322</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// This and all the methods it calls with things from 'items' requires the</span></pre></td></tr>
-<tr> <td class="numLine"> 323</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// parameter T even though ? would normally suffice. See comment in</span></pre></td></tr>
-<tr> <td class="numLine"> 324</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// DocIdSender to learn about the Java limitation causing the need for T.</span></pre></td></tr>
-<tr> <td class="numLine"> 325</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/** Makes feed file with groups and their definitions. */</span></pre></td></tr>
-<tr> <td class="numLine"> 326</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <T <span class="keyword">extends</span> Collection<Principal>> String makeGroupsDefinitionsXml(</pre></td></tr>
-<tr> <td class="numLine"> 327</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> Collection<Map.Entry<GroupPrincipal, T>> items,</pre></td></tr>
-<tr> <td class="numLine"> 328</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">boolean</span> caseSensitiveMembers) {</pre></td></tr>
-<tr> <td class="numLine"> 329</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 330</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> DocumentBuilderFactory dbfac = DocumentBuilderFactory.newInstance();</pre></td></tr>
-<tr> <td class="numLineCover"> 331</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> DocumentBuilder docBuilder = dbfac.newDocumentBuilder();</pre></td></tr>
-<tr> <td class="numLineCover"> 332</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> Document doc = docBuilder.newDocument();</pre></td></tr>
-<tr> <td class="numLineCover"> 333</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> constructGroupsDefinitionsFeedFile(doc, items, caseSensitiveMembers);</pre></td></tr>
-<tr> <td class="numLineCover"> 334</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> String xmlString = documentToString(doc); </pre></td></tr>
-<tr> <td class="numLineCover"> 335</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">return</span> xmlString;</pre></td></tr>
-<tr> <td class="numLineCover"> 336</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (TransformerConfigurationException tce) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 337</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(tce);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 338</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (TransformerException te) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 339</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(te);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 340</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (ParserConfigurationException pce) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 341</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(pce);</span></pre></td></tr>
-<tr> <td class="numLine"> 342</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 343</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 233</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/** Makes a Java String from the XML feed-file-document passed in. */</span></pre></td></tr>
+<tr> <td class="numLine"> 234</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> String documentToString(Document doc)</pre></td></tr>
+<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">throws</span> TransformerConfigurationException, TransformerException {</pre></td></tr>
+<tr> <td class="numLineCover"> 236</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> TransformerFactory transfac = TransformerFactory.newInstance();</pre></td></tr>
+<tr> <td class="numLineCover"> 237</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> Transformer trans = transfac.newTransformer();</pre></td></tr>
+<tr> <td class="numLineCover"> 238</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> String doctype = <span class="string">"-//Google//DTD GSA Feeds//EN"</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 239</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> trans.setOutputProperty(OutputKeys.DOCTYPE_PUBLIC, doctype);</pre></td></tr>
+<tr> <td class="numLineCover"> 240</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> trans.setOutputProperty(OutputKeys.DOCTYPE_SYSTEM, <span class="string">""</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 241</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> trans.setOutputProperty(OutputKeys.INDENT, <span class="string">"yes"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 242</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> trans.setOutputProperty(OutputKeys.STANDALONE, <span class="string">"no"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 243</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> StringWriter sw = <span class="keyword">new</span> StringWriter();</pre></td></tr>
+<tr> <td class="numLineCover"> 244</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> StreamResult result = <span class="keyword">new</span> StreamResult(sw);</pre></td></tr>
+<tr> <td class="numLineCover"> 245</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> DOMSource source = <span class="keyword">new</span> DOMSource(doc);</pre></td></tr>
+<tr> <td class="numLineCover"> 246</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> trans.transform(source, result);</pre></td></tr>
+<tr> <td class="numLineCover"> 247</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> String xmlString = <span class="string">""</span> + sw;</pre></td></tr>
+<tr> <td class="numLineCover"> 248</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> <span class="keyword">return</span> xmlString;</pre></td></tr>
+<tr> <td class="numLine"> 249</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 344</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 250</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 251</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/** Makes a metadata-and-url feed file from upto </span></pre></td></tr>
+<tr> <td class="numLine"> 252</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> provided DocIds and source name. Is used by</span></pre></td></tr>
+<tr> <td class="numLine"> 253</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> GsaCommunicationHandler.pushDocIds(). */</span></pre></td></tr>
+<tr> <td class="numLine"> 254</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String makeMetadataAndUrlXml(String srcName,</pre></td></tr>
+<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> List<? <span class="keyword">extends</span> DocIdSender.Item> items) {</pre></td></tr>
+<tr> <td class="numLine"> 256</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 257</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> DocumentBuilderFactory dbfac = DocumentBuilderFactory.newInstance();</pre></td></tr>
+<tr> <td class="numLineCover"> 258</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> DocumentBuilder docBuilder = dbfac.newDocumentBuilder();</pre></td></tr>
+<tr> <td class="numLineCover"> 259</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> Document doc = docBuilder.newDocument();</pre></td></tr>
+<tr> <td class="numLineCover"> 260</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> constructMetadataAndUrlFeedFile(doc, srcName, items);</pre></td></tr>
+<tr> <td class="numLineCover"> 261</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> String xmlString = documentToString(doc); </pre></td></tr>
+<tr> <td class="numLineCover"> 262</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> <span class="keyword">return</span> xmlString;</pre></td></tr>
+<tr> <td class="numLineCover"> 263</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (TransformerConfigurationException tce) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 264</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(tce);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 265</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (TransformerException te) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 266</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(te);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 267</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (ParserConfigurationException pce) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 268</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(pce);</span></pre></td></tr>
+<tr> <td class="numLine"> 269</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 270</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 271</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 272</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/** Creates single group definition of group principal key and members. */</span></pre></td></tr>
+<tr> <td class="numLine"> 273</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> constructSingleMembership(Document doc, Element root,</pre></td></tr>
+<tr> <td class="numLine"> 274</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> GroupPrincipal groupPrincipal, Collection<Principal> members,</pre></td></tr>
+<tr> <td class="numLine"> 275</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">boolean</span> caseSensitiveMembers) {</pre></td></tr>
+<tr> <td class="numLineCover"> 276</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> groupPrincipal = aclTransform.transform(groupPrincipal);</pre></td></tr>
+<tr> <td class="numLineCover"> 277</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> members = <span class="keyword">new</span> TreeSet<Principal>(aclTransform.transform(members));</pre></td></tr>
+<tr> <td class="numLineCover"> 278</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> Element groupWithDef = doc.createElement(<span class="string">"membership"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 279</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> root.appendChild(groupWithDef);</pre></td></tr>
+<tr> <td class="numLineCover"> 280</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> Element groupKey = doc.createElement(<span class="string">"principal"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 281</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> groupWithDef.appendChild(groupKey);</pre></td></tr>
+<tr> <td class="numLineCover"> 282</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> groupKey.setAttribute(<span class="string">"namespace"</span>, groupPrincipal.getNamespace());</pre></td></tr>
+<tr> <td class="numLineCover"> 283</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> groupKey.setAttribute(<span class="string">"scope"</span>, <span class="string">"GROUP"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 284</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> groupKey.appendChild(doc.createTextNode(groupPrincipal.getName()));</pre></td></tr>
+<tr> <td class="numLineCover"> 285</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> Element groupDef = doc.createElement(<span class="string">"members"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 286</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> groupWithDef.appendChild(groupDef);</pre></td></tr>
+<tr> <td class="numLineCover"> 287</td> <td class="nbHitsCovered"><a title="Line 287: Conditional coverage 100% (2/2)."> 5</a></td> <td class="src"><pre class="src"> <a title="Line 287: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Principal member : members) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 288</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> Element groupDefElement = doc.createElement(<span class="string">"principal"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 289</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> groupDefElement.setAttribute(<span class="string">"namespace"</span>, member.getNamespace());</pre></td></tr>
+<tr> <td class="numLineCover"> 290</td> <td class="nbHitsCovered"><a title="Line 290: Conditional coverage 100% (2/2)."> 8</a></td> <td class="src"><pre class="src"> <a title="Line 290: Conditional coverage 100% (2/2)."> String scope = member.isUser() ? <span class="string">"USER"</span> : <span class="string">"GROUP"</span>;</a></pre></td></tr>
+<tr> <td class="numLineCover"> 291</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> groupDefElement.setAttribute(<span class="string">"scope"</span>, scope);</pre></td></tr>
+<tr> <td class="numLineCover"> 292</td> <td class="nbHitsCovered"><a title="Line 292: Conditional coverage 100% (2/2)."> 8</a></td> <td class="src"><pre class="src"> <a title="Line 292: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (caseSensitiveMembers) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 293</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> groupDefElement.setAttribute(</pre></td></tr>
+<tr> <td class="numLine"> 294</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="string">"case-sensitivity-type"</span>, <span class="string">"EVERYTHING_CASE_SENSITIVE"</span>);</pre></td></tr>
+<tr> <td class="numLine"> 295</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 296</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> groupDefElement.setAttribute(</pre></td></tr>
+<tr> <td class="numLine"> 297</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="string">"case-sensitivity-type"</span>, <span class="string">"EVERYTHING_CASE_INSENSITIVE"</span>);</pre></td></tr>
+<tr> <td class="numLine"> 298</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 299</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> groupDefElement.appendChild(doc.createTextNode(member.getName()));</pre></td></tr>
+<tr> <td class="numLineCover"> 300</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> groupDef.appendChild(groupDefElement);</pre></td></tr>
+<tr> <td class="numLineCover"> 301</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 302</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 303</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 304</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/** Adds all the groups' definitions into body. */</span></pre></td></tr>
+<tr> <td class="numLine"> 305</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <T <span class="keyword">extends</span> Collection<Principal>> <span class="keyword">void</span></pre></td></tr>
+<tr> <td class="numLine"> 306</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> constructGroupsDefinitionsFileBody(Document doc, Element root,</pre></td></tr>
+<tr> <td class="numLine"> 307</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> Collection<Map.Entry<GroupPrincipal, T>> items,</pre></td></tr>
+<tr> <td class="numLine"> 308</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">boolean</span> caseSensitiveMembers) {</pre></td></tr>
+<tr> <td class="numLineCover"> 309</td> <td class="nbHitsCovered"><a title="Line 309: Conditional coverage 100% (2/2)."> 5</a></td> <td class="src"><pre class="src"> <a title="Line 309: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Map.Entry<GroupPrincipal, T> group : items) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 310</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> constructSingleMembership(doc, root, group.getKey(), group.getValue(),</pre></td></tr>
+<tr> <td class="numLine"> 311</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> caseSensitiveMembers);</pre></td></tr>
+<tr> <td class="numLine"> 312</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 313</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 314</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 315</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/** Puts all groups' definitions into document. */</span></pre></td></tr>
+<tr> <td class="numLine"> 316</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <T <span class="keyword">extends</span> Collection<Principal>> <span class="keyword">void</span></pre></td></tr>
+<tr> <td class="numLine"> 317</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> constructGroupsDefinitionsFeedFile(Document doc,</pre></td></tr>
+<tr> <td class="numLine"> 318</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> Collection<Map.Entry<GroupPrincipal, T>> items,</pre></td></tr>
+<tr> <td class="numLine"> 319</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">boolean</span> caseSensitiveMembers) {</pre></td></tr>
+<tr> <td class="numLineCover"> 320</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> Element root = doc.createElement(<span class="string">"xmlgroups"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 321</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> doc.appendChild(root);</pre></td></tr>
+<tr> <td class="numLineCover"> 322</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> Comment comment = doc.createComment(<span class="string">"GSA EasyConnector"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 323</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> root.appendChild(comment);</pre></td></tr>
+<tr> <td class="numLineCover"> 324</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> constructGroupsDefinitionsFileBody(doc, root, items, caseSensitiveMembers);</pre></td></tr>
+<tr> <td class="numLineCover"> 325</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 326</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 327</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// This and all the methods it calls with things from 'items' requires the</span></pre></td></tr>
+<tr> <td class="numLine"> 328</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// parameter T even though ? would normally suffice. See comment in</span></pre></td></tr>
+<tr> <td class="numLine"> 329</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// DocIdSender to learn about the Java limitation causing the need for T.</span></pre></td></tr>
+<tr> <td class="numLine"> 330</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/** Makes feed file with groups and their definitions. */</span></pre></td></tr>
+<tr> <td class="numLine"> 331</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <T <span class="keyword">extends</span> Collection<Principal>> String makeGroupsDefinitionsXml(</pre></td></tr>
+<tr> <td class="numLine"> 332</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> Collection<Map.Entry<GroupPrincipal, T>> items,</pre></td></tr>
+<tr> <td class="numLine"> 333</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">boolean</span> caseSensitiveMembers) {</pre></td></tr>
+<tr> <td class="numLine"> 334</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 335</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> DocumentBuilderFactory dbfac = DocumentBuilderFactory.newInstance();</pre></td></tr>
+<tr> <td class="numLineCover"> 336</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> DocumentBuilder docBuilder = dbfac.newDocumentBuilder();</pre></td></tr>
+<tr> <td class="numLineCover"> 337</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> Document doc = docBuilder.newDocument();</pre></td></tr>
+<tr> <td class="numLineCover"> 338</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> constructGroupsDefinitionsFeedFile(doc, items, caseSensitiveMembers);</pre></td></tr>
+<tr> <td class="numLineCover"> 339</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> String xmlString = documentToString(doc); </pre></td></tr>
+<tr> <td class="numLineCover"> 340</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">return</span> xmlString;</pre></td></tr>
+<tr> <td class="numLineCover"> 341</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (TransformerConfigurationException tce) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 342</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(tce);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 343</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (TransformerException te) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 344</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(te);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 345</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (ParserConfigurationException pce) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 346</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(pce);</span></pre></td></tr>
+<tr> <td class="numLine"> 347</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 348</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 349</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
diff --git a/coverage/com.google.enterprise.adaptor.IOHelper.html b/coverage/com.google.enterprise.adaptor.IOHelper.html
index 6be9b6a..118b146 100644
--- a/coverage/com.google.enterprise.adaptor.IOHelper.html
+++ b/coverage/com.google.enterprise.adaptor.IOHelper.html
@@ -83,8 +83,8 @@
<tr> <td class="numLineCover"> 33</td> <td class="nbHitsCovered"> 72</td> <td class="src"><pre class="src"> <span class="keyword">byte</span>[] buffer = <span class="keyword">new</span> <span class="keyword">byte</span>[1024];</pre></td></tr>
<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">int</span> read;</pre></td></tr>
-<tr> <td class="numLineCover"> 35</td> <td class="nbHitsCovered"><a title="Line 35: Conditional coverage 100% (2/2)."> 183</a></td> <td class="src"><pre class="src"> <a title="Line 35: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> ((read = in.read(buffer)) != -1) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 36</td> <td class="nbHitsCovered"> 112</td> <td class="src"><pre class="src"> out.write(buffer, 0, read);</pre></td></tr>
+<tr> <td class="numLineCover"> 35</td> <td class="nbHitsCovered"><a title="Line 35: Conditional coverage 100% (2/2)."> 206</a></td> <td class="src"><pre class="src"> <a title="Line 35: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> ((read = in.read(buffer)) != -1) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 36</td> <td class="nbHitsCovered"> 135</td> <td class="src"><pre class="src"> out.write(buffer, 0, read);</pre></td></tr>
<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLineCover"> 38</td> <td class="nbHitsCovered"> 70</td> <td class="src"><pre class="src"> out.flush();</pre></td></tr>
diff --git a/coverage/com.google.enterprise.adaptor.Journal.html b/coverage/com.google.enterprise.adaptor.Journal.html
index 1555f16..9f0740a 100644
--- a/coverage/com.google.enterprise.adaptor.Journal.html
+++ b/coverage/com.google.enterprise.adaptor.Journal.html
@@ -373,8 +373,8 @@
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">long</span> determineTimeResolutionOnce() {</pre></td></tr>
<tr> <td class="numLineCover"> 214</td> <td class="nbHitsCovered"> 1000</td> <td class="src"><pre class="src"> <span class="keyword">long</span> time = timeProvider.currentTimeMillis();</pre></td></tr>
<tr> <td class="numLineCover"> 215</td> <td class="nbHitsCovered"> 1000</td> <td class="src"><pre class="src"> <span class="keyword">long</span> startTime = time;</pre></td></tr>
-<tr> <td class="numLineCover"> 216</td> <td class="nbHitsCovered"><a title="Line 216: Conditional coverage 100% (2/2)."> 446180</a></td> <td class="src"><pre class="src"> <a title="Line 216: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (startTime == time) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 217</td> <td class="nbHitsCovered"> 445180</td> <td class="src"><pre class="src"> time = timeProvider.currentTimeMillis();</pre></td></tr>
+<tr> <td class="numLineCover"> 216</td> <td class="nbHitsCovered"><a title="Line 216: Conditional coverage 100% (2/2)."> 432288</a></td> <td class="src"><pre class="src"> <a title="Line 216: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (startTime == time) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 217</td> <td class="nbHitsCovered"> 431288</td> <td class="src"><pre class="src"> time = timeProvider.currentTimeMillis();</pre></td></tr>
<tr> <td class="numLine"> 218</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLineCover"> 219</td> <td class="nbHitsCovered"> 1000</td> <td class="src"><pre class="src"> <span class="keyword">return</span> time - startTime;</pre></td></tr>
diff --git a/coverage/com.google.enterprise.adaptor.Principal.html b/coverage/com.google.enterprise.adaptor.Principal.html
index 9c8777d..dc28138 100644
--- a/coverage/com.google.enterprise.adaptor.Principal.html
+++ b/coverage/com.google.enterprise.adaptor.Principal.html
@@ -62,7 +62,7 @@
<td class="src"><pre class="src"> <span class="comment"> * Represents either a user or a group.</span></pre></td></tr>
<tr> <td class="numLine"> 21</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 22</td> <td class="nbHitsCovered"> 698</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">abstract</span> <span class="keyword">class</span> Principal <span class="keyword">implements</span> Comparable<Principal> {</pre></td></tr>
+<tr> <td class="numLineCover"> 22</td> <td class="nbHitsCovered"> 644</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">abstract</span> <span class="keyword">class</span> Principal <span class="keyword">implements</span> Comparable<Principal> {</pre></td></tr>
<tr> <td class="numLine"> 23</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String DEFAULT_NAMESPACE = <span class="string">"Default"</span>;</pre></td></tr>
<tr> <td class="numLine"> 24</td> <td class="nbHits"> </td>
@@ -73,40 +73,40 @@
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> String namespace;</pre></td></tr>
<tr> <td class="numLine"> 27</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 28</td> <td class="nbHitsCovered"> 465</td> <td class="src"><pre class="src"> Principal(String n, String ns) {</pre></td></tr>
-<tr> <td class="numLineCover"> 29</td> <td class="nbHitsCovered"><a title="Line 29: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 465</a></td> <td class="src"><pre class="src"> <a title="Line 29: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (<span class="keyword">null</span> == n || <span class="keyword">null</span> == ns) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 28</td> <td class="nbHitsCovered"> 472</td> <td class="src"><pre class="src"> Principal(String n, String ns) {</pre></td></tr>
+<tr> <td class="numLineCover"> 29</td> <td class="nbHitsCovered"><a title="Line 29: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 472</a></td> <td class="src"><pre class="src"> <a title="Line 29: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (<span class="keyword">null</span> == n || <span class="keyword">null</span> == ns) {</a></pre></td></tr>
<tr> <td class="numLineCover"> 30</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> NullPointerException();</pre></td></tr>
<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 32</td> <td class="nbHitsCovered"><a title="Line 32: Conditional coverage 100% (2/2)."> 461</a></td> <td class="src"><pre class="src"> <a title="Line 32: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (n.isEmpty()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 32</td> <td class="nbHitsCovered"><a title="Line 32: Conditional coverage 100% (2/2)."> 468</a></td> <td class="src"><pre class="src"> <a title="Line 32: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (n.isEmpty()) {</a></pre></td></tr>
<tr> <td class="numLineCover"> 33</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalArgumentException(<span class="string">"name cannot be empty"</span>);</pre></td></tr>
<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 35</td> <td class="nbHitsCovered"><a title="Line 35: Conditional coverage 100% (2/2)."> 460</a></td> <td class="src"><pre class="src"> <a title="Line 35: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!n.trim().equals(n)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 35</td> <td class="nbHitsCovered"><a title="Line 35: Conditional coverage 100% (2/2)."> 467</a></td> <td class="src"><pre class="src"> <a title="Line 35: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!n.trim().equals(n)) {</a></pre></td></tr>
<tr> <td class="numLineCover"> 36</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalArgumentException(<span class="string">"name cannot start or end with space"</span>);</pre></td></tr>
<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 38</td> <td class="nbHitsCovered"> 458</td> <td class="src"><pre class="src"> name = n;</pre></td></tr>
-<tr> <td class="numLineCover"> 39</td> <td class="nbHitsCovered"> 458</td> <td class="src"><pre class="src"> namespace = ns;</pre></td></tr>
-<tr> <td class="numLineCover"> 40</td> <td class="nbHitsCovered"> 458</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 38</td> <td class="nbHitsCovered"> 465</td> <td class="src"><pre class="src"> name = n;</pre></td></tr>
+<tr> <td class="numLineCover"> 39</td> <td class="nbHitsCovered"> 465</td> <td class="src"><pre class="src"> namespace = ns;</pre></td></tr>
+<tr> <td class="numLineCover"> 40</td> <td class="nbHitsCovered"> 465</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> Principal(String n) {</pre></td></tr>
-<tr> <td class="numLineCover"> 43</td> <td class="nbHitsCovered"> 350</td> <td class="src"><pre class="src"> <span class="keyword">this</span>(n, DEFAULT_NAMESPACE);</pre></td></tr>
-<tr> <td class="numLineCover"> 44</td> <td class="nbHitsCovered"> 345</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 43</td> <td class="nbHitsCovered"> 354</td> <td class="src"><pre class="src"> <span class="keyword">this</span>(n, DEFAULT_NAMESPACE);</pre></td></tr>
+<tr> <td class="numLineCover"> 44</td> <td class="nbHitsCovered"> 349</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> String getName() {</pre></td></tr>
-<tr> <td class="numLineCover"> 47</td> <td class="nbHitsCovered"> 287</td> <td class="src"><pre class="src"> <span class="keyword">return</span> name;</pre></td></tr>
+<tr> <td class="numLineCover"> 47</td> <td class="nbHitsCovered"> 330</td> <td class="src"><pre class="src"> <span class="keyword">return</span> name;</pre></td></tr>
<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> String getNamespace() {</pre></td></tr>
-<tr> <td class="numLineCover"> 51</td> <td class="nbHitsCovered"> 441</td> <td class="src"><pre class="src"> <span class="keyword">return</span> namespace;</pre></td></tr>
+<tr> <td class="numLineCover"> 51</td> <td class="nbHitsCovered"> 514</td> <td class="src"><pre class="src"> <span class="keyword">return</span> namespace;</pre></td></tr>
<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
@@ -165,36 +165,36 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> compareTo(Principal other) {</pre></td></tr>
-<tr> <td class="numLineCover"> 85</td> <td class="nbHitsCovered"> 698</td> <td class="src"><pre class="src"> <span class="keyword">int</span> spacecmp = namespace.compareTo(other.namespace);</pre></td></tr>
-<tr> <td class="numLineCover"> 86</td> <td class="nbHitsCovered"><a title="Line 86: Conditional coverage 100% (2/2)."> 698</a></td> <td class="src"><pre class="src"> <a title="Line 86: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (0 != spacecmp) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 87</td> <td class="nbHitsCovered"> 165</td> <td class="src"><pre class="src"> <span class="keyword">return</span> spacecmp;</pre></td></tr>
+<tr> <td class="numLineCover"> 85</td> <td class="nbHitsCovered"> 644</td> <td class="src"><pre class="src"> <span class="keyword">int</span> spacecmp = namespace.compareTo(other.namespace);</pre></td></tr>
+<tr> <td class="numLineCover"> 86</td> <td class="nbHitsCovered"><a title="Line 86: Conditional coverage 100% (2/2)."> 644</a></td> <td class="src"><pre class="src"> <a title="Line 86: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (0 != spacecmp) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 87</td> <td class="nbHitsCovered"> 136</td> <td class="src"><pre class="src"> <span class="keyword">return</span> spacecmp;</pre></td></tr>
<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// OK, same namespace</span></pre></td></tr>
<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 91</td> <td class="nbHitsCovered"><a title="Line 91: Conditional coverage 100% (2/2)."> 533</a></td> <td class="src"><pre class="src"> <a title="Line 91: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (isUser() != other.isUser()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 92</td> <td class="nbHitsCovered"><a title="Line 92: Conditional coverage 100% (2/2)."> 69</a></td> <td class="src"><pre class="src"> <a title="Line 92: Conditional coverage 100% (2/2)."> <span class="keyword">return</span> isUser() ? -1 : 1;</a></pre></td></tr>
+<tr> <td class="numLineCover"> 91</td> <td class="nbHitsCovered"><a title="Line 91: Conditional coverage 100% (2/2)."> 508</a></td> <td class="src"><pre class="src"> <a title="Line 91: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (isUser() != other.isUser()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 92</td> <td class="nbHitsCovered"><a title="Line 92: Conditional coverage 100% (2/2)."> 58</a></td> <td class="src"><pre class="src"> <a title="Line 92: Conditional coverage 100% (2/2)."> <span class="keyword">return</span> isUser() ? -1 : 1;</a></pre></td></tr>
<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// OK, same namespace and same type</span></pre></td></tr>
<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 96</td> <td class="nbHitsCovered"> 464</td> <td class="src"><pre class="src"> <span class="keyword">return</span> name.compareTo(other.name);</pre></td></tr>
+<tr> <td class="numLineCover"> 96</td> <td class="nbHitsCovered"> 450</td> <td class="src"><pre class="src"> <span class="keyword">return</span> name.compareTo(other.name);</pre></td></tr>
<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> ParsedPrincipal parse() {</pre></td></tr>
-<tr> <td class="numLineCover"> 100</td> <td class="nbHitsCovered"><a title="Line 100: Conditional coverage 100% (2/2)."> 261</a></td> <td class="src"><pre class="src"> <a title="Line 100: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = 0; i < name.length(); i++) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 101</td> <td class="nbHitsCovered"> 231</td> <td class="src"><pre class="src"> <span class="keyword">char</span> c = name.charAt(i);</pre></td></tr>
-<tr> <td class="numLineCover"> 102</td> <td class="nbHitsCovered"><a title="Line 102: Conditional coverage 100% (4/4)."> 231</a></td> <td class="src"><pre class="src"> <a title="Line 102: Conditional coverage 100% (4/4)."> <span class="keyword">switch</span> (c) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 100</td> <td class="nbHitsCovered"><a title="Line 100: Conditional coverage 100% (2/2)."> 283</a></td> <td class="src"><pre class="src"> <a title="Line 100: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = 0; i < name.length(); i++) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 101</td> <td class="nbHitsCovered"> 251</td> <td class="src"><pre class="src"> <span class="keyword">char</span> c = name.charAt(i);</pre></td></tr>
+<tr> <td class="numLineCover"> 102</td> <td class="nbHitsCovered"><a title="Line 102: Conditional coverage 100% (4/4)."> 251</a></td> <td class="src"><pre class="src"> <a title="Line 102: Conditional coverage 100% (4/4)."> <span class="keyword">switch</span> (c) {</a></pre></td></tr>
<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">case</span> <span class="string">'\\'</span>:</pre></td></tr>
-<tr> <td class="numLineCover"> 104</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> ParsedPrincipal(isGroup(), name.substring(i + 1),</pre></td></tr>
+<tr> <td class="numLineCover"> 104</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> ParsedPrincipal(isGroup(), name.substring(i + 1),</pre></td></tr>
<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> name.substring(0, i), DomainFormat.NETBIOS, namespace);</pre></td></tr>
<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
@@ -215,7 +215,7 @@
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 116</td> <td class="nbHitsCovered"> 30</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> ParsedPrincipal(isGroup(), name, <span class="string">""</span>, DomainFormat.NONE,</pre></td></tr>
+<tr> <td class="numLineCover"> 116</td> <td class="nbHitsCovered"> 32</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> ParsedPrincipal(isGroup(), name, <span class="string">""</span>, DomainFormat.NONE,</pre></td></tr>
<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> namespace);</pre></td></tr>
<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
@@ -271,24 +271,24 @@
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> ParsedPrincipal(<span class="keyword">boolean</span> isGroup, String plainName, String domain,</pre></td></tr>
-<tr> <td class="numLineCover"> 147</td> <td class="nbHitsCovered"> 134</td> <td class="src"><pre class="src"> DomainFormat domainFormat, String namespace) {</pre></td></tr>
-<tr> <td class="numLineCover"> 148</td> <td class="nbHitsCovered"><a title="Line 148: Conditional coverage 100% (8/8) [each condition: 100%, 100%, 100%, 100%]."> 134</a></td> <td class="src"><pre class="src"> <a title="Line 148: Conditional coverage 100% (8/8) [each condition: 100%, 100%, 100%, 100%]."> <span class="keyword">if</span> (plainName == <span class="keyword">null</span> || domain == <span class="keyword">null</span> || domainFormat == <span class="keyword">null</span></a></pre></td></tr>
+<tr> <td class="numLineCover"> 147</td> <td class="nbHitsCovered"> 140</td> <td class="src"><pre class="src"> DomainFormat domainFormat, String namespace) {</pre></td></tr>
+<tr> <td class="numLineCover"> 148</td> <td class="nbHitsCovered"><a title="Line 148: Conditional coverage 100% (8/8) [each condition: 100%, 100%, 100%, 100%]."> 140</a></td> <td class="src"><pre class="src"> <a title="Line 148: Conditional coverage 100% (8/8) [each condition: 100%, 100%, 100%, 100%]."> <span class="keyword">if</span> (plainName == <span class="keyword">null</span> || domain == <span class="keyword">null</span> || domainFormat == <span class="keyword">null</span></a></pre></td></tr>
<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> || namespace == <span class="keyword">null</span>) {</pre></td></tr>
<tr> <td class="numLineCover"> 150</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> NullPointerException();</pre></td></tr>
<tr> <td class="numLine"> 151</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 152</td> <td class="nbHitsCovered"> 130</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.isGroup = isGroup;</pre></td></tr>
-<tr> <td class="numLineCover"> 153</td> <td class="nbHitsCovered"> 130</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.plainName = plainName;</pre></td></tr>
-<tr> <td class="numLineCover"> 154</td> <td class="nbHitsCovered"> 130</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.domain = domain;</pre></td></tr>
-<tr> <td class="numLineCover"> 155</td> <td class="nbHitsCovered"> 130</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.domainFormat = domainFormat;</pre></td></tr>
-<tr> <td class="numLineCover"> 156</td> <td class="nbHitsCovered"> 130</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.namespace = namespace;</pre></td></tr>
-<tr> <td class="numLineCover"> 157</td> <td class="nbHitsCovered"> 130</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 152</td> <td class="nbHitsCovered"> 136</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.isGroup = isGroup;</pre></td></tr>
+<tr> <td class="numLineCover"> 153</td> <td class="nbHitsCovered"> 136</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.plainName = plainName;</pre></td></tr>
+<tr> <td class="numLineCover"> 154</td> <td class="nbHitsCovered"> 136</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.domain = domain;</pre></td></tr>
+<tr> <td class="numLineCover"> 155</td> <td class="nbHitsCovered"> 136</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.domainFormat = domainFormat;</pre></td></tr>
+<tr> <td class="numLineCover"> 156</td> <td class="nbHitsCovered"> 136</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.namespace = namespace;</pre></td></tr>
+<tr> <td class="numLineCover"> 157</td> <td class="nbHitsCovered"> 136</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> ParsedPrincipal plainName(String plainName) {</pre></td></tr>
-<tr> <td class="numLineCover"> 160</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> ParsedPrincipal(isGroup, plainName, domain, domainFormat,</pre></td></tr>
+<tr> <td class="numLineCover"> 160</td> <td class="nbHitsCovered"> 21</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> ParsedPrincipal(isGroup, plainName, domain, domainFormat,</pre></td></tr>
<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> namespace);</pre></td></tr>
<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td>
@@ -334,20 +334,20 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 184</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> DomainFormat determineEffectiveFormat() {</pre></td></tr>
-<tr> <td class="numLineCover"> 185</td> <td class="nbHitsCovered"> 69</td> <td class="src"><pre class="src"> DomainFormat format = domainFormat;</pre></td></tr>
-<tr> <td class="numLineCover"> 186</td> <td class="nbHitsCovered"><a title="Line 186: Conditional coverage 100% (2/2)."> 69</a></td> <td class="src"><pre class="src"> <a title="Line 186: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (domain.equals(<span class="string">""</span>)) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 187</td> <td class="nbHitsCovered"> 28</td> <td class="src"><pre class="src"> <span class="keyword">return</span> format;</pre></td></tr>
+<tr> <td class="numLineCover"> 185</td> <td class="nbHitsCovered"> 72</td> <td class="src"><pre class="src"> DomainFormat format = domainFormat;</pre></td></tr>
+<tr> <td class="numLineCover"> 186</td> <td class="nbHitsCovered"><a title="Line 186: Conditional coverage 100% (2/2)."> 72</a></td> <td class="src"><pre class="src"> <a title="Line 186: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (domain.equals(<span class="string">""</span>)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 187</td> <td class="nbHitsCovered"> 30</td> <td class="src"><pre class="src"> <span class="keyword">return</span> format;</pre></td></tr>
<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 189</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// Domain handling</span></pre></td></tr>
-<tr> <td class="numLineCover"> 191</td> <td class="nbHitsCovered"><a title="Line 191: Conditional coverage 100% (2/2)."> 41</a></td> <td class="src"><pre class="src"> <a title="Line 191: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (format == DomainFormat.NONE) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 191</td> <td class="nbHitsCovered"><a title="Line 191: Conditional coverage 100% (2/2)."> 42</a></td> <td class="src"><pre class="src"> <a title="Line 191: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (format == DomainFormat.NONE) {</a></pre></td></tr>
<tr> <td class="numLineCover"> 192</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> format = DomainFormat.NETBIOS;</pre></td></tr>
<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 194</td> <td class="nbHitsCovered"><a title="Line 194: Conditional coverage 100% (6/6) [each condition: 100%, 100%, 100%]."> 41</a></td> <td class="src"><pre class="src"> <a title="Line 194: Conditional coverage 100% (6/6) [each condition: 100%, 100%, 100%]."> <span class="keyword">if</span> ((format == DomainFormat.NETBIOS</a></pre></td></tr>
+<tr> <td class="numLineCover"> 194</td> <td class="nbHitsCovered"><a title="Line 194: Conditional coverage 100% (6/6) [each condition: 100%, 100%, 100%]."> 42</a></td> <td class="src"><pre class="src"> <a title="Line 194: Conditional coverage 100% (6/6) [each condition: 100%, 100%, 100%]."> <span class="keyword">if</span> ((format == DomainFormat.NETBIOS</a></pre></td></tr>
<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> || format == DomainFormat.NETBIOS_FORWARDSLASH)</pre></td></tr>
<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
@@ -355,7 +355,7 @@
<tr> <td class="numLineCover"> 197</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> format = DomainFormat.DNS;</pre></td></tr>
<tr> <td class="numLine"> 198</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 199</td> <td class="nbHitsCovered"><a title="Line 199: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 41</a></td> <td class="src"><pre class="src"> <a title="Line 199: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (format == DomainFormat.DNS && containsSpecial(plainName)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 199</td> <td class="nbHitsCovered"><a title="Line 199: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 42</a></td> <td class="src"><pre class="src"> <a title="Line 199: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (format == DomainFormat.DNS && containsSpecial(plainName)) {</a></pre></td></tr>
<tr> <td class="numLineCover"> 200</td> <td class="nbHitsCovered"><a title="Line 200: Conditional coverage 100% (2/2)."> 3</a></td> <td class="src"><pre class="src"> <a title="Line 200: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (containsSpecial(domain)) {</a></pre></td></tr>
<tr> <td class="numLineCover"> 201</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(<span class="string">"Neither NETBIOS nor DNS formats can "</span></pre></td></tr>
<tr> <td class="numLine"> 202</td> <td class="nbHits"> </td>
@@ -365,14 +365,14 @@
<tr> <td class="numLineCover"> 204</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> format = DomainFormat.NETBIOS;</pre></td></tr>
<tr> <td class="numLine"> 205</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 206</td> <td class="nbHitsCovered"> 40</td> <td class="src"><pre class="src"> <span class="keyword">return</span> format;</pre></td></tr>
+<tr> <td class="numLineCover"> 206</td> <td class="nbHitsCovered"> 41</td> <td class="src"><pre class="src"> <span class="keyword">return</span> format;</pre></td></tr>
<tr> <td class="numLine"> 207</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 208</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 209</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> containsSpecial(String s) {</pre></td></tr>
-<tr> <td class="numLineCover"> 210</td> <td class="nbHitsCovered"><a title="Line 210: Conditional coverage 100% (6/6) [each condition: 100%, 100%, 100%]."> 45</a></td> <td class="src"><pre class="src"> <a title="Line 210: Conditional coverage 100% (6/6) [each condition: 100%, 100%, 100%]."> <span class="keyword">return</span> s.contains(<span class="string">"\\"</span>) || s.contains(<span class="string">"/"</span>) || s.contains(<span class="string">"@"</span>);</a></pre></td></tr>
+<tr> <td class="numLineCover"> 210</td> <td class="nbHitsCovered"><a title="Line 210: Conditional coverage 100% (6/6) [each condition: 100%, 100%, 100%]."> 46</a></td> <td class="src"><pre class="src"> <a title="Line 210: Conditional coverage 100% (6/6) [each condition: 100%, 100%, 100%]."> <span class="keyword">return</span> s.contains(<span class="string">"\\"</span>) || s.contains(<span class="string">"/"</span>) || s.contains(<span class="string">"@"</span>);</a></pre></td></tr>
<tr> <td class="numLine"> 211</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 212</td> <td class="nbHits"> </td>
@@ -381,19 +381,19 @@
<td class="src"><pre class="src"> <span class="keyword">public</span> Principal toPrincipal() {</pre></td></tr>
<tr> <td class="numLine"> 214</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> String name;</pre></td></tr>
-<tr> <td class="numLineCover"> 215</td> <td class="nbHitsUncovered"><a title="Line 215: Conditional coverage 80% (4/5)."> 69</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 215: Conditional coverage 80% (4/5)."> <span class="keyword">switch</span> (determineEffectiveFormat()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 215</td> <td class="nbHitsUncovered"><a title="Line 215: Conditional coverage 80% (4/5)."> 72</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 215: Conditional coverage 80% (4/5)."> <span class="keyword">switch</span> (determineEffectiveFormat()) {</a></span></pre></td></tr>
<tr> <td class="numLine"> 216</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">case</span> NONE:</pre></td></tr>
-<tr> <td class="numLineCover"> 217</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> name = plainName;</pre></td></tr>
-<tr> <td class="numLineCover"> 218</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> <span class="keyword">break</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 217</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> name = plainName;</pre></td></tr>
+<tr> <td class="numLineCover"> 218</td> <td class="nbHitsCovered"> 26</td> <td class="src"><pre class="src"> <span class="keyword">break</span>;</pre></td></tr>
<tr> <td class="numLine"> 219</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">case</span> DNS:</pre></td></tr>
<tr> <td class="numLineCover"> 220</td> <td class="nbHitsCovered"> 17</td> <td class="src"><pre class="src"> name = plainName + <span class="string">"@"</span> + domain;</pre></td></tr>
<tr> <td class="numLineCover"> 221</td> <td class="nbHitsCovered"> 17</td> <td class="src"><pre class="src"> <span class="keyword">break</span>;</pre></td></tr>
<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">case</span> NETBIOS:</pre></td></tr>
-<tr> <td class="numLineCover"> 223</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> name = domain + <span class="string">"\\"</span> + plainName;</pre></td></tr>
-<tr> <td class="numLineCover"> 224</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> <span class="keyword">break</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 223</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> name = domain + <span class="string">"\\"</span> + plainName;</pre></td></tr>
+<tr> <td class="numLineCover"> 224</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> <span class="keyword">break</span>;</pre></td></tr>
<tr> <td class="numLine"> 225</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">case</span> NETBIOS_FORWARDSLASH:</pre></td></tr>
<tr> <td class="numLineCover"> 226</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> name = domain + <span class="string">"/"</span> + plainName;</pre></td></tr>
@@ -403,11 +403,11 @@
<tr> <td class="numLineCover"> 229</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> AssertionError();</span></pre></td></tr>
<tr> <td class="numLine"> 230</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 231</td> <td class="nbHitsCovered"><a title="Line 231: Conditional coverage 100% (2/2)."> 68</a></td> <td class="src"><pre class="src"> <a title="Line 231: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (isGroup) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 232</td> <td class="nbHitsCovered"> 46</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> GroupPrincipal(name, namespace);</pre></td></tr>
+<tr> <td class="numLineCover"> 231</td> <td class="nbHitsCovered"><a title="Line 231: Conditional coverage 100% (2/2)."> 71</a></td> <td class="src"><pre class="src"> <a title="Line 231: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (isGroup) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 232</td> <td class="nbHitsCovered"> 47</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> GroupPrincipal(name, namespace);</pre></td></tr>
<tr> <td class="numLine"> 233</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 234</td> <td class="nbHitsCovered"> 22</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> UserPrincipal(name, namespace);</pre></td></tr>
+<tr> <td class="numLineCover"> 234</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> UserPrincipal(name, namespace);</pre></td></tr>
<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 236</td> <td class="nbHits"> </td>
diff --git a/coverage/com.google.enterprise.adaptor.ShutdownWaiter.html b/coverage/com.google.enterprise.adaptor.ShutdownWaiter.html
index 984825e..61acc8c 100644
--- a/coverage/com.google.enterprise.adaptor.ShutdownWaiter.html
+++ b/coverage/com.google.enterprise.adaptor.ShutdownWaiter.html
@@ -124,8 +124,8 @@
<tr> <td class="numLineCover"> 53</td> <td class="nbHitsCovered"> 17</td> <td class="src"><pre class="src"> stopped = <span class="keyword">true</span>;</pre></td></tr>
<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// Inform processing requests to shut down.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 55</td> <td class="nbHitsCovered"><a title="Line 55: Conditional coverage 100% (2/2)."> 42</a></td> <td class="src"><pre class="src"> <a title="Line 55: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Thread thread : processingThreads.toArray(<span class="keyword">new</span> Thread[0])) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 56</td> <td class="nbHitsCovered"> 25</td> <td class="src"><pre class="src"> thread.interrupt();</pre></td></tr>
+<tr> <td class="numLineCover"> 55</td> <td class="nbHitsCovered"><a title="Line 55: Conditional coverage 100% (2/2)."> 40</a></td> <td class="src"><pre class="src"> <a title="Line 55: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Thread thread : processingThreads.toArray(<span class="keyword">new</span> Thread[0])) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 56</td> <td class="nbHitsCovered"> 23</td> <td class="src"><pre class="src"> thread.interrupt();</pre></td></tr>
<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
diff --git a/coverage/com.google.enterprise.adaptor.SystemTimeProvider.html b/coverage/com.google.enterprise.adaptor.SystemTimeProvider.html
index 076466d..7eec1d9 100644
--- a/coverage/com.google.enterprise.adaptor.SystemTimeProvider.html
+++ b/coverage/com.google.enterprise.adaptor.SystemTimeProvider.html
@@ -58,7 +58,7 @@
<tr> <td class="numLineCover"> 20</td> <td class="nbHitsCovered"> 73</td> <td class="src"><pre class="src"> <span class="keyword">class</span> SystemTimeProvider <span class="keyword">implements</span> TimeProvider {</pre></td></tr>
<tr> <td class="numLine"> 21</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">long</span> currentTimeMillis() {</pre></td></tr>
-<tr> <td class="numLineCover"> 22</td> <td class="nbHitsCovered"> 444625</td> <td class="src"><pre class="src"> <span class="keyword">return</span> System.currentTimeMillis();</pre></td></tr>
+<tr> <td class="numLineCover"> 22</td> <td class="nbHitsCovered"> 430733</td> <td class="src"><pre class="src"> <span class="keyword">return</span> System.currentTimeMillis();</pre></td></tr>
<tr> <td class="numLine"> 23</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 24</td> <td class="nbHits"> </td>
diff --git a/coverage/com.google.enterprise.adaptor.UserPrincipal.html b/coverage/com.google.enterprise.adaptor.UserPrincipal.html
index ff5ae69..88ca306 100644
--- a/coverage/com.google.enterprise.adaptor.UserPrincipal.html
+++ b/coverage/com.google.enterprise.adaptor.UserPrincipal.html
@@ -59,14 +59,14 @@
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">final</span> <span class="keyword">class</span> UserPrincipal <span class="keyword">extends</span> Principal {</pre></td></tr>
<tr> <td class="numLine"> 21</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> UserPrincipal(String name, String namespace) {</pre></td></tr>
-<tr> <td class="numLineCover"> 22</td> <td class="nbHitsCovered"> 48</td> <td class="src"><pre class="src"> <span class="keyword">super</span>(name, namespace);</pre></td></tr>
-<tr> <td class="numLineCover"> 23</td> <td class="nbHitsCovered"> 47</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 22</td> <td class="nbHitsCovered"> 50</td> <td class="src"><pre class="src"> <span class="keyword">super</span>(name, namespace);</pre></td></tr>
+<tr> <td class="numLineCover"> 23</td> <td class="nbHitsCovered"> 49</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 24</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 25</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> UserPrincipal(String name) {</pre></td></tr>
-<tr> <td class="numLineCover"> 26</td> <td class="nbHitsCovered"> 189</td> <td class="src"><pre class="src"> <span class="keyword">super</span>(name);</pre></td></tr>
-<tr> <td class="numLineCover"> 27</td> <td class="nbHitsCovered"> 186</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 26</td> <td class="nbHitsCovered"> 192</td> <td class="src"><pre class="src"> <span class="keyword">super</span>(name);</pre></td></tr>
+<tr> <td class="numLineCover"> 27</td> <td class="nbHitsCovered"> 189</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 28</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 29</td> <td class="nbHits"> </td>
@@ -75,7 +75,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isUser() {</pre></td></tr>
-<tr> <td class="numLineCover"> 32</td> <td class="nbHitsCovered"> 1169</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 32</td> <td class="nbHitsCovered"> 1173</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">true</span>;</pre></td></tr>
<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
@@ -86,7 +86,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isGroup() {</pre></td></tr>
-<tr> <td class="numLineCover"> 38</td> <td class="nbHitsCovered"> 41</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 38</td> <td class="nbHitsCovered"> 44</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
diff --git a/coverage/frame-summary-com.google.enterprise.adaptor.html b/coverage/frame-summary-com.google.enterprise.adaptor.html
index d6c0519..d60c641 100644
--- a/coverage/frame-summary-com.google.enterprise.adaptor.html
+++ b/coverage/frame-summary-com.google.enterprise.adaptor.html
@@ -16,7 +16,7 @@
<table class="report" id="packageResults">
<thead><tr> <td class="heading">Package</td> <td class="heading"># Classes</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><a href="frame-summary-com.google.enterprise.adaptor.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-com.google.enterprise.adaptor.html"'>com.google.enterprise.adaptor</a></td><td class="value">209</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">738</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:85px"><span class="text">4224/4962</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">280</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:83px"><span class="text">1453/1733</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.4791029561671762;</span>2.479</td></tr>
+ <tr><td><a href="frame-summary-com.google.enterprise.adaptor.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-com.google.enterprise.adaptor.html"'>com.google.enterprise.adaptor</a></td><td class="value">209</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">738</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:85px"><span class="text">4236/4974</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">280</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:83px"><span class="text">1457/1737</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.4786585365853657;</span>2.479</td></tr>
<tr><td><a href="frame-summary-com.google.enterprise.adaptor.examples.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-com.google.enterprise.adaptor.examples.html"'>com.google.enterprise.adaptor.examples</a></td><td class="value">8</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">276</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:7px"><span class="text">22/298</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">61</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:10px"><span class="text">7/68</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.3333333333333335;</span>2.333</td></tr>
<tr><td><a href="frame-summary-com.google.enterprise.adaptor.experimental.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-com.google.enterprise.adaptor.experimental.html"'>com.google.enterprise.adaptor.experimental</a></td><td class="value">8</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">219</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/219</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">77</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/77</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.8;</span>3.8</td></tr>
<tr><td><a href="frame-summary-com.google.enterprise.adaptor.prebuilt.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-com.google.enterprise.adaptor.prebuilt.html"'>com.google.enterprise.adaptor.prebuilt</a></td><td class="value">25</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">146</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:73px"><span class="text">396/542</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">57</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:67px"><span class="text">121/178</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5934065934065935;</span>2.593</td></tr>
@@ -52,9 +52,9 @@
<tr><td><a href="com.google.enterprise.adaptor.Acl.html">Acl$InheritanceType$3</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">4/4</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">4/4</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.6470588235294117;</span>2.647</td></tr>
<tr><td><a href="com.google.enterprise.adaptor.Acl.html">Acl$InheritanceType$4</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">3/3</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.6470588235294117;</span>2.647</td></tr>
- <tr><td><a href="com.google.enterprise.adaptor.AclTransform.html">AclTransform</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">23/23</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">12/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.1875;</span>3.188</td></tr>
- <tr><td><a href="com.google.enterprise.adaptor.AclTransform.html">AclTransform$MatchData</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">1</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:96px"><span class="text">31/32</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">2</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:95px"><span class="text">40/42</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.1875;</span>3.188</td></tr>
- <tr><td><a href="com.google.enterprise.adaptor.AclTransform.html">AclTransform$Rule</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">15/15</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">12/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.1875;</span>3.188</td></tr>
+ <tr><td><a href="com.google.enterprise.adaptor.AclTransform.html">AclTransform</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">30/30</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">16/16</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.0526315789473686;</span>3.053</td></tr>
+ <tr><td><a href="com.google.enterprise.adaptor.AclTransform.html">AclTransform$MatchData</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">1</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:96px"><span class="text">31/32</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">2</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:95px"><span class="text">40/42</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.0526315789473686;</span>3.053</td></tr>
+ <tr><td><a href="com.google.enterprise.adaptor.AclTransform.html">AclTransform$Rule</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">15/15</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">12/12</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.0526315789473686;</span>3.053</td></tr>
<tr><td><a href="com.google.enterprise.adaptor.Adaptor.html">Adaptor</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
@@ -180,7 +180,7 @@
<tr><td><a href="com.google.enterprise.adaptor.GroupPrincipal.html">GroupPrincipal</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">6</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:66px"><span class="text">12/18</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">4</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:50px"><span class="text">4/8</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.0;</span>2</td></tr>
- <tr><td><a href="com.google.enterprise.adaptor.GsaCommunicationHandler.html">GsaCommunicationHandler</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">53</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:82px"><span class="text">249/302</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">22</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:78px"><span class="text">82/104</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.7555555555555555;</span>3.756</td></tr>
+ <tr><td><a href="com.google.enterprise.adaptor.GsaCommunicationHandler.html">GsaCommunicationHandler</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">53</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:82px"><span class="text">250/303</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">22</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:78px"><span class="text">82/104</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.7555555555555555;</span>3.756</td></tr>
<tr><td><a href="com.google.enterprise.adaptor.GsaCommunicationHandler.html">GsaCommunicationHandler$1</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.7555555555555555;</span>3.756</td></tr>
<tr><td><a href="com.google.enterprise.adaptor.GsaCommunicationHandler.html">GsaCommunicationHandler$AdaptorContextImpl</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">24</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:35px"><span class="text">13/37</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">9</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:10px"><span class="text">1/10</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.7555555555555555;</span>3.756</td></tr>
<tr><td><a href="com.google.enterprise.adaptor.GsaCommunicationHandler.html">GsaCommunicationHandler$AlreadyRunningRunnable</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">2</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:33px"><span class="text">1/3</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.7555555555555555;</span>3.756</td></tr>
@@ -189,7 +189,7 @@
<tr><td><a href="com.google.enterprise.adaptor.GsaCommunicationHandler.html">GsaCommunicationHandler$IncrementalPushRunnable</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">9</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:43px"><span class="text">7/16</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">2</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.7555555555555555;</span>3.756</td></tr>
<tr><td><a href="com.google.enterprise.adaptor.GsaCommunicationHandler.html">GsaCommunicationHandler$PushRunnable</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">2</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:83px"><span class="text">10/12</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">1</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:50px"><span class="text">1/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.7555555555555555;</span>3.756</td></tr>
- <tr><td><a href="com.google.enterprise.adaptor.GsaFeedFileMaker.html">GsaFeedFileMaker</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">16</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:90px"><span class="text">148/164</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">48/48</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.8666666666666667;</span>3.867</td></tr>
+ <tr><td><a href="com.google.enterprise.adaptor.GsaFeedFileMaker.html">GsaFeedFileMaker</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">16</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:90px"><span class="text">152/168</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">48/48</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.8666666666666667;</span>3.867</td></tr>
<tr><td><a href="com.google.enterprise.adaptor.GsaFeedFileMaker.html">GsaFeedFileMaker$1</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">4/4</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.8666666666666667;</span>3.867</td></tr>
<tr><td><a href="com.google.enterprise.adaptor.GsaFeedFileSender.html">GsaFeedFileSender</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">4</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:95px"><span class="text">92/96</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">6</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:78px"><span class="text">22/28</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.0;</span>3</td></tr>
diff --git a/coverage/frame-summary.html b/coverage/frame-summary.html
index 5a64840..10b7760 100644
--- a/coverage/frame-summary.html
+++ b/coverage/frame-summary.html
@@ -16,8 +16,8 @@
<table class="report" id="packageResults">
<thead><tr> <td class="heading">Package</td> <td class="heading"># Classes</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
<tbody>
- <tr><td><b>All Packages</b></td><td class="value">250</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">1379</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:77px"><span class="text">4642/6021</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">475</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:76px"><span class="text">1581/2056</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5118525021949076;</span>2.512</td></tr>
- <tr><td><a href="frame-summary-com.google.enterprise.adaptor.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-com.google.enterprise.adaptor.html"'>com.google.enterprise.adaptor</a></td><td class="value">209</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">738</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:85px"><span class="text">4224/4962</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">280</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:83px"><span class="text">1453/1733</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.4791029561671762;</span>2.479</td></tr>
+ <tr><td><b>All Packages</b></td><td class="value">250</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">1379</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:77px"><span class="text">4654/6033</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">475</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:76px"><span class="text">1585/2060</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.51138353765324;</span>2.511</td></tr>
+ <tr><td><a href="frame-summary-com.google.enterprise.adaptor.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-com.google.enterprise.adaptor.html"'>com.google.enterprise.adaptor</a></td><td class="value">209</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">738</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:85px"><span class="text">4236/4974</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">280</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:83px"><span class="text">1457/1737</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.4786585365853657;</span>2.479</td></tr>
<tr><td><a href="frame-summary-com.google.enterprise.adaptor.examples.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-com.google.enterprise.adaptor.examples.html"'>com.google.enterprise.adaptor.examples</a></td><td class="value">8</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">276</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:7px"><span class="text">22/298</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">61</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:10px"><span class="text">7/68</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.3333333333333335;</span>2.333</td></tr>
<tr><td><a href="frame-summary-com.google.enterprise.adaptor.experimental.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-com.google.enterprise.adaptor.experimental.html"'>com.google.enterprise.adaptor.experimental</a></td><td class="value">8</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">219</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/219</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">77</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/77</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.8;</span>3.8</td></tr>
<tr><td><a href="frame-summary-com.google.enterprise.adaptor.prebuilt.html" onclick='parent.sourceFileList.location.href="frame-sourcefiles-com.google.enterprise.adaptor.prebuilt.html"'>com.google.enterprise.adaptor.prebuilt</a></td><td class="value">25</td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">146</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:73px"><span class="text">396/542</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">57</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:67px"><span class="text">121/178</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5934065934065935;</span>2.593</td></tr>
