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 38b2fa1 REST refactoring.
38b2fa1 is described below
commit 38b2fa1d7984ae5709ce3954c9b662941eb3241a
Author: JamesBognar <[email protected]>
AuthorDate: Thu Mar 11 17:37:17 2021 -0500
REST refactoring.
---
.../juneau/http/header/HeaderListBuilder.java | 55 ----------------------
.../java/org/apache/juneau/rest/RestContext.java | 12 ++---
.../apache/juneau/rest/RestOperationContext.java | 10 ++--
3 files changed, 11 insertions(+), 66 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/HeaderListBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/HeaderListBuilder.java
index 7145c09..7609560 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/HeaderListBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/HeaderListBuilder.java
@@ -370,61 +370,6 @@ public class HeaderListBuilder {
return this;
}
- /**
- * Appends or replaces the header values in this list.
- *
- * <p>
- * If the header already exists in this list, it will be replaced with
the new value.
- * Otherwise it will be appended to the end of this list.
- *
- * @param values The values to append or replace in this list.
- * @return This object (for method chaining).
- */
- public HeaderListBuilder appendUnique(Header...values) {
- for (Header h : values) {
- boolean replaced = false;
- for (ListIterator<Header> li = headers.listIterator();
li.hasNext();) {
- Header h2 = li.next();
- if (h2.getName().equalsIgnoreCase(h.getName()))
{
- li.set(h);
- replaced = true;
- break;
- }
- }
- if (! replaced)
- add(h);
- }
- return this;
- }
-
-
- /**
- * Appends or replaces the header values in this list.
- *
- * <p>
- * If the header already exists in this list, it will be replaced with
the new value.
- * Otherwise it will be appended to the end of this list.
- *
- * @param values The values to append or replace in this list.
- * @return This object (for method chaining).
- */
- public HeaderListBuilder appendUnique(Collection<Header> values) {
- for (Header h : values) {
- boolean replaced = false;
- for (ListIterator<Header> li = headers.listIterator();
li.hasNext();) {
- Header h2 = li.next();
- if (h2.getName().equalsIgnoreCase(h.getName()))
{
- li.set(h);
- replaced = true;
- break;
- }
- }
- if (! replaced)
- add(h);
- }
- return this;
- }
-
private boolean isResolving() {
return varResolver != null;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index 3f37ccc..8c57a94 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -2314,17 +2314,17 @@ public class RestContext extends BeanContext {
*
* <ja>@Override</ja>
* <jk>public int</jk> process(RestCall <jv>call</jv>)
<jk>throws</jk> IOException {
- *
+ *
* RestResponse <jv>res</jv> =
<jv>call</jv>.getRestResponse();
* Foo <jv>foo</jv> =
<jv>res</jv>.getOutput(Foo.<jk>class</jk>);
- *
+ *
* <jk>if</jk> (<jv>foo</jv> ==
<jk>null</jk>)
* <jk>return</jk>
<jsf>NEXT</jsf>; <jc>// Let the next processor handle it.</jc>
- *
+ *
* <jk>try</jk> (Writer <jv>w</jv> =
<jv>res</jv>.getNegotiatedWriter()) {
* <jc>//Pipe it to the writer
ourselves.</jc>
* }
- *
+ *
* <jk>return</jk> <jsf>FINISHED</jsf>;
<jc>// We handled it.</jc>
* }
* }
@@ -5168,7 +5168,7 @@ public class RestContext extends BeanContext {
HeaderListBuilder x = HeaderList.create();
-
x.appendUnique(properties.getInstanceArray(REST_defaultRequestHeaders,
org.apache.http.Header.class, beanStore).orElse(new org.apache.http.Header[0]));
+
x.update(properties.getInstanceArray(REST_defaultRequestHeaders,
org.apache.http.Header.class, beanStore).orElse(new org.apache.http.Header[0]));
x = BeanStore
.of(beanStore, resource)
@@ -5199,7 +5199,7 @@ public class RestContext extends BeanContext {
HeaderListBuilder x = HeaderList.create();
-
x.appendUnique(properties.getInstanceArray(REST_defaultResponseHeaders,
org.apache.http.Header.class, beanStore).orElse(new org.apache.http.Header[0]));
+
x.update(properties.getInstanceArray(REST_defaultResponseHeaders,
org.apache.http.Header.class, beanStore).orElse(new org.apache.http.Header[0]));
x = BeanStore
.of(beanStore, resource)
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContext.java
index cdb1f10..1eb6137 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContext.java
@@ -1353,9 +1353,9 @@ public class RestOperationContext extends BeanContext
implements Comparable<Rest
HeaderListBuilder x = HeaderList.create();
- x.appendUnique(context.getDefaultRequestHeaders().getAll());
+ x.update(context.getDefaultRequestHeaders().getAll());
-
x.appendUnique(properties.getInstanceArray(RESTOP_defaultRequestHeaders,
org.apache.http.Header.class, beanStore).orElse(new org.apache.http.Header[0]));
+
x.update(properties.getInstanceArray(RESTOP_defaultRequestHeaders,
org.apache.http.Header.class, beanStore).orElse(new org.apache.http.Header[0]));
for (Annotation[] aa : method.getParameterAnnotations()) {
for (Annotation a : aa) {
@@ -1364,7 +1364,7 @@ public class RestOperationContext extends BeanContext
implements Comparable<Rest
String def =
joinnlFirstNonEmptyArray(h._default(), h.df());
if (def != null) {
try {
-
x.appendUnique(basicHeader(firstNonEmpty(h.name(), h.n(), h.value()),
parseAnything(def)));
+
x.update(basicHeader(firstNonEmpty(h.name(), h.n(), h.value()),
parseAnything(def)));
} catch (ParseException e) {
throw new
ConfigException(e, "Malformed @Header annotation");
}
@@ -1399,9 +1399,9 @@ public class RestOperationContext extends BeanContext
implements Comparable<Rest
HeaderListBuilder x = HeaderList.create();
- x.appendUnique(context.getDefaultResponseHeaders().getAll());
+ x.update(context.getDefaultResponseHeaders().getAll());
-
x.appendUnique(properties.getInstanceArray(RESTOP_defaultResponseHeaders,
org.apache.http.Header.class, beanStore).orElse(new org.apache.http.Header[0]));
+
x.update(properties.getInstanceArray(RESTOP_defaultResponseHeaders,
org.apache.http.Header.class, beanStore).orElse(new org.apache.http.Header[0]));
x = BeanStore
.of(beanStore, resource)
