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 dee335f Petstore enhancements and examples updates.
dee335f is described below
commit dee335f9c9cd8cf33c61f14ff1b154470dd09d48
Author: JamesBognar <jamesbog...@apache.org>
AuthorDate: Sun Nov 4 11:58:42 2018 -0500
Petstore enhancements and examples updates.
---
juneau-doc/juneau-doc.jar | Bin 21102 -> 21071 bytes
.../apache/juneau/doc/internal/PropertyTag.java | 2 +
.../javadoc/doc-files/juneau-examples-rest.3.png | Bin 242539 -> 55969 bytes
.../javadoc/doc-files/juneau-examples-rest.4.png | Bin 384505 -> 98777 bytes
.../juneau-examples-rest.RootResources.1.png | Bin 384548 -> 98777 bytes
juneau-doc/src/main/javadoc/overview.html | 81 +++++++++++----------
.../resources/Topics/12.juneau-examples-rest.html | 4 +-
.../12.juneau-examples-rest/01.RootResources.html | 49 +++++++------
.../02.HelloWorldResource.html | 6 +-
.../03.PetStoreResource.html | 2 +-
.../12.juneau-examples-rest/05.PhotosResource.html | 2 +-
.../06.SqlQueryResource.html | 2 +-
.../doc-files/juneau-examples-rest.3.png | Bin 242539 -> 55969 bytes
.../doc-files/juneau-examples-rest.4.png | Bin 384505 -> 98777 bytes
.../juneau-examples-rest.RootResources.1.png | Bin 384548 -> 98777 bytes
.../rest/petstore/rest/PetStoreResource.java | 12 ++-
.../rest/petstore/rest/PhotosResource.java | 3 +-
.../rest/petstore/rest/SqlQueryResource.java | 3 +-
.../org/apache/juneau/rest/RestJavaMethod.java | 2 +-
launches/juneau-env.sh | 2 +-
pom.xml | 10 ++-
21 files changed, 98 insertions(+), 82 deletions(-)
diff --git a/juneau-doc/juneau-doc.jar b/juneau-doc/juneau-doc.jar
index 9d9b35c..bcddd10 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/PropertyTag.java
b/juneau-doc/src/main/java/org/apache/juneau/doc/internal/PropertyTag.java
index 667d492..340b706 100644
--- a/juneau-doc/src/main/java/org/apache/juneau/doc/internal/PropertyTag.java
+++ b/juneau-doc/src/main/java/org/apache/juneau/doc/internal/PropertyTag.java
@@ -74,6 +74,8 @@ public class PropertyTag implements Taglet {
@Override
public String toString(Tag tag) {
String s = System.getProperty(tag.text());
+ if (s == null)
+ System.err.println("Unknown system property
'"+tag.text()+"'");
return s == null ? tag.text() : s;
}
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.3.png
b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.3.png
index 82792c0..320fc6e 100644
Binary files a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.3.png
and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.3.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.4.png
b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.4.png
index ce012f4..3eff3a5 100644
Binary files a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.4.png
and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.4.png differ
diff --git
a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.RootResources.1.png
b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.RootResources.1.png
index 61365da..3eff3a5 100644
Binary files
a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.RootResources.1.png
and
b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.RootResources.1.png
differ
diff --git a/juneau-doc/src/main/javadoc/overview.html
b/juneau-doc/src/main/javadoc/overview.html
index a1ae12a..55537c6 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -316,7 +316,7 @@
<li><p class=''><a class='doclink'
href='#juneau-rest-server.HttpPartAnnotations.ResponseStatus'>@ResponseStatus</a></p>
</ol>
<li><p class=''><a class='doclink'
href='#juneau-rest-server.HandlingFormPosts'>Handling Form Posts</a></p>
- <li><p class=''><a class='doclink'
href='#juneau-rest-server.HandlingMultiPartFormPosts'>Handling Multi-Part Form
Posts</a></p>
+ <li><p class='todo'><a class='doclink'
href='#juneau-rest-server.HandlingMultiPartFormPosts'>Handling Multi-Part Form
Posts</a></p>
<li><p class=''><a class='doclink'
href='#juneau-rest-server.Serializers'>Serializers</a></p>
<li><p class=''><a class='doclink'
href='#juneau-rest-server.Parsers'>Parsers</a></p>
<li><p class=''><a class='doclink'
href='#juneau-rest-server.Properties'>Properties</a></p>
@@ -427,14 +427,14 @@
<li><p class=''><a class='doclink'
href='#juneau-microservice-server.UiCustomization'>UI Customization</a></p>
</ol>
<li><p class='toc2 '><a class='doclink'
href='#juneau-examples-core'>juneau-examples-core</a></p>
- <li><p class='toc2 '><a class='doclink'
href='#juneau-examples-rest'>juneau-examples-rest</a></p>
+ <li><p class='toc2 updated'><a class='doclink'
href='#juneau-examples-rest'>juneau-examples-rest</a></p>
<ol>
- <li><p class=''><a class='doclink'
href='#juneau-examples-rest.RootResources'>RootResources</a></p>
- <li><p class=''><a class='doclink'
href='#juneau-examples-rest.HelloWorldResource'>HelloWorldResource</a></p>
- <li><p class=''><a class='doclink'
href='#juneau-examples-rest.PetStoreResource'>PetStoreResource</a></p>
+ <li><p class='updated'><a class='doclink'
href='#juneau-examples-rest.RootResources'>RootResources</a></p>
+ <li><p class='updated'><a class='doclink'
href='#juneau-examples-rest.HelloWorldResource'>HelloWorldResource</a></p>
+ <li><p class='todo'><a class='doclink'
href='#juneau-examples-rest.PetStoreResource'>PetStoreResource</a></p>
<li><p class='new'><a class='doclink'
href='#juneau-examples-rest.DtoExamples'>DtoExamples</a></p>
- <li><p class=''><a class='doclink'
href='#juneau-examples-rest.PhotosResource'>PhotosResource</a></p>
- <li><p class=''><a class='doclink'
href='#juneau-examples-rest.SqlQueryResource'>SqlQueryResource</a></p>
+ <li><p class='todo'><a class='doclink'
href='#juneau-examples-rest.PhotosResource'>PhotosResource</a></p>
+ <li><p class='todo'><a class='doclink'
href='#juneau-examples-rest.SqlQueryResource'>SqlQueryResource</a></p>
<li><p class=''><a class='doclink'
href='#juneau-examples-rest.ConfigResource'>ConfigResource</a></p>
<li><p class=''><a class='doclink'
href='#juneau-examples-rest.LogsResource'>LogsResource</a></p>
</ol>
@@ -17078,7 +17078,7 @@
<!--
====================================================================================================
-->
-<h3 class='topic ' onclick='toggle(this)'><a
href='#juneau-rest-server.HandlingMultiPartFormPosts'
id='juneau-rest-server.HandlingMultiPartFormPosts'>7.12 - Handling Multi-Part
Form Posts</a></h3>
+<h3 class='topic todo' onclick='toggle(this)'><a
href='#juneau-rest-server.HandlingMultiPartFormPosts'
id='juneau-rest-server.HandlingMultiPartFormPosts'>7.12 - Handling Multi-Part
Form Posts</a></h3>
<div class='topic'><!-- START: 7.12 -
juneau-rest-server.HandlingMultiPartFormPosts -->
<p>
The Juneau framework does not natively support multipart form posts.
@@ -24157,7 +24157,7 @@
<!--
====================================================================================================
-->
-<h2 class='topic ' onclick='toggle(this)'><a href='#juneau-examples-rest'
id='juneau-examples-rest'>12 - juneau-examples-rest</a></h2>
+<h2 class='topic updated' onclick='toggle(this)'><a
href='#juneau-examples-rest' id='juneau-examples-rest'>12 -
juneau-examples-rest</a></h2>
<div class='topic'><!-- START: 12 - juneau-examples-rest -->
<h5 class='figure'>Archive File</h5>
<p class='bpcode w500'>
@@ -24186,7 +24186,7 @@
<p>
Once loaded, you should see the following project structure:
</p>
-<img class='bordered' src='doc-files/juneau-examples-rest.3.png'
style='width:412px'>
+<img class='bordered' src='doc-files/juneau-examples-rest.3.png'
style='width:325px'>
<p>
The microservice can be started from the
<code>juneau-examples-rest.launch</code> file.
It will start up the microservice on port 10000 which you can then view
through a browser:
@@ -24198,7 +24198,7 @@
<!--
====================================================================================================
-->
-<h3 class='topic ' onclick='toggle(this)'><a
href='#juneau-examples-rest.RootResources'
id='juneau-examples-rest.RootResources'>12.1 - RootResources</a></h3>
+<h3 class='topic updated' onclick='toggle(this)'><a
href='#juneau-examples-rest.RootResources'
id='juneau-examples-rest.RootResources'>12.1 - RootResources</a></h3>
<div class='topic'><!-- START: 12.1 - juneau-examples-rest.RootResources -->
<p>
The <l>RootResources</l> class is the main page for the REST
microservice.
@@ -24216,6 +24216,15 @@
<ul>
<li class='jac'>
{@link
org.apache.juneau.rest.BasicRestServletGroup} - Specialized subclass for
grouping other resources.
+ <ul>
+ <li class='jac'>
+ {@link
org.apache.juneau.microservice.BasicRestServletJenaGroup} - Group resource with
added RDF support.
+ <ul>
+ <li
class='jc'>
+
<code>RootResources</code>
+ </ul>
+ </li>
+ </ul>
</li>
</ul>
</li>
@@ -24233,10 +24242,10 @@
The <l>RootResources</l> class can also be defined as a servlet in a
<l>web.xml</l> file:
</p>
<p class='bpcode w800'>
- <xt><web-app</xt> <xa>version</xa>=<xs>'2.3'</xs><xt>></xt>
+ <xt><web-app</xt> <xa>version</xa>=<xs>'3.0'</xs><xt>></xt>
<xt><servlet></xt>
<xt><servlet-name></xt>RootResources<xt></servlet-name></xt>
-
<xt><servlet-class></xt>org.apache.juneau.rest.samples.RootResources<xt></servlet-class></xt>
+
<xt><servlet-class></xt>org.apache.juneau.examples.rest.RootResources<xt></servlet-class></xt>
<xt></servlet></xt>
<xt><servlet-mapping></xt>
<xt><servlet-name></xt>RootResources<xt></servlet-name></xt>
@@ -24259,7 +24268,6 @@
description=<js>"Example of a router resource page."</js>,
htmldoc=<ja>@HtmlDoc</ja>(
widgets={
- PoweredByApache.<jk>class</jk>,
ContentTypeMenuItem.<jk>class</jk>,
StyleMenuItem.<jk>class</jk>
},
@@ -24278,23 +24286,18 @@
" <p>All content on pages in the UI
are serialized POJOs. In this case, it's a serialized array of beans with 2
properties, 'name' and 'description'.</p>"</js>,
<js>" <p>Other features (such as this
aside) are added through annotations.</p>"</js>,
<js>"</div>"</js>
- },
- footer=<js>"$W{PoweredByApache}"</js>
+ }
),
properties={
<jc>// For testing purposes, we want to use single
quotes in all the serializers so it's easier to do simple
// String comparisons.
// You can apply any of the
Serializer/Parser/BeanContext settings this way.</jc>
-
<ja>@Property</ja>(name=<jsf>SERIALIZER_quoteChar</jsf>, value=<js>"'"</js>)
+
<ja>@Property</ja>(name=<jsf>WSERIALIZER_quoteChar</jsf>, value=<js>"'"</js>)
},
children={
HelloWorldResource.<jk>class</jk>,
PetStoreResource.<jk>class</jk>,
- RequestEchoResource.<jk>class</jk>,
- SampleRrpcServlet.<jk>class</jk>,
- PhotosResource.<jk>class</jk>,
DtoExamples.<jk>class</jk>,
- SqlQueryResource.<jk>class</jk>,
ConfigResource.<jk>class</jk>,
LogsResource.<jk>class</jk>,
DebugResource.<jk>class</jk>,
@@ -24307,16 +24310,12 @@
</p>
<p>
The <l>children</l> annotation defines the child resources of this
router resource.
- <br>These are resources whose paths are direct decendents to the parent
resource.
+ These are resources whose paths are direct descendants to the parent
resource.
</p>
<p>
Child resources must be annotated with the {@link
org.apache.juneau.rest.annotation.RestResource#path() @RestResource(path)}
annotation to
identify the subpath of the child.
- <br>Children CAN extend from {@link
org.apache.juneau.rest.BasicRestServlet}, but it is not a requirement.
-</p>
-<p>
- Child resources can also be defined programmatically by using the
- {@link org.apache.juneau.rest.RestContextBuilder#children(Class[])}
method.
+ Children CAN extend from {@link
org.apache.juneau.rest.BasicRestServlet} but it is not a requirement.
</p>
<p>
Note that these router pages can be arbitrarily nested deep.
@@ -24324,23 +24323,27 @@
</p>
<p>
Let's step back and describe what's going on here:
- <br>During servlet initialization of the <l>RootResources</l> object,
the toolkit looks for the
+</p>
+<p>
+ During servlet initialization of the <l>RootResources</l> object, the
toolkit looks for the
<l>@RestResource(children)</l> annotation.
- <br>If it finds it, it instantiates instances of each class and
recursively performs servlet initialization
+ If it finds it, it instantiates instances of each class and recursively
performs servlet initialization
on them.
- <br>It then associates the child resource with the parent by the name
specified by the
+ It then associates the child resource with the parent by the name
specified by the
<l>@RestResource(path)</l> annotation on the child class.
- <br>When a request for the child URL (<l>/helloWorld</l>) is received,
the <l>RootResources</l> servlet
+</p>
+<p>
+ When a request for the child URL (<l>/helloWorld</l>) is received, the
<l>RootResources</l> servlet
gets the request and sees that the URL remainder matches one of its
child resources.
- <br>It then forwards the request to the child resource for processing.
- <br>The request passed to the child resource is the same as if the
child resource had been deployed
+ It then forwards the request to the child resource for processing.
+ The request passed to the child resource is the same as if the child
resource had been deployed
independently (e.g. path-info, resource-URI, and so forth).
</p>
</div><!-- END: 12.1 - juneau-examples-rest.RootResources -->
<!--
====================================================================================================
-->
-<h3 class='topic ' onclick='toggle(this)'><a
href='#juneau-examples-rest.HelloWorldResource'
id='juneau-examples-rest.HelloWorldResource'>12.2 - HelloWorldResource</a></h3>
+<h3 class='topic updated' onclick='toggle(this)'><a
href='#juneau-examples-rest.HelloWorldResource'
id='juneau-examples-rest.HelloWorldResource'>12.2 - HelloWorldResource</a></h3>
<div class='topic'><!-- START: 12.2 - juneau-examples-rest.HelloWorldResource
-->
<p>
The <l>HelloWorldResource</l> class is a simple resource that prints a
"Hello world!" message.
@@ -24367,7 +24370,7 @@
<jk>public class</jk> HelloWorldResource <jk>implements</jk>
BasicRestConfig {
<jd>/** GET request handler */</jd>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/*"</js>)
+ <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/*"</js>,
summary=<js>"Responds with \"Hello world!\""</js>)
<jk>public</jk> String sayHello() {
<jk>return</jk> <js>"Hello world!"</js>;
}
@@ -24375,7 +24378,7 @@
</p>
<p>
Notice that in this case we're not extending from {@link
org.apache.juneau.rest.RestServlet}.
- <br>We are however implementing {@link
org.apache.juneau.rest.BasicRestConfig} which is a no-op
+ We are however implementing {@link
org.apache.juneau.rest.BasicRestConfig} which is a no-op
interface that defines a default <ja>@RestResource</ja> annotation with
all the serializers, parsers,
and configuration defined on the {@link
org.apache.juneau.rest.BasicRestServlet} class.
</p>
@@ -24409,7 +24412,7 @@
<!--
====================================================================================================
-->
-<h3 class='topic ' onclick='toggle(this)'><a
href='#juneau-examples-rest.PetStoreResource'
id='juneau-examples-rest.PetStoreResource'>12.3 - PetStoreResource</a></h3>
+<h3 class='topic todo' onclick='toggle(this)'><a
href='#juneau-examples-rest.PetStoreResource'
id='juneau-examples-rest.PetStoreResource'>12.3 - PetStoreResource</a></h3>
<div class='topic'><!-- START: 12.3 - juneau-examples-rest.PetStoreResource -->
<p>
The <code>PetStoreResource</code> class provides examples for creating
a Swagger-based interface.
@@ -25352,7 +25355,7 @@
<!--
====================================================================================================
-->
-<h3 class='topic ' onclick='toggle(this)'><a
href='#juneau-examples-rest.PhotosResource'
id='juneau-examples-rest.PhotosResource'>12.5 - PhotosResource</a></h3>
+<h3 class='topic todo' onclick='toggle(this)'><a
href='#juneau-examples-rest.PhotosResource'
id='juneau-examples-rest.PhotosResource'>12.5 - PhotosResource</a></h3>
<div class='topic'><!-- START: 12.5 - juneau-examples-rest.PhotosResource -->
<p>
The <l>PhotosResource</l> class shows examples of the following:
@@ -25529,7 +25532,7 @@
<!--
====================================================================================================
-->
-<h3 class='topic ' onclick='toggle(this)'><a
href='#juneau-examples-rest.SqlQueryResource'
id='juneau-examples-rest.SqlQueryResource'>12.6 - SqlQueryResource</a></h3>
+<h3 class='topic todo' onclick='toggle(this)'><a
href='#juneau-examples-rest.SqlQueryResource'
id='juneau-examples-rest.SqlQueryResource'>12.6 - SqlQueryResource</a></h3>
<div class='topic'><!-- START: 12.6 - juneau-examples-rest.SqlQueryResource -->
<p>
The <l>SqlQueryResource</l> class shows examples of the following:
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest.html
b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest.html
index 8bdabc6..b425db4 100644
--- a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest.html
+++ b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-juneau-examples-rest
+{updated} juneau-examples-rest
<h5 class='figure'>Archive File</h5>
<p class='bpcode w500'>
@@ -42,7 +42,7 @@ juneau-examples-rest
<p>
Once loaded, you should see the following project structure:
</p>
-<img class='bordered' src='doc-files/juneau-examples-rest.3.png'
style='width:412px'>
+<img class='bordered' src='doc-files/juneau-examples-rest.3.png'
style='width:325px'>
<p>
The microservice can be started from the
<code>juneau-examples-rest.launch</code> file.
It will start up the microservice on port 10000 which you can then view
through a browser:
diff --git
a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/01.RootResources.html
b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/01.RootResources.html
index e433df7..8a88af3 100644
---
a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/01.RootResources.html
+++
b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/01.RootResources.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-RootResources
+{updated} RootResources
<p>
The <l>RootResources</l> class is the main page for the REST
microservice.
@@ -31,6 +31,15 @@ RootResources
<ul>
<li class='jac'>
{@link
oajr.BasicRestServletGroup} - Specialized subclass for grouping other resources.
+ <ul>
+ <li class='jac'>
+ {@link
oaj.microservice.BasicRestServletJenaGroup} - Group resource with added RDF
support.
+ <ul>
+ <li
class='jc'>
+
<code>RootResources</code>
+ </ul>
+ </li>
+ </ul>
</li>
</ul>
</li>
@@ -48,10 +57,10 @@ RootResources
The <l>RootResources</l> class can also be defined as a servlet in a
<l>web.xml</l> file:
</p>
<p class='bpcode w800'>
- <xt><web-app</xt> <xa>version</xa>=<xs>'2.3'</xs><xt>></xt>
+ <xt><web-app</xt> <xa>version</xa>=<xs>'3.0'</xs><xt>></xt>
<xt><servlet></xt>
<xt><servlet-name></xt>RootResources<xt></servlet-name></xt>
-
<xt><servlet-class></xt>org.apache.juneau.rest.samples.RootResources<xt></servlet-class></xt>
+
<xt><servlet-class></xt>org.apache.juneau.examples.rest.RootResources<xt></servlet-class></xt>
<xt></servlet></xt>
<xt><servlet-mapping></xt>
<xt><servlet-name></xt>RootResources<xt></servlet-name></xt>
@@ -74,7 +83,6 @@ RootResources
description=<js>"Example of a router resource page."</js>,
htmldoc=<ja>@HtmlDoc</ja>(
widgets={
- PoweredByApache.<jk>class</jk>,
ContentTypeMenuItem.<jk>class</jk>,
StyleMenuItem.<jk>class</jk>
},
@@ -93,23 +101,18 @@ RootResources
" <p>All content on pages in the UI
are serialized POJOs. In this case, it's a serialized array of beans with 2
properties, 'name' and 'description'.</p>"</js>,
<js>" <p>Other features (such as this
aside) are added through annotations.</p>"</js>,
<js>"</div>"</js>
- },
- footer=<js>"$W{PoweredByApache}"</js>
+ }
),
properties={
<jc>// For testing purposes, we want to use single
quotes in all the serializers so it's easier to do simple
// String comparisons.
// You can apply any of the
Serializer/Parser/BeanContext settings this way.</jc>
-
<ja>@Property</ja>(name=<jsf>SERIALIZER_quoteChar</jsf>, value=<js>"'"</js>)
+
<ja>@Property</ja>(name=<jsf>WSERIALIZER_quoteChar</jsf>, value=<js>"'"</js>)
},
children={
HelloWorldResource.<jk>class</jk>,
PetStoreResource.<jk>class</jk>,
- RequestEchoResource.<jk>class</jk>,
- SampleRrpcServlet.<jk>class</jk>,
- PhotosResource.<jk>class</jk>,
DtoExamples.<jk>class</jk>,
- SqlQueryResource.<jk>class</jk>,
ConfigResource.<jk>class</jk>,
LogsResource.<jk>class</jk>,
DebugResource.<jk>class</jk>,
@@ -122,16 +125,12 @@ RootResources
</p>
<p>
The <l>children</l> annotation defines the child resources of this
router resource.
- <br>These are resources whose paths are direct decendents to the parent
resource.
+ These are resources whose paths are direct descendants to the parent
resource.
</p>
<p>
Child resources must be annotated with the {@link
oajr.annotation.RestResource#path() @RestResource(path)} annotation to
identify the subpath of the child.
- <br>Children CAN extend from {@link oajr.BasicRestServlet}, but it is
not a requirement.
-</p>
-<p>
- Child resources can also be defined programmatically by using the
- {@link oajr.RestContextBuilder#children(Class[])} method.
+ Children CAN extend from {@link oajr.BasicRestServlet} but it is not a
requirement.
</p>
<p>
Note that these router pages can be arbitrarily nested deep.
@@ -139,15 +138,19 @@ RootResources
</p>
<p>
Let's step back and describe what's going on here:
- <br>During servlet initialization of the <l>RootResources</l> object,
the toolkit looks for the
+</p>
+<p>
+ During servlet initialization of the <l>RootResources</l> object, the
toolkit looks for the
<l>@RestResource(children)</l> annotation.
- <br>If it finds it, it instantiates instances of each class and
recursively performs servlet initialization
+ If it finds it, it instantiates instances of each class and recursively
performs servlet initialization
on them.
- <br>It then associates the child resource with the parent by the name
specified by the
+ It then associates the child resource with the parent by the name
specified by the
<l>@RestResource(path)</l> annotation on the child class.
- <br>When a request for the child URL (<l>/helloWorld</l>) is received,
the <l>RootResources</l> servlet
+</p>
+<p>
+ When a request for the child URL (<l>/helloWorld</l>) is received, the
<l>RootResources</l> servlet
gets the request and sees that the URL remainder matches one of its
child resources.
- <br>It then forwards the request to the child resource for processing.
- <br>The request passed to the child resource is the same as if the
child resource had been deployed
+ It then forwards the request to the child resource for processing.
+ The request passed to the child resource is the same as if the child
resource had been deployed
independently (e.g. path-info, resource-URI, and so forth).
</p>
diff --git
a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/02.HelloWorldResource.html
b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/02.HelloWorldResource.html
index 87708dc..e75b14a 100644
---
a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/02.HelloWorldResource.html
+++
b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/02.HelloWorldResource.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-HelloWorldResource
+{updated} HelloWorldResource
<p>
The <l>HelloWorldResource</l> class is a simple resource that prints a
"Hello world!" message.
@@ -40,7 +40,7 @@ HelloWorldResource
<jk>public class</jk> HelloWorldResource <jk>implements</jk>
BasicRestConfig {
<jd>/** GET request handler */</jd>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/*"</js>)
+ <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/*"</js>,
summary=<js>"Responds with \"Hello world!\""</js>)
<jk>public</jk> String sayHello() {
<jk>return</jk> <js>"Hello world!"</js>;
}
@@ -48,7 +48,7 @@ HelloWorldResource
</p>
<p>
Notice that in this case we're not extending from {@link
oajr.RestServlet}.
- <br>We are however implementing {@link oajr.BasicRestConfig} which is a
no-op
+ We are however implementing {@link oajr.BasicRestConfig} which is a
no-op
interface that defines a default <ja>@RestResource</ja> annotation with
all the serializers, parsers,
and configuration defined on the {@link oajr.BasicRestServlet} class.
</p>
diff --git
a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/03.PetStoreResource.html
b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/03.PetStoreResource.html
index e939bc1..5acb381 100644
---
a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/03.PetStoreResource.html
+++
b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/03.PetStoreResource.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-PetStoreResource
+{todo} PetStoreResource
<p>
The <code>PetStoreResource</code> class provides examples for creating
a Swagger-based interface.
diff --git
a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/05.PhotosResource.html
b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/05.PhotosResource.html
index ea01519..3071340 100644
---
a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/05.PhotosResource.html
+++
b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/05.PhotosResource.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-PhotosResource
+{todo} PhotosResource
<p>
The <l>PhotosResource</l> class shows examples of the following:
diff --git
a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/06.SqlQueryResource.html
b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/06.SqlQueryResource.html
index 653d4a8..5888d43 100644
---
a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/06.SqlQueryResource.html
+++
b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/06.SqlQueryResource.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-SqlQueryResource
+{todo} SqlQueryResource
<p>
The <l>SqlQueryResource</l> class shows examples of the following:
diff --git
a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.3.png
b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.3.png
index 82792c0..320fc6e 100644
Binary files
a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.3.png
and
b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.3.png
differ
diff --git
a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.4.png
b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.4.png
index ce012f4..3eff3a5 100644
Binary files
a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.4.png
and
b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.4.png
differ
diff --git
a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.RootResources.1.png
b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.RootResources.1.png
index 61365da..3eff3a5 100644
Binary files
a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.RootResources.1.png
and
b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.RootResources.1.png
differ
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/PetStoreResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/PetStoreResource.java
index c63a3cf..4e0233a 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/PetStoreResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/PetStoreResource.java
@@ -79,9 +79,7 @@ import org.apache.juneau.rest.converters.*;
" <p>It also shows how the Queryable converter
and query widget can be used to create searchable interfaces.</p>",
"</div>"
},
- style={
- "body { background-image: url('/petstore/photos/cat');
background-size: cover; background-attachment: fixed; }"
- }
+ stylesheet="servlet:/htdocs/themes/dark.css"
),
properties= {
// Resolve recursive references when showing schema info in the
swagger.
@@ -146,7 +144,13 @@ public class PetStoreResource extends BasicRestServletJena
implements PetStore {
@RestMethod(
name=GET,
path="/",
- summary="Navigation page"
+ summary="Navigation page",
+ htmldoc=@HtmlDoc(
+ style={
+ "INHERIT",
+ "body { background-image:
url('/petstore/photos/cat'); background-color: black; background-size: cover;
background-attachment: fixed; }"
+ }
+ )
)
public ResourceDescriptions getTopPage() {
return new ResourceDescriptions()
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/PhotosResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/PhotosResource.java
index 5b1e891..9006101 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/PhotosResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/PhotosResource.java
@@ -64,7 +64,8 @@ import org.apache.juneau.serializer.*;
},
widgets={
UploadPhotoMenuItem.class
- }
+ },
+ stylesheet="servlet:/htdocs/themes/dark.css"
),
properties={
// Make the anchor text on URLs be just the path relative to
the servlet.
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/SqlQueryResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/SqlQueryResource.java
index 3866846..ec57ce6 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/SqlQueryResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/SqlQueryResource.java
@@ -61,7 +61,8 @@ import org.apache.juneau.rest.widget.*;
" <li><a class='link'
href='?sql=select+*+from+PetstoreUser'>Users</a>",
" </ul>",
"</div>"
- }
+ },
+ stylesheet="servlet:/htdocs/themes/dark.css"
),
swagger=@ResourceSwagger(
contact=@Contact(name="Juneau
Developer",email="d...@juneau.apache.org"),
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestJavaMethod.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestJavaMethod.java
index a10aef9..203fa64 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestJavaMethod.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestJavaMethod.java
@@ -238,7 +238,7 @@ public class RestJavaMethod implements
Comparable<RestJavaMethod> {
this.requiredMatchers =
requiredMatchers.toArray(new RestMatcher[requiredMatchers.size()]);
this.optionalMatchers =
optionalMatchers.toArray(new RestMatcher[optionalMatchers.size()]);
- PropertyStoreBuilder psb =
context.getPropertyStore().builder().set(BEAN_beanFilters,
mBeanFilters).set(BEAN_pojoSwaps, mPojoSwaps);
+ PropertyStoreBuilder psb =
PropertyStore.create().add(properties).set(BEAN_beanFilters,
mBeanFilters).set(BEAN_pojoSwaps, mPojoSwaps);
for (Property p1 : m.properties())
psb.set(p1.name(), p1.value());
for (String p1 : m.flags())
diff --git a/launches/juneau-env.sh b/launches/juneau-env.sh
index aa362f5..bc4f167 100755
--- a/launches/juneau-env.sh
+++ b/launches/juneau-env.sh
@@ -13,4 +13,4 @@
. ~/.profile
set -e
-export JUNEAU_VERSION=7.2.1
+export JUNEAU_VERSION=7.2.2
diff --git a/pom.xml b/pom.xml
index e24e725..be15e94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,8 +40,8 @@
<jetty.version>9.4.12.v20180830</jetty.version>
<juneau.compare.version>7.2.0</juneau.compare.version>
<javadoc.juneau.version>7.2.1</javadoc.juneau.version>
- <juneauVersion>7.2.1</juneauVersion>
- <juneauVersionNext>7.2.1</juneauVersionNext>
+ <juneauVersion>7.2.2</juneauVersion>
+ <juneauVersionNext>7.2.3</juneauVersionNext>
</properties>
<dependencyManagement>
@@ -177,8 +177,10 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<configuration>
-
<additionalJOption>-J-DjuneauVersion=${juneauVersion}</additionalJOption>
-
<additionalJOption>-J-DjuneauVersionNext=${juneauVersionNext}</additionalJOption>
+ <additionalJOptions>
+
<additionalJOption>-J-DjuneauVersion=${juneauVersion}</additionalJOption>
+
<additionalJOption>-J-DjuneauVersionNext=${juneauVersionNext}</additionalJOption>
+ </additionalJOptions>
<show>protected</show>
<windowtitle>${project.name}
${project.version}</windowtitle>
<author>true</author>
