Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/MultipartStreamTest.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/MultipartStreamTest.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/MultipartStreamTest.html Wed Jan 16 11:35:52 2019 @@ -84,6 +84,6 @@ <a class="jxr_linenumber" name="L76" href="#L76">76</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2017 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file
Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/ParameterParserTest.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/ParameterParserTest.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/ParameterParserTest.html Wed Jan 16 11:35:52 2019 @@ -128,6 +128,6 @@ <a class="jxr_linenumber" name="L120" href="#L120">120</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2017 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/ProgressListenerTest.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/ProgressListenerTest.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/ProgressListenerTest.html Wed Jan 16 11:35:52 2019 @@ -55,86 +55,87 @@ <a class="jxr_linenumber" name="L47" href="#L47">47</a> expectedItems = pItems; <a class="jxr_linenumber" name="L48" href="#L48">48</a> } <a class="jxr_linenumber" name="L49" href="#L49">49</a> -<a class="jxr_linenumber" name="L50" href="#L50">50</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> update(<strong class="jxr_keyword">long</strong> pBytesRead, <strong class="jxr_keyword">long</strong> pContentLength, <strong class="jxr_keyword">int</strong> pItems) { -<a class="jxr_linenumber" name="L51" href="#L51">51</a> assertTrue(pBytesRead >= 0 && pBytesRead <= expectedContentLength); -<a class="jxr_linenumber" name="L52" href="#L52">52</a> assertTrue(pContentLength == -1 || pContentLength == expectedContentLength); -<a class="jxr_linenumber" name="L53" href="#L53">53</a> assertTrue(pItems >= 0 && pItems <= expectedItems); -<a class="jxr_linenumber" name="L54" href="#L54">54</a> -<a class="jxr_linenumber" name="L55" href="#L55">55</a> assertTrue(bytesRead == <strong class="jxr_keyword">null</strong> || pBytesRead >= bytesRead.longValue()); -<a class="jxr_linenumber" name="L56" href="#L56">56</a> bytesRead = <strong class="jxr_keyword">new</strong> Long(pBytesRead); -<a class="jxr_linenumber" name="L57" href="#L57">57</a> assertTrue(items == <strong class="jxr_keyword">null</strong> || pItems >= items.intValue()); -<a class="jxr_linenumber" name="L58" href="#L58">58</a> items = <strong class="jxr_keyword">new</strong> Integer(pItems); -<a class="jxr_linenumber" name="L59" href="#L59">59</a> } -<a class="jxr_linenumber" name="L60" href="#L60">60</a> -<a class="jxr_linenumber" name="L61" href="#L61">61</a> <strong class="jxr_keyword">void</strong> checkFinished(){ -<a class="jxr_linenumber" name="L62" href="#L62">62</a> assertEquals(expectedContentLength, bytesRead.longValue()); -<a class="jxr_linenumber" name="L63" href="#L63">63</a> assertEquals(expectedItems, items.intValue()); -<a class="jxr_linenumber" name="L64" href="#L64">64</a> } -<a class="jxr_linenumber" name="L65" href="#L65">65</a> -<a class="jxr_linenumber" name="L66" href="#L66">66</a> } -<a class="jxr_linenumber" name="L67" href="#L67">67</a> -<a class="jxr_linenumber" name="L68" href="#L68">68</a> <em class="jxr_javadoccomment">/**</em> -<a class="jxr_linenumber" name="L69" href="#L69">69</a> <em class="jxr_javadoccomment"> * Parse a very long file upload by using a progress listener.</em> -<a class="jxr_linenumber" name="L70" href="#L70">70</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L71" href="#L71">71</a> @Test -<a class="jxr_linenumber" name="L72" href="#L72">72</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testProgressListener() <strong class="jxr_keyword">throws</strong> Exception { -<a class="jxr_linenumber" name="L73" href="#L73">73</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> NUM_ITEMS = 512; -<a class="jxr_linenumber" name="L74" href="#L74">74</a> ByteArrayOutputStream baos = <strong class="jxr_keyword">new</strong> ByteArrayOutputStream(); -<a class="jxr_linenumber" name="L75" href="#L75">75</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < NUM_ITEMS; i++) { -<a class="jxr_linenumber" name="L76" href="#L76">76</a> String header = <span class="jxr_string">"-----1234\r\n"</span> -<a class="jxr_linenumber" name="L77" href="#L77">77</a> + <span class="jxr_string">"Content-Disposition: form-data; name=\"field"</span> + (i+1) + <span class="jxr_string">"\"\r\n"</span> -<a class="jxr_linenumber" name="L78" href="#L78">78</a> + <span class="jxr_string">"\r\n"</span>; -<a class="jxr_linenumber" name="L79" href="#L79">79</a> baos.write(header.getBytes(<span class="jxr_string">"US-ASCII"</span>)); -<a class="jxr_linenumber" name="L80" href="#L80">80</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> j = 0; j < 16384+i; j++) { -<a class="jxr_linenumber" name="L81" href="#L81">81</a> baos.write((byte) j); -<a class="jxr_linenumber" name="L82" href="#L82">82</a> } -<a class="jxr_linenumber" name="L83" href="#L83">83</a> baos.write(<span class="jxr_string">"\r\n"</span>.getBytes(<span class="jxr_string">"US-ASCII"</span>)); -<a class="jxr_linenumber" name="L84" href="#L84">84</a> } -<a class="jxr_linenumber" name="L85" href="#L85">85</a> baos.write(<span class="jxr_string">"-----1234--\r\n"</span>.getBytes(<span class="jxr_string">"US-ASCII"</span>)); -<a class="jxr_linenumber" name="L86" href="#L86">86</a> byte[] contents = baos.toByteArray(); -<a class="jxr_linenumber" name="L87" href="#L87">87</a> -<a class="jxr_linenumber" name="L88" href="#L88">88</a> <a href="../../../../org/apache/commons/fileupload/MockHttpServletRequest.html">MockHttpServletRequest</a> request = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/fileupload/MockHttpServletRequest.html">MockHttpServletRequest</a>(contents, Constants.CONTENT_TYPE); -<a class="jxr_linenumber" name="L89" href="#L89">89</a> runTest(NUM_ITEMS, contents.length, request); -<a class="jxr_linenumber" name="L90" href="#L90">90</a> request = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/fileupload/MockHttpServletRequest.html">MockHttpServletRequest</a>(contents, Constants.CONTENT_TYPE){ -<a class="jxr_linenumber" name="L91" href="#L91">91</a> @Override -<a class="jxr_linenumber" name="L92" href="#L92">92</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getContentLength() { -<a class="jxr_linenumber" name="L93" href="#L93">93</a> <strong class="jxr_keyword">return</strong> -1; -<a class="jxr_linenumber" name="L94" href="#L94">94</a> } -<a class="jxr_linenumber" name="L95" href="#L95">95</a> }; -<a class="jxr_linenumber" name="L96" href="#L96">96</a> runTest(NUM_ITEMS, contents.length, request); -<a class="jxr_linenumber" name="L97" href="#L97">97</a> } -<a class="jxr_linenumber" name="L98" href="#L98">98</a> -<a class="jxr_linenumber" name="L99" href="#L99">99</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> runTest(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> NUM_ITEMS, <strong class="jxr_keyword">long</strong> pContentLength, <a href="../../../../org/apache/commons/fileupload/MockHttpServletRequest.html">MockHttpServletRequest</a> request) <strong class="jxr_keyword">throws</strong> FileUploadException, IOException { -<a class="jxr_linenumber" name="L100" href="#L100">100</a> ServletFileUpload upload = <strong class="jxr_keyword">new</strong> ServletFileUpload(); -<a class="jxr_linenumber" name="L101" href="#L101">101</a> <a href="../../../../org/apache/commons/fileupload/ProgressListenerTest.html">ProgressListenerImpl</a> listener = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/fileupload/ProgressListenerTest.html">ProgressListenerImpl</a>(pContentLength, NUM_ITEMS); -<a class="jxr_linenumber" name="L102" href="#L102">102</a> upload.setProgressListener(listener); -<a class="jxr_linenumber" name="L103" href="#L103">103</a> FileItemIterator iter = upload.getItemIterator(request); -<a class="jxr_linenumber" name="L104" href="#L104">104</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < NUM_ITEMS; i++) { -<a class="jxr_linenumber" name="L105" href="#L105">105</a> FileItemStream stream = iter.next(); -<a class="jxr_linenumber" name="L106" href="#L106">106</a> InputStream istream = stream.openStream(); -<a class="jxr_linenumber" name="L107" href="#L107">107</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> j = 0; j < 16384+i; j++) { -<a class="jxr_linenumber" name="L108" href="#L108">108</a> <em class="jxr_javadoccomment">/**</em> -<a class="jxr_linenumber" name="L109" href="#L109">109</a> <em class="jxr_javadoccomment"> * This used to be</em> -<a class="jxr_linenumber" name="L110" href="#L110">110</a> <em class="jxr_javadoccomment"> * assertEquals((byte) j, (byte) istream.read());</em> -<a class="jxr_linenumber" name="L111" href="#L111">111</a> <em class="jxr_javadoccomment"> * but this seems to trigger a bug in JRockit, so</em> -<a class="jxr_linenumber" name="L112" href="#L112">112</a> <em class="jxr_javadoccomment"> * we express the same like this:</em> -<a class="jxr_linenumber" name="L113" href="#L113">113</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L114" href="#L114">114</a> byte b1 = (byte) j; -<a class="jxr_linenumber" name="L115" href="#L115">115</a> byte b2 = (byte) istream.read(); -<a class="jxr_linenumber" name="L116" href="#L116">116</a> <strong class="jxr_keyword">if</strong> (b1 != b2) { -<a class="jxr_linenumber" name="L117" href="#L117">117</a> fail(<span class="jxr_string">"Expected "</span> + b1 + <span class="jxr_string">", got "</span> + b2); -<a class="jxr_linenumber" name="L118" href="#L118">118</a> } -<a class="jxr_linenumber" name="L119" href="#L119">119</a> } -<a class="jxr_linenumber" name="L120" href="#L120">120</a> assertEquals(-1, istream.read()); -<a class="jxr_linenumber" name="L121" href="#L121">121</a> istream.close(); -<a class="jxr_linenumber" name="L122" href="#L122">122</a> } -<a class="jxr_linenumber" name="L123" href="#L123">123</a> assertTrue(!iter.hasNext()); -<a class="jxr_linenumber" name="L124" href="#L124">124</a> listener.checkFinished(); -<a class="jxr_linenumber" name="L125" href="#L125">125</a> } -<a class="jxr_linenumber" name="L126" href="#L126">126</a> -<a class="jxr_linenumber" name="L127" href="#L127">127</a> } +<a class="jxr_linenumber" name="L50" href="#L50">50</a> @Override +<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> update(<strong class="jxr_keyword">long</strong> pBytesRead, <strong class="jxr_keyword">long</strong> pContentLength, <strong class="jxr_keyword">int</strong> pItems) { +<a class="jxr_linenumber" name="L52" href="#L52">52</a> assertTrue(pBytesRead >= 0 && pBytesRead <= expectedContentLength); +<a class="jxr_linenumber" name="L53" href="#L53">53</a> assertTrue(pContentLength == -1 || pContentLength == expectedContentLength); +<a class="jxr_linenumber" name="L54" href="#L54">54</a> assertTrue(pItems >= 0 && pItems <= expectedItems); +<a class="jxr_linenumber" name="L55" href="#L55">55</a> +<a class="jxr_linenumber" name="L56" href="#L56">56</a> assertTrue(bytesRead == <strong class="jxr_keyword">null</strong> || pBytesRead >= bytesRead.longValue()); +<a class="jxr_linenumber" name="L57" href="#L57">57</a> bytesRead = <strong class="jxr_keyword">new</strong> Long(pBytesRead); +<a class="jxr_linenumber" name="L58" href="#L58">58</a> assertTrue(items == <strong class="jxr_keyword">null</strong> || pItems >= items.intValue()); +<a class="jxr_linenumber" name="L59" href="#L59">59</a> items = <strong class="jxr_keyword">new</strong> Integer(pItems); +<a class="jxr_linenumber" name="L60" href="#L60">60</a> } +<a class="jxr_linenumber" name="L61" href="#L61">61</a> +<a class="jxr_linenumber" name="L62" href="#L62">62</a> <strong class="jxr_keyword">void</strong> checkFinished(){ +<a class="jxr_linenumber" name="L63" href="#L63">63</a> assertEquals(expectedContentLength, bytesRead.longValue()); +<a class="jxr_linenumber" name="L64" href="#L64">64</a> assertEquals(expectedItems, items.intValue()); +<a class="jxr_linenumber" name="L65" href="#L65">65</a> } +<a class="jxr_linenumber" name="L66" href="#L66">66</a> +<a class="jxr_linenumber" name="L67" href="#L67">67</a> } +<a class="jxr_linenumber" name="L68" href="#L68">68</a> +<a class="jxr_linenumber" name="L69" href="#L69">69</a> <em class="jxr_javadoccomment">/**</em> +<a class="jxr_linenumber" name="L70" href="#L70">70</a> <em class="jxr_javadoccomment"> * Parse a very long file upload by using a progress listener.</em> +<a class="jxr_linenumber" name="L71" href="#L71">71</a> <em class="jxr_javadoccomment"> */</em> +<a class="jxr_linenumber" name="L72" href="#L72">72</a> @Test +<a class="jxr_linenumber" name="L73" href="#L73">73</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testProgressListener() <strong class="jxr_keyword">throws</strong> Exception { +<a class="jxr_linenumber" name="L74" href="#L74">74</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> NUM_ITEMS = 512; +<a class="jxr_linenumber" name="L75" href="#L75">75</a> ByteArrayOutputStream baos = <strong class="jxr_keyword">new</strong> ByteArrayOutputStream(); +<a class="jxr_linenumber" name="L76" href="#L76">76</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < NUM_ITEMS; i++) { +<a class="jxr_linenumber" name="L77" href="#L77">77</a> String header = <span class="jxr_string">"-----1234\r\n"</span> +<a class="jxr_linenumber" name="L78" href="#L78">78</a> + <span class="jxr_string">"Content-Disposition: form-data; name=\"field"</span> + (i+1) + <span class="jxr_string">"\"\r\n"</span> +<a class="jxr_linenumber" name="L79" href="#L79">79</a> + <span class="jxr_string">"\r\n"</span>; +<a class="jxr_linenumber" name="L80" href="#L80">80</a> baos.write(header.getBytes(<span class="jxr_string">"US-ASCII"</span>)); +<a class="jxr_linenumber" name="L81" href="#L81">81</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> j = 0; j < 16384+i; j++) { +<a class="jxr_linenumber" name="L82" href="#L82">82</a> baos.write((byte) j); +<a class="jxr_linenumber" name="L83" href="#L83">83</a> } +<a class="jxr_linenumber" name="L84" href="#L84">84</a> baos.write(<span class="jxr_string">"\r\n"</span>.getBytes(<span class="jxr_string">"US-ASCII"</span>)); +<a class="jxr_linenumber" name="L85" href="#L85">85</a> } +<a class="jxr_linenumber" name="L86" href="#L86">86</a> baos.write(<span class="jxr_string">"-----1234--\r\n"</span>.getBytes(<span class="jxr_string">"US-ASCII"</span>)); +<a class="jxr_linenumber" name="L87" href="#L87">87</a> byte[] contents = baos.toByteArray(); +<a class="jxr_linenumber" name="L88" href="#L88">88</a> +<a class="jxr_linenumber" name="L89" href="#L89">89</a> <a href="../../../../org/apache/commons/fileupload/MockHttpServletRequest.html">MockHttpServletRequest</a> request = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/fileupload/MockHttpServletRequest.html">MockHttpServletRequest</a>(contents, Constants.CONTENT_TYPE); +<a class="jxr_linenumber" name="L90" href="#L90">90</a> runTest(NUM_ITEMS, contents.length, request); +<a class="jxr_linenumber" name="L91" href="#L91">91</a> request = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/fileupload/MockHttpServletRequest.html">MockHttpServletRequest</a>(contents, Constants.CONTENT_TYPE){ +<a class="jxr_linenumber" name="L92" href="#L92">92</a> @Override +<a class="jxr_linenumber" name="L93" href="#L93">93</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getContentLength() { +<a class="jxr_linenumber" name="L94" href="#L94">94</a> <strong class="jxr_keyword">return</strong> -1; +<a class="jxr_linenumber" name="L95" href="#L95">95</a> } +<a class="jxr_linenumber" name="L96" href="#L96">96</a> }; +<a class="jxr_linenumber" name="L97" href="#L97">97</a> runTest(NUM_ITEMS, contents.length, request); +<a class="jxr_linenumber" name="L98" href="#L98">98</a> } +<a class="jxr_linenumber" name="L99" href="#L99">99</a> +<a class="jxr_linenumber" name="L100" href="#L100">100</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> runTest(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> NUM_ITEMS, <strong class="jxr_keyword">long</strong> pContentLength, <a href="../../../../org/apache/commons/fileupload/MockHttpServletRequest.html">MockHttpServletRequest</a> request) <strong class="jxr_keyword">throws</strong> FileUploadException, IOException { +<a class="jxr_linenumber" name="L101" href="#L101">101</a> ServletFileUpload upload = <strong class="jxr_keyword">new</strong> ServletFileUpload(); +<a class="jxr_linenumber" name="L102" href="#L102">102</a> <a href="../../../../org/apache/commons/fileupload/ProgressListenerTest.html">ProgressListenerImpl</a> listener = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/fileupload/ProgressListenerTest.html">ProgressListenerImpl</a>(pContentLength, NUM_ITEMS); +<a class="jxr_linenumber" name="L103" href="#L103">103</a> upload.setProgressListener(listener); +<a class="jxr_linenumber" name="L104" href="#L104">104</a> FileItemIterator iter = upload.getItemIterator(request); +<a class="jxr_linenumber" name="L105" href="#L105">105</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < NUM_ITEMS; i++) { +<a class="jxr_linenumber" name="L106" href="#L106">106</a> FileItemStream stream = iter.next(); +<a class="jxr_linenumber" name="L107" href="#L107">107</a> InputStream istream = stream.openStream(); +<a class="jxr_linenumber" name="L108" href="#L108">108</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> j = 0; j < 16384+i; j++) { +<a class="jxr_linenumber" name="L109" href="#L109">109</a> <em class="jxr_javadoccomment">/**</em> +<a class="jxr_linenumber" name="L110" href="#L110">110</a> <em class="jxr_javadoccomment"> * This used to be</em> +<a class="jxr_linenumber" name="L111" href="#L111">111</a> <em class="jxr_javadoccomment"> * assertEquals((byte) j, (byte) istream.read());</em> +<a class="jxr_linenumber" name="L112" href="#L112">112</a> <em class="jxr_javadoccomment"> * but this seems to trigger a bug in JRockit, so</em> +<a class="jxr_linenumber" name="L113" href="#L113">113</a> <em class="jxr_javadoccomment"> * we express the same like this:</em> +<a class="jxr_linenumber" name="L114" href="#L114">114</a> <em class="jxr_javadoccomment"> */</em> +<a class="jxr_linenumber" name="L115" href="#L115">115</a> byte b1 = (byte) j; +<a class="jxr_linenumber" name="L116" href="#L116">116</a> byte b2 = (byte) istream.read(); +<a class="jxr_linenumber" name="L117" href="#L117">117</a> <strong class="jxr_keyword">if</strong> (b1 != b2) { +<a class="jxr_linenumber" name="L118" href="#L118">118</a> fail(<span class="jxr_string">"Expected "</span> + b1 + <span class="jxr_string">", got "</span> + b2); +<a class="jxr_linenumber" name="L119" href="#L119">119</a> } +<a class="jxr_linenumber" name="L120" href="#L120">120</a> } +<a class="jxr_linenumber" name="L121" href="#L121">121</a> assertEquals(-1, istream.read()); +<a class="jxr_linenumber" name="L122" href="#L122">122</a> istream.close(); +<a class="jxr_linenumber" name="L123" href="#L123">123</a> } +<a class="jxr_linenumber" name="L124" href="#L124">124</a> assertTrue(!iter.hasNext()); +<a class="jxr_linenumber" name="L125" href="#L125">125</a> listener.checkFinished(); +<a class="jxr_linenumber" name="L126" href="#L126">126</a> } +<a class="jxr_linenumber" name="L127" href="#L127">127</a> +<a class="jxr_linenumber" name="L128" href="#L128">128</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2017 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/SizesTest.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/SizesTest.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/SizesTest.html Wed Jan 16 11:35:52 2019 @@ -294,6 +294,6 @@ <a class="jxr_linenumber" name="L286" href="#L286">286</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2017 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/StreamingTest.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/StreamingTest.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/StreamingTest.html Wed Jan 16 11:35:52 2019 @@ -283,6 +283,6 @@ <a class="jxr_linenumber" name="L275" href="#L275">275</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2017 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/Util.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/Util.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/Util.html Wed Jan 16 11:35:52 2019 @@ -70,6 +70,6 @@ <a class="jxr_linenumber" name="L62" href="#L62">62</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2017 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/package-frame.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/package-frame.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/package-frame.html Wed Jan 16 11:35:52 2019 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> - <title>Apache Commons FileUpload 1.4-SNAPSHOT Reference Package org.apache.commons.fileupload</title> + <title>Apache Commons FileUpload 1.4 Reference Package org.apache.commons.fileupload</title> <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="style" /> </head> <body> Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/package-summary.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/package-summary.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/package-summary.html Wed Jan 16 11:35:52 2019 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> - <title>Apache Commons FileUpload 1.4-SNAPSHOT Reference Package org.apache.commons.fileupload</title> + <title>Apache Commons FileUpload 1.4 Reference Package org.apache.commons.fileupload</title> <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="style" /> </head> <body> @@ -138,7 +138,7 @@ </div> <hr /> <div id="footer"> - Copyright © 2002–2017 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. + Copyright © 2002–2019 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. </div> </body> </html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/portlet/MockPortletActionRequest.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/portlet/MockPortletActionRequest.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/portlet/MockPortletActionRequest.html Wed Jan 16 11:35:52 2019 @@ -61,7 +61,7 @@ <a class="jxr_linenumber" name="L53" href="#L53">53</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Map<String, String> parameters = <strong class="jxr_keyword">new</strong> HashMap<String, String>(); <a class="jxr_linenumber" name="L54" href="#L54">54</a> <a class="jxr_linenumber" name="L55" href="#L55">55</a> <strong class="jxr_keyword">private</strong> String characterEncoding; -<a class="jxr_linenumber" name="L56" href="#L56">56</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> length; +<a class="jxr_linenumber" name="L56" href="#L56">56</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> length; <a class="jxr_linenumber" name="L57" href="#L57">57</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String contentType; <a class="jxr_linenumber" name="L58" href="#L58">58</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> InputStream requestData; <a class="jxr_linenumber" name="L59" href="#L59">59</a> @@ -279,6 +279,6 @@ <a class="jxr_linenumber" name="L271" href="#L271">271</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2017 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/portlet/PortletFileUploadTest.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/portlet/PortletFileUploadTest.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/portlet/PortletFileUploadTest.html Wed Jan 16 11:35:52 2019 @@ -93,6 +93,6 @@ <a class="jxr_linenumber" name="L85" href="#L85">85</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2017 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/portlet/package-frame.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/portlet/package-frame.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/portlet/package-frame.html Wed Jan 16 11:35:52 2019 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> - <title>Apache Commons FileUpload 1.4-SNAPSHOT Reference Package org.apache.commons.fileupload.portlet</title> + <title>Apache Commons FileUpload 1.4 Reference Package org.apache.commons.fileupload.portlet</title> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" /> </head> <body> Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/portlet/package-summary.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/portlet/package-summary.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/portlet/package-summary.html Wed Jan 16 11:35:52 2019 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> - <title>Apache Commons FileUpload 1.4-SNAPSHOT Reference Package org.apache.commons.fileupload.portlet</title> + <title>Apache Commons FileUpload 1.4 Reference Package org.apache.commons.fileupload.portlet</title> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" /> </head> <body> @@ -68,7 +68,7 @@ </div> <hr /> <div id="footer"> - Copyright © 2002–2017 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. + Copyright © 2002–2019 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. </div> </body> </html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/servlet/ServletFileUploadTest.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/servlet/ServletFileUploadTest.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/servlet/ServletFileUploadTest.html Wed Jan 16 11:35:52 2019 @@ -36,66 +36,81 @@ <a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong class="jxr_keyword">import</strong> org.apache.commons.fileupload.FileItem; <a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong class="jxr_keyword">import</strong> org.apache.commons.fileupload.MockHttpServletRequest; <a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong class="jxr_keyword">import</strong> org.apache.commons.fileupload.disk.DiskFileItemFactory; -<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong class="jxr_keyword">import</strong> org.junit.Before; -<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong class="jxr_keyword">import</strong> org.junit.Test; -<a class="jxr_linenumber" name="L33" href="#L33">33</a> -<a class="jxr_linenumber" name="L34" href="#L34">34</a> <em class="jxr_javadoccomment">/**</em> -<a class="jxr_linenumber" name="L35" href="#L35">35</a> <em class="jxr_javadoccomment"> * Test for {@link ServletFileUpload}.</em> -<a class="jxr_linenumber" name="L36" href="#L36">36</a> <em class="jxr_javadoccomment"> *</em> -<a class="jxr_linenumber" name="L37" href="#L37">37</a> <em class="jxr_javadoccomment"> * @see FileUploadTest</em> -<a class="jxr_linenumber" name="L38" href="#L38">38</a> <em class="jxr_javadoccomment"> * @since 1.4</em> -<a class="jxr_linenumber" name="L39" href="#L39">39</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/fileupload/servlet/ServletFileUploadTest.html">ServletFileUploadTest</a> { -<a class="jxr_linenumber" name="L41" href="#L41">41</a> -<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong class="jxr_keyword">private</strong> ServletFileUpload upload; -<a class="jxr_linenumber" name="L43" href="#L43">43</a> -<a class="jxr_linenumber" name="L44" href="#L44">44</a> @Before -<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setUp() { -<a class="jxr_linenumber" name="L46" href="#L46">46</a> upload = <strong class="jxr_keyword">new</strong> ServletFileUpload(<strong class="jxr_keyword">new</strong> DiskFileItemFactory()); -<a class="jxr_linenumber" name="L47" href="#L47">47</a> } -<a class="jxr_linenumber" name="L48" href="#L48">48</a> -<a class="jxr_linenumber" name="L49" href="#L49">49</a> <em class="jxr_javadoccomment">/**</em> -<a class="jxr_linenumber" name="L50" href="#L50">50</a> <em class="jxr_javadoccomment"> * Test case for <a href="<a href="http://issues.apache.org/jira/browse/FILEUPLOAD-210"; target="alexandria_uri">http://issues.apache.org/jira/browse/FILEUPLOAD-210</a>"></em> -<a class="jxr_linenumber" name="L51" href="#L51">51</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L52" href="#L52">52</a> @Test -<a class="jxr_linenumber" name="L53" href="#L53">53</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> parseParameterMap() -<a class="jxr_linenumber" name="L54" href="#L54">54</a> <strong class="jxr_keyword">throws</strong> Exception { -<a class="jxr_linenumber" name="L55" href="#L55">55</a> String text = <span class="jxr_string">"-----1234\r\n"</span> + -<a class="jxr_linenumber" name="L56" href="#L56">56</a> <span class="jxr_string">"Content-Disposition: form-data; name=\"file\"; filename=\"foo.tab\"\r\n"</span> + -<a class="jxr_linenumber" name="L57" href="#L57">57</a> <span class="jxr_string">"Content-Type: text/whatever\r\n"</span> + -<a class="jxr_linenumber" name="L58" href="#L58">58</a> <span class="jxr_string">"\r\n"</span> + -<a class="jxr_linenumber" name="L59" href="#L59">59</a> <span class="jxr_string">"This is the content of the file\n"</span> + -<a class="jxr_linenumber" name="L60" href="#L60">60</a> <span class="jxr_string">"\r\n"</span> + +<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong class="jxr_keyword">import</strong> org.junit.Test; +<a class="jxr_linenumber" name="L32" href="#L32">32</a> +<a class="jxr_linenumber" name="L33" href="#L33">33</a> <em class="jxr_javadoccomment">/**</em> +<a class="jxr_linenumber" name="L34" href="#L34">34</a> <em class="jxr_javadoccomment"> * Test for {@link ServletFileUpload}.</em> +<a class="jxr_linenumber" name="L35" href="#L35">35</a> <em class="jxr_javadoccomment"> *</em> +<a class="jxr_linenumber" name="L36" href="#L36">36</a> <em class="jxr_javadoccomment"> * @see FileUploadTest</em> +<a class="jxr_linenumber" name="L37" href="#L37">37</a> <em class="jxr_javadoccomment"> * @since 1.4</em> +<a class="jxr_linenumber" name="L38" href="#L38">38</a> <em class="jxr_javadoccomment"> */</em> +<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/fileupload/servlet/ServletFileUploadTest.html">ServletFileUploadTest</a> { +<a class="jxr_linenumber" name="L40" href="#L40">40</a> +<a class="jxr_linenumber" name="L41" href="#L41">41</a> <em class="jxr_javadoccomment">/**</em> +<a class="jxr_linenumber" name="L42" href="#L42">42</a> <em class="jxr_javadoccomment"> * Test case for <a href="<a href="http://issues.apache.org/jira/browse/FILEUPLOAD-210"; target="alexandria_uri">http://issues.apache.org/jira/browse/FILEUPLOAD-210</a>"></em> +<a class="jxr_linenumber" name="L43" href="#L43">43</a> <em class="jxr_javadoccomment"> */</em> +<a class="jxr_linenumber" name="L44" href="#L44">44</a> @Test +<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> parseParameterMap() +<a class="jxr_linenumber" name="L46" href="#L46">46</a> <strong class="jxr_keyword">throws</strong> Exception { +<a class="jxr_linenumber" name="L47" href="#L47">47</a> String text = <span class="jxr_string">"-----1234\r\n"</span> + +<a class="jxr_linenumber" name="L48" href="#L48">48</a> <span class="jxr_string">"Content-Disposition: form-data; name=\"file\"; filename=\"foo.tab\"\r\n"</span> + +<a class="jxr_linenumber" name="L49" href="#L49">49</a> <span class="jxr_string">"Content-Type: text/whatever\r\n"</span> + +<a class="jxr_linenumber" name="L50" href="#L50">50</a> <span class="jxr_string">"\r\n"</span> + +<a class="jxr_linenumber" name="L51" href="#L51">51</a> <span class="jxr_string">"This is the content of the file\n"</span> + +<a class="jxr_linenumber" name="L52" href="#L52">52</a> <span class="jxr_string">"\r\n"</span> + +<a class="jxr_linenumber" name="L53" href="#L53">53</a> <span class="jxr_string">"-----1234\r\n"</span> + +<a class="jxr_linenumber" name="L54" href="#L54">54</a> <span class="jxr_string">"Content-Disposition: form-data; name=\"field\"\r\n"</span> + +<a class="jxr_linenumber" name="L55" href="#L55">55</a> <span class="jxr_string">"\r\n"</span> + +<a class="jxr_linenumber" name="L56" href="#L56">56</a> <span class="jxr_string">"fieldValue\r\n"</span> + +<a class="jxr_linenumber" name="L57" href="#L57">57</a> <span class="jxr_string">"-----1234\r\n"</span> + +<a class="jxr_linenumber" name="L58" href="#L58">58</a> <span class="jxr_string">"Content-Disposition: form-data; name=\"multi\"\r\n"</span> + +<a class="jxr_linenumber" name="L59" href="#L59">59</a> <span class="jxr_string">"\r\n"</span> + +<a class="jxr_linenumber" name="L60" href="#L60">60</a> <span class="jxr_string">"value1\r\n"</span> + <a class="jxr_linenumber" name="L61" href="#L61">61</a> <span class="jxr_string">"-----1234\r\n"</span> + -<a class="jxr_linenumber" name="L62" href="#L62">62</a> <span class="jxr_string">"Content-Disposition: form-data; name=\"field\"\r\n"</span> + +<a class="jxr_linenumber" name="L62" href="#L62">62</a> <span class="jxr_string">"Content-Disposition: form-data; name=\"multi\"\r\n"</span> + <a class="jxr_linenumber" name="L63" href="#L63">63</a> <span class="jxr_string">"\r\n"</span> + -<a class="jxr_linenumber" name="L64" href="#L64">64</a> <span class="jxr_string">"fieldValue\r\n"</span> + -<a class="jxr_linenumber" name="L65" href="#L65">65</a> <span class="jxr_string">"-----1234\r\n"</span> + -<a class="jxr_linenumber" name="L66" href="#L66">66</a> <span class="jxr_string">"Content-Disposition: form-data; name=\"multi\"\r\n"</span> + -<a class="jxr_linenumber" name="L67" href="#L67">67</a> <span class="jxr_string">"\r\n"</span> + -<a class="jxr_linenumber" name="L68" href="#L68">68</a> <span class="jxr_string">"value1\r\n"</span> + -<a class="jxr_linenumber" name="L69" href="#L69">69</a> <span class="jxr_string">"-----1234\r\n"</span> + -<a class="jxr_linenumber" name="L70" href="#L70">70</a> <span class="jxr_string">"Content-Disposition: form-data; name=\"multi\"\r\n"</span> + -<a class="jxr_linenumber" name="L71" href="#L71">71</a> <span class="jxr_string">"\r\n"</span> + -<a class="jxr_linenumber" name="L72" href="#L72">72</a> <span class="jxr_string">"value2\r\n"</span> + -<a class="jxr_linenumber" name="L73" href="#L73">73</a> <span class="jxr_string">"-----1234--\r\n"</span>; -<a class="jxr_linenumber" name="L74" href="#L74">74</a> byte[] bytes = text.getBytes(<span class="jxr_string">"US-ASCII"</span>); -<a class="jxr_linenumber" name="L75" href="#L75">75</a> HttpServletRequest request = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/commons/fileupload/MockHttpServletRequest.html">MockHttpServletRequest</a>(bytes, Constants.CONTENT_TYPE); +<a class="jxr_linenumber" name="L64" href="#L64">64</a> <span class="jxr_string">"value2\r\n"</span> + +<a class="jxr_linenumber" name="L65" href="#L65">65</a> <span class="jxr_string">"-----1234--\r\n"</span>; +<a class="jxr_linenumber" name="L66" href="#L66">66</a> byte[] bytes = text.getBytes(<span class="jxr_string">"US-ASCII"</span>); +<a class="jxr_linenumber" name="L67" href="#L67">67</a> HttpServletRequest request = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/commons/fileupload/MockHttpServletRequest.html">MockHttpServletRequest</a>(bytes, Constants.CONTENT_TYPE); +<a class="jxr_linenumber" name="L68" href="#L68">68</a> +<a class="jxr_linenumber" name="L69" href="#L69">69</a> ServletFileUpload upload = <strong class="jxr_keyword">new</strong> ServletFileUpload(<strong class="jxr_keyword">new</strong> DiskFileItemFactory()); +<a class="jxr_linenumber" name="L70" href="#L70">70</a> Map<String, List<FileItem>> mappedParameters = upload.parseParameterMap(request); +<a class="jxr_linenumber" name="L71" href="#L71">71</a> assertTrue(mappedParameters.containsKey(<span class="jxr_string">"file"</span>)); +<a class="jxr_linenumber" name="L72" href="#L72">72</a> assertEquals(1, mappedParameters.get(<span class="jxr_string">"file"</span>).size()); +<a class="jxr_linenumber" name="L73" href="#L73">73</a> +<a class="jxr_linenumber" name="L74" href="#L74">74</a> assertTrue(mappedParameters.containsKey(<span class="jxr_string">"field"</span>)); +<a class="jxr_linenumber" name="L75" href="#L75">75</a> assertEquals(1, mappedParameters.get(<span class="jxr_string">"field"</span>).size()); <a class="jxr_linenumber" name="L76" href="#L76">76</a> -<a class="jxr_linenumber" name="L77" href="#L77">77</a> Map<String, List<FileItem>> mappedParameters = upload.parseParameterMap(request); -<a class="jxr_linenumber" name="L78" href="#L78">78</a> assertTrue(mappedParameters.containsKey(<span class="jxr_string">"file"</span>)); -<a class="jxr_linenumber" name="L79" href="#L79">79</a> assertEquals(1, mappedParameters.get(<span class="jxr_string">"file"</span>).size()); +<a class="jxr_linenumber" name="L77" href="#L77">77</a> assertTrue(mappedParameters.containsKey(<span class="jxr_string">"multi"</span>)); +<a class="jxr_linenumber" name="L78" href="#L78">78</a> assertEquals(2, mappedParameters.get(<span class="jxr_string">"multi"</span>).size()); +<a class="jxr_linenumber" name="L79" href="#L79">79</a> } <a class="jxr_linenumber" name="L80" href="#L80">80</a> -<a class="jxr_linenumber" name="L81" href="#L81">81</a> assertTrue(mappedParameters.containsKey(<span class="jxr_string">"field"</span>)); -<a class="jxr_linenumber" name="L82" href="#L82">82</a> assertEquals(1, mappedParameters.get(<span class="jxr_string">"field"</span>).size()); -<a class="jxr_linenumber" name="L83" href="#L83">83</a> -<a class="jxr_linenumber" name="L84" href="#L84">84</a> assertTrue(mappedParameters.containsKey(<span class="jxr_string">"multi"</span>)); -<a class="jxr_linenumber" name="L85" href="#L85">85</a> assertEquals(2, mappedParameters.get(<span class="jxr_string">"multi"</span>).size()); -<a class="jxr_linenumber" name="L86" href="#L86">86</a> } -<a class="jxr_linenumber" name="L87" href="#L87">87</a> -<a class="jxr_linenumber" name="L88" href="#L88">88</a> } +<a class="jxr_linenumber" name="L81" href="#L81">81</a> +<a class="jxr_linenumber" name="L82" href="#L82">82</a> @Test +<a class="jxr_linenumber" name="L83" href="#L83">83</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> parseImpliedUtf8() +<a class="jxr_linenumber" name="L84" href="#L84">84</a> <strong class="jxr_keyword">throws</strong> Exception { +<a class="jxr_linenumber" name="L85" href="#L85">85</a> <em class="jxr_comment">// utf8 encoded form-data without explicit content-type encoding</em> +<a class="jxr_linenumber" name="L86" href="#L86">86</a> String text = <span class="jxr_string">"-----1234\r\n"</span> + +<a class="jxr_linenumber" name="L87" href="#L87">87</a> <span class="jxr_string">"Content-Disposition: form-data; name=\"utf8Html\"\r\n"</span> + +<a class="jxr_linenumber" name="L88" href="#L88">88</a> <span class="jxr_string">"\r\n"</span> + +<a class="jxr_linenumber" name="L89" href="#L89">89</a> <span class="jxr_string">"Thís ís the coñteñt of the fíle\n"</span> + +<a class="jxr_linenumber" name="L90" href="#L90">90</a> <span class="jxr_string">"\r\n"</span> + +<a class="jxr_linenumber" name="L91" href="#L91">91</a> <span class="jxr_string">"-----1234--\r\n"</span>; +<a class="jxr_linenumber" name="L92" href="#L92">92</a> +<a class="jxr_linenumber" name="L93" href="#L93">93</a> byte[] bytes = text.getBytes(<span class="jxr_string">"UTF-8"</span>); +<a class="jxr_linenumber" name="L94" href="#L94">94</a> HttpServletRequest request = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/commons/fileupload/MockHttpServletRequest.html">MockHttpServletRequest</a>(bytes, Constants.CONTENT_TYPE); +<a class="jxr_linenumber" name="L95" href="#L95">95</a> +<a class="jxr_linenumber" name="L96" href="#L96">96</a> DiskFileItemFactory fileItemFactory = <strong class="jxr_keyword">new</strong> DiskFileItemFactory(); +<a class="jxr_linenumber" name="L97" href="#L97">97</a> fileItemFactory.setDefaultCharset(<span class="jxr_string">"UTF-8"</span>); +<a class="jxr_linenumber" name="L98" href="#L98">98</a> ServletFileUpload upload = <strong class="jxr_keyword">new</strong> ServletFileUpload(fileItemFactory); +<a class="jxr_linenumber" name="L99" href="#L99">99</a> List<FileItem> fileItems = upload.parseRequest(request); +<a class="jxr_linenumber" name="L100" href="#L100">100</a> FileItem fileItem = fileItems.get(0); +<a class="jxr_linenumber" name="L101" href="#L101">101</a> assertTrue(fileItem.getString(), fileItem.getString().contains(<span class="jxr_string">"coñteñt"</span>)); +<a class="jxr_linenumber" name="L102" href="#L102">102</a> } +<a class="jxr_linenumber" name="L103" href="#L103">103</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2017 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/servlet/package-frame.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/servlet/package-frame.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/servlet/package-frame.html Wed Jan 16 11:35:52 2019 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> - <title>Apache Commons FileUpload 1.4-SNAPSHOT Reference Package org.apache.commons.fileupload.servlet</title> + <title>Apache Commons FileUpload 1.4 Reference Package org.apache.commons.fileupload.servlet</title> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" /> </head> <body> Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/servlet/package-summary.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/servlet/package-summary.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/servlet/package-summary.html Wed Jan 16 11:35:52 2019 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> - <title>Apache Commons FileUpload 1.4-SNAPSHOT Reference Package org.apache.commons.fileupload.servlet</title> + <title>Apache Commons FileUpload 1.4 Reference Package org.apache.commons.fileupload.servlet</title> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" /> </head> <body> @@ -63,7 +63,7 @@ </div> <hr /> <div id="footer"> - Copyright © 2002–2017 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. + Copyright © 2002–2019 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. </div> </body> </html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/util/mime/Base64DecoderTestCase.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/util/mime/Base64DecoderTestCase.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/util/mime/Base64DecoderTestCase.html Wed Jan 16 11:35:52 2019 @@ -171,6 +171,6 @@ <a class="jxr_linenumber" name="L163" href="#L163">163</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2017 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/util/mime/MimeUtilityTestCase.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/util/mime/MimeUtilityTestCase.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/util/mime/MimeUtilityTestCase.html Wed Jan 16 11:35:52 2019 @@ -77,6 +77,6 @@ <a class="jxr_linenumber" name="L69" href="#L69">69</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2017 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/util/mime/QuotedPrintableDecoderTestCase.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/util/mime/QuotedPrintableDecoderTestCase.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/util/mime/QuotedPrintableDecoderTestCase.html Wed Jan 16 11:35:52 2019 @@ -131,6 +131,6 @@ <a class="jxr_linenumber" name="L123" href="#L123">123</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2017 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/util/mime/package-frame.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/util/mime/package-frame.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/util/mime/package-frame.html Wed Jan 16 11:35:52 2019 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> - <title>Apache Commons FileUpload 1.4-SNAPSHOT Reference Package org.apache.commons.fileupload.util.mime</title> + <title>Apache Commons FileUpload 1.4 Reference Package org.apache.commons.fileupload.util.mime</title> <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="style" /> </head> <body> Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/util/mime/package-summary.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/util/mime/package-summary.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/util/mime/package-summary.html Wed Jan 16 11:35:52 2019 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> - <title>Apache Commons FileUpload 1.4-SNAPSHOT Reference Package org.apache.commons.fileupload.util.mime</title> + <title>Apache Commons FileUpload 1.4 Reference Package org.apache.commons.fileupload.util.mime</title> <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="style" /> </head> <body> @@ -73,7 +73,7 @@ </div> <hr /> <div id="footer"> - Copyright © 2002–2017 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. + Copyright © 2002–2019 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. </div> </body> </html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/overview-frame.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref-test/overview-frame.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref-test/overview-frame.html Wed Jan 16 11:35:52 2019 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> - <title>Apache Commons FileUpload 1.4-SNAPSHOT Reference</title> + <title>Apache Commons FileUpload 1.4 Reference</title> <link rel="stylesheet" type="text/css" href="stylesheet.css" title="style" /> </head> <body> Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/overview-summary.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref-test/overview-summary.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref-test/overview-summary.html Wed Jan 16 11:35:52 2019 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> - <title>Apache Commons FileUpload 1.4-SNAPSHOT Reference</title> + <title>Apache Commons FileUpload 1.4 Reference</title> <link rel="stylesheet" type="text/css" href="stylesheet.css" title="style" /> </head> <body> @@ -24,7 +24,7 @@ </ul> </div> - <h2>Apache Commons FileUpload 1.4-SNAPSHOT Reference</h2> + <h2>Apache Commons FileUpload 1.4 Reference</h2> <table class="summary"> <thead> @@ -75,7 +75,7 @@ <hr /> <div id="footer"> - Copyright © 2002–2017 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. + Copyright © 2002–2019 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. </div> </body> </html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-fileupload/xref/index.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref/index.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref/index.html Wed Jan 16 11:35:52 2019 @@ -4,7 +4,7 @@ <!-- this is a JXR report set --> <head> <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> - <title>Apache Commons FileUpload 1.4-SNAPSHOT Reference</title> + <title>Apache Commons FileUpload 1.4 Reference</title> </head> <frameset cols="20%,80%"> <frameset rows="30%,70%"> Modified: websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/DefaultFileItem.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/DefaultFileItem.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/DefaultFileItem.html Wed Jan 16 11:35:52 2019 @@ -78,6 +78,6 @@ <a class="jxr_linenumber" name="L70" href="#L70">70</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2017 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/DefaultFileItemFactory.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/DefaultFileItemFactory.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/DefaultFileItemFactory.html Wed Jan 16 11:35:52 2019 @@ -112,6 +112,6 @@ <a class="jxr_linenumber" name="L104" href="#L104">104</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2017 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/DiskFileUpload.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/DiskFileUpload.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/DiskFileUpload.html Wed Jan 16 11:35:52 2019 @@ -210,6 +210,6 @@ <a class="jxr_linenumber" name="L202" href="#L202">202</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2017 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/FileItem.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/FileItem.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/FileItem.html Wed Jan 16 11:35:52 2019 @@ -212,6 +212,6 @@ <a class="jxr_linenumber" name="L204" href="#L204">204</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2017 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/FileItemFactory.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/FileItemFactory.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/FileItemFactory.html Wed Jan 16 11:35:52 2019 @@ -54,6 +54,6 @@ <a class="jxr_linenumber" name="L46" href="#L46">46</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2017 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/FileItemHeaders.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/FileItemHeaders.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/FileItemHeaders.html Wed Jan 16 11:35:52 2019 @@ -82,6 +82,6 @@ <a class="jxr_linenumber" name="L74" href="#L74">74</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2017 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/FileItemHeadersSupport.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/FileItemHeadersSupport.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/FileItemHeadersSupport.html Wed Jan 16 11:35:52 2019 @@ -56,6 +56,6 @@ <a class="jxr_linenumber" name="L48" href="#L48">48</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2017 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/FileItemIterator.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/FileItemIterator.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/FileItemIterator.html Wed Jan 16 11:35:52 2019 @@ -60,6 +60,6 @@ <a class="jxr_linenumber" name="L52" href="#L52">52</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2017 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/FileItemStream.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/FileItemStream.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/FileItemStream.html Wed Jan 16 11:35:52 2019 @@ -110,6 +110,6 @@ <a class="jxr_linenumber" name="L102" href="#L102">102</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2017 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/FileUpload.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/FileUpload.html (original) +++ websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/FileUpload.html Wed Jan 16 11:35:52 2019 @@ -100,6 +100,6 @@ <a class="jxr_linenumber" name="L92" href="#L92">92</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2017 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file
