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 9392ca8 Javadocs.
9392ca8 is described below
commit 9392ca80c4bcd64bc1e8ef771fe2bc40dd1e4032
Author: JamesBognar <jamesbog...@apache.org>
AuthorDate: Wed Dec 19 19:09:10 2018 -0500
Javadocs.
---
.../src/main/java/org/apache/juneau/Value.java | 4 +-
juneau-doc/.classpath | 1 +
juneau-doc/docs/Fragments/about.html | 36 ++-
juneau-doc/docs/ReleaseNotes/8.0.0.html | 23 +-
.../Topics/02.juneau-marshall/10.Transforms.html | 16 +-
.../10.Transforms/16.InterfaceFilters.html | 2 +-
.../10.Transforms/17.StopClasses.html | 2 +-
.../02.juneau-marshall/11.BeanDictionaries.html | 6 +-
.../02.juneau-marshall/25.OpenApiDetails.html | 14 +-
.../docs/Topics/04.juneau-dto/04.SwaggerUI.html | 2 +-
.../06.RestMethod/13.RestMethodMatchers.html | 2 +-
.../08.OpenApiSchemaPartParsing.html | 10 +-
.../09.OpenApiSchemaPartSerializing.html | 4 +-
.../10.HttpPartAnnotations.html | 28 +-
.../10.HttpPartAnnotations/01.Body.html | 2 +-
.../10.HttpPartAnnotations/02.FormData.html | 2 +-
.../10.HttpPartAnnotations/03.HasFormData.html | 2 +-
.../10.HttpPartAnnotations/04.Query.html | 2 +-
.../10.HttpPartAnnotations/05.HasQuery.html | 2 +-
.../10.HttpPartAnnotations/06.Header.html | 2 +-
.../10.HttpPartAnnotations/07.Path.html | 2 +-
.../10.HttpPartAnnotations/08.Request.html | 2 +-
.../10.HttpPartAnnotations/09.Response.html | 2 +-
.../10.HttpPartAnnotations/10.ResponseHeader.html | 2 +-
.../10.HttpPartAnnotations/11.ResponseStatus.html | 2 +-
.../07.juneau-rest-server/13.Serializers.html | 4 +-
.../Topics/07.juneau-rest-server/14.Parsers.html | 4 +-
.../07.juneau-rest-server/15.Properties.html | 8 +-
.../07.juneau-rest-server/16.Transforms.html | 8 +-
.../docs/Topics/07.juneau-rest-server/17.URIs.html | 1 -
.../Topics/07.juneau-rest-server/18.Guards.html | 4 +-
.../07.juneau-rest-server/19.Converters.html | 4 +-
.../23.ConfigurationFiles.html | 4 +-
.../07.juneau-rest-server/25.ClientVersioning.html | 4 +-
.../27.Swagger/01.BasicRestServlet.html | 2 +-
.../27.Swagger/05.Parameters.html | 4 +-
.../27.Swagger/06.ParameterExamples.html | 6 +-
.../27.Swagger/08.ResponseExamples.html | 2 +-
.../28.HtmlDocAnnotation.html | 4 +-
.../28.HtmlDocAnnotation/02.Widgets.html | 2 +-
.../07.juneau-rest-server/29.DefaultHeaders.html | 4 +-
.../10.juneau-rest-client/01.RestProxies.html | 14 +-
.../01.RestProxies/03.Body.html | 2 +-
.../01.RestProxies/04.FormData.html | 2 +-
.../01.RestProxies/05.Query.html | 2 +-
.../01.RestProxies/06.Header.html | 2 +-
.../01.RestProxies/07.Path.html | 2 +-
.../01.RestProxies/08.Request.html | 12 +-
.../01.RestProxies/09.Response.html | 8 +-
.../docs/Topics/11.juneau-microservice-core.html | 14 +
.../03.PetStoreResource.html | 16 +-
.../Topics/18.juneau-examples-rest-springboot.html | 2 +-
.../docs/{overview.html => overview_template.html} | 0
juneau-doc/juneau-doc.jar | Bin 25503 -> 25553 bytes
.../apache/juneau/doc/internal/DocGenerator.java | 12 +-
juneau-doc/src/main/javadoc/overview.html | 287 ++++++++++++---------
.../main/javadoc/resources/fragments/about.html | 36 ++-
.../src/main/javadoc/resources/juneau-doc.css | 12 +-
.../java/org/apache/juneau/rest/RestContext.java | 2 +-
59 files changed, 386 insertions(+), 276 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Value.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Value.java
index aefab7c..dcbed9f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Value.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Value.java
@@ -36,7 +36,7 @@ public class Value<T> {
* }
* </p>
* <p class='bcode w800'>
- * Class<?> t =
Value.<jsm>getValueType</jsm>(A.<jk>class</jk>.getMethod(<js>"doX"</js>,
Value.<jk>class</jk>));
+ * Class<?> t =
Value.<jsm>getValueType</jsm>(A.<jk>class</jk>.getMethod(<js>"doX"</js>,
Value.<jk>class</jk>));
* <jsm>assertTrue</jsm>(t == Foo.<jk>class</jk>);
* </p>
*
@@ -59,7 +59,7 @@ public class Value<T> {
ParameterizedType pt = (ParameterizedType)t;
if (pt.getRawType() == Value.class) {
Type[] ta = pt.getActualTypeArguments();
- if (ta.length > 0)
+ if (ta.length > 0)
return ta[0];
}
} else if (t instanceof Class) {
diff --git a/juneau-doc/.classpath b/juneau-doc/.classpath
index 96c9715..1605ea8 100644
--- a/juneau-doc/.classpath
+++ b/juneau-doc/.classpath
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/javadoc"/>
+ <classpathentry kind="src" path="docs"/>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
diff --git a/juneau-doc/docs/Fragments/about.html
b/juneau-doc/docs/Fragments/about.html
index abed929..265c3d5 100644
--- a/juneau-doc/docs/Fragments/about.html
+++ b/juneau-doc/docs/Fragments/about.html
@@ -16,14 +16,34 @@
Apache Juneau™ is a single cohesive Java ecosystem consisting of
the following parts:
</p>
<ul class='spaced-list'>
- <li><b>juneau-marshall</b><br>A universal toolkit for marshalling POJOs
to a wide variety of content types using a common framework with no external
library dependencies.
- <li><b>juneau-dto</b><br>A variety of predefined DTOs for serializing
and parsing languages such as HTML5, Swagger and ATOM.
- <li><b>juneau-svl</b><br>A simple yet powerful variable replacement
language API.
- <li><b>juneau-config</b><br>A sophisticated configuration file API.
- <li><b>juneau-rest-server</b><br>A universal REST server API for
creating Swagger-based self-documenting REST interfaces using POJOs, simply
deployed as
- one or more top-level servlets in any Servlet 3.1.0+ container
or Spring Boot.
- <li><b>juneau-rest-client</b><br>A universal REST client API for
interacting with Juneau or 3rd-party REST interfaces using POJOs and proxy
interfaces.
- <li><b>juneau-microservice</b><br>A REST microservice API that combines
all the features above as a simple configurable Jetty server for
+ <li>
+ <b>juneau-marshall</b>
+ <br>A universal toolkit for marshalling POJOs to a wide variety
of content types using a common framework with no external library dependencies.
+ <li>
+ <b>juneau-dto</b>
+ <br>A variety of predefined DTOs for serializing and parsing
languages such as HTML5, Swagger and ATOM.
+ <li>
+ <b>juneau-svl</b>
+ <br>A simple yet powerful variable replacement language API.
+ <li>
+ <b>juneau-config</b>
+ <br>A sophisticated configuration API.
+ <li>
+ <b>juneau-rest-server</b>
+ <br>A universal REST server API for creating REST interfaces
using POJOs simply deployed in any Servlet 3.1.0+ container.
+ <br>Includes auto-generation of Swagger and self-hosting of
Swagger UI through OPTIONS page requests.
+ <li>
+ <b>juneau-rest-server-springboot</b>
+ <br>Integration support for deploying Juneau-based REST
resources as Spring beans in a Spring Boot application.
+ <li>
+ <b>juneau-rest-client</b>
+ <br>A universal REST client API for interacting with Juneau or
3rd-party REST interfaces using POJOs and proxy interfaces.
+ <li>
+ <b>juneau-microservice</b>
+ <br>A builder-based API for creating microservices.
+ <li>
+ <b>juneau-microservice-jetty</b>
+ <br>REST microservice API that combines all the features above
as a simple configurable Jetty server for
creating lightweight standalone REST interfaces that start up
in milliseconds.
</ul>
<p>
diff --git a/juneau-doc/docs/ReleaseNotes/8.0.0.html
b/juneau-doc/docs/ReleaseNotes/8.0.0.html
index 15a3047..834b458 100644
--- a/juneau-doc/docs/ReleaseNotes/8.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/8.0.0.html
@@ -87,7 +87,7 @@
</ul>
</ul>
-<h5 class='topic w800'>juneau-server</h5>
+<h5 class='topic w800'>juneau-rest-server</h5>
<ul class='spaced-list'>
<li>
New methods on {@link oajr.RestServlet}:
@@ -100,6 +100,12 @@
<br>This allows for any of those instance to be injectable
beans.
</ul>
+<h5 class='topic w800'>juneau-rest-server-springboot</h5>
+<ul class='spaced-list'>
+ <li>
+ New project containing classes for making it easy to use Juneau
with Spring Boot.
+</ul>
+
<h5 class='topic w800'>juneau-microservice-core</h5>
<ul class='spaced-list'>
<li>
@@ -125,12 +131,17 @@
New {@link oaj.microservice.jetty.JettyMicroservice} class
replaces the previous <code>RestMicroservice</code>.
</ul>
-<h5 class='topic w800'>juneau-examples-rest</h5>
+<h5 class='topic w800'>juneau-my-jetty-microservice</h5>
<ul class='spaced-list'>
<li>
- New <code>org.apache.juneau.examples.rest.spring</code> package
with code showing how to use Juneau REST
- with Spring Boot.
- <li>
- New <code>app.json</code> and <code>Procfile</code> files for
deploying examples into Heroku.
+ New template starter project for Jetty-based microservices.
</ul>
+<h5 class='topic w800'>juneau-my-springboot-microservice</h5>
+<ul class='spaced-list'>
+ <li>
+ Template starter project for Spring-Boot-based microservices.
+ <li>
+ <code>app.json</code> and <code>Procfile</code> files for
deploying examples into Heroku.
+ <br>Includes instructions.
+</ul>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms.html
b/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms.html
index f4671ff..1446a02 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms.html
@@ -47,27 +47,27 @@ Transforms
</p>
<ul class='doctree'>
<li class='ja'>
- {@link oaj.annotation.Swap @Swap}
+ {@link oaj.annotation.Swap}
- Used to tailor how non-bean POJOs get interpreted by the
framework.
<li class='ja'>
- {@link oaj.annotation.Bean @Bean}
+ {@link oaj.annotation.Bean}
- Used to tailor how beans get interpreted by the framework.
<li class='ja'>
- {@link oaj.annotation.BeanConstructor @BeanConstructor}
+ {@link oaj.annotation.BeanConstructor}
- Maps constructor arguments to property names on beans with
read-only properties.
<li class='ja'>
- {@link oaj.annotation.BeanIgnore @BeanIgnore}
+ {@link oaj.annotation.BeanIgnore}
- Ignore classes, fields, and methods from being interpreted as
bean or bean components.
<li class='ja'>
- {@link oaj.annotation.BeanProperty @BeanProperty}
+ {@link oaj.annotation.BeanProperty}
- Used to tailor how bean properties get interpreted by the
framework.
<li class='ja'>
- {@link oaj.annotation.NameProperty @NameProperty}
+ {@link oaj.annotation.NameProperty}
- Identifies a setter as a method for setting the name of a
POJO as it's known by its parent object.
<li class='ja'>
- {@link oaj.annotation.ParentProperty @ParentProperty}
+ {@link oaj.annotation.ParentProperty}
- Identifies a setter as a method for adding a parent reference
to a child object.
<li class='ja'>
- {@link oaj.annotation.URI @URI}
+ {@link oaj.annotation.URI}
- Used to identify a class or bean property as a URI.
</ul>
diff --git
a/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/16.InterfaceFilters.html
b/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/16.InterfaceFilters.html
index 5d8ee79..5830509 100644
---
a/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/16.InterfaceFilters.html
+++
b/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/16.InterfaceFilters.html
@@ -24,7 +24,7 @@ Interface Filters
</p>
<ul>
<li class='jf'>{@link oaj.BeanContext#BEAN_beanFilters}
- <li class='ja'>{@link oaj.annotation.Bean#interfaceClass()
@Bean(interfaceClass)}
+ <li class='ja'>{@link oaj.annotation.Bean#interfaceClass()
Bean(interfaceClass)}
<li class='jm'>{@link
oaj.transform.BeanFilterBuilder#interfaceClass(Class)}
</ul>
<p>
diff --git
a/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/17.StopClasses.html
b/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/17.StopClasses.html
index 281a772..e33d17e 100644
---
a/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/17.StopClasses.html
+++
b/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/17.StopClasses.html
@@ -23,7 +23,7 @@ Stop Classes
Stop classes are defined through the following:
</p>
<ul>
- <li class='ja'>{@link oaj.annotation.Bean#stopClass() @Bean(stopClass)}
+ <li class='ja'>{@link oaj.annotation.Bean#stopClass() Bean(stopClass)}
<li class='jf'>{@link oaj.transform.BeanFilterBuilder#stopClass(Class)}
</ul>
<p>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/11.BeanDictionaries.html
b/juneau-doc/docs/Topics/02.juneau-marshall/11.BeanDictionaries.html
index a2b0ef0..5e8d611 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/11.BeanDictionaries.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/11.BeanDictionaries.html
@@ -86,9 +86,9 @@ Bean Names and Dictionaries
Bean dictionaries are registered through the following:
</p>
<ul>
- <li class='ja'>{@link oaj.annotation.BeanProperty#beanDictionary()
@BeanProperty(beanDictionary)}
+ <li class='ja'>{@link oaj.annotation.BeanProperty#beanDictionary()
BeanProperty(beanDictionary)}
- On individual bean properties through the annotation.
- <li class='ja'>{@link oaj.annotation.Bean#beanDictionary()
@Bean(beanDictionary)}
+ <li class='ja'>{@link oaj.annotation.Bean#beanDictionary()
Bean(beanDictionary)}
- On all properties on a bean and all subclasses.
<li class='jf'>{@link oaj.BeanContext#BEAN_beanDictionary}
- Configuration property on serializers and parsers.
@@ -128,7 +128,7 @@ Bean Names and Dictionaries
The <js>"_type"</js> property name can be overridden through the
following:
</p>
<ul>
- <li class='ja'>{@link oaj.annotation.Bean#typePropertyName()
@Bean(typePropertyName)}
+ <li class='ja'>{@link oaj.annotation.Bean#typePropertyName()
Bean(typePropertyName)}
- On individual beans through the annotation.
<li class='jf'>{@link oaj.BeanContext#BEAN_beanTypePropertyName}
- Configuration property on serializers and parsers.
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/25.OpenApiDetails.html
b/juneau-doc/docs/Topics/02.juneau-marshall/25.OpenApiDetails.html
index abc15dd..8446ef0 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/25.OpenApiDetails.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/25.OpenApiDetails.html
@@ -37,11 +37,11 @@ OpenAPI Details
can be applied to method parameters and class types to define the
schema for various HTTP parts:
</p>
<ul class='doctree'>
- <li class='ja'>{@link oaj.http.annotation.Body Body}
- <li class='ja'>{@link oaj.http.annotation.Header Header}
- <li class='ja'>{@link oaj.http.annotation.Query Query}
- <li class='ja'>{@link oaj.http.annotation.FormData FormData}
- <li class='ja'>{@link oaj.http.annotation.Path Path}
- <li class='ja'>{@link oaj.http.annotation.Response Response}
- <li class='ja'>{@link oaj.http.annotation.ResponseHeader ResponseHeader}
+ <li class='ja'>{@link oaj.http.annotation.Body}
+ <li class='ja'>{@link oaj.http.annotation.Header}
+ <li class='ja'>{@link oaj.http.annotation.Query}
+ <li class='ja'>{@link oaj.http.annotation.FormData}
+ <li class='ja'>{@link oaj.http.annotation.Path}
+ <li class='ja'>{@link oaj.http.annotation.Response}
+ <li class='ja'>{@link oaj.http.annotation.ResponseHeader}
</ul>
diff --git a/juneau-doc/docs/Topics/04.juneau-dto/04.SwaggerUI.html
b/juneau-doc/docs/Topics/04.juneau-dto/04.SwaggerUI.html
index bd63cc5..56d5e6a 100644
--- a/juneau-doc/docs/Topics/04.juneau-dto/04.SwaggerUI.html
+++ b/juneau-doc/docs/Topics/04.juneau-dto/04.SwaggerUI.html
@@ -80,7 +80,7 @@ Swagger UI
<jc>// Override the nav links for the swagger
page.</jc>
navlinks={
<js>"back: servlet:/"</js>,
- <js>"json:
servlet:/?method=OPTIONS&Accept=text/json&plainText=true"</js>
+ <js>"json:
servlet:/?method=OPTIONS&Accept=text/json&plainText=true"</js>
},
<jc>// Never show aside contents of page
inherited from class.</jc>
aside="<js>NONE"</js>
diff --git
a/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/13.RestMethodMatchers.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/13.RestMethodMatchers.html
index cab3feb..cd4b48a 100644
---
a/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/13.RestMethodMatchers.html
+++
b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/13.RestMethodMatchers.html
@@ -66,7 +66,7 @@
<h5 class='section'>See Also:</h5>
<ul>
- <li class='ja'>{@link oajr.annotation.RestMethod#matchers}
+ <li class='ja'>{@link oajr.annotation.RestMethod#matchers
RestMethod(matchers)}
<li class='jc'>{@link oajr.matchers.MultipartFormDataMatcher}
<li class='jc'>{@link oajr.matchers.UrlEncodedFormMatcher}
</ul>
diff --git
a/juneau-doc/docs/Topics/07.juneau-rest-server/08.OpenApiSchemaPartParsing.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/08.OpenApiSchemaPartParsing.html
index d5c33ca..b385335 100644
---
a/juneau-doc/docs/Topics/07.juneau-rest-server/08.OpenApiSchemaPartParsing.html
+++
b/juneau-doc/docs/Topics/07.juneau-rest-server/08.OpenApiSchemaPartParsing.html
@@ -20,11 +20,11 @@ OpenAPI Schema Part Parsing
therefore support OpenAPI syntax and validation:
</p>
<ul class='doctree'>
- <li class='ja'>{@link oaj.http.annotation.Header Header}
- <li class='ja'>{@link oaj.http.annotation.Query Query}
- <li class='ja'>{@link oaj.http.annotation.FormData FormData}
- <li class='ja'>{@link oaj.http.annotation.Path Path}
- <li class='ja'>{@link oaj.http.annotation.Body Body}
(<code>Content-Type</code> must match <js>"text/openapi"</js>)
+ <li class='ja'>{@link oaj.http.annotation.Header}
+ <li class='ja'>{@link oaj.http.annotation.Query}
+ <li class='ja'>{@link oaj.http.annotation.FormData}
+ <li class='ja'>{@link oaj.http.annotation.Path}
+ <li class='ja'>{@link oaj.http.annotation.Body}
(<code>Content-Type</code> must match <js>"text/openapi"</js>)
</ul>
<p>
For example, the following shows how a pipe-delimited list of
comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) in a query
parameter can be converted to a 2-dimensional array of <code>Longs</code>:
diff --git
a/juneau-doc/docs/Topics/07.juneau-rest-server/09.OpenApiSchemaPartSerializing.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/09.OpenApiSchemaPartSerializing.html
index 2c05e2e..38df8b8 100644
---
a/juneau-doc/docs/Topics/07.juneau-rest-server/09.OpenApiSchemaPartSerializing.html
+++
b/juneau-doc/docs/Topics/07.juneau-rest-server/09.OpenApiSchemaPartSerializing.html
@@ -20,8 +20,8 @@ OpenAPI Schema Part Serializing
therefore support OpenAPI syntax and validation:
</p>
<ul class='doctree'>
- <li class='ja'>{@link oaj.http.annotation.ResponseHeader ResponseHeader}
- <li class='ja'>{@link oaj.http.annotation.Response Response}
(<code>Accept</code> must match <js>"text/openapi"</js>)
+ <li class='ja'>{@link oaj.http.annotation.ResponseHeader}
+ <li class='ja'>{@link oaj.http.annotation.Response}
(<code>Accept</code> must match <js>"text/openapi"</js>)
</ul>
<p>
For example, the following shows how a pipe-delimited list of
comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) in a response
header can be converted to a 2-dimensional array of <code>Longs</code>:
diff --git
a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations.html
index fee802c..b6e3b68 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations.html
@@ -19,30 +19,30 @@ HTTP-Part Annotations
The annotations used for defining the schema for request HTTP parts are:
</p>
<ul class='doctree'>
- <li class='ja'>{@link oaj.http.annotation.Body Body}
- <li class='ja'>{@link oaj.http.annotation.Header Header}
- <li class='ja'>{@link oaj.http.annotation.FormData FormData}
- <li class='ja'>{@link oaj.http.annotation.Query Query}
- <li class='ja'>{@link oaj.http.annotation.Path Path}
- <li class='ja'>{@link oaj.http.annotation.HasFormData HasFormData}
- <li class='ja'>{@link oaj.http.annotation.HasQuery HasQuery}
- <li class='ja'>{@link oaj.http.annotation.Request Request}
+ <li class='ja'>{@link oaj.http.annotation.Body}
+ <li class='ja'>{@link oaj.http.annotation.Header}
+ <li class='ja'>{@link oaj.http.annotation.FormData}
+ <li class='ja'>{@link oaj.http.annotation.Query}
+ <li class='ja'>{@link oaj.http.annotation.Path}
+ <li class='ja'>{@link oaj.http.annotation.HasFormData}
+ <li class='ja'>{@link oaj.http.annotation.HasQuery}
+ <li class='ja'>{@link oaj.http.annotation.Request}
</ul>
<p>
The annotations used for defining the schema for response HTTP parts
are:
</p>
<ul class='doctree'>
- <li class='ja'>{@link oaj.http.annotation.ResponseBody ResponseBody}
- <li class='ja'>{@link oaj.http.annotation.ResponseHeader ResponseHeader}
- <li class='ja'>{@link oaj.http.annotation.ResponseStatus ResponseStatus}
- <li class='ja'>{@link oaj.http.annotation.Response Response}
+ <li class='ja'>{@link oaj.http.annotation.ResponseBody}
+ <li class='ja'>{@link oaj.http.annotation.ResponseHeader}
+ <li class='ja'>{@link oaj.http.annotation.ResponseStatus}
+ <li class='ja'>{@link oaj.http.annotation.Response}
</ul>
<p>
The sub-annotations used in the annotation above are:
</p>
<ul class='doctree'>
- <li class='ja'>{@link oaj.jsonschema.annotation.Schema Schema}
- <li class='ja'>{@link oaj.jsonschema.annotation.Items Items}
+ <li class='ja'>{@link oaj.jsonschema.annotation.Schema}
+ <li class='ja'>{@link oaj.jsonschema.annotation.Items}
</ul>
<h5 class='section'>Other Notes:</h5>
diff --git
a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/01.Body.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/01.Body.html
index 52463fb..a969766 100644
---
a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/01.Body.html
+++
b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/01.Body.html
@@ -19,7 +19,7 @@
The {@link oaj.http.annotation.Body @Body} annotation is used to
identify POJOs to be used as the body of an HTTP request.
</p>
<ul class='doctree'>
- <li class='ja'>{@link oaj.http.annotation.Body Body}
+ <li class='ja'>{@link oaj.http.annotation.Body}
<ul>
<li class='jf'>{@link oaj.http.annotation.Body#api() api} -
Free-form Swagger JSON.
<li class='jf'>{@link oaj.http.annotation.Body#description()
description} - Description.
diff --git
a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/02.FormData.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/02.FormData.html
index d8f4811..8abee3e 100644
---
a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/02.FormData.html
+++
b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/02.FormData.html
@@ -19,7 +19,7 @@
The {@link oaj.http.annotation.FormData @FormData} annotation is used
to retrieve request form post entries.
</p>
<ul class='doctree'>
- <li class='ja'>{@link oaj.http.annotation.FormData FormData}
+ <li class='ja'>{@link oaj.http.annotation.FormData}
<ul>
<li class='jf'>{@link oaj.http.annotation.FormData#_default()
_default} - Default value if not present.
<li class='jf'>{@link oaj.http.annotation.FormData#_enum()
_enum} - Input validation. Must match one of the values.
diff --git
a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/03.HasFormData.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/03.HasFormData.html
index 228ba42..7742af6 100644
---
a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/03.HasFormData.html
+++
b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/03.HasFormData.html
@@ -19,7 +19,7 @@
This annotation can be used to detect the existence of a parameter when
it's not set to a particular value.
</p>
<ul class='doctree'>
- <li class='ja'>{@link oaj.http.annotation.HasFormData HasFormData}
+ <li class='ja'>{@link oaj.http.annotation.HasFormData}
</ul>
<h5 class='figure'>Example:</h5>
diff --git
a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/04.Query.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/04.Query.html
index 2b9bf0f..24e4a6d 100644
---
a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/04.Query.html
+++
b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/04.Query.html
@@ -20,7 +20,7 @@
<br>It's identical to {@link oaj.http.annotation.FormData @FormData},
but only retrieves the parameter from the URL string, not URL-encoded form
posts.
</p>
<ul class='doctree'>
- <li class='ja'>{@link oaj.http.annotation.Query Query}
+ <li class='ja'>{@link oaj.http.annotation.Query}
<ul>
<li class='jf'>{@link oaj.http.annotation.Query#_default()
_default} - Default value if not present.
<li class='jf'>{@link oaj.http.annotation.Query#_enum() _enum}
- Input validation. Must match one of the values.
diff --git
a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/05.HasQuery.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/05.HasQuery.html
index 70f20fb..9f8a3b8 100644
---
a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/05.HasQuery.html
+++
b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/05.HasQuery.html
@@ -20,7 +20,7 @@
URL-encoded form posts.
</p>
<ul class='doctree'>
- <li class='ja'>{@link oaj.http.annotation.HasQuery HasQuery}
+ <li class='ja'>{@link oaj.http.annotation.HasQuery}
</ul>
<p>
Unlike {@link oaj.http.annotation.HasFormData @HasFormData}, using this
annotation does not result in the servlet reading the contents
diff --git
a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/06.Header.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/06.Header.html
index b8023d4..c4b3be0 100644
---
a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/06.Header.html
+++
b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/06.Header.html
@@ -19,7 +19,7 @@
The {@link oaj.http.annotation.Header @Header} annotation is used to
retrieve request headers.
</p>
<ul class='doctree'>
- <li class='ja'>{@link oaj.http.annotation.Header Header}
+ <li class='ja'>{@link oaj.http.annotation.Header}
<ul>
<li class='jf'>{@link oaj.http.annotation.Header#_default()
_default} - Default value if not present.
<li class='jf'>{@link oaj.http.annotation.Header#_enum() _enum}
- Input validation. Must match one of the values.
diff --git
a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/07.Path.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/07.Path.html
index 3a4430f..6ae3810 100644
---
a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/07.Path.html
+++
b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/07.Path.html
@@ -19,7 +19,7 @@
The {@link oaj.http.annotation.Path @Path} annotation is used to
retrieve request path parameters.
</p>
<ul class='doctree'>
- <li class='ja'>{@link oaj.http.annotation.Path Path}
+ <li class='ja'>{@link oaj.http.annotation.Path}
<ul>
<li class='jf'>{@link oaj.http.annotation.Path#_enum() _enum} -
Input validation. Must match one of the values.
<li class='jf'>{@link
oaj.http.annotation.Path#allowEmptyValue() allowEmptyValue} - Input validation.
Allow empty value.
diff --git
a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/08.Request.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/08.Request.html
index 7a23d34..e6cbc13 100644
---
a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/08.Request.html
+++
b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/08.Request.html
@@ -20,7 +20,7 @@
to identify it as an interface for retrieving HTTP parts through a
bean-like interface.
</p>
<ul class='doctree'>
- <li class='ja'>{@link oaj.http.annotation.Request Request}
+ <li class='ja'>{@link oaj.http.annotation.Request}
<ul>
<li class='jf'>{@link oaj.http.annotation.Request#partParser()
partParser} - Override the part parser.
</ul>
diff --git
a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/09.Response.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/09.Response.html
index b9e686d..d306484 100644
---
a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/09.Response.html
+++
b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/09.Response.html
@@ -19,7 +19,7 @@
The {@link oaj.http.annotation.Response @Response} annotation is used
to identify schema information about an HTTP response.
</p>
<ul class='doctree'>
- <li class='ja'>{@link oaj.http.annotation.Response Response}
+ <li class='ja'>{@link oaj.http.annotation.Response}
<ul>
<li class='jf'>{@link oaj.http.annotation.Response#api() api} -
Free-form Swagger JSON.
<li class='jf'>{@link oaj.http.annotation.Response#code() code}
- HTTP status code.
diff --git
a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/10.ResponseHeader.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/10.ResponseHeader.html
index d4beec6..f8c08a0 100644
---
a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/10.ResponseHeader.html
+++
b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/10.ResponseHeader.html
@@ -19,7 +19,7 @@
The {@link oaj.http.annotation.ResponseHeader @ResponseHeader}
annotation can be applied to <ja>@RestMethod</ja>-annotated parameters to
denote them as an HTTP response headers.
</p>
<ul class='doctree'>
- <li class='ja'>{@link oaj.http.annotation.ResponseHeader ResponseHeader}
+ <li class='ja'>{@link oaj.http.annotation.ResponseHeader}
<ul>
<li class='jf'>{@link
oaj.http.annotation.ResponseHeader#_default() _default} - Default value if not
present.
<li class='jf'>{@link
oaj.http.annotation.ResponseHeader#_enum() _enum} - Output validation. Must
match one of the values.
diff --git
a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/11.ResponseStatus.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/11.ResponseStatus.html
index da02819..51ba6e8 100644
---
a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/11.ResponseStatus.html
+++
b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/11.ResponseStatus.html
@@ -19,7 +19,7 @@
The {@link oaj.http.annotation.ResponseStatus @ResponseStatus}
annotation annotation can be applied to <ja>@RestMethod</ja>-annotated
parameters to denote them as an HTTP response status codes.
</p>
<ul class='doctree'>
- <li class='ja'>{@link oaj.http.annotation.ResponseStatus ResponseStatus}
+ <li class='ja'>{@link oaj.http.annotation.ResponseStatus}
</ul>
<p>
This can only be applied to parameters of the {@link oaj.Value} class
with an {@link java.lang.Integer} type.
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/13.Serializers.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/13.Serializers.html
index 6bb7693..57b6a1f 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/13.Serializers.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/13.Serializers.html
@@ -28,10 +28,10 @@ Serializers
</p>
<ul class='doctree'>
<li class='ja'>
- {@link oajr.annotation.RestResource#serializers()}
+ {@link oajr.annotation.RestResource#serializers()
RestResource(serializers)}
- Annotation on resource Java class.
<li class='ja'>
- {@link oajr.annotation.RestMethod#serializers()}
+ {@link oajr.annotation.RestMethod#serializers()
RestMethod(serializers)}
- Annotation on resource Java method.
<li class='jf'>
{@link oajr.RestContext#REST_serializers}
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/14.Parsers.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/14.Parsers.html
index 5eda460..348fd44 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/14.Parsers.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/14.Parsers.html
@@ -28,10 +28,10 @@ Parsers
</p>
<ul class='doctree'>
<li class='ja'>
- {@link oajr.annotation.RestResource#parsers()}
+ {@link oajr.annotation.RestResource#parsers()
RestResource(parsers)}
- Annotation on resource Java class.
<li class='ja'>
- {@link oajr.annotation.RestMethod#parsers()}
+ {@link oajr.annotation.RestMethod#parsers()
RestMethod(parsers)}
- Annotation on resource Java method.
<li class='jm'>
{@link oajr.RestContextBuilder#parsers(Class[])}
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/15.Properties.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/15.Properties.html
index 7148037..717bb57 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/15.Properties.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/15.Properties.html
@@ -23,7 +23,7 @@ Properties
These properties can be defined for serializers and parsers registered
on a REST resource via the following:
</p>
<ul>
- <li class='ja'>{@link oajr.annotation.RestResource#properties()}
+ <li class='ja'>{@link oajr.annotation.RestResource#properties()
RestResource(properties)}
<li class='jc'>{@link oajr.RestContextBuilder} - Various methods on the
context builder.
</ul>
<h5 class='figure'>Example:</h5>
@@ -68,7 +68,7 @@ Properties
Properties can also be overridden at the Java method level:
</p>
<ul>
- <li class='ja'>{@link oajr.annotation.RestMethod#properties()}
+ <li class='ja'>{@link oajr.annotation.RestMethod#properties()
RestMethod(properties)}
<li class='jc'>{@link oajr.RequestProperties}
</ul>
<p class='bpcode w800'>
@@ -120,8 +120,8 @@ Properties
</ul>
<h5 class='section'>See Also:</h5>
<ul>
- <li class='ja'>{@link oajr.annotation.RestResource#flags()} - Shorthand
for boolean properties.
- <li class='ja'>{@link oajr.annotation.RestMethod#flags()} - Shorthand
for boolean properties.
+ <li class='ja'>{@link oajr.annotation.RestResource#flags()
RestResource(flags)} - Shorthand for boolean properties.
+ <li class='ja'>{@link oajr.annotation.RestMethod#flags()
RestMethod(flags)} - Shorthand for boolean properties.
<li class='jc'>{@link oajr.RestContextProperties}
<li class='jc'>{@link oajr.RestMethodProperties}
<li class='jc'>{@link oajr.RequestProperties}
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/16.Transforms.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/16.Transforms.html
index 05f96f9..1e270f2 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/16.Transforms.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/16.Transforms.html
@@ -23,10 +23,10 @@ Transforms
Transforms are associated serializers and parsers registered on a REST
resource via the following:
</p>
<ul>
- <li class='ja'>{@link oajr.annotation.RestResource#beanFilters()}
- <li class='ja'>{@link oajr.annotation.RestResource#pojoSwaps()}
- <li class='ja'>{@link oajr.annotation.RestMethod#beanFilters()}
- <li class='ja'>{@link oajr.annotation.RestMethod#pojoSwaps()}
+ <li class='ja'>{@link oajr.annotation.RestResource#beanFilters()
RestResource(beanFilters)}
+ <li class='ja'>{@link oajr.annotation.RestResource#pojoSwaps()
RestResource(pojoSwaps)}
+ <li class='ja'>{@link oajr.annotation.RestMethod#beanFilters()
RestMethod(beanFilters)}
+ <li class='ja'>{@link oajr.annotation.RestMethod#pojoSwaps()
RestMethod(pojoSwaps)}
<li class='jm'>{@link oajr.RestContextBuilder#beanFilters(Object...)}
<li class='jm'>{@link oajr.RestContextBuilder#pojoSwaps(Object...)}
</ul>
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/17.URIs.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/17.URIs.html
index b8017ad..d8cd43a 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/17.URIs.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/17.URIs.html
@@ -94,5 +94,4 @@ URIs
<p>
URIs are resolved by both regular and part serializers.
</p>
-</p>
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/18.Guards.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/18.Guards.html
index 560305e..06cee32 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/18.Guards.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/18.Guards.html
@@ -22,8 +22,8 @@ Guards
Guards are associated with resource classes and methods via the
following:
</p>
<ul>
- <li class='ja'>{@link oajr.annotation.RestResource#guards()}
- <li class='ja'>{@link oajr.annotation.RestMethod#guards()}
+ <li class='ja'>{@link oajr.annotation.RestResource#guards()
RestResource(guards)}
+ <li class='ja'>{@link oajr.annotation.RestMethod#guards()
RestMethod(guards)}
<li class='jm'>{@link oajr.RestContextBuilder#guards(Class...)}
</ul>
<p class='bpcode w800'>
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/19.Converters.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/19.Converters.html
index fd64c02..92932bf 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/19.Converters.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/19.Converters.html
@@ -22,8 +22,8 @@ Converters
Converters are associated with resource classes and methods via the
following:
</p>
<ul>
- <li class='ja'>{@link oajr.annotation.RestResource#converters()}
- <li class='ja'>{@link oajr.annotation.RestMethod#converters()}
+ <li class='ja'>{@link oajr.annotation.RestResource#converters()
RestResource(converters)}
+ <li class='ja'>{@link oajr.annotation.RestMethod#converters()
RestMethod(converters)}
<li class='jm'>{@link oajr.RestContextBuilder#converters(Class...)}
</ul>
<h5 class='figure'>Example:</h5>
diff --git
a/juneau-doc/docs/Topics/07.juneau-rest-server/23.ConfigurationFiles.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/23.ConfigurationFiles.html
index d7acff9..dc73b0d 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/23.ConfigurationFiles.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/23.ConfigurationFiles.html
@@ -46,7 +46,7 @@ Configuration Files
Configuration files are associated with REST resources through the
following:
</p>
<ul>
- <li class='ja'>{@link oajr.annotation.RestResource#config()}
+ <li class='ja'>{@link oajr.annotation.RestResource#config()
RestResource(config)}
</ul>
<h5 class='figure'>Example:</h5>
@@ -177,5 +177,5 @@ Configuration Files
</p>
<h5 class='section'>See Also:</h5>
<ul class='doctree'>
- {@doc juneau-config}
+ <li>{@doc juneau-config}
</ul>
diff --git
a/juneau-doc/docs/Topics/07.juneau-rest-server/25.ClientVersioning.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/25.ClientVersioning.html
index 4567491..e7c23bc 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/25.ClientVersioning.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/25.ClientVersioning.html
@@ -23,9 +23,9 @@ Client Versioning
The APIs involved with defining client version headers are:
</p>
<ul>
- <li class='ja'>{@link
oajr.annotation.RestResource#clientVersionHeader()}
+ <li class='ja'>{@link
oajr.annotation.RestResource#clientVersionHeader()
RestResource(clientVersionHeader)}
<li class='jm'>{@link
oajr.RestContextBuilder#clientVersionHeader(String)}
- <li class='ja'>{@link oajr.annotation.RestMethod#clientVersion()}
+ <li class='ja'>{@link oajr.annotation.RestMethod#clientVersion()
RestMethod(clientVersion)}
</ul>
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
diff --git
a/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/01.BasicRestServlet.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/01.BasicRestServlet.html
index da96905..1075078 100644
---
a/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/01.BasicRestServlet.html
+++
b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/01.BasicRestServlet.html
@@ -53,7 +53,7 @@ BasicRestServlet
<jc>// Override the nav links for the swagger
page.</jc>
navlinks={
<js>"back: servlet:/"</js>,
- <js>"json:
servlet:/?method=OPTIONS&Accept=text/json&plainText=true"</js>
+ <js>"json:
servlet:/?method=OPTIONS&Accept=text/json&plainText=true"</js>
},
<jc>// Never show aside contents of page
inherited from class.</jc>
aside=<js>"NONE"</js>
diff --git
a/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/05.Parameters.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/05.Parameters.html
index 2476124..7a0a950 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/05.Parameters.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/05.Parameters.html
@@ -34,7 +34,7 @@ Parameters
<js>"Search."</js>,
<js>"Key/value pairs representing
column names and search tokens."</js>,
<js>"'*' and '?' can be used as
meta-characters in string fields."</js>,
- <js>"'>', '>=', '<', and '<=' can be
used as limits on numeric and date fields."</js>,
+ <js>"'>', '>=', '<', and
'<=' can be used as limits on numeric and date fields."</js>,
<js>"Date fields can be matched with
partial dates (e.g. '2018' to match any date in the year 2018)."</js>
},
type=<js>"array"</js>,
@@ -99,7 +99,7 @@ Parameters
+ <js>"Search.\n"</js>
+ <js>"Key/value pairs representing
column names and search tokens.\n"</js>
+ <js>"\\'*\\' and \\'?\\' can be used
as meta-characters in string fields.\n"</js>
- + <js>"\\'>\\', \\'>=\\', \\'<\\', and
\\'<=\\' can be used as limits on numeric and date fields.\n"</js>
+ + <js>"\\'>\\', \\'>=\\',
\\'<\\', and \\'<=\\' can be used as limits on numeric and date
fields.\n"</js>
+ <js>"Date fields can be matched with
partial dates (e.g. \\'2018\\' to match any date in the year 2018)."</js>
+ <js>"',"</js>
+ <js>"type:'array',"</js>
diff --git
a/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/06.ParameterExamples.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/06.ParameterExamples.html
index 8a28bfb..006218d 100644
---
a/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/06.ParameterExamples.html
+++
b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/06.ParameterExamples.html
@@ -33,7 +33,7 @@ Parameter Examples
<js>"Search."</js>,
<js>"Key/value pairs representing
column names and search tokens."</js>,
<js>"'*' and '?' can be used as
meta-characters in string fields."</js>,
- <js>"'>', '>=', '<', and '<=' can be
used as limits on numeric and date fields."</js>,
+ <js>"'>', '>=', '<', and
'<=' can be used as limits on numeric and date fields."</js>,
<js>"Date fields can be matched with
partial dates (e.g. '2018' to match any date in the year 2018)."</js>
},
type=<js>"array"</js>,
@@ -141,10 +141,10 @@ Parameter Examples
<jok>"x-examples"</jok>: {
<jok>"application/json"</jok>:
<jov>"{\n\t\"name\": \"Doggie\",\n\t\"species\": \"Dog\",\n\t\"price\":
9.99,\n\t\"tags\": [\n..."</jov>,
<jok>"application/json+simple"</jok>: <jov>"{\n\tname: 'Doggie',\n\tspecies:
'Dog',\n\tprice: 9.99,\n\ttags: [\n\t\t'friendly..."</jov>,
- <jok>"text/xml"</jok>:
<jov>"<?xml version=\"1.0\"
encoding=\"UTF-8\"?>\n<object>\n\t<name>Doggie</name&..."</jov>,
+ <jok>"text/xml"</jok>:
<jov>"<?xml version=\"1.0\"
encoding=\"UTF-8\"?>\n<object>\n\t<name>Doggie</name&..."</jov>,
<jok>"text/html+stripped"</jok>:
<jov>"<table>\n\t<tr>\n\t\t<td>name</td>\n\t\t<td>Doggie</t..."</jov>,
<jok>"text/uon"</jok>:
<jov>"(\n\tname=Doggie,\n\tspecies=Dog,\n\tprice=9.99,\n\ttags=@(\n\t\tfriendly,\n\t\tcute\n\t)\n)"</jov>,
-
<jok>"application/x-www-form-urlencoded"</jok>:
<jov>"name=Doggie\n&species=Dog\n&price=9.99\n&tags=@(\n\tfriendly,\n\tcute\n)"</jov>,
+
<jok>"application/x-www-form-urlencoded"</jok>:
<jov>"name=Doggie\n&species=Dog\n&price=9.99\n&tags=@(\n\tfriendly,\n\tcute\n)"</jov>,
<jok>"text/openapi"</jok>:
<jov>"(\n\tname=Doggie,\n\tspecies=Dog,\n\tprice=9.99,\n\ttags=@(\n\t\tfriendly,\n\t\tcute\n\t)\n)"</jov>,
<jok>"octal/msgpack"</jok>:
<jov>"84 A4 6E 61 6D 65 A6 44 6F 67 67 69 65 A7 73 70 65 63 69 65 73 A3 44 6F
67 A5 70 72 69 63 6..."</jov>,
<jok>"text/plain"</jok>:
<jov>"{name:'Doggie',species:'Dog',price:9.99,tags:['friendly','cute']}"</jov>,
diff --git
a/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/08.ResponseExamples.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/08.ResponseExamples.html
index dfe89c7..a9135f3 100644
---
a/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/08.ResponseExamples.html
+++
b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/08.ResponseExamples.html
@@ -52,7 +52,7 @@ Response Examples
<jok>"text/xml"</jok>:
<jov>"<?xml version=\"1.0\"
encoding=\"UTF-8\"?>\n<Pet>\n\t<id>123</id>\n\t<spec..."</jov>,
<jok>"text/xml+schema"</jok>:
<jov>"<schema xmlns=\"http://www.w3.org/2001/XMLSchema\";
targetNamespace=\"http://www.apache.org/...";</jov>,
<jok>"text/uon"</jok>:
<jov>"(\n\tid=123,\n\tspecies=(\n\t\tname=Dog,\n\t\tid=123\n\t),\n\tname=Doggie,\n\ttags=@(\n\t\t(\n\t\t\tn..."</jov>,
-
<jok>"application/x-www-form-urlencoded"</jok>:
<jov>"id=123\n&species=(\n\tname=Dog,\n\tid=123\n)\n&name=Doggie\n&tags=@(\n\t(\n\..."</jov>,
+
<jok>"application/x-www-form-urlencoded"</jok>:
<jov>"id=123\n&species=(\n\tname=Dog,\n\tid=123\n)\n&name=Doggie\n&tags=@(\n\t(\n\..."</jov>,
<jok>"text/openapi"</jok>:
<jov>"(\n\tid=123,\n\tspecies=(\n\t\tname=Dog,\n\t\tid=123\n\t),\n\tname=Doggie,\n\ttags=@(\n\t\t(\n\t\..."</jov>,
<jok>"octal/msgpack"</jok>:
<jov>"86 A2 69 64 7B A7 73 70 65 63 69 65 73 82 A4 6E 61 6D 65 A3 44 6F 67 A2
69 64 7B A4 6E 61 6D 65 ..."</jov>,
<jok>"text/xml+soap"</jok>:
<jov>"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Envelope
soap=\"http://www.w3.org/2003/05/...";</jov>,
diff --git
a/juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation.html
index 0891556..e3842f0 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation.html
@@ -21,8 +21,8 @@
<br>It's used in the following locations:
</p>
<ul>
- <li class='ja'>{@link oajr.annotation.RestResource#htmldoc()}
- <li class='ja'>{@link oajr.annotation.RestMethod#htmldoc()}
+ <li class='ja'>{@link oajr.annotation.RestResource#htmldoc()
RestResource(htmldoc)}
+ <li class='ja'>{@link oajr.annotation.RestMethod#htmldoc()
RestMethod(htmldoc)}
</ul>
<p>
The annotation itself is just a convenience for setting configuration
properties set
diff --git
a/juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/02.Widgets.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/02.Widgets.html
index acda55c..d0f821b 100644
---
a/juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/02.Widgets.html
+++
b/juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/02.Widgets.html
@@ -21,7 +21,7 @@ Widgets
<br>They are registered in the following locations:
</p>
<ul>
- <li class='ja'>{@link oajr.annotation.HtmlDoc#widgets()
@HtmlDoc.widgets}
+ <li class='ja'>{@link oajr.annotation.HtmlDoc#widgets()
HtmlDoc(widgets)}
<li class='jm'>{@link oajr.RestContextBuilder#widgets(Class...)}
<li class='jm'>{@link oajr.RestContextBuilder#widgets(Widget...)}
<li class='jf'>{@link oajr.RestContext#REST_widgets}
diff --git
a/juneau-doc/docs/Topics/07.juneau-rest-server/29.DefaultHeaders.html
b/juneau-doc/docs/Topics/07.juneau-rest-server/29.DefaultHeaders.html
index 71fda82..c11890b 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/29.DefaultHeaders.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/29.DefaultHeaders.html
@@ -20,10 +20,10 @@ Default Headers
</p>
<ul class='doctree'>
<li class='ja'>
- {@link oajr.annotation.RestResource#defaultRequestHeaders()
@RestResource(defaultRequestHeaders)}
+ {@link oajr.annotation.RestResource#defaultRequestHeaders()
RestResource(defaultRequestHeaders)}
<br>Defines default headers on request when the client doesn't
specify them.
<li class='ja'>
- {@link oajr.annotation.RestResource#defaultResponseHeaders()
@RestResource(defaultResponseHeaders)}
+ {@link oajr.annotation.RestResource#defaultResponseHeaders()
RestResource(defaultResponseHeaders)}
<br>Appends the specified headers if they weren't already set
programmatically.
</ul>
diff --git a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies.html
b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies.html
index a59d97a..92428bc 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies.html
@@ -43,13 +43,13 @@ REST Proxies
</ul>
<li class='jp'>{@link oaj.http.annotation}
<ul>
- <li class='ja'>{@link oaj.http.annotation.Body Body}
- <li class='ja'>{@link oaj.http.annotation.Header Header}
- <li class='ja'>{@link oaj.http.annotation.FormData FormData}
- <li class='ja'>{@link oaj.http.annotation.Query Query}
- <li class='ja'>{@link oaj.http.annotation.Path Path}
- <li class='ja'>{@link oaj.http.annotation.Request Request}
- <li class='ja'>{@link oaj.http.annotation.Response Response}
+ <li class='ja'>{@link oaj.http.annotation.Body}
+ <li class='ja'>{@link oaj.http.annotation.Header}
+ <li class='ja'>{@link oaj.http.annotation.FormData}
+ <li class='ja'>{@link oaj.http.annotation.Query}
+ <li class='ja'>{@link oaj.http.annotation.Path}
+ <li class='ja'>{@link oaj.http.annotation.Request}
+ <li class='ja'>{@link oaj.http.annotation.Response}
</ul>
</ul>
diff --git
a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/03.Body.html
b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/03.Body.html
index 82146da..d52f532 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/03.Body.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/03.Body.html
@@ -20,7 +20,7 @@
to denote that they are the HTTP body of the request.
</p>
<ul class='doctree'>
- <li class='ja'>{@link oaj.http.annotation.Body Body}
+ <li class='ja'>{@link oaj.http.annotation.Body}
<ul>
<li class='jf'>{@link oaj.http.annotation.Body#required()
required} - Input validation. Body must be present.
<li class='jf'>{@link oaj.http.annotation.Body#schema() schema}
- Swagger schema.
diff --git
a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/04.FormData.html
b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/04.FormData.html
index 50fcf4b..0a21ecc 100644
---
a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/04.FormData.html
+++
b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/04.FormData.html
@@ -20,7 +20,7 @@
to denote that they are form-data parameters on the request.
</p>
<ul class='doctree'>
- <li class='ja'>{@link oaj.http.annotation.FormData FormData}
+ <li class='ja'>{@link oaj.http.annotation.FormData}
<ul>
<li class='jf'>{@link oaj.http.annotation.FormData#_default()
_default} - Default value if not present.
<li class='jf'>{@link oaj.http.annotation.FormData#_enum()
_enum} - Input validation. Must match one of the values.
diff --git
a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/05.Query.html
b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/05.Query.html
index 6ca319c..c61144f 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/05.Query.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/05.Query.html
@@ -20,7 +20,7 @@
to denote that they are query parameters on the request.
</p>
<ul class='doctree'>
- <li class='ja'>{@link oaj.http.annotation.Query Query}
+ <li class='ja'>{@link oaj.http.annotation.Query}
<ul>
<li class='jf'>{@link oaj.http.annotation.Query#_default()
_default} - Default value if not present.
<li class='jf'>{@link oaj.http.annotation.Query#_enum() _enum}
- Input validation. Must match one of the values.
diff --git
a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/06.Header.html
b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/06.Header.html
index 62aa4e7..47c5efd 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/06.Header.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/06.Header.html
@@ -20,7 +20,7 @@
to denote that they are header parameters on the request.
</p>
<ul class='doctree'>
- <li class='ja'>{@link oaj.http.annotation.Header Header}
+ <li class='ja'>{@link oaj.http.annotation.Header}
<ul>
<li class='jf'>{@link oaj.http.annotation.Header#_default()
_default} - Default value if not present.
<li class='jf'>{@link oaj.http.annotation.Header#_enum() _enum}
- Input validation. Must match one of the values.
diff --git
a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/07.Path.html
b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/07.Path.html
index 47cab6e..63032bf 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/07.Path.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/07.Path.html
@@ -20,7 +20,7 @@
to denote that they are path parameters on the request.
</p>
<ul class='doctree'>
- <li class='ja'>{@link oaj.http.annotation.Path Path}
+ <li class='ja'>{@link oaj.http.annotation.Path}
<ul>
<li class='jf'>{@link oaj.http.annotation.Path#_enum() _enum} -
Input validation. Must match one of the values.
<li class='jf'>{@link
oaj.http.annotation.Path#allowEmptyValue() allowEmptyValue} - Input validation.
Allow empty value.
diff --git
a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/08.Request.html
b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/08.Request.html
index df114f2..1e9e992 100644
---
a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/08.Request.html
+++
b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/08.Request.html
@@ -21,7 +21,7 @@
</p>
<ul class='doctree'>
- <li class='ja'>{@link oaj.http.annotation.Request Request}
+ <li class='ja'>{@link oaj.http.annotation.Request}
<ul>
<li class='jf'>{@link
oaj.http.annotation.Request#partSerializer() partSerializer} - Override the
part serializer.
</ul>
@@ -79,11 +79,11 @@
Any of the following annotations can be used on the methods:
</p>
<ul class='doctree'>
- <li class='ja'>{@link oaj.http.annotation.Body Body}
- <li class='ja'>{@link oaj.http.annotation.Header Header}
- <li class='ja'>{@link oaj.http.annotation.FormData FormData}
- <li class='ja'>{@link oaj.http.annotation.Query Query}
- <li class='ja'>{@link oaj.http.annotation.Path Path}
+ <li class='ja'>{@link oaj.http.annotation.Body}
+ <li class='ja'>{@link oaj.http.annotation.Header}
+ <li class='ja'>{@link oaj.http.annotation.FormData}
+ <li class='ja'>{@link oaj.http.annotation.Query}
+ <li class='ja'>{@link oaj.http.annotation.Path}
</ul>
<p>
The behavior and functionality of all of the annotations are the same
as if they were used on method arguments directly.
diff --git
a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/09.Response.html
b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/09.Response.html
index 24a812e..7cf96f8 100644
---
a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/09.Response.html
+++
b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/09.Response.html
@@ -19,7 +19,7 @@
The {@link oaj.http.annotation.Response @Response} annotation can be
applied to types returned by <ja>@RemoteMethod</ja>-annotated methods.
</p>
<ul class='doctree'>
- <li class='ja'>{@link oaj.http.annotation.Response Response}
+ <li class='ja'>{@link oaj.http.annotation.Response}
<ul>
<li class='jf'>{@link oaj.http.annotation.Response#partParser()
partParser} - Override the part parser.
</ul>
@@ -65,9 +65,9 @@
Any of the following annotations can be used on the methods:
</p>
<ul class='doctree'>
- <li class='ja'>{@link oaj.http.annotation.ResponseBody ResponseBody}
- <li class='ja'>{@link oaj.http.annotation.ResponseHeader ResponseHeader}
- <li class='ja'>{@link oaj.http.annotation.ResponseStatus ResponseStatus}
+ <li class='ja'>{@link oaj.http.annotation.ResponseBody}
+ <li class='ja'>{@link oaj.http.annotation.ResponseHeader}
+ <li class='ja'>{@link oaj.http.annotation.ResponseStatus}
</ul>
<p>
The behavior and functionality of all of the annotations are the same
as if they were used on method arguments directly. This means full support for
OpenAPI serialization and validation.
diff --git a/juneau-doc/docs/Topics/11.juneau-microservice-core.html
b/juneau-doc/docs/Topics/11.juneau-microservice-core.html
index c3f21ee..61dde09 100644
--- a/juneau-doc/docs/Topics/11.juneau-microservice-core.html
+++ b/juneau-doc/docs/Topics/11.juneau-microservice-core.html
@@ -38,3 +38,17 @@
Juneau Microservice is an API for creating stand-alone executable jars
with automatic support for
Juneau configurations and console commands.
</p>
+
+<p>
+ Features include:
+</p>
+<ul class='spaced-list'>
+ <li>
+ A builder-based API for defining and starting microservices.
+ <li>
+ An extensible API that allows you to hook into various
lifecycle events.
+ <li>
+ Simple-to-use APIs for accessing manifest file entries,
command-line arguments, and external configuration
+ file properties.
+</ul>
+
diff --git
a/juneau-doc/docs/Topics/16.juneau-examples-rest/03.PetStoreResource.html
b/juneau-doc/docs/Topics/16.juneau-examples-rest/03.PetStoreResource.html
index 56c2962..0e83192 100644
--- a/juneau-doc/docs/Topics/16.juneau-examples-rest/03.PetStoreResource.html
+++ b/juneau-doc/docs/Topics/16.juneau-examples-rest/03.PetStoreResource.html
@@ -656,7 +656,7 @@
For example, selecting <l>APPLICATION/JSON+SIMPLE</l> shows us
simplified JSON:
</p>
<p class='bpcode w800'>
-
http://localhost:10000/petstore/pet?plainText=true&Accept=application%2Fjson%2Bsimple
+
http://localhost:10000/petstore/pet?plainText=true&Accept=application%2Fjson%2Bsimple
</p>
<img class='bordered w800'
src='doc-files/juneau-examples-rest.PetStoreResource.5b.png'>
<p>
@@ -715,7 +715,7 @@
<ja>@Override</ja> <jc>/* MenuItemWidget */</jc>
<jk>public</jk> Div getContent(RestRequest req) {
Div div = <jsm>div</jsm>();
- Set<MediaType> l = <jk>new</jk> TreeSet<>();
+ Set<MediaType> l = <jk>new</jk> TreeSet<>();
<jk>for</jk> (Serializer s :
req.getSerializers().getSerializers())
l.add(s.getPrimaryMediaType());
<jk>for</jk> (MediaType mt : l) {
@@ -761,7 +761,7 @@
The converter will take the POJOs to be serialized and filter them
based on the provided query/view/sort/paging attributes:
</p>
<p class='bpcode w800'>
-
http://localhost:10000/petstore/pet?s=name%3DHoppy*&v=species%2Cname&o=name&p=0&l=20
+
http://localhost:10000/petstore/pet?s=name%3DHoppy*&v=species%2Cname&o=name&p=0&l=20
</p>
<img class='bordered w800'
src='doc-files/juneau-examples-rest.PetStoreResource.7b.png'>
<p>
@@ -963,7 +963,7 @@
<jk>public class</jk> PhotosResource <jk>extends</jk> BasicRestServlet {
<jd>/** Our cache of photos */</jd>
- <jk>private</jk> Map<String,Photo> <jf>photos</jf> =
<jk>new</jk> TreeMap<>();
+ <jk>private</jk> Map<String,Photo> <jf>photos</jf> =
<jk>new</jk> TreeMap<>();
<jd>/** Our bean class for storing photos */</jd>
<jk>public static class</jk> Photo {
@@ -1319,15 +1319,15 @@
PostInput in
) <jk>throws</jk> BadRequest {
- List<Object> results = <jk>new</jk> LinkedList<>();
+ List<Object> results = <jk>new</jk> LinkedList<>();
<jc>// Don't try to submit empty input.</jc>
<jk>if</jk> (isEmpty(in.<jf>sql</jf>))
<jk>return</jk> results;
- <jk>if</jk> (in.<jf>pos</jf> < 1 || in.<jf>pos</jf> > 10000)
+ <jk>if</jk> (in.<jf>pos</jf> < 1 || in.<jf>pos</jf> > 10000)
<jk>throw new</jk> BadRequest(<js>"Invalid value for
position. Must be between 1-10000"</js>);
- <jk>if</jk> (in.<jf>limit</jf> < 1 || in.<jf>limit</jf> > 10000)
+ <jk>if</jk> (in.<jf>limit</jf> < 1 || in.<jf>limit</jf> >
10000)
<jk>throw new</jk> BadRequest(<js>"Invalid value for
limit. Must be between 1-10000"</js>);
String sql = <jk>null</jk>;
@@ -1341,7 +1341,7 @@
sql = s.trim();
<jk>if</jk> (! sql.isEmpty()) {
Object o = <jk>null</jk>;
- <jk>if</jk>
(<jf>allowUpdates</jf> || (<jf>allowTempUpdates</jf> && !
sql.matches(<js>"(?:i)commit.*"</js>))) {
+ <jk>if</jk>
(<jf>allowUpdates</jf> || (<jf>allowTempUpdates</jf> && !
sql.matches(<js>"(?:i)commit.*"</js>))) {
<jk>if</jk>
(st.execute(sql)) {
<jk>try</jk>
(ResultSet rs = st.getResultSet()) {
o =
<jk>new</jk> ResultSetList(rs, in.<jf>pos</jf>, in.<jf>limit</jf>,
<jf>includeRowNums</jf>);
diff --git a/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot.html
b/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot.html
index 44dbe14..9885f0a 100644
--- a/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot.html
+++ b/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot.html
@@ -21,7 +21,7 @@
</p>
<p>
- The <code>juneau-examples-rest-springboot</code> class contains the
same examples as <code>juneau-examples-rest</code>
+ The <code>juneau-examples-rest-springboot</code> library contains the
same examples as <code>juneau-examples-rest</code>
but also includes the following:
</p>
<ul class='spaced-list'>
diff --git a/juneau-doc/docs/overview.html
b/juneau-doc/docs/overview_template.html
similarity index 100%
rename from juneau-doc/docs/overview.html
rename to juneau-doc/docs/overview_template.html
diff --git a/juneau-doc/juneau-doc.jar b/juneau-doc/juneau-doc.jar
index 7b719c6..feb28d3 100644
Binary files a/juneau-doc/juneau-doc.jar and b/juneau-doc/juneau-doc.jar differ
diff --git
a/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DocGenerator.java
b/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DocGenerator.java
index 5fadc78..4019ad7 100644
--- a/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DocGenerator.java
+++ b/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DocGenerator.java
@@ -56,7 +56,7 @@ public class DocGenerator {
try {
long startTime = System.currentTimeMillis();
- String template =
IOUtils.readFile("docs/overview.html");
+ String template =
IOUtils.readFile("docs/overview_template.html");
DocStore ds = new DocStore(new File("docs/docs.txt"));
@@ -200,10 +200,12 @@ public class DocGenerator {
public Topics(File topicsDir) throws IOException {
for (File f : topicsDir.listFiles()) {
- if (f.isFile())
- pageFiles.add(new PageFile(null, f,
docFiles));
- else if (f.isDirectory() &&
f.getName().contains("doc-files"))
-
docFiles.addAll(Arrays.asList(f.listFiles()));
+ if (! f.getName().startsWith(".")) {
+ if (f.isFile())
+ pageFiles.add(new
PageFile(null, f, docFiles));
+ else if (f.isDirectory() &&
f.getName().contains("doc-files"))
+
docFiles.addAll(Arrays.asList(f.listFiles()));
+ }
}
}
}
diff --git a/juneau-doc/src/main/javadoc/overview.html
b/juneau-doc/src/main/javadoc/overview.html
index 7681f0c..d6cdce4 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -1713,28 +1713,28 @@
</p>
<ul class='doctree'>
<li class='ja'>
- {@link org.apache.juneau.annotation.Swap @Swap}
+ {@link org.apache.juneau.annotation.Swap}
- Used to tailor how non-bean POJOs get interpreted by the
framework.
<li class='ja'>
- {@link org.apache.juneau.annotation.Bean @Bean}
+ {@link org.apache.juneau.annotation.Bean}
- Used to tailor how beans get interpreted by the framework.
<li class='ja'>
- {@link org.apache.juneau.annotation.BeanConstructor
@BeanConstructor}
+ {@link org.apache.juneau.annotation.BeanConstructor}
- Maps constructor arguments to property names on beans with
read-only properties.
<li class='ja'>
- {@link org.apache.juneau.annotation.BeanIgnore @BeanIgnore}
+ {@link org.apache.juneau.annotation.BeanIgnore}
- Ignore classes, fields, and methods from being interpreted as
bean or bean components.
<li class='ja'>
- {@link org.apache.juneau.annotation.BeanProperty @BeanProperty}
+ {@link org.apache.juneau.annotation.BeanProperty}
- Used to tailor how bean properties get interpreted by the
framework.
<li class='ja'>
- {@link org.apache.juneau.annotation.NameProperty @NameProperty}
+ {@link org.apache.juneau.annotation.NameProperty}
- Identifies a setter as a method for setting the name of a
POJO as it's known by its parent object.
<li class='ja'>
- {@link org.apache.juneau.annotation.ParentProperty
@ParentProperty}
+ {@link org.apache.juneau.annotation.ParentProperty}
- Identifies a setter as a method for adding a parent reference
to a child object.
<li class='ja'>
- {@link org.apache.juneau.annotation.URI @URI}
+ {@link org.apache.juneau.annotation.URI}
- Used to identify a class or bean property as a URI.
</ul>
@@ -3097,7 +3097,7 @@
</p>
<ul>
<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_beanFilters}
- <li class='ja'>{@link
org.apache.juneau.annotation.Bean#interfaceClass() @Bean(interfaceClass)}
+ <li class='ja'>{@link
org.apache.juneau.annotation.Bean#interfaceClass() Bean(interfaceClass)}
<li class='jm'>{@link
org.apache.juneau.transform.BeanFilterBuilder#interfaceClass(Class)}
</ul>
<p>
@@ -3200,7 +3200,7 @@
Stop classes are defined through the following:
</p>
<ul>
- <li class='ja'>{@link org.apache.juneau.annotation.Bean#stopClass()
@Bean(stopClass)}
+ <li class='ja'>{@link org.apache.juneau.annotation.Bean#stopClass()
Bean(stopClass)}
<li class='jf'>{@link
org.apache.juneau.transform.BeanFilterBuilder#stopClass(Class)}
</ul>
<p>
@@ -3359,9 +3359,9 @@
Bean dictionaries are registered through the following:
</p>
<ul>
- <li class='ja'>{@link
org.apache.juneau.annotation.BeanProperty#beanDictionary()
@BeanProperty(beanDictionary)}
+ <li class='ja'>{@link
org.apache.juneau.annotation.BeanProperty#beanDictionary()
BeanProperty(beanDictionary)}
- On individual bean properties through the annotation.
- <li class='ja'>{@link
org.apache.juneau.annotation.Bean#beanDictionary() @Bean(beanDictionary)}
+ <li class='ja'>{@link
org.apache.juneau.annotation.Bean#beanDictionary() Bean(beanDictionary)}
- On all properties on a bean and all subclasses.
<li class='jf'>{@link
org.apache.juneau.BeanContext#BEAN_beanDictionary}
- Configuration property on serializers and parsers.
@@ -3401,7 +3401,7 @@
The <js>"_type"</js> property name can be overridden through the
following:
</p>
<ul>
- <li class='ja'>{@link
org.apache.juneau.annotation.Bean#typePropertyName() @Bean(typePropertyName)}
+ <li class='ja'>{@link
org.apache.juneau.annotation.Bean#typePropertyName() Bean(typePropertyName)}
- On individual beans through the annotation.
<li class='jf'>{@link
org.apache.juneau.BeanContext#BEAN_beanTypePropertyName}
- Configuration property on serializers and parsers.
@@ -8710,13 +8710,13 @@
can be applied to method parameters and class types to define the
schema for various HTTP parts:
</p>
<ul class='doctree'>
- <li class='ja'>{@link org.apache.juneau.http.annotation.Body Body}
- <li class='ja'>{@link org.apache.juneau.http.annotation.Header Header}
- <li class='ja'>{@link org.apache.juneau.http.annotation.Query Query}
- <li class='ja'>{@link org.apache.juneau.http.annotation.FormData
FormData}
- <li class='ja'>{@link org.apache.juneau.http.annotation.Path Path}
- <li class='ja'>{@link org.apache.juneau.http.annotation.Response
Response}
- <li class='ja'>{@link org.apache.juneau.http.annotation.ResponseHeader
ResponseHeader}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Body}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Header}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Query}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.FormData}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Path}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Response}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.ResponseHeader}
</ul>
<!--
====================================================================================================
-->
@@ -10794,7 +10794,7 @@
<jc>// Override the nav links for the swagger
page.</jc>
navlinks={
<js>"back: servlet:/"</js>,
- <js>"json:
servlet:/?method=OPTIONS&Accept=text/json&plainText=true"</js>
+ <js>"json:
servlet:/?method=OPTIONS&Accept=text/json&plainText=true"</js>
},
<jc>// Never show aside contents of page
inherited from class.</jc>
aside="<js>NONE"</js>
@@ -14519,7 +14519,7 @@
<h5 class='section'>See Also:</h5>
<ul>
- <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestMethod#matchers}
+ <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestMethod#matchers RestMethod(matchers)}
<li class='jc'>{@link
org.apache.juneau.rest.matchers.MultipartFormDataMatcher}
<li class='jc'>{@link
org.apache.juneau.rest.matchers.UrlEncodedFormMatcher}
</ul>
@@ -15261,11 +15261,11 @@
therefore support OpenAPI syntax and validation:
</p>
<ul class='doctree'>
- <li class='ja'>{@link org.apache.juneau.http.annotation.Header Header}
- <li class='ja'>{@link org.apache.juneau.http.annotation.Query Query}
- <li class='ja'>{@link org.apache.juneau.http.annotation.FormData
FormData}
- <li class='ja'>{@link org.apache.juneau.http.annotation.Path Path}
- <li class='ja'>{@link org.apache.juneau.http.annotation.Body Body}
(<code>Content-Type</code> must match <js>"text/openapi"</js>)
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Header}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Query}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.FormData}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Path}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Body}
(<code>Content-Type</code> must match <js>"text/openapi"</js>)
</ul>
<p>
For example, the following shows how a pipe-delimited list of
comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) in a query
parameter can be converted to a 2-dimensional array of <code>Longs</code>:
@@ -15376,8 +15376,8 @@
therefore support OpenAPI syntax and validation:
</p>
<ul class='doctree'>
- <li class='ja'>{@link org.apache.juneau.http.annotation.ResponseHeader
ResponseHeader}
- <li class='ja'>{@link org.apache.juneau.http.annotation.Response
Response} (<code>Accept</code> must match <js>"text/openapi"</js>)
+ <li class='ja'>{@link org.apache.juneau.http.annotation.ResponseHeader}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Response}
(<code>Accept</code> must match <js>"text/openapi"</js>)
</ul>
<p>
For example, the following shows how a pipe-delimited list of
comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) in a response
header can be converted to a 2-dimensional array of <code>Longs</code>:
@@ -15447,30 +15447,30 @@
The annotations used for defining the schema for request HTTP parts are:
</p>
<ul class='doctree'>
- <li class='ja'>{@link org.apache.juneau.http.annotation.Body Body}
- <li class='ja'>{@link org.apache.juneau.http.annotation.Header Header}
- <li class='ja'>{@link org.apache.juneau.http.annotation.FormData
FormData}
- <li class='ja'>{@link org.apache.juneau.http.annotation.Query Query}
- <li class='ja'>{@link org.apache.juneau.http.annotation.Path Path}
- <li class='ja'>{@link org.apache.juneau.http.annotation.HasFormData
HasFormData}
- <li class='ja'>{@link org.apache.juneau.http.annotation.HasQuery
HasQuery}
- <li class='ja'>{@link org.apache.juneau.http.annotation.Request Request}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Body}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Header}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.FormData}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Query}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Path}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.HasFormData}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.HasQuery}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Request}
</ul>
<p>
The annotations used for defining the schema for response HTTP parts
are:
</p>
<ul class='doctree'>
- <li class='ja'>{@link org.apache.juneau.http.annotation.ResponseBody
ResponseBody}
- <li class='ja'>{@link org.apache.juneau.http.annotation.ResponseHeader
ResponseHeader}
- <li class='ja'>{@link org.apache.juneau.http.annotation.ResponseStatus
ResponseStatus}
- <li class='ja'>{@link org.apache.juneau.http.annotation.Response
Response}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.ResponseBody}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.ResponseHeader}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.ResponseStatus}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Response}
</ul>
<p>
The sub-annotations used in the annotation above are:
</p>
<ul class='doctree'>
- <li class='ja'>{@link org.apache.juneau.jsonschema.annotation.Schema
Schema}
- <li class='ja'>{@link org.apache.juneau.jsonschema.annotation.Items
Items}
+ <li class='ja'>{@link org.apache.juneau.jsonschema.annotation.Schema}
+ <li class='ja'>{@link org.apache.juneau.jsonschema.annotation.Items}
</ul>
<h5 class='section'>Other Notes:</h5>
@@ -15491,7 +15491,7 @@
The {@link org.apache.juneau.http.annotation.Body @Body} annotation is
used to identify POJOs to be used as the body of an HTTP request.
</p>
<ul class='doctree'>
- <li class='ja'>{@link org.apache.juneau.http.annotation.Body Body}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Body}
<ul>
<li class='jf'>{@link
org.apache.juneau.http.annotation.Body#api() api} - Free-form Swagger JSON.
<li class='jf'>{@link
org.apache.juneau.http.annotation.Body#description() description} - Description.
@@ -15675,7 +15675,7 @@
The {@link org.apache.juneau.http.annotation.FormData @FormData}
annotation is used to retrieve request form post entries.
</p>
<ul class='doctree'>
- <li class='ja'>{@link org.apache.juneau.http.annotation.FormData
FormData}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.FormData}
<ul>
<li class='jf'>{@link
org.apache.juneau.http.annotation.FormData#_default() _default} - Default value
if not present.
<li class='jf'>{@link
org.apache.juneau.http.annotation.FormData#_enum() _enum} - Input validation.
Must match one of the values.
@@ -15849,7 +15849,7 @@
This annotation can be used to detect the existence of a parameter when
it's not set to a particular value.
</p>
<ul class='doctree'>
- <li class='ja'>{@link org.apache.juneau.http.annotation.HasFormData
HasFormData}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.HasFormData}
</ul>
<h5 class='figure'>Example:</h5>
@@ -15922,7 +15922,7 @@
<br>It's identical to {@link org.apache.juneau.http.annotation.FormData
@FormData}, but only retrieves the parameter from the URL string, not
URL-encoded form posts.
</p>
<ul class='doctree'>
- <li class='ja'>{@link org.apache.juneau.http.annotation.Query Query}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Query}
<ul>
<li class='jf'>{@link
org.apache.juneau.http.annotation.Query#_default() _default} - Default value if
not present.
<li class='jf'>{@link
org.apache.juneau.http.annotation.Query#_enum() _enum} - Input validation.
Must match one of the values.
@@ -16096,7 +16096,7 @@
URL-encoded form posts.
</p>
<ul class='doctree'>
- <li class='ja'>{@link org.apache.juneau.http.annotation.HasQuery
HasQuery}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.HasQuery}
</ul>
<p>
Unlike {@link org.apache.juneau.http.annotation.HasFormData
@HasFormData}, using this annotation does not result in the servlet reading the
contents
@@ -16162,7 +16162,7 @@
The {@link org.apache.juneau.http.annotation.Header @Header} annotation
is used to retrieve request headers.
</p>
<ul class='doctree'>
- <li class='ja'>{@link org.apache.juneau.http.annotation.Header Header}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Header}
<ul>
<li class='jf'>{@link
org.apache.juneau.http.annotation.Header#_default() _default} - Default value
if not present.
<li class='jf'>{@link
org.apache.juneau.http.annotation.Header#_enum() _enum} - Input validation.
Must match one of the values.
@@ -16321,7 +16321,7 @@
The {@link org.apache.juneau.http.annotation.Path @Path} annotation is
used to retrieve request path parameters.
</p>
<ul class='doctree'>
- <li class='ja'>{@link org.apache.juneau.http.annotation.Path Path}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Path}
<ul>
<li class='jf'>{@link
org.apache.juneau.http.annotation.Path#_enum() _enum} - Input validation. Must
match one of the values.
<li class='jf'>{@link
org.apache.juneau.http.annotation.Path#allowEmptyValue() allowEmptyValue} -
Input validation. Allow empty value.
@@ -16486,7 +16486,7 @@
to identify it as an interface for retrieving HTTP parts through a
bean-like interface.
</p>
<ul class='doctree'>
- <li class='ja'>{@link org.apache.juneau.http.annotation.Request Request}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Request}
<ul>
<li class='jf'>{@link
org.apache.juneau.http.annotation.Request#partParser() partParser} - Override
the part parser.
</ul>
@@ -16574,7 +16574,7 @@
The {@link org.apache.juneau.http.annotation.Response @Response}
annotation is used to identify schema information about an HTTP response.
</p>
<ul class='doctree'>
- <li class='ja'>{@link org.apache.juneau.http.annotation.Response
Response}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Response}
<ul>
<li class='jf'>{@link
org.apache.juneau.http.annotation.Response#api() api} - Free-form Swagger JSON.
<li class='jf'>{@link
org.apache.juneau.http.annotation.Response#code() code} - HTTP status code.
@@ -16969,7 +16969,7 @@
The {@link org.apache.juneau.http.annotation.ResponseHeader
@ResponseHeader} annotation can be applied to <ja>@RestMethod</ja>-annotated
parameters to denote them as an HTTP response headers.
</p>
<ul class='doctree'>
- <li class='ja'>{@link org.apache.juneau.http.annotation.ResponseHeader
ResponseHeader}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.ResponseHeader}
<ul>
<li class='jf'>{@link
org.apache.juneau.http.annotation.ResponseHeader#_default() _default} - Default
value if not present.
<li class='jf'>{@link
org.apache.juneau.http.annotation.ResponseHeader#_enum() _enum} - Output
validation. Must match one of the values.
@@ -17085,7 +17085,7 @@
The {@link org.apache.juneau.http.annotation.ResponseStatus
@ResponseStatus} annotation annotation can be applied to
<ja>@RestMethod</ja>-annotated parameters to denote them as an HTTP response
status codes.
</p>
<ul class='doctree'>
- <li class='ja'>{@link org.apache.juneau.http.annotation.ResponseStatus
ResponseStatus}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.ResponseStatus}
</ul>
<p>
This can only be applied to parameters of the {@link
org.apache.juneau.Value} class with an {@link java.lang.Integer} type.
@@ -17258,10 +17258,10 @@
</p>
<ul class='doctree'>
<li class='ja'>
- {@link
org.apache.juneau.rest.annotation.RestResource#serializers()}
+ {@link
org.apache.juneau.rest.annotation.RestResource#serializers()
RestResource(serializers)}
- Annotation on resource Java class.
<li class='ja'>
- {@link
org.apache.juneau.rest.annotation.RestMethod#serializers()}
+ {@link
org.apache.juneau.rest.annotation.RestMethod#serializers()
RestMethod(serializers)}
- Annotation on resource Java method.
<li class='jf'>
{@link org.apache.juneau.rest.RestContext#REST_serializers}
@@ -17326,10 +17326,10 @@
</p>
<ul class='doctree'>
<li class='ja'>
- {@link
org.apache.juneau.rest.annotation.RestResource#parsers()}
+ {@link org.apache.juneau.rest.annotation.RestResource#parsers()
RestResource(parsers)}
- Annotation on resource Java class.
<li class='ja'>
- {@link org.apache.juneau.rest.annotation.RestMethod#parsers()}
+ {@link org.apache.juneau.rest.annotation.RestMethod#parsers()
RestMethod(parsers)}
- Annotation on resource Java method.
<li class='jm'>
{@link
org.apache.juneau.rest.RestContextBuilder#parsers(Class[])}
@@ -17387,7 +17387,7 @@
These properties can be defined for serializers and parsers registered
on a REST resource via the following:
</p>
<ul>
- <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestResource#properties()}
+ <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestResource#properties()
RestResource(properties)}
<li class='jc'>{@link org.apache.juneau.rest.RestContextBuilder} -
Various methods on the context builder.
</ul>
<h5 class='figure'>Example:</h5>
@@ -17432,7 +17432,7 @@
Properties can also be overridden at the Java method level:
</p>
<ul>
- <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestMethod#properties()}
+ <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestMethod#properties()
RestMethod(properties)}
<li class='jc'>{@link org.apache.juneau.rest.RequestProperties}
</ul>
<p class='bpcode w800'>
@@ -17484,8 +17484,8 @@
</ul>
<h5 class='section'>See Also:</h5>
<ul>
- <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestResource#flags()} - Shorthand for boolean
properties.
- <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestMethod#flags()} - Shorthand for boolean
properties.
+ <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestResource#flags() RestResource(flags)} -
Shorthand for boolean properties.
+ <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestMethod#flags() RestMethod(flags)} -
Shorthand for boolean properties.
<li class='jc'>{@link org.apache.juneau.rest.RestContextProperties}
<li class='jc'>{@link org.apache.juneau.rest.RestMethodProperties}
<li class='jc'>{@link org.apache.juneau.rest.RequestProperties}
@@ -17504,10 +17504,10 @@
Transforms are associated serializers and parsers registered on a REST
resource via the following:
</p>
<ul>
- <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestResource#beanFilters()}
- <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestResource#pojoSwaps()}
- <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestMethod#beanFilters()}
- <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestMethod#pojoSwaps()}
+ <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestResource#beanFilters()
RestResource(beanFilters)}
+ <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestResource#pojoSwaps()
RestResource(pojoSwaps)}
+ <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestMethod#beanFilters()
RestMethod(beanFilters)}
+ <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestMethod#pojoSwaps() RestMethod(pojoSwaps)}
<li class='jm'>{@link
org.apache.juneau.rest.RestContextBuilder#beanFilters(Object...)}
<li class='jm'>{@link
org.apache.juneau.rest.RestContextBuilder#pojoSwaps(Object...)}
</ul>
@@ -17632,7 +17632,6 @@
<p>
URIs are resolved by both regular and part serializers.
</p>
-</p>
</div><!-- END: 7.17 - juneau-rest-server.URIs -->
<!--
====================================================================================================
-->
@@ -17646,8 +17645,8 @@
Guards are associated with resource classes and methods via the
following:
</p>
<ul>
- <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestResource#guards()}
- <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestMethod#guards()}
+ <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestResource#guards() RestResource(guards)}
+ <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestMethod#guards() RestMethod(guards)}
<li class='jm'>{@link
org.apache.juneau.rest.RestContextBuilder#guards(Class...)}
</ul>
<p class='bpcode w800'>
@@ -17725,8 +17724,8 @@
Converters are associated with resource classes and methods via the
following:
</p>
<ul>
- <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestResource#converters()}
- <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestMethod#converters()}
+ <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestResource#converters()
RestResource(converters)}
+ <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestMethod#converters()
RestMethod(converters)}
<li class='jm'>{@link
org.apache.juneau.rest.RestContextBuilder#converters(Class...)}
</ul>
<h5 class='figure'>Example:</h5>
@@ -18216,7 +18215,7 @@
Configuration files are associated with REST resources through the
following:
</p>
<ul>
- <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestResource#config()}
+ <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestResource#config() RestResource(config)}
</ul>
<h5 class='figure'>Example:</h5>
@@ -18347,7 +18346,7 @@
</p>
<h5 class='section'>See Also:</h5>
<ul class='doctree'>
- {@doc juneau-config}
+ <li>{@doc juneau-config}
</ul>
</div><!-- END: 7.23 - juneau-rest-server.ConfigurationFiles -->
@@ -18415,9 +18414,9 @@
The APIs involved with defining client version headers are:
</p>
<ul>
- <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestResource#clientVersionHeader()}
+ <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestResource#clientVersionHeader()
RestResource(clientVersionHeader)}
<li class='jm'>{@link
org.apache.juneau.rest.RestContextBuilder#clientVersionHeader(String)}
- <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestMethod#clientVersion()}
+ <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestMethod#clientVersion()
RestMethod(clientVersion)}
</ul>
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
@@ -18581,7 +18580,7 @@
<jc>// Override the nav links for the swagger
page.</jc>
navlinks={
<js>"back: servlet:/"</js>,
- <js>"json:
servlet:/?method=OPTIONS&Accept=text/json&plainText=true"</js>
+ <js>"json:
servlet:/?method=OPTIONS&Accept=text/json&plainText=true"</js>
},
<jc>// Never show aside contents of page
inherited from class.</jc>
aside=<js>"NONE"</js>
@@ -18959,7 +18958,7 @@
<js>"Search."</js>,
<js>"Key/value pairs representing
column names and search tokens."</js>,
<js>"'*' and '?' can be used as
meta-characters in string fields."</js>,
- <js>"'>', '>=', '<', and '<=' can be
used as limits on numeric and date fields."</js>,
+ <js>"'>', '>=', '<', and
'<=' can be used as limits on numeric and date fields."</js>,
<js>"Date fields can be matched with
partial dates (e.g. '2018' to match any date in the year 2018)."</js>
},
type=<js>"array"</js>,
@@ -19024,7 +19023,7 @@
+ <js>"Search.\n"</js>
+ <js>"Key/value pairs representing
column names and search tokens.\n"</js>
+ <js>"\\'*\\' and \\'?\\' can be used
as meta-characters in string fields.\n"</js>
- + <js>"\\'>\\', \\'>=\\', \\'<\\', and
\\'<=\\' can be used as limits on numeric and date fields.\n"</js>
+ + <js>"\\'>\\', \\'>=\\',
\\'<\\', and \\'<=\\' can be used as limits on numeric and date
fields.\n"</js>
+ <js>"Date fields can be matched with
partial dates (e.g. \\'2018\\' to match any date in the year 2018)."</js>
+ <js>"',"</js>
+ <js>"type:'array',"</js>
@@ -19098,7 +19097,7 @@
<js>"Search."</js>,
<js>"Key/value pairs representing
column names and search tokens."</js>,
<js>"'*' and '?' can be used as
meta-characters in string fields."</js>,
- <js>"'>', '>=', '<', and '<=' can be
used as limits on numeric and date fields."</js>,
+ <js>"'>', '>=', '<', and
'<=' can be used as limits on numeric and date fields."</js>,
<js>"Date fields can be matched with
partial dates (e.g. '2018' to match any date in the year 2018)."</js>
},
type=<js>"array"</js>,
@@ -19206,10 +19205,10 @@
<jok>"x-examples"</jok>: {
<jok>"application/json"</jok>:
<jov>"{\n\t\"name\": \"Doggie\",\n\t\"species\": \"Dog\",\n\t\"price\":
9.99,\n\t\"tags\": [\n..."</jov>,
<jok>"application/json+simple"</jok>: <jov>"{\n\tname: 'Doggie',\n\tspecies:
'Dog',\n\tprice: 9.99,\n\ttags: [\n\t\t'friendly..."</jov>,
- <jok>"text/xml"</jok>:
<jov>"<?xml version=\"1.0\"
encoding=\"UTF-8\"?>\n<object>\n\t<name>Doggie</name&..."</jov>,
+ <jok>"text/xml"</jok>:
<jov>"<?xml version=\"1.0\"
encoding=\"UTF-8\"?>\n<object>\n\t<name>Doggie</name&..."</jov>,
<jok>"text/html+stripped"</jok>:
<jov>"<table>\n\t<tr>\n\t\t<td>name</td>\n\t\t<td>Doggie</t..."</jov>,
<jok>"text/uon"</jok>:
<jov>"(\n\tname=Doggie,\n\tspecies=Dog,\n\tprice=9.99,\n\ttags=@(\n\t\tfriendly,\n\t\tcute\n\t)\n)"</jov>,
-
<jok>"application/x-www-form-urlencoded"</jok>:
<jov>"name=Doggie\n&species=Dog\n&price=9.99\n&tags=@(\n\tfriendly,\n\tcute\n)"</jov>,
+
<jok>"application/x-www-form-urlencoded"</jok>:
<jov>"name=Doggie\n&species=Dog\n&price=9.99\n&tags=@(\n\tfriendly,\n\tcute\n)"</jov>,
<jok>"text/openapi"</jok>:
<jov>"(\n\tname=Doggie,\n\tspecies=Dog,\n\tprice=9.99,\n\ttags=@(\n\t\tfriendly,\n\t\tcute\n\t)\n)"</jov>,
<jok>"octal/msgpack"</jok>:
<jov>"84 A4 6E 61 6D 65 A6 44 6F 67 67 69 65 A7 73 70 65 63 69 65 73 A3 44 6F
67 A5 70 72 69 63 6..."</jov>,
<jok>"text/plain"</jok>:
<jov>"{name:'Doggie',species:'Dog',price:9.99,tags:['friendly','cute']}"</jov>,
@@ -19393,7 +19392,7 @@
<jok>"text/xml"</jok>:
<jov>"<?xml version=\"1.0\"
encoding=\"UTF-8\"?>\n<Pet>\n\t<id>123</id>\n\t<spec..."</jov>,
<jok>"text/xml+schema"</jok>:
<jov>"<schema xmlns=\"http://www.w3.org/2001/XMLSchema\";
targetNamespace=\"http://www.apache.org/...";</jov>,
<jok>"text/uon"</jok>:
<jov>"(\n\tid=123,\n\tspecies=(\n\t\tname=Dog,\n\t\tid=123\n\t),\n\tname=Doggie,\n\ttags=@(\n\t\t(\n\t\t\tn..."</jov>,
-
<jok>"application/x-www-form-urlencoded"</jok>:
<jov>"id=123\n&species=(\n\tname=Dog,\n\tid=123\n)\n&name=Doggie\n&tags=@(\n\t(\n\..."</jov>,
+
<jok>"application/x-www-form-urlencoded"</jok>:
<jov>"id=123\n&species=(\n\tname=Dog,\n\tid=123\n)\n&name=Doggie\n&tags=@(\n\t(\n\..."</jov>,
<jok>"text/openapi"</jok>:
<jov>"(\n\tid=123,\n\tspecies=(\n\t\tname=Dog,\n\t\tid=123\n\t),\n\tname=Doggie,\n\ttags=@(\n\t\t(\n\t\..."</jov>,
<jok>"octal/msgpack"</jok>:
<jov>"86 A2 69 64 7B A7 73 70 65 63 69 65 73 82 A4 6E 61 6D 65 A3 44 6F 67 A2
69 64 7B A4 6E 61 6D 65 ..."</jov>,
<jok>"text/xml+soap"</jok>:
<jov>"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Envelope
soap=\"http://www.w3.org/2003/05/...";</jov>,
@@ -19701,8 +19700,8 @@
<br>It's used in the following locations:
</p>
<ul>
- <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestResource#htmldoc()}
- <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestMethod#htmldoc()}
+ <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestResource#htmldoc() RestResource(htmldoc)}
+ <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestMethod#htmldoc() RestMethod(htmldoc)}
</ul>
<p>
The annotation itself is just a convenience for setting configuration
properties set
@@ -19870,7 +19869,7 @@
<br>They are registered in the following locations:
</p>
<ul>
- <li class='ja'>{@link
org.apache.juneau.rest.annotation.HtmlDoc#widgets() @HtmlDoc.widgets}
+ <li class='ja'>{@link
org.apache.juneau.rest.annotation.HtmlDoc#widgets() HtmlDoc(widgets)}
<li class='jm'>{@link
org.apache.juneau.rest.RestContextBuilder#widgets(Class...)}
<li class='jm'>{@link
org.apache.juneau.rest.RestContextBuilder#widgets(Widget...)}
<li class='jf'>{@link org.apache.juneau.rest.RestContext#REST_widgets}
@@ -20498,10 +20497,10 @@
</p>
<ul class='doctree'>
<li class='ja'>
- {@link
org.apache.juneau.rest.annotation.RestResource#defaultRequestHeaders()
@RestResource(defaultRequestHeaders)}
+ {@link
org.apache.juneau.rest.annotation.RestResource#defaultRequestHeaders()
RestResource(defaultRequestHeaders)}
<br>Defines default headers on request when the client doesn't
specify them.
<li class='ja'>
- {@link
org.apache.juneau.rest.annotation.RestResource#defaultResponseHeaders()
@RestResource(defaultResponseHeaders)}
+ {@link
org.apache.juneau.rest.annotation.RestResource#defaultResponseHeaders()
RestResource(defaultResponseHeaders)}
<br>Appends the specified headers if they weren't already set
programmatically.
</ul>
@@ -21691,13 +21690,13 @@
</ul>
<li class='jp'>{@link org.apache.juneau.http.annotation}
<ul>
- <li class='ja'>{@link org.apache.juneau.http.annotation.Body
Body}
- <li class='ja'>{@link org.apache.juneau.http.annotation.Header
Header}
- <li class='ja'>{@link
org.apache.juneau.http.annotation.FormData FormData}
- <li class='ja'>{@link org.apache.juneau.http.annotation.Query
Query}
- <li class='ja'>{@link org.apache.juneau.http.annotation.Path
Path}
- <li class='ja'>{@link org.apache.juneau.http.annotation.Request
Request}
- <li class='ja'>{@link
org.apache.juneau.http.annotation.Response Response}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Body}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Header}
+ <li class='ja'>{@link
org.apache.juneau.http.annotation.FormData}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Query}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Path}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Request}
+ <li class='ja'>{@link
org.apache.juneau.http.annotation.Response}
</ul>
</ul>
@@ -21961,7 +21960,7 @@
to denote that they are the HTTP body of the request.
</p>
<ul class='doctree'>
- <li class='ja'>{@link org.apache.juneau.http.annotation.Body Body}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Body}
<ul>
<li class='jf'>{@link
org.apache.juneau.http.annotation.Body#required() required} - Input validation.
Body must be present.
<li class='jf'>{@link
org.apache.juneau.http.annotation.Body#schema() schema} - Swagger schema.
@@ -22056,7 +22055,7 @@
to denote that they are form-data parameters on the request.
</p>
<ul class='doctree'>
- <li class='ja'>{@link org.apache.juneau.http.annotation.FormData
FormData}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.FormData}
<ul>
<li class='jf'>{@link
org.apache.juneau.http.annotation.FormData#_default() _default} - Default value
if not present.
<li class='jf'>{@link
org.apache.juneau.http.annotation.FormData#_enum() _enum} - Input validation.
Must match one of the values.
@@ -22164,7 +22163,7 @@
to denote that they are query parameters on the request.
</p>
<ul class='doctree'>
- <li class='ja'>{@link org.apache.juneau.http.annotation.Query Query}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Query}
<ul>
<li class='jf'>{@link
org.apache.juneau.http.annotation.Query#_default() _default} - Default value if
not present.
<li class='jf'>{@link
org.apache.juneau.http.annotation.Query#_enum() _enum} - Input validation.
Must match one of the values.
@@ -22275,7 +22274,7 @@
to denote that they are header parameters on the request.
</p>
<ul class='doctree'>
- <li class='ja'>{@link org.apache.juneau.http.annotation.Header Header}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Header}
<ul>
<li class='jf'>{@link
org.apache.juneau.http.annotation.Header#_default() _default} - Default value
if not present.
<li class='jf'>{@link
org.apache.juneau.http.annotation.Header#_enum() _enum} - Input validation.
Must match one of the values.
@@ -22372,7 +22371,7 @@
to denote that they are path parameters on the request.
</p>
<ul class='doctree'>
- <li class='ja'>{@link org.apache.juneau.http.annotation.Path Path}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Path}
<ul>
<li class='jf'>{@link
org.apache.juneau.http.annotation.Path#_enum() _enum} - Input validation. Must
match one of the values.
<li class='jf'>{@link
org.apache.juneau.http.annotation.Path#allowEmptyValue() allowEmptyValue} -
Input validation. Allow empty value.
@@ -22463,7 +22462,7 @@
</p>
<ul class='doctree'>
- <li class='ja'>{@link org.apache.juneau.http.annotation.Request Request}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Request}
<ul>
<li class='jf'>{@link
org.apache.juneau.http.annotation.Request#partSerializer() partSerializer} -
Override the part serializer.
</ul>
@@ -22521,11 +22520,11 @@
Any of the following annotations can be used on the methods:
</p>
<ul class='doctree'>
- <li class='ja'>{@link org.apache.juneau.http.annotation.Body Body}
- <li class='ja'>{@link org.apache.juneau.http.annotation.Header Header}
- <li class='ja'>{@link org.apache.juneau.http.annotation.FormData
FormData}
- <li class='ja'>{@link org.apache.juneau.http.annotation.Query Query}
- <li class='ja'>{@link org.apache.juneau.http.annotation.Path Path}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Body}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Header}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.FormData}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Query}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Path}
</ul>
<p>
The behavior and functionality of all of the annotations are the same
as if they were used on method arguments directly.
@@ -22580,7 +22579,7 @@
The {@link org.apache.juneau.http.annotation.Response @Response}
annotation can be applied to types returned by <ja>@RemoteMethod</ja>-annotated
methods.
</p>
<ul class='doctree'>
- <li class='ja'>{@link org.apache.juneau.http.annotation.Response
Response}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.Response}
<ul>
<li class='jf'>{@link
org.apache.juneau.http.annotation.Response#partParser() partParser} - Override
the part parser.
</ul>
@@ -22626,9 +22625,9 @@
Any of the following annotations can be used on the methods:
</p>
<ul class='doctree'>
- <li class='ja'>{@link org.apache.juneau.http.annotation.ResponseBody
ResponseBody}
- <li class='ja'>{@link org.apache.juneau.http.annotation.ResponseHeader
ResponseHeader}
- <li class='ja'>{@link org.apache.juneau.http.annotation.ResponseStatus
ResponseStatus}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.ResponseBody}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.ResponseHeader}
+ <li class='ja'>{@link org.apache.juneau.http.annotation.ResponseStatus}
</ul>
<p>
The behavior and functionality of all of the annotations are the same
as if they were used on method arguments directly. This means full support for
OpenAPI serialization and validation.
@@ -23498,6 +23497,19 @@
Juneau configurations and console commands.
</p>
+<p>
+ Features include:
+</p>
+<ul class='spaced-list'>
+ <li>
+ A builder-based API for defining and starting microservices.
+ <li>
+ An extensible API that allows you to hook into various
lifecycle events.
+ <li>
+ Simple-to-use APIs for accessing manifest file entries,
command-line arguments, and external configuration
+ file properties.
+</ul>
+
<!--
====================================================================================================
-->
<h3 class='topic new' onclick='toggle(this)'><a
href='#juneau-microservice-core.Overview'
id='juneau-microservice-core.Overview'>11.1 - Microservice Overview</a></h3>
@@ -25754,6 +25766,10 @@
<li class='jc'>{@link
org.apache.juneau.examples.core.xml.XmlComplexExample} - XmlSerializer and
XmlParser usage on serialize and deserialize complex Pojo bean.
<li class='jc'>{@link
org.apache.juneau.examples.core.xml.XmlConfigurationExample} - XmlSerializers
configured using properties defined in XmlSerializer class.
</ul>
+ <li class='jp'>{@link org.apache.juneau.examples.core.dto}
+ <ul>
+ <li class='jc'>{@link
org.apache.juneau.examples.core.dto.DtoExample} - Usage of core dto module.
+ </ul>
<li class='jp'>{@link org.apache.juneau.examples.core.rdf}
<ul>
<li class='jc'>{@link
org.apache.juneau.examples.core.rdf.RdfExample} - RdfXmlSerializer usage on
serialize simple Pojo bean.
@@ -25761,8 +25777,17 @@
</ul>
<li class='jp'>{@link org.apache.juneau.examples.core.html}
<ul>
- <li class='jc'>{@link
org.apache.juneau.examples.core.html.HtmlSimpleExample} - HtmlSerializer usage
on serialize simple Pojo bean.
- <li class='jc'>{@link
org.apache.juneau.examples.core.html.HtmlComplexExample} - HtmlSerializer usage
on serialize complex Pojo bean.
+ <li class='jc'>{@link
org.apache.juneau.examples.core.html.HtmlSimpleExample} - HtmlSerializer usage
on serialize and deserialize simple Pojo bean.
+ <li class='jc'>{@link
org.apache.juneau.examples.core.html.HtmlComplexExample} - HtmlSerializer usage
on serialize and deserialize complex Pojo bean.
+ </ul>
+ <li class='jp'>{@link org.apache.juneau.examples.core.uon}
+ <ul>
+ <li class='jc'>{@link
org.apache.juneau.examples.core.uon.UONExample} - UonSerializer usage on
serialize and deserialize simple Pojo bean.
+ <li class='jc'>{@link
org.apache.juneau.examples.core.uon.UONComplexExample} - UonSerializer usage on
serialize and deserialize complex Pojo bean.
+ </ul>
+ <li class='jp'>{@link org.apache.juneau.examples.core.svl}
+ <ul>
+ <li class='jc'>{@link
org.apache.juneau.examples.core.svl.SvlExample} - Usage of Svl module in juneau.
</ul>
</ul>
</div><!-- END: 15.2 - juneau-examples-core.Examples -->
@@ -26663,7 +26688,7 @@
For example, selecting <l>APPLICATION/JSON+SIMPLE</l> shows us
simplified JSON:
</p>
<p class='bpcode w800'>
-
http://localhost:10000/petstore/pet?plainText=true&Accept=application%2Fjson%2Bsimple
+
http://localhost:10000/petstore/pet?plainText=true&Accept=application%2Fjson%2Bsimple
</p>
<img class='bordered w800'
src='doc-files/juneau-examples-rest.PetStoreResource.5b.png'>
<p>
@@ -26722,7 +26747,7 @@
<ja>@Override</ja> <jc>/* MenuItemWidget */</jc>
<jk>public</jk> Div getContent(RestRequest req) {
Div div = <jsm>div</jsm>();
- Set<MediaType> l = <jk>new</jk> TreeSet<>();
+ Set<MediaType> l = <jk>new</jk> TreeSet<>();
<jk>for</jk> (Serializer s :
req.getSerializers().getSerializers())
l.add(s.getPrimaryMediaType());
<jk>for</jk> (MediaType mt : l) {
@@ -26768,7 +26793,7 @@
The converter will take the POJOs to be serialized and filter them
based on the provided query/view/sort/paging attributes:
</p>
<p class='bpcode w800'>
-
http://localhost:10000/petstore/pet?s=name%3DHoppy*&v=species%2Cname&o=name&p=0&l=20
+
http://localhost:10000/petstore/pet?s=name%3DHoppy*&v=species%2Cname&o=name&p=0&l=20
</p>
<img class='bordered w800'
src='doc-files/juneau-examples-rest.PetStoreResource.7b.png'>
<p>
@@ -26970,7 +26995,7 @@
<jk>public class</jk> PhotosResource <jk>extends</jk> BasicRestServlet {
<jd>/** Our cache of photos */</jd>
- <jk>private</jk> Map<String,Photo> <jf>photos</jf> =
<jk>new</jk> TreeMap<>();
+ <jk>private</jk> Map<String,Photo> <jf>photos</jf> =
<jk>new</jk> TreeMap<>();
<jd>/** Our bean class for storing photos */</jd>
<jk>public static class</jk> Photo {
@@ -27326,15 +27351,15 @@
PostInput in
) <jk>throws</jk> BadRequest {
- List<Object> results = <jk>new</jk> LinkedList<>();
+ List<Object> results = <jk>new</jk> LinkedList<>();
<jc>// Don't try to submit empty input.</jc>
<jk>if</jk> (isEmpty(in.<jf>sql</jf>))
<jk>return</jk> results;
- <jk>if</jk> (in.<jf>pos</jf> < 1 || in.<jf>pos</jf> > 10000)
+ <jk>if</jk> (in.<jf>pos</jf> < 1 || in.<jf>pos</jf> > 10000)
<jk>throw new</jk> BadRequest(<js>"Invalid value for
position. Must be between 1-10000"</js>);
- <jk>if</jk> (in.<jf>limit</jf> < 1 || in.<jf>limit</jf> > 10000)
+ <jk>if</jk> (in.<jf>limit</jf> < 1 || in.<jf>limit</jf> >
10000)
<jk>throw new</jk> BadRequest(<js>"Invalid value for
limit. Must be between 1-10000"</js>);
String sql = <jk>null</jk>;
@@ -27348,7 +27373,7 @@
sql = s.trim();
<jk>if</jk> (! sql.isEmpty()) {
Object o = <jk>null</jk>;
- <jk>if</jk>
(<jf>allowUpdates</jf> || (<jf>allowTempUpdates</jf> && !
sql.matches(<js>"(?:i)commit.*"</js>))) {
+ <jk>if</jk>
(<jf>allowUpdates</jf> || (<jf>allowTempUpdates</jf> && !
sql.matches(<js>"(?:i)commit.*"</js>))) {
<jk>if</jk>
(st.execute(sql)) {
<jk>try</jk>
(ResultSet rs = st.getResultSet()) {
o =
<jk>new</jk> ResultSetList(rs, in.<jf>pos</jf>, in.<jf>limit</jf>,
<jf>includeRowNums</jf>);
@@ -28170,7 +28195,7 @@
</p>
<p>
- The <code>juneau-examples-rest-springboot</code> class contains the
same examples as <code>juneau-examples-rest</code>
+ The <code>juneau-examples-rest-springboot</code> library contains the
same examples as <code>juneau-examples-rest</code>
but also includes the following:
</p>
<ul class='spaced-list'>
@@ -34861,7 +34886,7 @@
</ul>
</ul>
-<h5 class='topic w800'>juneau-server</h5>
+<h5 class='topic w800'>juneau-rest-server</h5>
<ul class='spaced-list'>
<li>
New methods on {@link org.apache.juneau.rest.RestServlet}:
@@ -34874,6 +34899,12 @@
<br>This allows for any of those instance to be injectable
beans.
</ul>
+<h5 class='topic w800'>juneau-rest-server-springboot</h5>
+<ul class='spaced-list'>
+ <li>
+ New project containing classes for making it easy to use Juneau
with Spring Boot.
+</ul>
+
<h5 class='topic w800'>juneau-microservice-core</h5>
<ul class='spaced-list'>
<li>
@@ -34899,13 +34930,19 @@
New {@link
org.apache.juneau.microservice.jetty.JettyMicroservice} class replaces the
previous <code>RestMicroservice</code>.
</ul>
-<h5 class='topic w800'>juneau-examples-rest</h5>
+<h5 class='topic w800'>juneau-my-jetty-microservice</h5>
+<ul class='spaced-list'>
+ <li>
+ New template starter project for Jetty-based microservices.
+</ul>
+
+<h5 class='topic w800'>juneau-my-springboot-microservice</h5>
<ul class='spaced-list'>
<li>
- New <code>org.apache.juneau.examples.rest.spring</code> package
with code showing how to use Juneau REST
- with Spring Boot.
+ Template starter project for Spring-Boot-based microservices.
<li>
- New <code>app.json</code> and <code>Procfile</code> files for
deploying examples into Heroku.
+ <code>app.json</code> and <code>Procfile</code> files for
deploying examples into Heroku.
+ <br>Includes instructions.
</ul>
</div><!-- END: 8.0.0 -->
diff --git a/juneau-doc/src/main/javadoc/resources/fragments/about.html
b/juneau-doc/src/main/javadoc/resources/fragments/about.html
index abed929..265c3d5 100644
--- a/juneau-doc/src/main/javadoc/resources/fragments/about.html
+++ b/juneau-doc/src/main/javadoc/resources/fragments/about.html
@@ -16,14 +16,34 @@
Apache Juneau™ is a single cohesive Java ecosystem consisting of
the following parts:
</p>
<ul class='spaced-list'>
- <li><b>juneau-marshall</b><br>A universal toolkit for marshalling POJOs
to a wide variety of content types using a common framework with no external
library dependencies.
- <li><b>juneau-dto</b><br>A variety of predefined DTOs for serializing
and parsing languages such as HTML5, Swagger and ATOM.
- <li><b>juneau-svl</b><br>A simple yet powerful variable replacement
language API.
- <li><b>juneau-config</b><br>A sophisticated configuration file API.
- <li><b>juneau-rest-server</b><br>A universal REST server API for
creating Swagger-based self-documenting REST interfaces using POJOs, simply
deployed as
- one or more top-level servlets in any Servlet 3.1.0+ container
or Spring Boot.
- <li><b>juneau-rest-client</b><br>A universal REST client API for
interacting with Juneau or 3rd-party REST interfaces using POJOs and proxy
interfaces.
- <li><b>juneau-microservice</b><br>A REST microservice API that combines
all the features above as a simple configurable Jetty server for
+ <li>
+ <b>juneau-marshall</b>
+ <br>A universal toolkit for marshalling POJOs to a wide variety
of content types using a common framework with no external library dependencies.
+ <li>
+ <b>juneau-dto</b>
+ <br>A variety of predefined DTOs for serializing and parsing
languages such as HTML5, Swagger and ATOM.
+ <li>
+ <b>juneau-svl</b>
+ <br>A simple yet powerful variable replacement language API.
+ <li>
+ <b>juneau-config</b>
+ <br>A sophisticated configuration API.
+ <li>
+ <b>juneau-rest-server</b>
+ <br>A universal REST server API for creating REST interfaces
using POJOs simply deployed in any Servlet 3.1.0+ container.
+ <br>Includes auto-generation of Swagger and self-hosting of
Swagger UI through OPTIONS page requests.
+ <li>
+ <b>juneau-rest-server-springboot</b>
+ <br>Integration support for deploying Juneau-based REST
resources as Spring beans in a Spring Boot application.
+ <li>
+ <b>juneau-rest-client</b>
+ <br>A universal REST client API for interacting with Juneau or
3rd-party REST interfaces using POJOs and proxy interfaces.
+ <li>
+ <b>juneau-microservice</b>
+ <br>A builder-based API for creating microservices.
+ <li>
+ <b>juneau-microservice-jetty</b>
+ <br>REST microservice API that combines all the features above
as a simple configurable Jetty server for
creating lightweight standalone REST interfaces that start up
in milliseconds.
</ul>
<p>
diff --git a/juneau-doc/src/main/javadoc/resources/juneau-doc.css
b/juneau-doc/src/main/javadoc/resources/juneau-doc.css
index aa9848d..5afe1de 100755
--- a/juneau-doc/src/main/javadoc/resources/juneau-doc.css
+++ b/juneau-doc/src/main/javadoc/resources/juneau-doc.css
@@ -332,7 +332,10 @@ l {
.footer .spaced-list ul { margin:0; max-width: 800px; }
/* Documentation Tree */
-.doctree li { max-width: 800px; }
+.doctree li {
+ max-width: 800px;
+ margin-top: 0px;
+}
li.normal {
list-style-image:none;
}
@@ -377,12 +380,15 @@ li.jp {
}
.doctree ul {
- padding: 5px 0px 5px 20px;
+ padding: 0px 0px 0px 15px;
+ margin-top: -2px;
+ margin-bottom: -2px;
}
ul.doctree {
- padding: 0px 0px 0px 20px;
+ padding: 0px 0px 0px 15px;
margin-left: 5px;
+ margin-top: -2px;
}
.topic a {
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 e1967df..32a3e60 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
@@ -2673,7 +2673,7 @@ public final class RestContext extends BeanContext {
* String scheme = request.getScheme();
* <jk>int</jk> port = request.getServerPort();
* StringBuilder sb = <jk>new</jk>
StringBuilder(request.getScheme()).append(<js>"://"</js>).append(request.getServerName());
- * <jk>if</jk> (! (port == 80 && <js>"http"</js>.equals(scheme) ||
port == 443 && <js>"https"</js>.equals(scheme)))
+ * <jk>if</jk> (! (port == 80 &&
<js>"http"</js>.equals(scheme) || port == 443 &&
<js>"https"</js>.equals(scheme)))
* sb.append(<js>':'</js>).append(port);
* authorityPath = sb.toString();
* </p>
