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 eea12a5 JUNEAU-102 Expanded REST annotations
eea12a5 is described below
commit eea12a59de0c25b28d2ceed6ac798871ff2f55c6
Author: JamesBognar <[email protected]>
AuthorDate: Sun May 12 15:42:31 2019 -0400
JUNEAU-102 Expanded REST annotations
---
.../microservice/resources/ConfigResource.java | 17 +++++++++--------
.../microservice/resources/DirectoryResource.java | 20 ++++++++++----------
.../juneau/microservice/resources/LogsResource.java | 14 +++++++-------
.../microservice/jetty/resources/DebugResource.java | 15 ++++++++-------
4 files changed, 34 insertions(+), 32 deletions(-)
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ConfigResource.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ConfigResource.java
index ec3c011..19043a3 100755
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ConfigResource.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ConfigResource.java
@@ -20,6 +20,7 @@ import java.util.Map;
import org.apache.juneau.*;
import org.apache.juneau.dto.html5.*;
+import org.apache.juneau.html.annotation.HtmlDocConfig;
import org.apache.juneau.http.annotation.Body;
import org.apache.juneau.http.annotation.FormData;
import org.apache.juneau.http.annotation.Path;
@@ -35,14 +36,14 @@ import org.apache.juneau.rest.exception.*;
@RestResource(
path="/config",
title="Configuration",
- description="Contents of configuration file.",
- htmldoc=@HtmlDoc(
- navlinks={
- "up: request:/..",
- "options: servlet:/?method=OPTIONS",
- "edit: servlet:/edit"
- }
- )
+ description="Contents of configuration file."
+)
+@HtmlDocConfig(
+ navlinks={
+ "up: request:/..",
+ "options: servlet:/?method=OPTIONS",
+ "edit: servlet:/edit"
+ }
)
@SuppressWarnings("javadoc")
public class ConfigResource extends BasicRestServlet {
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
index 366cc72..973e3ea 100755
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
@@ -59,14 +59,14 @@ import org.apache.juneau.utils.*;
@RestResource(
title="File System Explorer",
messages="nls/DirectoryResource",
- htmldoc=@HtmlDoc(
- navlinks={
- "up: request:/..",
- "options: servlet:/?method=OPTIONS"
- }
- ),
allowedMethodParams="*"
)
+@HtmlDocConfig(
+ navlinks={
+ "up: request:/..",
+ "options: servlet:/?method=OPTIONS"
+ }
+)
@HtmlConfig(uriAnchorText="PROPERTY_NAME")
@SuppressWarnings("javadoc")
public class DirectoryResource extends BasicRestServlet {
@@ -121,10 +121,10 @@ public class DirectoryResource extends BasicRestServlet {
name=GET,
path="/*",
summary="View information on file or directory",
- description="Returns information about the specified file or
directory.",
- htmldoc=@HtmlDoc(
- nav={"<h5>Folder: $RA{fullPath}</h5>"}
- )
+ description="Returns information about the specified file or
directory."
+ )
+ @HtmlDocConfig(
+ nav={"<h5>Folder: $RA{fullPath}</h5>"}
)
public FileResource getFile(RestRequest req, @Path("/*") String path)
throws NotFound, Exception {
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
index 2ea0fc2..413abcc 100755
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
@@ -115,10 +115,10 @@ public class LogsResource extends BasicRestServlet {
name=GET,
path="/*",
summary="View information on file or directory",
- description="Returns information about the specified file or
directory.",
- htmldoc=@HtmlDoc(
- nav={"<h5>Folder: $RA{fullPath}</h5>"}
- )
+ description="Returns information about the specified file or
directory."
+ )
+ @HtmlDocConfig(
+ nav={"<h5>Folder: $RA{fullPath}</h5>"}
)
public FileResource getFile(RestRequest req, @Path("/*") String path)
throws NotFound, Exception {
@@ -194,15 +194,15 @@ public class LogsResource extends BasicRestServlet {
converters=Queryable.class,
summary="View parsed contents of file",
description="View the parsed contents of a file.",
- htmldoc=@HtmlDoc(
- nav={"<h5>Folder: $RA{fullPath}</h5>"}
- ),
swagger=@MethodSwagger(
parameters={
Queryable.SWAGGER_PARAMS
}
)
)
+ @HtmlDocConfig(
+ nav={"<h5>Folder: $RA{fullPath}</h5>"}
+ )
public LogParser viewParsedEntries(
RestRequest req,
@Path("/*") String path,
diff --git
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/resources/DebugResource.java
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/resources/DebugResource.java
index 8e45762..9c569b8 100644
---
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/resources/DebugResource.java
+++
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/resources/DebugResource.java
@@ -16,6 +16,7 @@ import static org.apache.juneau.http.HttpMethodName.*;
import java.io.*;
+import org.apache.juneau.html.annotation.HtmlDocConfig;
import org.apache.juneau.internal.*;
import org.apache.juneau.microservice.jetty.*;
import org.apache.juneau.rest.*;
@@ -29,15 +30,15 @@ import org.apache.juneau.rest.helper.*;
path="/debug",
title="Debug",
description="Debug Utilities.",
- htmldoc=@HtmlDoc(
- navlinks={
- "up: request:/..",
- "jetty-thread-dump: servlet:/jetty/dump?method=POST",
- "options: servlet:/?method=OPTIONS"
- }
- ),
allowedMethodParams="OPTIONS,POST"
)
+@HtmlDocConfig(
+ navlinks={
+ "up: request:/..",
+ "jetty-thread-dump: servlet:/jetty/dump?method=POST",
+ "options: servlet:/?method=OPTIONS"
+ }
+)
@SuppressWarnings("javadoc")
public class DebugResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
