This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 55134b3 org.apache.juneau.http improvements.
55134b3 is described below
commit 55134b3b8fbd363baf4e8f5943700e350aa54a2d
Author: JamesBognar <[email protected]>
AuthorDate: Tue Jul 14 14:42:09 2020 -0400
org.apache.juneau.http improvements.
---
.../org/apache/juneau/rest/client2/RestClient_Body_Test.java | 4 ++--
.../apache/juneau/rest/client2/RestClient_Headers_Test.java | 12 ++++++------
.../main/java/org/apache/juneau/rest/jaxrs/BaseProvider.java | 4 ++--
.../src/main/java/org/apache/juneau/rest/RestRequest.java | 12 ++++++------
.../src/main/java/org/apache/juneau/rest/RestResponse.java | 8 ++++----
5 files changed, 20 insertions(+), 20 deletions(-)
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Body_Test.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Body_Test.java
index b99458f..a671f7f 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Body_Test.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Body_Test.java
@@ -160,7 +160,7 @@ public class RestClient_Body_Test {
File f = File.createTempFile("test", "txt");
SerializedHttpEntity x1 =
serializedHttpEntity(ABean.get(),null);
- client().debug().build().post("/",x1).run()
+ client().build().post("/",x1).run()
.assertHeader("X-Content-Length").doesNotExist()
.assertHeader("X-Content-Encoding").doesNotExist()
.assertHeader("X-Content-Type").doesNotExist()
@@ -239,7 +239,7 @@ public class RestClient_Body_Test {
.assertHeader("X-Content-Encoding").is("identity");
SerializedHttpEntity x15 = serializedHttpEntity(new
StringReader("foo"), null).contentLength(3l);
- client().debug().build().post("/",x15).run()
+ client().build().post("/",x15).run()
.assertHeader("X-Content-Length").is("3");
}
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Headers_Test.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Headers_Test.java
index 0c184b5..3275f8b 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Headers_Test.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Headers_Test.java
@@ -110,14 +110,14 @@ public class RestClient_Headers_Test {
checkFooClient().headers(OMap.of("Foo","bar")).build().get("/headers").headers(OMap.of("Foo","baz")).run().assertBody().is("['bar','baz']");
checkFooClient().headers(AMap.of("Foo","bar")).build().get("/headers").headers(AMap.of("Foo","baz")).run().assertBody().is("['bar','baz']");
checkFooClient().headers(pair("Foo","bar")).build().get("/headers").headers(pair("Foo","baz")).run().assertBody().is("['bar','baz']");
-
checkFooClient().headers(SerializedNameValuePair.of("Foo","Bar").serializer(OpenApiSerializer.DEFAULT)).build().get("/headers").headers(SerializedNameValuePair.of("Foo","Baz").serializer(OpenApiSerializer.DEFAULT)).debug().run().assertBody().is("['Bar','Baz']");
-
checkFooClient().headers(SerializedHeader.of("Foo","Bar").serializer(OpenApiSerializer.DEFAULT)).build().get("/headers").headers(SerializedHeader.of("Foo","Baz").serializer(OpenApiSerializer.DEFAULT)).debug().run().assertBody().is("['Bar','Baz']");
-
checkFooClient().headers(SerializedHeader.of("Foo",()->"Bar").serializer(OpenApiSerializer.DEFAULT)).build().get("/headers").headers(SerializedHeader.of("Foo",()->"Baz").serializer(OpenApiSerializer.DEFAULT)).debug().run().assertBody().is("['Bar','Baz']");
- checkFooClient().headers((Object)new
Header[]{header("Foo","bar")}).build().get("/headers").headers((Object)new
Header[]{header("Foo","baz")}).debug().run().assertBody().is("['bar','baz']");
+
checkFooClient().headers(SerializedNameValuePair.of("Foo","Bar").serializer(OpenApiSerializer.DEFAULT)).build().get("/headers").headers(SerializedNameValuePair.of("Foo","Baz").serializer(OpenApiSerializer.DEFAULT)).run().assertBody().is("['Bar','Baz']");
+
checkFooClient().headers(SerializedHeader.of("Foo","Bar").serializer(OpenApiSerializer.DEFAULT)).build().get("/headers").headers(SerializedHeader.of("Foo","Baz").serializer(OpenApiSerializer.DEFAULT)).run().assertBody().is("['Bar','Baz']");
+
checkFooClient().headers(SerializedHeader.of("Foo",()->"Bar").serializer(OpenApiSerializer.DEFAULT)).build().get("/headers").headers(SerializedHeader.of("Foo",()->"Baz").serializer(OpenApiSerializer.DEFAULT)).run().assertBody().is("['Bar','Baz']");
+ checkFooClient().headers((Object)new
Header[]{header("Foo","bar")}).build().get("/headers").headers((Object)new
Header[]{header("Foo","baz")}).run().assertBody().is("['bar','baz']");
checkFooClient().headers(HeaderSupplier.of(header("Foo","bar"))).build().get("/headers").headers(HeaderSupplier.of(header("Foo","baz"))).run().assertBody().is("['bar','baz']");
checkFooClient().headers(AList.of(header("Foo","bar"))).build().get("/headers").headers(AList.of(header("Foo","baz"))).run().assertBody().is("['bar','baz']");
-
checkClient("f").build().get("/headers").headers(bean).debug().run().assertBody().is("['1']");
-
checkClient("f").build().get("/headers").headers((Object)null).debug().run().assertBody().is("null");
+
checkClient("f").build().get("/headers").headers(bean).run().assertBody().is("['1']");
+
checkClient("f").build().get("/headers").headers((Object)null).run().assertBody().is("null");
assertThrown(()->client().headers("Foo")).contains("Invalid
type");
assertThrown(()->client().build().get("").headers("Foo")).contains("Invalid
type");
diff --git
a/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/BaseProvider.java
b/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/BaseProvider.java
index 229fbb4..1cc30a7 100644
---
a/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/BaseProvider.java
+++
b/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/BaseProvider.java
@@ -176,9 +176,9 @@ public class BaseProvider implements
MessageBodyReader<Object>, MessageBodyWrite
if (headers.containsKey("Accept-Language") &&
headers.get("Accept-Language") != null) {
String h =
String.valueOf(headers.get("Accept-Language"));
if (h != null) {
- MediaRanges mr = MediaRanges.of(h);
+ StringRanges mr = StringRanges.of(h);
if (! mr.getRanges().isEmpty())
- return
toLocale(mr.getRange(0).getType());
+ return
toLocale(mr.getRange(0).getName());
}
}
return null;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
index 33b9039..7398fb3 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
@@ -454,9 +454,9 @@ public final class RestRequest extends
HttpServletRequestWrapper {
public Locale getLocale() {
String h = headers.getString("Accept-Language");
if (h != null) {
- MediaRanges mr = MediaRanges.of(h);
- if (! mr.getRanges().isEmpty())
- return toLocale(mr.getRange(0).getType());
+ StringRanges sr = StringRanges.of(h);
+ if (! sr.getRanges().isEmpty())
+ return toLocale(sr.getRange(0).getName());
}
return super.getLocale();
}
@@ -465,11 +465,11 @@ public final class RestRequest extends
HttpServletRequestWrapper {
public Enumeration<Locale> getLocales() {
String h = headers.getString("Accept-Language");
if (h != null) {
- MediaRanges mr = MediaRanges.of(h);
+ StringRanges mr = StringRanges.of(h);
if (! mr.getRanges().isEmpty()) {
List<Locale> l = new
ArrayList<>(mr.getRanges().size());
- for (MediaRange r : mr.getRanges())
- l.add(toLocale(r.getType()));
+ for (StringRange r : mr.getRanges())
+ l.add(toLocale(r.getName()));
return enumeration(l);
}
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
index a3b23db..ae31225 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
@@ -115,12 +115,12 @@ public final class RestResponse extends
HttpServletResponseWrapper {
String charset = null;
if (h == null)
charset = rjm.defaultCharset;
- else for (MediaRange r : MediaRanges.of(h).getRanges()) {
+ else for (StringRange r : StringRanges.of(h).getRanges()) {
if (r.getQValue() > 0) {
- if (r.getType().equals("*"))
+ if (r.getName().equals("*"))
charset = rjm.defaultCharset;
- else if (Charset.isSupported(r.getType()))
- charset = r.getType();
+ else if (Charset.isSupported(r.getName()))
+ charset = r.getName();
if (charset != null)
break;
}
