subject:"\[juneau\] branch master updated\: Code cleanup."

[juneau] branch master updated: Code cleanup.

2021-08-07 Thread jamesbognar

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 0b4fb8f  Code cleanup.
0b4fb8f is described below

commit 0b4fb8f415d9f10059d8c7266a763661cd97a3fe
Author: JamesBognar 
AuthorDate: Sat Aug 7 13:47:21 2021 -0400

Code cleanup.
---
 .../main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java | 4 ++--
 .../org/apache/juneau/jena/annotation/RdfConfigAnnotation.java | 4 ++--
 .../src/main/java/org/apache/juneau/ConfigApply.java   | 5 ++---
 .../src/main/java/org/apache/juneau/annotation/BeanAnnotation.java | 5 ++---
 .../java/org/apache/juneau/annotation/BeanConfigAnnotation.java| 5 ++---
 .../java/org/apache/juneau/annotation/BeanIgnoreAnnotation.java| 5 ++---
 .../main/java/org/apache/juneau/annotation/BeancAnnotation.java| 5 ++---
 .../main/java/org/apache/juneau/annotation/BeanpAnnotation.java| 5 ++---
 .../main/java/org/apache/juneau/annotation/ExampleAnnotation.java  | 5 ++---
 .../java/org/apache/juneau/annotation/MarshalledAnnotation.java| 5 ++---
 .../java/org/apache/juneau/annotation/NamePropertyAnnotation.java  | 5 ++---
 .../org/apache/juneau/annotation/ParentPropertyAnnotation.java | 5 ++---
 .../src/main/java/org/apache/juneau/annotation/SwapAnnotation.java | 5 ++---
 .../src/main/java/org/apache/juneau/annotation/UriAnnotation.java  | 5 ++---
 .../main/java/org/apache/juneau/csv/annotation/CsvAnnotation.java  | 5 ++---
 .../java/org/apache/juneau/csv/annotation/CsvConfigAnnotation.java | 5 ++---
 .../java/org/apache/juneau/html/annotation/HtmlAnnotation.java | 5 ++---
 .../org/apache/juneau/html/annotation/HtmlConfigAnnotation.java| 5 ++---
 .../org/apache/juneau/html/annotation/HtmlDocConfigAnnotation.java | 5 ++---
 .../java/org/apache/juneau/html/annotation/HtmlLinkAnnotation.java | 5 ++---
 .../java/org/apache/juneau/http/annotation/BodyAnnotation.java | 5 ++---
 .../java/org/apache/juneau/http/annotation/FormDataAnnotation.java | 5 ++---
 .../java/org/apache/juneau/http/annotation/HeaderAnnotation.java   | 5 ++---
 .../java/org/apache/juneau/http/annotation/PathAnnotation.java | 5 ++---
 .../java/org/apache/juneau/http/annotation/QueryAnnotation.java| 5 ++---
 .../java/org/apache/juneau/http/annotation/RequestAnnotation.java  | 5 ++---
 .../java/org/apache/juneau/http/annotation/ResponseAnnotation.java | 5 ++---
 .../org/apache/juneau/http/annotation/ResponseBodyAnnotation.java  | 5 ++---
 .../apache/juneau/http/annotation/ResponseHeaderAnnotation.java| 5 ++---
 .../apache/juneau/http/annotation/ResponseStatusAnnotation.java| 5 ++---
 .../main/java/org/apache/juneau/jso/annotation/JsoAnnotation.java  | 5 ++---
 .../java/org/apache/juneau/jso/annotation/JsoConfigAnnotation.java | 5 ++---
 .../java/org/apache/juneau/json/annotation/JsonAnnotation.java | 5 ++---
 .../org/apache/juneau/json/annotation/JsonConfigAnnotation.java| 5 ++---
 .../juneau/jsonschema/annotation/JsonSchemaConfigAnnotation.java   | 5 ++---
 .../org/apache/juneau/jsonschema/annotation/SchemaAnnotation.java  | 5 ++---
 .../org/apache/juneau/msgpack/annotation/MsgPackAnnotation.java| 5 ++---
 .../apache/juneau/msgpack/annotation/MsgPackConfigAnnotation.java  | 5 ++---
 .../java/org/apache/juneau/oapi/annotation/OpenApiAnnotation.java  | 5 ++---
 .../org/apache/juneau/oapi/annotation/OpenApiConfigAnnotation.java | 5 ++---
 .../apache/juneau/parser/annotation/ParserConfigAnnotation.java| 5 ++---
 .../apache/juneau/plaintext/annotation/PlainTextAnnotation.java| 5 ++---
 .../juneau/plaintext/annotation/PlainTextConfigAnnotation.java | 5 ++---
 .../src/main/java/org/apache/juneau/reflect/AnnotationInfo.java| 7 +++
 .../juneau/serializer/annotation/SerializerConfigAnnotation.java   | 5 ++---
 .../java/org/apache/juneau/soap/annotation/SoapXmlAnnotation.java  | 5 ++---
 .../org/apache/juneau/soap/annotation/SoapXmlConfigAnnotation.java | 5 ++---
 .../main/java/org/apache/juneau/uon/annotation/UonAnnotation.java  | 5 ++---
 .../java/org/apache/juneau/uon/annotation/UonConfigAnnotation.java | 5 ++---
 .../juneau/urlencoding/annotation/UrlEncodingAnnotation.java   | 5 ++---
 .../juneau/urlencoding/annotation/UrlEncodingConfigAnnotation.java | 5 ++---
 .../main/java/org/apache/juneau/xml/annotation/XmlAnnotation.java  | 5 ++---
 .../java/org/apache/juneau/xml/annotation/XmlConfigAnnotation.java | 5 ++---
 .../java/org/apache/juneau/rest/annotation/RestAnnotation.java | 5 ++---
 .../org/apache/juneau/rest/annotation/RestDeleteAnnotation.java| 5 ++---
 .../java/org/apache/juneau/rest/annotation/RestGetAnnotation.java  | 5 ++---
 .../java/org/apache/juneau/rest/annotation/RestOpAnnotation.java   | 5 ++---
 .../java/org/apache/juneau/rest/annotation/RestPostAnnotation.java | 5 ++---

[juneau] branch master updated: Code cleanup.

2021-06-06 Thread jamesbognar

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 0ae7dba  Code cleanup.
0ae7dba is described below

commit 0ae7dba819945894ba0d225bd138cfb5190784cf
Author: JamesBognar 
AuthorDate: Sun Jun 6 17:59:13 2021 -0400

Code cleanup.
---
 .../src/main/java/org/apache/juneau/rest/client/RestRequest.java  | 2 +-
 .../src/main/java/org/apache/juneau/rest/mock/MockRestRequest.java| 4 ++--
 .../apache/juneau/rest/client/RestClient_Config_RestClient_Test.java  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
 
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
index afae51a..3b7c32a 100644
--- 
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
+++ 
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
@@ -818,7 +818,7 @@ public class RestRequest extends BeanSession implements 
HttpUriRequest, Configur
 * @param scheme The new URI host.
 * @return This object (for method chaining).
 */
-   public RestRequest scheme(String scheme) {
+   public RestRequest uriScheme(String scheme) {
uriBuilder.setScheme(scheme);
return this;
}
diff --git 
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestRequest.java
 
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestRequest.java
index 3c2acc8..99c26de 100644
--- 
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestRequest.java
+++ 
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestRequest.java
@@ -221,8 +221,8 @@ public class MockRestRequest extends 
org.apache.juneau.rest.client.RestRequest {
 * @return This object (for method chaining).
 */
@Override
-   public MockRestRequest scheme(String value) {
-   super.scheme(value);
+   public MockRestRequest uriScheme(String value) {
+   super.uriScheme(value);
this.scheme = value;
return this;
}
diff --git 
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
 
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
index cb6316b..bd431f7 100644
--- 
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
+++ 
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
@@ -515,10 +515,10 @@ public class RestClient_Config_RestClient_Test {
 
@Test
public void a16_request_uriParts() throws Exception {
-   java.net.URI uri = 
client().build().get().scheme("http").host("localhost").port(8080).userInfo("foo:bar").uri("/bean").fragment("baz").query("foo","bar").run().assertBody().is("{f:1}").getRequest().getURI();
+   java.net.URI uri = 
client().build().get().uriScheme("http").host("localhost").port(8080).userInfo("foo:bar").uri("/bean").fragment("baz").query("foo","bar").run().assertBody().is("{f:1}").getRequest().getURI();

assertEquals("http://foo:bar@localhost:8080/bean?foo=bar#baz",uri.toString());
 
-   uri = 
client().build().get().scheme("http").host("localhost").port(8080).userInfo("foo","bar").uri("/bean").fragment("baz").query("foo","bar").run().assertBody().is("{f:1}").getRequest().getURI();
+   uri = 
client().build().get().uriScheme("http").host("localhost").port(8080).userInfo("foo","bar").uri("/bean").fragment("baz").query("foo","bar").run().assertBody().is("{f:1}").getRequest().getURI();

assertEquals("http://foo:bar@localhost:8080/bean?foo=bar#baz",uri.toString());
 
uri = 
client().build().get().uri("http://localhost;).uri("http://foo:bar@localhost:8080/bean?foo=bar#baz;).run().assertBody().is("{f:1}").getRequest().getURI();

[juneau] branch master updated: Code cleanup.

2021-06-06 Thread jamesbognar

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 fa7a3b8  Code cleanup.
fa7a3b8 is described below

commit fa7a3b8b9f8a724e89506ad5d9c4a86e63684223
Author: JamesBognar 
AuthorDate: Sun Jun 6 17:40:18 2021 -0400

Code cleanup.
---
 .../org/apache/juneau/http/header/ContentType.java |  1 +
 .../org/apache/juneau/rest/client/RestClient.java  | 56 --
 .../apache/juneau/rest/mock/MockRestClient.java|  7 +-
 .../juneau/rest/Header_ContentType_Test.java   | 39 +-
 .../rest/Rest_PredefinedStatusCodes_Test.java  | 21 +++---
 .../rest/annotation/BeanConfig_Swaps_Test.java |  9 ++-
 .../apache/juneau/rest/annotation/Body_Test.java   | 87 +++---
 .../rest/client/RestClient_BasicCalls_Test.java| 23 +++---
 8 files changed, 112 insertions(+), 131 deletions(-)

diff --git 
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentType.java
 
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentType.java
index 95ab25e..1fb7611 100644
--- 
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentType.java
+++ 
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentType.java
@@ -77,6 +77,7 @@ public class ContentType extends BasicMediaTypeHeader {
IMAGE_WEBP = of("image/webp"),
MULTIPART_FORM_DATA = of("multipart/form-data"),
TEXT_HTML = of("text/html"),
+   TEXT_OPENAPI = of("text/openapi"),
TEXT_PLAIN = of("text/plain"),
TEXT_XML = of("text/xml"),
WILDCARD = of("*/*");
diff --git 
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
 
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index 502f013..e5551fe 100644
--- 
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++ 
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -332,7 +332,6 @@ import org.apache.juneau.http.HttpHeaders;
  * {@link RestClientBuilder}
  * 
  * {@link RestClientBuilder#header(String,Object) 
header(String,Object)}
- * {@link 
RestClientBuilder#header(String,Object,HttpPartSchema) 
header(String,Object,HttpPartSchema)}
  * {@link RestClientBuilder#header(String,Supplier) 
header(String,Supplier?)}
  * {@link 
RestClientBuilder#header(String,Supplier,HttpPartSchema) 
header(String,Supplier?,HttpPartSchema)}
  * {@link RestClientBuilder#header(Header) 
header(Header)}
@@ -342,32 +341,14 @@ import org.apache.juneau.http.HttpHeaders;
  * {@link RestRequest}
  * 
  * {@link RestRequest#header(String,Object) 
header(String,Object)}
- * {@link 
RestRequest#header(String,Object,HttpPartSchema) 
header(String,Object,HttpPartSchema)}
- * {@link 
RestRequest#header(ListOperation,String,Object) 
header(ListOperation,String,Object)}
- * {@link 
RestRequest#header(ListOperation,String,Object,HttpPartSchema) 
header(ListOperation,String,Object,HttpPartSchema)}
+ * {@link 
RestRequest#header(ListOperation,String,Object) header(AddFlag,String,Object)}
  * {@link RestRequest#header(Header) header(Header)}
  * {@link RestRequest#headers(Object...) 
headers(Object...)}
- * {@link 
RestRequest#headers(ListOperation,Object...) headers(ListOperation;Object...)}
+ * {@link 
RestRequest#headers(ListOperation,Object...) headers(AddFlag;Object...)}
  * {@link RestRequest#headerPairs(Object...) 
headers(Object...)}
  * 
  * 
  *
- * 
- * Additionally, methods are provided on the client builder and per request 
for all standard HTTP headers
- * such as {@link RestClientBuilder#authorization(Object) 
authorization(Object)}.
- *
- * Example:
- * 
- * // Create a client that adds an Authorization header to every 
request.
- * RestClient client = 
RestClient.create().authorization("Foo").build();
- *
- * // Or do it per-request.
- * String response = 
client.get(URI).authorization("Foo").run().getBody().asString();
- *
- * // Or use an HttpHeader.
- * response = 
client.get(URI).headers(Authorization.of("Foo")).run().getBody().asString();
- * 
- *
  * 
  * The supplier methods are particularly useful for header values whose values 
may change over time (such as Authorization headers
  * which may need to change every few minutes).
@@ -408,18 +389,15 @@ import org.apache.juneau.http.HttpHeaders;
  * {@link RestClientBuilder}
  * 
  * {@link RestClientBuilder#query(String,Object) 
query(String,Object)}
- *

[juneau] branch master updated: Code cleanup.

2021-06-06 Thread jamesbognar

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 3828830  Code cleanup.
3828830 is described below

commit 3828830f06b76cbc608bd541e8b69389132b4278
Author: JamesBognar 
AuthorDate: Sun Jun 6 16:41:55 2021 -0400

Code cleanup.
---
 .../src/main/java/org/apache/juneau/rest/RestContext.java | 4 ++--
 .../src/main/java/org/apache/juneau/rest/RestOperationContext.java| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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 5059360..30bb3a1 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
@@ -1181,7 +1181,7 @@ public class RestContext extends BeanContext {
 *  
 *  Methods:
 *  
-*  {@link 
org.apache.juneau.rest.RestContextBuilder#defaultRequestHeader(String,Object)}
+*  {@link 
org.apache.juneau.rest.RestContextBuilder#defaultRequestHeader(String,String)}
 *  {@link 
org.apache.juneau.rest.RestContextBuilder#defaultRequestHeader(String,Supplier)}
 *  {@link 
org.apache.juneau.rest.RestContextBuilder#defaultRequestHeaders(org.apache.http.Header...)}
 *  
@@ -1252,7 +1252,7 @@ public class RestContext extends BeanContext {
 *  
 *  Methods:
 *  
-*  {@link 
org.apache.juneau.rest.RestContextBuilder#defaultResponseHeader(String,Object)}
+*  {@link 
org.apache.juneau.rest.RestContextBuilder#defaultResponseHeader(String,String)}
 *  {@link 
org.apache.juneau.rest.RestContextBuilder#defaultResponseHeader(String,Supplier)}
 *  {@link 
org.apache.juneau.rest.RestContextBuilder#defaultResponseHeaders(org.apache.http.Header...)}
 *  
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 91ba4d8..07a372f 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
@@ -415,7 +415,7 @@ public class RestOperationContext extends BeanContext 
implements Comparable
 *  Methods:
 *  
-*  {@link 
org.apache.juneau.rest.RestOperationContextBuilder#defaultRequestHeader(String,Object)}
+*  {@link 
org.apache.juneau.rest.RestOperationContextBuilder#defaultRequestHeader(String,String)}
 *  {@link 
org.apache.juneau.rest.RestOperationContextBuilder#defaultRequestHeader(String,Supplier)}
 *  {@link 
org.apache.juneau.rest.RestOperationContextBuilder#defaultRequestHeaders(org.apache.http.Header...)}
 *  
@@ -460,7 +460,7 @@ public class RestOperationContext extends BeanContext 
implements Comparable
 *  Methods:
 *  
-*  {@link 
org.apache.juneau.rest.RestOperationContextBuilder#defaultResponseHeader(String,Object)}
+*  {@link 
org.apache.juneau.rest.RestOperationContextBuilder#defaultResponseHeader(String,String)}
 *  {@link 
org.apache.juneau.rest.RestOperationContextBuilder#defaultResponseHeader(String,Supplier)}
 *  {@link 
org.apache.juneau.rest.RestOperationContextBuilder#defaultResponseHeaders(org.apache.http.Header...)}
 *

[juneau] branch master updated: Code cleanup.

2021-06-06 Thread jamesbognar

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 60d138d  Code cleanup.
60d138d is described below

commit 60d138d854671defc27b928833cc98d39f8dc322
Author: JamesBognar 
AuthorDate: Sun Jun 6 16:40:12 2021 -0400

Code cleanup.
---
 .../java/org/apache/juneau/rest/RestContextBuilder.java  | 16 
 .../apache/juneau/rest/RestOperationContextBuilder.java  | 16 
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git 
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
 
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
index 566f19e..feafa5e 100644
--- 
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
+++ 
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
@@ -1022,8 +1022,8 @@ public class RestContextBuilder extends 
BeanContextBuilder implements ServletCon
 * @return This object (for method chaining).
 */
@FluentSetter
-   public RestContextBuilder defaultRequestHeader(String name, Object 
value) {
-   return defaultRequestHeaders(basicHeader(name, value));
+   public RestContextBuilder defaultRequestHeader(String name, String 
value) {
+   return defaultRequestHeaders(stringHeader(name, value));
}
 
/**
@@ -1041,8 +1041,8 @@ public class RestContextBuilder extends 
BeanContextBuilder implements ServletCon
 * @return This object (for method chaining).
 */
@FluentSetter
-   public RestContextBuilder defaultRequestHeader(String name, Supplier 
value) {
-   return defaultRequestHeaders(basicHeader(name, value));
+   public RestContextBuilder defaultRequestHeader(String name, 
Supplier value) {
+   return defaultRequestHeaders(stringHeader(name, value));
}
 
/**
@@ -1079,8 +1079,8 @@ public class RestContextBuilder extends 
BeanContextBuilder implements ServletCon
 * @return This object (for method chaining).
 */
@FluentSetter
-   public RestContextBuilder defaultResponseHeader(String name, Object 
value) {
-   return defaultResponseHeaders(basicHeader(name, value));
+   public RestContextBuilder defaultResponseHeader(String name, String 
value) {
+   return defaultResponseHeaders(stringHeader(name, value));
}
 
/**
@@ -1098,8 +1098,8 @@ public class RestContextBuilder extends 
BeanContextBuilder implements ServletCon
 * @return This object (for method chaining).
 */
@FluentSetter
-   public RestContextBuilder defaultResponseHeader(String name, 
Supplier value) {
-   return defaultResponseHeaders(basicHeader(name, value));
+   public RestContextBuilder defaultResponseHeader(String name, 
Supplier value) {
+   return defaultResponseHeaders(stringHeader(name, value));
}
 
/**
diff --git 
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContextBuilder.java
 
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContextBuilder.java
index 357e59b..af5741c 100644
--- 
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContextBuilder.java
+++ 
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContextBuilder.java
@@ -377,8 +377,8 @@ public class RestOperationContextBuilder extends 
BeanContextBuilder {
 * @return This object (for method chaining).
 */
@FluentSetter
-   public RestOperationContextBuilder defaultRequestHeader(String name, 
Object value) {
-   return defaultRequestHeaders(basicHeader(name, value));
+   public RestOperationContextBuilder defaultRequestHeader(String name, 
String value) {
+   return defaultRequestHeaders(stringHeader(name, value));
}
 
/**
@@ -396,8 +396,8 @@ public class RestOperationContextBuilder extends 
BeanContextBuilder {
 * @return This object (for method chaining).
 */
@FluentSetter
-   public RestOperationContextBuilder defaultRequestHeader(String name, 
Supplier value) {
-   return defaultRequestHeaders(basicHeader(name, value));
+   public RestOperationContextBuilder defaultRequestHeader(String name, 
Supplier value) {
+   return defaultRequestHeaders(stringHeader(name, value));
}
 
/**
@@ -434,8 +434,8 @@ public class RestOperationContextBuilder extends 
BeanContextBuilder {
 * @return This object (for method chaining).
 */
@FluentSetter
-   public RestOperationContextBuilder

[juneau] branch master updated: Code cleanup.

2021-06-06 Thread jamesbognar

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 e59c7e8  Code cleanup.
e59c7e8 is described below

commit e59c7e8e190c95e237c5f0cbc17bd70943886e21
Author: JamesBognar 
AuthorDate: Sun Jun 6 16:01:21 2021 -0400

Code cleanup.
---
 .../httppart/bean/RequestBeanPropertyMeta.java |  11 ++-
 .../juneau/httppart/bean/ResponseBeanMeta.java |  13 +--
 .../httppart/bean/ResponseBeanPropertyMeta.java|  21 +++--
 .../org/apache/juneau/rest/client/RestClient.java  |  92 ---
 .../org/apache/juneau/rest/client/RestRequest.java | 101 ++---
 .../apache/juneau/rest/client/RestResponse.java|  43 +++--
 .../rest/client/remote/RemoteOperationArg.java |  12 ++-
 .../java/org/apache/juneau/rest/RestRequest.java   |  38 +---
 .../rest/processors/ResponseBeanProcessor.java |  21 +
 9 files changed, 242 insertions(+), 110 deletions(-)

diff --git 
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanPropertyMeta.java
 
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanPropertyMeta.java
index 204e826..f5e98ed 100644
--- 
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanPropertyMeta.java
+++ 
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanPropertyMeta.java
@@ -13,9 +13,11 @@
 package org.apache.juneau.httppart.bean;
 
 import static org.apache.juneau.internal.ClassUtils.*;
+import static java.util.Optional.*;
 
 import java.lang.annotation.*;
 import java.lang.reflect.*;
+import java.util.*;
 
 import org.apache.juneau.*;
 import org.apache.juneau.http.annotation.*;
@@ -40,7 +42,7 @@ public class RequestBeanPropertyMeta {
 
private final Method getter;
private final HttpPartType partType;
-   private final HttpPartSerializer serializer;
+   private final Optional serializer;
private final HttpPartParser parser;
private final HttpPartSchema schema;
 
@@ -48,7 +50,7 @@ public class RequestBeanPropertyMeta {
this.partType = b.partType;
this.schema = b.schema;
this.getter = b.getter;
-   this.serializer = schema.getSerializer() == null ? serializer : 
castOrCreate(HttpPartSerializer.class, schema.getSerializer(), true, b.cp);
+   this.serializer = ofNullable(schema.getSerializer() == null ? 
serializer : castOrCreate(HttpPartSerializer.class, schema.getSerializer(), 
true, b.cp));
this.parser = schema.getParser() == null ? parser : 
castOrCreate(HttpPartParser.class, schema.getParser(), true, b.cp);
}
 
@@ -112,11 +114,10 @@ public class RequestBeanPropertyMeta {
/**
 * Returns the serializer to use for serializing the bean property 
value.
 *
-* @param _default The default serializer to use if not defined on the 
annotation.
 * @return The serializer to use for serializing the bean property 
value.
 */
-   public HttpPartSerializerSession 
getSerializer(HttpPartSerializerSession _default) {
-   return serializer == null ? _default : 
serializer.createPartSession(null);
+   public Optional getSerializer() {
+   return serializer;
}
 
/**
diff --git 
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
 
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
index d4d865d..b4ada18 100644
--- 
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
+++ 
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
@@ -16,6 +16,7 @@ import static org.apache.juneau.internal.ClassUtils.*;
 import static org.apache.juneau.httppart.bean.Utils.*;
 import static org.apache.juneau.httppart.HttpPartType.*;
 import static org.apache.juneau.annotation.InvalidAnnotationException.*;
+import static java.util.Optional.*;
 
 import java.io.*;
 import java.lang.reflect.*;
@@ -104,15 +105,15 @@ public class ResponseBeanMeta {
private final int code;
private final Map headerMethods;
private final ResponseBeanPropertyMeta statusMethod, bodyMethod;
-   private final HttpPartSerializer partSerializer;
-   private final HttpPartParser partParser;
+   private final Optional partSerializer;
+   private final Optional partParser;
private final HttpPartSchema schema;
 
ResponseBeanMeta(Builder b) {
this.cm = b.cm;
this.code = b.code;
-   this.partSerializer = castOrCreate(HttpPartSerializer.class, 
b.partSerializer, true, b.cp);
-

[juneau] branch master updated: Code cleanup.

2021-06-06 Thread jamesbognar

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 a7d0740  Code cleanup.
a7d0740 is described below

commit a7d07401d3d64266789faaf04088188ec24a330a
Author: JamesBognar 
AuthorDate: Sun Jun 6 14:08:11 2021 -0400

Code cleanup.
---
 .../main/java/org/apache/juneau/BeanSession.java   | 21 ++
 .../main/java/org/apache/juneau/ListOperation.java |  9 ++---
 .../org/apache/juneau/httppart/HttpPartSchema.java | 46 --
 3 files changed, 25 insertions(+), 51 deletions(-)

diff --git 
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java 
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
index 32a7116..98ff9b6 100644
--- 
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
+++ 
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
@@ -782,6 +782,27 @@ public class BeanSession extends Session {
}
 
/**
+* Wraps an object inside a {@link BeanMap} object (a modifiable {@link 
Map}).
+*
+* 
+* Same as {@link #toBeanMap(Object)} but allows you to specify a 
property namer instance.
+*
+* Example:
+* 
+*  // Construct a bean map around a bean instance
+*  BeanMapPerson bm = 
BeanContext.DEFAULT.toBeanMap(new Person(), 
PropertyNamerDLC.INSTANCE);
+* 
+*
+* @param  The class of the object being wrapped.
+* @param o The object to wrap in a map interface.  Must not be null.
+* @param propertyNamer The property namer to use.
+* @return The wrapped object.
+*/
+   public final  BeanMap toBeanMap(T o, PropertyNamer propertyNamer) 
{
+   return this.toBeanMap(o, (Class)o.getClass());
+   }
+
+   /**
 * Determines whether the specified object matches the requirements on 
this context of being a bean.
 *
 * @param o The object being tested.
diff --git 
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ListOperation.java
 
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ListOperation.java
index aaf0157..3ccfebc 100644
--- 
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ListOperation.java
+++ 
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ListOperation.java
@@ -43,29 +43,28 @@ public enum ListOperation {
/**
 * Don't add the value if it's null or an empty string.
 */
+   @Deprecated
SKIP_IF_EMPTY;
 
-   public static final boolean NEEDS_CLEANUP = true;
-
/**
 * Default flags.
-* Needs to be removed.
 */
+   @Deprecated
public static final EnumSet DEFAULT_FLAGS = 
EnumSet.of(APPEND);
 
/**
 * Default skip-if-empty flags.
-* Needs to be removed.
 */
+   @Deprecated
public static final EnumSet SKIP_IF_EMPTY_FLAGS = 
EnumSet.of(APPEND, SKIP_IF_EMPTY);
 
/**
 * Returns {@link #DEFAULT_FLAGS} if the enum set is null or 
empty.
-* Needs to be removed.
 *
 * @param s The set to check.
 * @return Either the same set or {@link #DEFAULT_FLAGS}.  Never 
null.
 */
+   @Deprecated
public static EnumSet orDefault(EnumSet 
s) {
return s == null || s.isEmpty() ? DEFAULT_FLAGS : s;
}
diff --git 
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
 
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
index f4410d5..2cbfa30 100644
--- 
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
+++ 
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
@@ -147,7 +147,6 @@ public class HttpPartSchema {
 
 
final String name;
-   final Set codes;
final String _default;
final Set _enum;
final Map properties;
@@ -643,7 +642,6 @@ public class HttpPartSchema {
 
HttpPartSchema(HttpPartSchemaBuilder b) {
this.name = b.name;
-   this.codes = copy(b.codes);
this._default = b._default;
this._enum = copy(b._enum);
this.properties = build(b.properties, b.noValidate);
@@ -873,49 +871,6 @@ public class HttpPartSchema {
}
 
/**
-* Returns the HTTP status code or codes defined on a schema.
-*
-* @return
-*  The list of HTTP status codes.
-*  Never null.
-* @see HttpPartSchemaBuilder#code(int)
-* @see HttpPartSchemaBuilder#codes(int[])
-*/
-   public Set getCodes() {
-   return codes;
-   }
-
-

[juneau] branch master updated: Code cleanup.

2021-01-15 Thread jamesbognar

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 92d656d  Code cleanup.
92d656d is described below

commit 92d656d07929585f5b6a75dee2d81e6452af50d4
Author: JamesBognar 
AuthorDate: Fri Jan 15 19:24:17 2021 -0500

Code cleanup.
---
 .../jena/annotation/RdfConfigAnnotation.java   | 104 ++---
 .../main/java/org/apache/juneau/ConfigApply.java   |  17 +--
 .../juneau/annotation/BeanConfigAnnotation.java| 127 -
 .../html/annotation/HtmlConfigAnnotation.java  |  19 ++-
 .../html/annotation/HtmlDocConfigAnnotation.java   |  49 +++-
 .../json/annotation/JsonConfigAnnotation.java  |  12 +-
 .../annotation/JsonSchemaConfigAnnotation.java |  22 ++--
 .../annotation/MsgPackConfigAnnotation.java|   3 +-
 .../oapi/annotation/OpenApiConfigAnnotation.java   |   6 +-
 .../parser/annotation/ParserConfigAnnotation.java  |  28 ++---
 .../annotation/SerializerConfigAnnotation.java |  59 --
 .../soap/annotation/SoapXmlConfigAnnotation.java   |   3 +-
 .../juneau/uon/annotation/UonConfigAnnotation.java |  15 +--
 .../juneau/xml/annotation/XmlConfigAnnotation.java |  33 ++
 .../juneau/rest/annotation/RestAnnotation.java |  46 +---
 .../rest/annotation/RestMethodAnnotation.java  |  40 ++-
 16 files changed, 183 insertions(+), 400 deletions(-)

diff --git 
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java
 
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java
index 8b3e888..ecd802a 100644
--- 
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java
+++ 
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java
@@ -43,76 +43,40 @@ public class RdfConfigAnnotation {
@Override
public void apply(AnnotationInfo ai, 
PropertyStoreBuilder psb, VarResolverSession vr) {
RdfConfig a = ai.getAnnotation();
-   if (! a.language().isEmpty())
-   psb.set(RDF_language, string(a.language()));
-   if (! a.juneauNs().isEmpty())
-   psb.set(RDF_juneauNs, string(a.juneauNs()));
-   if (! a.juneauBpNs().isEmpty())
-   psb.set(RDF_juneauBpNs, string(a.juneauBpNs()));
-   if (! a.disableUseXmlNamespaces().isEmpty())
-   psb.set(RDF_disableUseXmlNamespaces, 
bool(a.disableUseXmlNamespaces()));
-   if (! a.arp_iriRules().isEmpty())
-   psb.set(RDF_arp_iriRules, 
string(a.arp_iriRules()));
-   if (! a.arp_errorMode().isEmpty())
-   psb.set(RDF_arp_errorMode, 
string(a.arp_errorMode()));
-   if (! a.arp_embedding().isEmpty())
-   psb.set(RDF_arp_embedding, 
bool(a.arp_embedding()));
-   if (! a.rdfxml_xmlBase().isEmpty())
-   psb.set(RDF_rdfxml_xmlBase, 
string(a.rdfxml_xmlBase()));
-   if (! a.rdfxml_longId().isEmpty())
-   psb.set(RDF_rdfxml_longId, 
bool(a.rdfxml_longId()));
-   if (! a.rdfxml_allowBadUris().isEmpty())
-   psb.set(RDF_rdfxml_allowBadUris, 
bool(a.rdfxml_allowBadUris()));
-   if (! a.rdfxml_relativeUris().isEmpty())
-   psb.set(RDF_rdfxml_relativeUris, 
string(a.rdfxml_relativeUris()));
-   if (! a.rdfxml_showXmlDeclaration().isEmpty())
-   psb.set(RDF_rdfxml_showXmlDeclaration, 
string(a.rdfxml_showXmlDeclaration()));
-   if (! 
a.rdfxml_disableShowDoctypeDeclaration().isEmpty())
-   
psb.set(RDF_rdfxml_disableShowDoctypeDeclaration, 
bool(a.rdfxml_disableShowDoctypeDeclaration()));
-   if (! a.rdfxml_tab().isEmpty())
-   psb.set(RDF_rdfxml_tab, integer(a.rdfxml_tab(), 
"rdfxml_tab"));
-   if (! a.rdfxml_attributeQuoteChar().isEmpty())
-   psb.set(RDF_rdfxml_attributeQuoteChar, 
string(a.rdfxml_attributeQuoteChar()));
-   if (! a.rdfxml_blockRules().isEmpty())
-   psb.set(RDF_rdfxml_blockRules, 
string(a.rdfxml_blockRules()));
-   if (! a.n3_minGap().isEmpty())
-   psb.set(RDF_n3_minGap, integer(a.n3_minGap(), 
"n3_minGap"));
-   if (!

[juneau] branch master updated: Code cleanup.

2018-07-08 Thread jamesbognar

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 da69083  Code cleanup.
da69083 is described below

commit da690830a0114eb06caca5b76a7d78656b9d3a9b
Author: JamesBognar 
AuthorDate: Sun Jul 8 17:49:08 2018 -0400

Code cleanup.
---
 .../main/java/org/apache/juneau/BeanContext.java   |  58 ++---
 .../main/java/org/apache/juneau/BeanSession.java   | 270 -
 .../org/apache/juneau/json/JsonParserSession.java  |   1 -
 .../apache/juneau/parser/ReaderParserSession.java  |   2 -
 .../org/apache/juneau/xml/XmlParserSession.java|   2 -
 5 files changed, 286 insertions(+), 47 deletions(-)

diff --git 
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java 
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
index 8f520ba..25bd425 100644
--- 
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
+++ 
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
@@ -2680,7 +2680,7 @@ public class BeanContext extends Context {
 * @param c The class.
 * @return The properties to include for the specified class, or 
null if it's not defined for the class.
 */
-   public String[] getIncludeProperties(Class c) {
+   protected String[] getIncludeProperties(Class c) {
if (includeProperties.isEmpty())
return null;
String[] s = null;
@@ -2702,7 +2702,7 @@ public class BeanContext extends Context {
 * @param c The class.
 * @return The properties to exclude for the specified class, or 
null if it's not defined for the class.
 */
-   public String[] getExcludeProperties(Class c) {
+   protected String[] getExcludeProperties(Class c) {
if (excludeProperties.isEmpty())
return null;
String[] s = null;
@@ -2837,7 +2837,7 @@ public class BeanContext extends Context {
 *
 * @return The lookup table for resolving bean types by name.
 */
-   public final BeanRegistry getBeanRegistry() {
+   protected final BeanRegistry getBeanRegistry() {
return beanRegistry;
}
 
@@ -2853,7 +2853,7 @@ public class BeanContext extends Context {
 *  true if a Java class must implement a default no-arg 
constructor to be considered a bean.
 *  Otherwise, the bean will be serialized as a string using 
the {@link Object#toString()} method.
 */
-   public final boolean isBeansRequireDefaultConstructor() {
+   protected final boolean isBeansRequireDefaultConstructor() {
return beansRequireDefaultConstructor;
}
 
@@ -2865,7 +2865,7 @@ public class BeanContext extends Context {
 *  true if a Java class must implement the {@link 
Serializable} interface to be considered a bean.
 *  Otherwise, the bean will be serialized as a string using 
the {@link Object#toString()} method.
 */
-   public final boolean isBeansRequireSerializable() {
+   protected final boolean isBeansRequireSerializable() {
return beansRequireSerializable;
}
 
@@ -2877,7 +2877,7 @@ public class BeanContext extends Context {
 *  true if only getters that have equivalent setters will 
be considered as properties on a bean.
 *  Otherwise, they are ignored.
 */
-   public final boolean isBeansRequireSettersForGetters() {
+   protected final boolean isBeansRequireSettersForGetters() {
return beansRequireSettersForGetters;
}
 
@@ -2889,7 +2889,7 @@ public class BeanContext extends Context {
 *  true if a Java class must contain at least 1 property 
to be considered a bean.
 *  Otherwise, the bean is serialized as a string using the 
{@link Object#toString()} method.
 */
-   public final boolean isBeansRequireSomeProperties() {
+   protected final boolean isBeansRequireSomeProperties() {
return beansRequireSomeProperties;
}
 
@@ -2901,7 +2901,7 @@ public class BeanContext extends Context {
 *  true if the {@link BeanMap#put(String,Object) 
BeanMap.put()} method will return old property values.
 *  Otherwise, it returns null.
 */
-   public final boolean isBeanMapPutReturnsOldValue() {
+   protected final boolean isBeanMapPutReturnsOldValue() {
return beanMapPutReturnsOldValue;
}
 
@@ -2913,7 +2913,7 @@ public class BeanContext extends Context {
 *  true if interfaces will be instantiated as proxy 
classes through the use of an
 *  {@link InvocationHandler} if there is no other way of 
instantiating them.
 */

[juneau] branch master updated: Code cleanup.

[juneau] branch master updated: Code cleanup.

[juneau] branch master updated: Code cleanup.

[juneau] branch master updated: Code cleanup.

[juneau] branch master updated: Code cleanup.

[juneau] branch master updated: Code cleanup.

[juneau] branch master updated: Code cleanup.

[juneau] branch master updated: Code cleanup.

[juneau] branch master updated: Code cleanup.

9 matches

Site Navigation

Mail list logo

Footer information