author | dfuchs |
Fri, 12 Jan 2018 15:36:28 +0000 | |
branch | http-client-branch |
changeset 56009 | cf8792f51dee |
child 56089 | 42208b2f224e |
permissions | -rw-r--r-- |
56009
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
1 |
/* |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
2 |
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
4 |
* |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
8 |
* |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
13 |
* accompanied this code). |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
14 |
* |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
18 |
* |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
21 |
* questions. |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
22 |
*/ |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
23 |
|
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
24 |
import jdk.incubator.http.HttpResponse.BodySubscriber; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
25 |
import org.testng.annotations.DataProvider; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
26 |
import org.testng.annotations.Test; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
27 |
|
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
28 |
import java.io.BufferedReader; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
29 |
import java.io.ByteArrayInputStream; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
30 |
import java.io.ByteArrayOutputStream; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
31 |
import java.io.IOException; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
32 |
import java.io.InputStreamReader; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
33 |
import java.io.StringReader; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
34 |
import java.io.UncheckedIOException; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
35 |
import java.nio.ByteBuffer; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
36 |
import java.nio.charset.MalformedInputException; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
37 |
import java.nio.charset.StandardCharsets; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
38 |
import java.util.ArrayList; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
39 |
import java.util.Arrays; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
40 |
import java.util.List; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
41 |
import java.util.concurrent.CopyOnWriteArrayList; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
42 |
import java.util.concurrent.ExecutionException; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
43 |
import java.util.concurrent.Flow; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
44 |
import java.util.concurrent.SubmissionPublisher; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
45 |
import java.util.function.Supplier; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
46 |
import java.util.stream.Collectors; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
47 |
import java.util.stream.Stream; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
48 |
|
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
49 |
import static java.nio.charset.StandardCharsets.UTF_8; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
50 |
import static java.nio.charset.StandardCharsets.UTF_16; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
51 |
import static org.testng.Assert.assertEquals; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
52 |
import static org.testng.Assert.assertThrows; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
53 |
import static org.testng.Assert.assertTrue; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
54 |
|
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
55 |
/* |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
56 |
* @test |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
57 |
* @summary tests for BodySubscribers returned by fromLineSubscriber. |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
58 |
* In particular tests that surrogate characters are handled |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
59 |
* correctly. |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
60 |
* @modules jdk.incubator.httpclient java.logging |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
61 |
* @run testng/othervm LineSubscribersAndSurrogatesTest |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
62 |
*/ |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
63 |
|
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
64 |
public class LineSubscribersAndSurrogatesTest { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
65 |
|
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
66 |
|
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
67 |
static final Class<NullPointerException> NPE = NullPointerException.class; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
68 |
|
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
69 |
private static final List<String> lines(String text, String eol) { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
70 |
if (eol == null) { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
71 |
return new BufferedReader(new StringReader(text)).lines().collect(Collectors.toList()); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
72 |
} else { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
73 |
String replaced = text.replace(eol, "|"); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
74 |
int i=0; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
75 |
while(replaced.endsWith("||")) { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
76 |
replaced = replaced.substring(0,replaced.length()-1); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
77 |
i++; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
78 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
79 |
List<String> res = List.of(replaced.split("\\|")); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
80 |
if (i > 0) { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
81 |
res = new ArrayList<>(res); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
82 |
for (int j=0; j<i; j++) res.add(""); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
83 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
84 |
return res; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
85 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
86 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
87 |
|
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
88 |
@Test |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
89 |
void testIncomplete() throws Exception { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
90 |
// Uses U+10400 which is encoded as the surrogate pair U+D801 U+DC00 |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
91 |
String text = "Bient\u00f4t\r\n nous plongerons\r\n dans\r" + |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
92 |
" les\n\n fr\u00f4\ud801\udc00des\r\n t\u00e9n\u00e8bres\ud801\udc00"; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
93 |
ObjectSubscriber subscriber = new ObjectSubscriber(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
94 |
BodySubscriber<String> bodySubscriber = BodySubscriber.fromLineSubscriber( |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
95 |
subscriber, Supplier::get, UTF_8, null); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
96 |
SubmissionPublisher<List<ByteBuffer>> publisher = new SubmissionPublisher<>(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
97 |
byte[] sbytes = text.getBytes(UTF_8); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
98 |
byte[] bytes = Arrays.copyOfRange(sbytes,0, sbytes.length - 1); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
99 |
publisher.subscribe(bodySubscriber); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
100 |
System.out.println("Publishing " + bytes.length + " bytes"); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
101 |
for (int i=0; i<bytes.length; i++) { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
102 |
// ensure that surrogates are split over several buffers. |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
103 |
publisher.submit(List.of(ByteBuffer.wrap(bytes, i, 1))); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
104 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
105 |
publisher.close(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
106 |
try { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
107 |
String resp = bodySubscriber.getBody().toCompletableFuture().get(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
108 |
System.out.println("***** Got: " + resp); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
109 |
ByteArrayInputStream bais = new ByteArrayInputStream(bytes); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
110 |
BufferedReader reader = new BufferedReader(new InputStreamReader(bais, UTF_8)); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
111 |
String resp2 = reader.lines().collect(Collectors.joining("")); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
112 |
assertEquals(resp, resp2); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
113 |
assertEquals(subscriber.list, List.of("Bient\u00f4t", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
114 |
" nous plongerons", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
115 |
" dans", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
116 |
" les", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
117 |
"", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
118 |
" fr\u00f4\ud801\udc00des", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
119 |
" t\u00e9n\u00e8bres\ufffd")); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
120 |
} catch (ExecutionException x) { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
121 |
Throwable cause = x.getCause(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
122 |
if (cause instanceof MalformedInputException) { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
123 |
throw new RuntimeException("Unexpected MalformedInputException thrown", cause); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
124 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
125 |
throw x; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
126 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
127 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
128 |
|
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
129 |
|
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
130 |
@Test |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
131 |
void testStringWithFinisherLF() throws Exception { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
132 |
// Uses U+10400 which is encoded as the surrogate pair U+D801 U+DC00 |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
133 |
String text = "Bient\u00f4t\r\n nous plongerons\r\n dans\r" + |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
134 |
" les\n\n fr\u00f4\ud801\udc00des\r\n t\u00e9n\u00e8bres\r"; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
135 |
ObjectSubscriber subscriber = new ObjectSubscriber(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
136 |
BodySubscriber<String> bodySubscriber = BodySubscriber.fromLineSubscriber( |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
137 |
subscriber, Supplier::get, UTF_8, "\n"); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
138 |
SubmissionPublisher<List<ByteBuffer>> publisher = new SubmissionPublisher<>(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
139 |
byte[] bytes = text.getBytes(UTF_8); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
140 |
publisher.subscribe(bodySubscriber); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
141 |
System.out.println("Publishing " + bytes.length + " bytes"); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
142 |
for (int i=0; i<bytes.length; i++) { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
143 |
// ensure that surrogates are split over several buffers. |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
144 |
publisher.submit(List.of(ByteBuffer.wrap(bytes, i, 1))); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
145 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
146 |
publisher.close(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
147 |
String resp = bodySubscriber.getBody().toCompletableFuture().get(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
148 |
System.out.println("***** Got: " + resp); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
149 |
List<String> expected = List.of("Bient\u00f4t\r", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
150 |
" nous plongerons\r", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
151 |
" dans\r les", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
152 |
"", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
153 |
" fr\u00f4\ud801\udc00des\r", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
154 |
" t\u00e9n\u00e8bres\r"); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
155 |
assertEquals(subscriber.list, expected); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
156 |
assertEquals(resp, Stream.of(text.split("\n")).collect(Collectors.joining(""))); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
157 |
assertEquals(resp, expected.stream().collect(Collectors.joining(""))); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
158 |
assertEquals(subscriber.list, lines(text, "\n")); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
159 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
160 |
|
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
161 |
|
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
162 |
@Test |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
163 |
void testStringWithFinisherCR() throws Exception { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
164 |
String text = "Bient\u00f4t\r\n nous plongerons\r\n dans\r" + |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
165 |
" les fr\u00f4\ud801\udc00des\r\n t\u00e9n\u00e8bres\r\r"; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
166 |
ObjectSubscriber subscriber = new ObjectSubscriber(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
167 |
BodySubscriber<String> bodySubscriber = BodySubscriber.fromLineSubscriber( |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
168 |
subscriber, Supplier::get, UTF_8, "\r"); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
169 |
SubmissionPublisher<List<ByteBuffer>> publisher = new SubmissionPublisher<>(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
170 |
byte[] bytes = text.getBytes(UTF_8); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
171 |
publisher.subscribe(bodySubscriber); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
172 |
System.out.println("Publishing " + bytes.length + " bytes"); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
173 |
for (int i=0; i<bytes.length; i++) { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
174 |
// ensure that surrogates are split over several buffers. |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
175 |
publisher.submit(List.of(ByteBuffer.wrap(bytes, i, 1))); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
176 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
177 |
publisher.close(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
178 |
String resp = bodySubscriber.getBody().toCompletableFuture().get(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
179 |
System.out.println("***** Got: " + resp); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
180 |
assertEquals(resp, text.replace("\r", "")); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
181 |
assertEquals(subscriber.list, List.of("Bient\u00f4t", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
182 |
"\n nous plongerons", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
183 |
"\n dans", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
184 |
" les fr\u00f4\ud801\udc00des", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
185 |
"\n t\u00e9n\u00e8bres", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
186 |
"")); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
187 |
assertEquals(subscriber.list, lines(text, "\r")); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
188 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
189 |
|
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
190 |
@Test |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
191 |
void testStringWithFinisherCRLF() throws Exception { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
192 |
String text = "Bient\u00f4t\r\n nous plongerons\r\n dans\r" + |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
193 |
" les fr\u00f4\ud801\udc00des\r\n t\u00e9n\u00e8bres"; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
194 |
ObjectSubscriber subscriber = new ObjectSubscriber(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
195 |
BodySubscriber<String> bodySubscriber = BodySubscriber.fromLineSubscriber( |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
196 |
subscriber, Supplier::get, UTF_8, "\r\n"); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
197 |
SubmissionPublisher<List<ByteBuffer>> publisher = new SubmissionPublisher<>(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
198 |
byte[] bytes = text.getBytes(UTF_8); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
199 |
publisher.subscribe(bodySubscriber); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
200 |
System.out.println("Publishing " + bytes.length + " bytes"); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
201 |
for (int i=0; i<bytes.length; i++) { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
202 |
// ensure that surrogates are split over several buffers. |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
203 |
publisher.submit(List.of(ByteBuffer.wrap(bytes, i, 1))); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
204 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
205 |
publisher.close(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
206 |
String resp = bodySubscriber.getBody().toCompletableFuture().get(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
207 |
System.out.println("***** Got: " + resp); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
208 |
assertEquals(resp, text.replace("\r\n","")); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
209 |
assertEquals(subscriber.list, List.of("Bient\u00f4t", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
210 |
" nous plongerons", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
211 |
" dans\r les fr\u00f4\ud801\udc00des", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
212 |
" t\u00e9n\u00e8bres")); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
213 |
assertEquals(subscriber.list, lines(text, "\r\n")); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
214 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
215 |
|
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
216 |
|
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
217 |
@Test |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
218 |
void testStringWithFinisherBR() throws Exception { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
219 |
String text = "Bient\u00f4t\r\n nous plongerons\r\n dans\r" + |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
220 |
" les\r\r fr\u00f4\ud801\udc00des\r\n t\u00e9n\u00e8bres"; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
221 |
ObjectSubscriber subscriber = new ObjectSubscriber(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
222 |
BodySubscriber<String> bodySubscriber = BodySubscriber.fromLineSubscriber( |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
223 |
subscriber, Supplier::get, UTF_8, null); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
224 |
SubmissionPublisher<List<ByteBuffer>> publisher = new SubmissionPublisher<>(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
225 |
byte[] bytes = text.getBytes(UTF_8); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
226 |
publisher.subscribe(bodySubscriber); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
227 |
System.out.println("Publishing " + bytes.length + " bytes"); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
228 |
for (int i=0; i<bytes.length; i++) { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
229 |
// ensure that surrogates are split over several buffers. |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
230 |
publisher.submit(List.of(ByteBuffer.wrap(bytes, i, 1))); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
231 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
232 |
publisher.close(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
233 |
String resp = bodySubscriber.getBody().toCompletableFuture().get(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
234 |
System.out.println("***** Got: " + resp); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
235 |
List<String> expected = List.of("Bient\u00f4t", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
236 |
" nous plongerons", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
237 |
" dans", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
238 |
" les", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
239 |
"", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
240 |
" fr\u00f4\ud801\udc00des", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
241 |
" t\u00e9n\u00e8bres"); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
242 |
assertEquals(subscriber.list, expected); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
243 |
assertEquals(resp, expected.stream().collect(Collectors.joining(""))); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
244 |
assertEquals(subscriber.list, lines(text, null)); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
245 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
246 |
|
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
247 |
@Test |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
248 |
void testStringWithFinisherBR_UTF_16() throws Exception { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
249 |
String text = "Bient\u00f4t\r\n nous plongerons\r\n dans\r" + |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
250 |
" les\r\r fr\u00f4\ud801\udc00des\r\n t\u00e9n\u00e8bres\r\r"; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
251 |
ObjectSubscriber subscriber = new ObjectSubscriber(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
252 |
BodySubscriber<String> bodySubscriber = BodySubscriber.fromLineSubscriber( |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
253 |
subscriber, Supplier::get, UTF_16, null); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
254 |
SubmissionPublisher<List<ByteBuffer>> publisher = new SubmissionPublisher<>(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
255 |
byte[] bytes = text.getBytes(UTF_16); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
256 |
publisher.subscribe(bodySubscriber); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
257 |
System.out.println("Publishing " + bytes.length + " bytes"); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
258 |
for (int i=0; i<bytes.length; i++) { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
259 |
// ensure that surrogates are split over several buffers. |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
260 |
publisher.submit(List.of(ByteBuffer.wrap(bytes, i, 1))); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
261 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
262 |
publisher.close(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
263 |
String resp = bodySubscriber.getBody().toCompletableFuture().get(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
264 |
System.out.println("***** Got: " + resp); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
265 |
List<String> expected = List.of("Bient\u00f4t", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
266 |
" nous plongerons", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
267 |
" dans", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
268 |
" les", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
269 |
"", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
270 |
" fr\u00f4\ud801\udc00des", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
271 |
" t\u00e9n\u00e8bres", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
272 |
""); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
273 |
assertEquals(resp, expected.stream().collect(Collectors.joining(""))); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
274 |
assertEquals(subscriber.list, expected); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
275 |
assertEquals(subscriber.list, lines(text, null)); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
276 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
277 |
|
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
278 |
void testStringWithoutFinisherBR() throws Exception { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
279 |
String text = "Bient\u00f4t\r\n nous plongerons\r\n dans\r" + |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
280 |
" les\r\r fr\u00f4\ud801\udc00des\r\n t\u00e9n\u00e8bres"; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
281 |
ObjectSubscriber subscriber = new ObjectSubscriber(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
282 |
BodySubscriber<Void> bodySubscriber = BodySubscriber.fromLineSubscriber(subscriber); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
283 |
SubmissionPublisher<List<ByteBuffer>> publisher = new SubmissionPublisher<>(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
284 |
byte[] bytes = text.getBytes(UTF_8); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
285 |
publisher.subscribe(bodySubscriber); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
286 |
System.out.println("Publishing " + bytes.length + " bytes"); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
287 |
for (int i = 0; i < bytes.length; i++) { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
288 |
// ensure that surrogates are split over several buffers. |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
289 |
publisher.submit(List.of(ByteBuffer.wrap(bytes, i, 1))); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
290 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
291 |
publisher.close(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
292 |
Void resp = bodySubscriber.getBody().toCompletableFuture().get(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
293 |
System.out.println("***** Got: " + resp); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
294 |
List<String> expected = List.of("Bient\u00f4t", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
295 |
" nous plongerons", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
296 |
" dans", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
297 |
" les", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
298 |
"", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
299 |
" fr\u00f4\ud801\udc00des", |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
300 |
" t\u00e9n\u00e8bres"); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
301 |
assertEquals(subscriber.text, expected.stream().collect(Collectors.joining(""))); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
302 |
assertEquals(subscriber.list, expected); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
303 |
assertEquals(subscriber.list, lines(text, null)); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
304 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
305 |
|
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
306 |
|
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
307 |
/** An abstract Subscriber that converts all received data into a String. */ |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
308 |
static abstract class AbstractSubscriber implements Supplier<String> { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
309 |
protected final List<Object> list = new CopyOnWriteArrayList<>(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
310 |
protected volatile Flow.Subscription subscription; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
311 |
protected final StringBuilder baos = new StringBuilder(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
312 |
protected volatile String text; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
313 |
protected volatile RuntimeException error; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
314 |
|
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
315 |
public void onSubscribe(Flow.Subscription subscription) { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
316 |
this.subscription = subscription; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
317 |
subscription.request(Long.MAX_VALUE); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
318 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
319 |
public void onError(Throwable throwable) { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
320 |
System.out.println(this + " onError: " + throwable); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
321 |
error = new RuntimeException(throwable); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
322 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
323 |
public void onComplete() { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
324 |
System.out.println(this + " onComplete"); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
325 |
text = baos.toString(); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
326 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
327 |
@Override public String get() { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
328 |
if (error != null) throw error; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
329 |
return text; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
330 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
331 |
public final List<?> list() { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
332 |
return list; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
333 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
334 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
335 |
|
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
336 |
static class StringSubscriber extends AbstractSubscriber |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
337 |
implements Flow.Subscriber<String>, Supplier<String> |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
338 |
{ |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
339 |
@Override public void onNext(String item) { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
340 |
System.out.println(this + " onNext: \"" |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
341 |
+ item.replace("\n","\\n") |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
342 |
.replace("\r", "\\r") |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
343 |
+ "\""); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
344 |
baos.append(item); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
345 |
list.add(item); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
346 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
347 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
348 |
|
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
349 |
static class CharSequenceSubscriber extends AbstractSubscriber |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
350 |
implements Flow.Subscriber<CharSequence>, Supplier<String> |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
351 |
{ |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
352 |
@Override public void onNext(CharSequence item) { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
353 |
System.out.println(this + " onNext: \"" |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
354 |
+ item.toString().replace("\n","\\n") |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
355 |
.replace("\r", "\\r") |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
356 |
+ "\""); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
357 |
baos.append(item); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
358 |
list.add(item); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
359 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
360 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
361 |
|
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
362 |
static class ObjectSubscriber extends AbstractSubscriber |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
363 |
implements Flow.Subscriber<Object>, Supplier<String> |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
364 |
{ |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
365 |
@Override public void onNext(Object item) { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
366 |
System.out.println(this + " onNext: \"" |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
367 |
+ item.toString().replace("\n","\\n") |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
368 |
.replace("\r", "\\r") |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
369 |
+ "\""); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
370 |
baos.append(item); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
371 |
list.add(item); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
372 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
373 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
374 |
|
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
375 |
|
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
376 |
static void uncheckedWrite(ByteArrayOutputStream baos, byte[] ba) { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
377 |
try { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
378 |
baos.write(ba); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
379 |
} catch (IOException e) { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
380 |
throw new UncheckedIOException(e); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
381 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
382 |
} |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
383 |
|
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
diff
changeset
|
384 |
} |