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 68951b0 JUNEAU-102 Expanded REST annotations
68951b0 is described below
commit 68951b04d8a83d0ef214f64c0a88f48ecbca6ea1
Author: JamesBognar <[email protected]>
AuthorDate: Sun May 12 16:34:09 2019 -0400
JUNEAU-102 Expanded REST annotations
---
.../juneau/rest/annotation/HtmlDocAsideTest.java | 4 +-
...cAsideTest.java => HtmlDocConfigAsideTest.java} | 33 +++++++----
...ooterTest.java => HtmlDocConfigFooterTest.java} | 33 +++++++----
...eaderTest.java => HtmlDocConfigHeaderTest.java} | 33 +++++++----
...mlDocNavTest.java => HtmlDocConfigNavTest.java} | 33 +++++++----
...nksTest.java => HtmlDocConfigNavlinksTest.java} | 69 ++++++++++++++--------
...criptTest.java => HtmlDocConfigScriptTest.java} | 33 +++++++----
...cStyleTest.java => HtmlDocConfigStyleTest.java} | 33 +++++++----
.../juneau/rest/annotation/HtmlDocFooterTest.java | 4 +-
.../juneau/rest/annotation/HtmlDocHeaderTest.java | 4 +-
.../juneau/rest/annotation/HtmlDocNavTest.java | 4 +-
.../rest/annotation/HtmlDocNavlinksTest.java | 4 +-
.../juneau/rest/annotation/HtmlDocScriptTest.java | 4 +-
.../juneau/rest/annotation/HtmlDocStyleTest.java | 4 +-
14 files changed, 199 insertions(+), 96 deletions(-)
diff --git
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocAsideTest.java
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocAsideTest.java
index 62735f9..cec7788 100644
---
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocAsideTest.java
+++
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocAsideTest.java
@@ -19,9 +19,11 @@ import org.junit.runners.*;
/**
* Tests related to @HtmlDoc(aside) annotation.
+ *
+ * TODO - Remove in 9.0. Replaced by HtmlDocConfigAsideTest.
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-@SuppressWarnings({"javadoc","serial"})
+@SuppressWarnings({"javadoc","serial","deprecation"})
public class HtmlDocAsideTest {
//=================================================================================================================
diff --git
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocAsideTest.java
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigAsideTest.java
similarity index 84%
copy from
juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocAsideTest.java
copy to
juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigAsideTest.java
index 62735f9..37a9577 100644
---
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocAsideTest.java
+++
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigAsideTest.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
+import org.apache.juneau.html.annotation.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.mock2.*;
import org.junit.*;
@@ -22,31 +23,36 @@ import org.junit.runners.*;
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@SuppressWarnings({"javadoc","serial"})
-public class HtmlDocAsideTest {
+public class HtmlDocConfigAsideTest {
//=================================================================================================================
// Basic tests
//=================================================================================================================
- @RestResource(htmldoc=@HtmlDoc(aside={"a01a","a01b","INHERIT"}))
+ @RestResource()
+ @HtmlDocConfig(aside={"a01a","a01b","INHERIT"})
public static class A extends BasicRestServlet {
@RestMethod(path="/a01")
public Object a01() {
return "OK";
}
- @RestMethod(path="/a02",
htmldoc=@HtmlDoc(aside={"a02a","a02b"}))
+ @RestMethod(path="/a02")
+ @HtmlDocConfig(aside={"a02a","a02b"})
public Object a02() {
return "OK";
}
- @RestMethod(path="/a03",
htmldoc=@HtmlDoc(aside={"INHERIT","a03a","a03b"}))
+ @RestMethod(path="/a03")
+ @HtmlDocConfig(aside={"INHERIT","a03a","a03b"})
public Object a03() {
return "OK";
}
- @RestMethod(path="/a04",
htmldoc=@HtmlDoc(aside={"a04a","INHERIT","a04b"}))
+ @RestMethod(path="/a04")
+ @HtmlDocConfig(aside={"a04a","INHERIT","a04b"})
public Object a04() {
return "OK";
}
- @RestMethod(path="/a05",
htmldoc=@HtmlDoc(aside={"a05a","a05b","INHERIT"}))
+ @RestMethod(path="/a05")
+ @HtmlDocConfig(aside={"a05a","a05b","INHERIT"})
public Object a05() {
return "OK";
}
@@ -78,25 +84,30 @@ public class HtmlDocAsideTest {
// Inheritance
//=================================================================================================================
- @RestResource(htmldoc=@HtmlDoc(aside={"INHERIT","b01a","b01b"}))
+ @RestResource()
+ @HtmlDocConfig(aside={"INHERIT","b01a","b01b"})
public static class B extends A {
@RestMethod(path="/b01")
public Object b01() {
return "OK";
}
- @RestMethod(path="/b02",
htmldoc=@HtmlDoc(aside={"b02a","b02b"}))
+ @RestMethod(path="/b02")
+ @HtmlDocConfig(aside={"b02a","b02b"})
public Object b02() {
return "OK";
}
- @RestMethod(path="/b03",
htmldoc=@HtmlDoc(aside={"INHERIT","b03a","b03b"}))
+ @RestMethod(path="/b03")
+ @HtmlDocConfig(aside={"INHERIT","b03a","b03b"})
public Object b03() {
return "OK";
}
- @RestMethod(path="/b04",
htmldoc=@HtmlDoc(aside={"b04a","INHERIT","b04b"}))
+ @RestMethod(path="/b04")
+ @HtmlDocConfig(aside={"b04a","INHERIT","b04b"})
public Object b04() {
return "OK";
}
- @RestMethod(path="/b05",
htmldoc=@HtmlDoc(aside={"b05a","b05b","INHERIT"}))
+ @RestMethod(path="/b05")
+ @HtmlDocConfig(aside={"b05a","b05b","INHERIT"})
public Object b05() {
return "OK";
}
diff --git
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocFooterTest.java
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigFooterTest.java
similarity index 84%
copy from
juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocFooterTest.java
copy to
juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigFooterTest.java
index 9a56fe8..344e1c6 100644
---
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocFooterTest.java
+++
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigFooterTest.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
+import org.apache.juneau.html.annotation.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.mock2.*;
import org.junit.*;
@@ -22,31 +23,36 @@ import org.junit.runners.*;
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@SuppressWarnings({"javadoc","serial"})
-public class HtmlDocFooterTest {
+public class HtmlDocConfigFooterTest {
//=================================================================================================================
// Basic tests
//=================================================================================================================
- @RestResource(htmldoc=@HtmlDoc(footer={"a01a","a01b"}))
+ @RestResource()
+ @HtmlDocConfig(footer={"a01a","a01b"})
public static class A extends BasicRestServlet {
@RestMethod(path="/a01")
public Object a01() {
return "OK";
}
- @RestMethod(path="/a02",
htmldoc=@HtmlDoc(footer={"a02a","a02b"}))
+ @RestMethod(path="/a02")
+ @HtmlDocConfig(footer={"a02a","a02b"})
public Object a02() {
return "OK";
}
- @RestMethod(path="/a03",
htmldoc=@HtmlDoc(footer={"INHERIT","a03a","a03b"}))
+ @RestMethod(path="/a03")
+ @HtmlDocConfig(footer={"INHERIT","a03a","a03b"})
public Object a03() {
return "OK";
}
- @RestMethod(path="/a04",
htmldoc=@HtmlDoc(footer={"a04a","INHERIT","a04b"}))
+ @RestMethod(path="/a04")
+ @HtmlDocConfig(footer={"a04a","INHERIT","a04b"})
public Object a04() {
return "OK";
}
- @RestMethod(path="/a05",
htmldoc=@HtmlDoc(footer={"a05a","a05b","INHERIT"}))
+ @RestMethod(path="/a05")
+ @HtmlDocConfig(footer={"a05a","a05b","INHERIT"})
public Object a05() {
return "OK";
}
@@ -78,25 +84,30 @@ public class HtmlDocFooterTest {
// Inheritance
//=================================================================================================================
- @RestResource(htmldoc=@HtmlDoc(footer={"b01a","INHERIT","b01b"}))
+ @RestResource()
+ @HtmlDocConfig(footer={"b01a","INHERIT","b01b"})
public static class B extends A {
@RestMethod(path="/b01")
public Object b01() {
return "OK";
}
- @RestMethod(path="/b02",
htmldoc=@HtmlDoc(footer={"b02a","b02b"}))
+ @RestMethod(path="/b02")
+ @HtmlDocConfig(footer={"b02a","b02b"})
public Object b02() {
return "OK";
}
- @RestMethod(path="/b03",
htmldoc=@HtmlDoc(footer={"INHERIT","b03a","b03b"}))
+ @RestMethod(path="/b03")
+ @HtmlDocConfig(footer={"INHERIT","b03a","b03b"})
public Object b03() {
return "OK";
}
- @RestMethod(path="/b04",
htmldoc=@HtmlDoc(footer={"b04a","INHERIT","b04b"}))
+ @RestMethod(path="/b04")
+ @HtmlDocConfig(footer={"b04a","INHERIT","b04b"})
public Object b04() {
return "OK";
}
- @RestMethod(path="/b05",
htmldoc=@HtmlDoc(footer={"b05a","b05b","INHERIT"}))
+ @RestMethod(path="/b05")
+ @HtmlDocConfig(footer={"b05a","b05b","INHERIT"})
public Object b05() {
return "OK";
}
diff --git
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocHeaderTest.java
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigHeaderTest.java
similarity index 84%
copy from
juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocHeaderTest.java
copy to
juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigHeaderTest.java
index 593bc7b..9d1807a 100644
---
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocHeaderTest.java
+++
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigHeaderTest.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
+import org.apache.juneau.html.annotation.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.mock2.*;
import org.junit.*;
@@ -22,31 +23,36 @@ import org.junit.runners.*;
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@SuppressWarnings({"javadoc","serial"})
-public class HtmlDocHeaderTest {
+public class HtmlDocConfigHeaderTest {
//=================================================================================================================
// Basic tests
//=================================================================================================================
- @RestResource(htmldoc=@HtmlDoc(header={"a01a","a01b"}))
+ @RestResource()
+ @HtmlDocConfig(header={"a01a","a01b"})
public static class A extends BasicRestServlet {
@RestMethod(path="/a01")
public Object a01() {
return "OK";
}
- @RestMethod(path="/a02",
htmldoc=@HtmlDoc(header={"a02a","a02b"}))
+ @RestMethod(path="/a02")
+ @HtmlDocConfig(header={"a02a","a02b"})
public Object a02() {
return "OK";
}
- @RestMethod(path="/a03",
htmldoc=@HtmlDoc(header={"INHERIT","a03a","a03b"}))
+ @RestMethod(path="/a03")
+ @HtmlDocConfig(header={"INHERIT","a03a","a03b"})
public Object a03() {
return "OK";
}
- @RestMethod(path="/a04",
htmldoc=@HtmlDoc(header={"a04a","INHERIT","a04b"}))
+ @RestMethod(path="/a04")
+ @HtmlDocConfig(header={"a04a","INHERIT","a04b"})
public Object a04() {
return "OK";
}
- @RestMethod(path="/a05",
htmldoc=@HtmlDoc(header={"a05a","a05b","INHERIT"}))
+ @RestMethod(path="/a05")
+ @HtmlDocConfig(header={"a05a","a05b","INHERIT"})
public Object a05() {
return "OK";
}
@@ -78,25 +84,30 @@ public class HtmlDocHeaderTest {
// Inheritance
//=================================================================================================================
- @RestResource(htmldoc=@HtmlDoc(header={"b01a","b01b","INHERIT"}))
+ @RestResource()
+ @HtmlDocConfig(header={"b01a","b01b","INHERIT"})
public static class B extends A {
@RestMethod(path="/b01")
public Object b01() {
return "OK";
}
- @RestMethod(path="/b02",
htmldoc=@HtmlDoc(header={"b02a","b02b"}))
+ @RestMethod(path="/b02")
+ @HtmlDocConfig(header={"b02a","b02b"})
public Object b02() {
return "OK";
}
- @RestMethod(path="/b03",
htmldoc=@HtmlDoc(header={"INHERIT","b03a","b03b"}))
+ @RestMethod(path="/b03")
+ @HtmlDocConfig(header={"INHERIT","b03a","b03b"})
public Object b03() {
return "OK";
}
- @RestMethod(path="/b04",
htmldoc=@HtmlDoc(header={"b04a","INHERIT","b04b"}))
+ @RestMethod(path="/b04")
+ @HtmlDocConfig(header={"b04a","INHERIT","b04b"})
public Object b04() {
return "OK";
}
- @RestMethod(path="/b05",
htmldoc=@HtmlDoc(header={"b05a","b05b","INHERIT"}))
+ @RestMethod(path="/b05")
+ @HtmlDocConfig(header={"b05a","b05b","INHERIT"})
public Object b05() {
return "OK";
}
diff --git
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavTest.java
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigNavTest.java
similarity index 84%
copy from
juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavTest.java
copy to
juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigNavTest.java
index 60c3611..ca70359 100644
---
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavTest.java
+++
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigNavTest.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
+import org.apache.juneau.html.annotation.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.mock2.*;
import org.junit.*;
@@ -22,31 +23,36 @@ import org.junit.runners.*;
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@SuppressWarnings({"javadoc","serial"})
-public class HtmlDocNavTest {
+public class HtmlDocConfigNavTest {
//=================================================================================================================
// Basic tests
//=================================================================================================================
- @RestResource(htmldoc=@HtmlDoc(navlinks={"NONE"},nav={"a01a","a01b"}))
+ @RestResource()
+ @HtmlDocConfig(navlinks={"NONE"},nav={"a01a","a01b"})
public static class A extends BasicRestServlet {
@RestMethod(path="/a01")
public Object a01() {
return "OK";
}
- @RestMethod(path="/a02", htmldoc=@HtmlDoc(nav={"a02a","a02b"}))
+ @RestMethod(path="/a02")
+ @HtmlDocConfig(nav={"a02a","a02b"})
public Object a02() {
return "OK";
}
- @RestMethod(path="/a03",
htmldoc=@HtmlDoc(nav={"INHERIT","a03a","a03b"}))
+ @RestMethod(path="/a03")
+ @HtmlDocConfig(nav={"INHERIT","a03a","a03b"})
public Object a03() {
return "OK";
}
- @RestMethod(path="/a04",
htmldoc=@HtmlDoc(nav={"a04a","INHERIT","a04b"}))
+ @RestMethod(path="/a04")
+ @HtmlDocConfig(nav={"a04a","INHERIT","a04b"})
public Object a04() {
return "OK";
}
- @RestMethod(path="/a05",
htmldoc=@HtmlDoc(nav={"a05a","a05b","INHERIT"}))
+ @RestMethod(path="/a05")
+ @HtmlDocConfig(nav={"a05a","a05b","INHERIT"})
public Object a05() {
return "OK";
}
@@ -78,25 +84,30 @@ public class HtmlDocNavTest {
// Inheritance
//=================================================================================================================
- @RestResource(htmldoc=@HtmlDoc(nav={"INHERIT","b01a","b01b"}))
+ @RestResource()
+ @HtmlDocConfig(nav={"INHERIT","b01a","b01b"})
public static class B extends A {
@RestMethod(path="/b01")
public Object b01() {
return "OK";
}
- @RestMethod(path="/b02", htmldoc=@HtmlDoc(nav={"b02a","b02b"}))
+ @RestMethod(path="/b02")
+ @HtmlDocConfig(nav={"b02a","b02b"})
public Object b02() {
return "OK";
}
- @RestMethod(path="/b03",
htmldoc=@HtmlDoc(nav={"INHERIT","b03a","b03b"}))
+ @RestMethod(path="/b03")
+ @HtmlDocConfig(nav={"INHERIT","b03a","b03b"})
public Object b03() {
return "OK";
}
- @RestMethod(path="/b04",
htmldoc=@HtmlDoc(nav={"b04a","INHERIT","b04b"}))
+ @RestMethod(path="/b04")
+ @HtmlDocConfig(nav={"b04a","INHERIT","b04b"})
public Object b04() {
return "OK";
}
- @RestMethod(path="/b05",
htmldoc=@HtmlDoc(nav={"b05a","b05b","INHERIT"}))
+ @RestMethod(path="/b05")
+ @HtmlDocConfig(nav={"b05a","b05b","INHERIT"})
public Object b05() {
return "OK";
}
diff --git
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavlinksTest.java
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigNavlinksTest.java
similarity index 80%
copy from
juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavlinksTest.java
copy to
juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigNavlinksTest.java
index 68a4572..34bb0a4 100644
---
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavlinksTest.java
+++
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigNavlinksTest.java
@@ -13,6 +13,7 @@
package org.apache.juneau.rest.annotation;
+import org.apache.juneau.html.annotation.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.mock2.*;
import org.junit.*;
@@ -23,55 +24,66 @@ import org.junit.runners.*;
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@SuppressWarnings({"javadoc","serial"})
-public class HtmlDocNavlinksTest {
+public class HtmlDocConfigNavlinksTest {
//=================================================================================================================
// Basic tests
//=================================================================================================================
- @RestResource(htmldoc=@HtmlDoc(navlinks={"a01a","a01b"}))
+ @RestResource()
+ @HtmlDocConfig(navlinks={"a01a","a01b"})
public static class A extends BasicRestServlet {
@RestMethod(path="/a01")
public Object a01() {
return "OK";
}
- @RestMethod(path="/a02",
htmldoc=@HtmlDoc(navlinks={"a02a","a02b"}))
+ @RestMethod(path="/a02")
+ @HtmlDocConfig(navlinks={"a02a","a02b"})
public Object test2() {
return "OK";
}
- @RestMethod(path="/a03",
htmldoc=@HtmlDoc(navlinks={"INHERIT","a03a","a03b"}))
+ @RestMethod(path="/a03")
+ @HtmlDocConfig(navlinks={"INHERIT","a03a","a03b"})
public Object a03() {
return "OK";
}
- @RestMethod(path="/a04",
htmldoc=@HtmlDoc(navlinks={"a04a","INHERIT","a04b"}))
+ @RestMethod(path="/a04")
+ @HtmlDocConfig(navlinks={"a04a","INHERIT","a04b"})
public Object test4() {
return "OK";
}
- @RestMethod(path="/a05",
htmldoc=@HtmlDoc(navlinks={"a05a","a05b","INHERIT"}))
+ @RestMethod(path="/a05")
+ @HtmlDocConfig(navlinks={"a05a","a05b","INHERIT"})
public Object test5() {
return "OK";
}
- @RestMethod(path="/a06",
htmldoc=@HtmlDoc(navlinks={"INHERIT","[0]:a06a","[3]:a06b"}))
+ @RestMethod(path="/a06")
+ @HtmlDocConfig(navlinks={"INHERIT","[0]:a06a","[3]:a06b"})
public Object test6a() {
return "OK";
}
- @RestMethod(path="/a07",
htmldoc=@HtmlDoc(navlinks={"[1]:a07a","[2]:a07b","INHERIT"}))
+ @RestMethod(path="/a07")
+ @HtmlDocConfig(navlinks={"[1]:a07a","[2]:a07b","INHERIT"})
public Object test6b() {
return "OK";
}
- @RestMethod(path="/a08",
htmldoc=@HtmlDoc(navlinks={"[1]:a08a","[0]:a08b"}))
+ @RestMethod(path="/a08")
+ @HtmlDocConfig(navlinks={"[1]:a08a","[0]:a08b"})
public Object test6c() {
return "OK";
}
- @RestMethod(path="/a09",
htmldoc=@HtmlDoc(navlinks={"INHERIT","foo[0]:a09a","bar[3]:a09b"}))
+ @RestMethod(path="/a09")
+ @HtmlDocConfig(navlinks={"INHERIT","foo[0]:a09a","bar[3]:a09b"})
public Object test6d() {
return "OK";
}
- @RestMethod(path="/a10",
htmldoc=@HtmlDoc(navlinks={"foo[1]:a10a","bar[2]:a10b","INHERIT"}))
+ @RestMethod(path="/a10")
+ @HtmlDocConfig(navlinks={"foo[1]:a10a","bar[2]:a10b","INHERIT"})
public Object test6e() {
return "OK";
}
- @RestMethod(path="/a11",
htmldoc=@HtmlDoc(navlinks={"foo[1]:a11a","bar[0]:a11b"}))
+ @RestMethod(path="/a11")
+ @HtmlDocConfig(navlinks={"foo[1]:a11a","bar[0]:a11b"})
public Object test6f() {
return "OK";
}
@@ -127,49 +139,60 @@ public class HtmlDocNavlinksTest {
// Inheritance
//=================================================================================================================
- @RestResource(htmldoc=@HtmlDoc(navlinks={"INHERIT","b01a","b01b"}))
+ @RestResource()
+ @HtmlDocConfig(navlinks={"INHERIT","b01a","b01b"})
public static class B extends A {
@RestMethod(path="/b01")
public Object b01() {
return "OK";
}
- @RestMethod(path="/b02",
htmldoc=@HtmlDoc(navlinks={"b02a","b02b"}))
+ @RestMethod(path="/b02")
+ @HtmlDocConfig(navlinks={"b02a","b02b"})
public Object b02() {
return "OK";
}
- @RestMethod(path="/b03",
htmldoc=@HtmlDoc(navlinks={"INHERIT","b03a","b03b"}))
+ @RestMethod(path="/b03")
+ @HtmlDocConfig(navlinks={"INHERIT","b03a","b03b"})
public Object b03() {
return "OK";
}
- @RestMethod(path="/b04",
htmldoc=@HtmlDoc(navlinks={"b04a","INHERIT","b04b"}))
+ @RestMethod(path="/b04")
+ @HtmlDocConfig(navlinks={"b04a","INHERIT","b04b"})
public Object b04() {
return "OK";
}
- @RestMethod(path="/b05",
htmldoc=@HtmlDoc(navlinks={"b05a","b05b","INHERIT"}))
+ @RestMethod(path="/b05")
+ @HtmlDocConfig(navlinks={"b05a","b05b","INHERIT"})
public Object b05() {
return "OK";
}
- @RestMethod(path="/b06",
htmldoc=@HtmlDoc(navlinks={"INHERIT","[0]:b06a","[3]:b06b"}))
+ @RestMethod(path="/b06")
+ @HtmlDocConfig(navlinks={"INHERIT","[0]:b06a","[3]:b06b"})
public Object b06() {
return "OK";
}
- @RestMethod(path="/b07",
htmldoc=@HtmlDoc(navlinks={"[1]:b07a","[2]:b07b","INHERIT"}))
+ @RestMethod(path="/b07")
+ @HtmlDocConfig(navlinks={"[1]:b07a","[2]:b07b","INHERIT"})
public Object b07() {
return "OK";
}
- @RestMethod(path="/b08",
htmldoc=@HtmlDoc(navlinks={"[1]:b08a","[0]:b08b"}))
+ @RestMethod(path="/b08")
+ @HtmlDocConfig(navlinks={"[1]:b08a","[0]:b08b"})
public Object b08() {
return "OK";
}
- @RestMethod(path="/b09",
htmldoc=@HtmlDoc(navlinks={"INHERIT","foo[0]:b09a","bar[3]:b09b"}))
+ @RestMethod(path="/b09")
+ @HtmlDocConfig(navlinks={"INHERIT","foo[0]:b09a","bar[3]:b09b"})
public Object b09() {
return "OK";
}
- @RestMethod(path="/b10",
htmldoc=@HtmlDoc(navlinks={"foo[1]:b10a","bar[2]:b10b","INHERIT"}))
+ @RestMethod(path="/b10")
+ @HtmlDocConfig(navlinks={"foo[1]:b10a","bar[2]:b10b","INHERIT"})
public Object b10() {
return "OK";
}
- @RestMethod(path="/b11",
htmldoc=@HtmlDoc(navlinks={"foo[1]:b11a","bar[0]:b11b"}))
+ @RestMethod(path="/b11")
+ @HtmlDocConfig(navlinks={"foo[1]:b11a","bar[0]:b11b"})
public Object b11() {
return "OK";
}
diff --git
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocScriptTest.java
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigScriptTest.java
similarity index 85%
copy from
juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocScriptTest.java
copy to
juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigScriptTest.java
index 1cd1e05..b6651a6 100644
---
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocScriptTest.java
+++
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigScriptTest.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
+import org.apache.juneau.html.annotation.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.mock2.*;
import org.junit.*;
@@ -22,31 +23,36 @@ import org.junit.runners.*;
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@SuppressWarnings({"javadoc","serial"})
-public class HtmlDocScriptTest {
+public class HtmlDocConfigScriptTest {
//=================================================================================================================
// Basic tests
//=================================================================================================================
- @RestResource(htmldoc=@HtmlDoc(script={"a01a","a01b"}))
+ @RestResource()
+ @HtmlDocConfig(script={"a01a","a01b"})
public static class A extends BasicRestServlet {
@RestMethod(path="/a01")
public Object a01() {
return "OK";
}
- @RestMethod(path="/a02",
htmldoc=@HtmlDoc(script={"a02a","a02b"}))
+ @RestMethod(path="/a02")
+ @HtmlDocConfig(script={"a02a","a02b"})
public Object a02() {
return "OK";
}
- @RestMethod(path="/a03",
htmldoc=@HtmlDoc(script={"INHERIT","a03a","a03b"}))
+ @RestMethod(path="/a03")
+ @HtmlDocConfig(script={"INHERIT","a03a","a03b"})
public Object a03() {
return "OK";
}
- @RestMethod(path="/a04",
htmldoc=@HtmlDoc(script={"a04a","INHERIT","a04b"}))
+ @RestMethod(path="/a04")
+ @HtmlDocConfig(script={"a04a","INHERIT","a04b"})
public Object a04() {
return "OK";
}
- @RestMethod(path="/a05",
htmldoc=@HtmlDoc(script={"a05a","a05b","INHERIT"}))
+ @RestMethod(path="/a05")
+ @HtmlDocConfig(script={"a05a","a05b","INHERIT"})
public Object a05() {
return "OK";
}
@@ -78,25 +84,30 @@ public class HtmlDocScriptTest {
// Inheritance
//=================================================================================================================
- @RestResource(htmldoc=@HtmlDoc(script={"b01a","b01b"}))
+ @RestResource()
+ @HtmlDocConfig(script={"b01a","b01b"})
public static class B extends A {
@RestMethod(path="/b01")
public Object b01() {
return "OK";
}
- @RestMethod(path="/b02",
htmldoc=@HtmlDoc(script={"b02a","b02b"}))
+ @RestMethod(path="/b02")
+ @HtmlDocConfig(script={"b02a","b02b"})
public Object b02() {
return "OK";
}
- @RestMethod(path="/b03",
htmldoc=@HtmlDoc(script={"INHERIT","b03a","b03b"}))
+ @RestMethod(path="/b03")
+ @HtmlDocConfig(script={"INHERIT","b03a","b03b"})
public Object b03() {
return "OK";
}
- @RestMethod(path="/b04",
htmldoc=@HtmlDoc(script={"b04a","INHERIT","b04b"}))
+ @RestMethod(path="/b04")
+ @HtmlDocConfig(script={"b04a","INHERIT","b04b"})
public Object b04() {
return "OK";
}
- @RestMethod(path="/b05",
htmldoc=@HtmlDoc(script={"b05a","b05b","INHERIT"}))
+ @RestMethod(path="/b05")
+ @HtmlDocConfig(script={"b05a","b05b","INHERIT"})
public Object b05() {
return "OK";
}
diff --git
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocStyleTest.java
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigStyleTest.java
similarity index 84%
copy from
juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocStyleTest.java
copy to
juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigStyleTest.java
index 3ef9c34..3e12bfc 100644
---
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocStyleTest.java
+++
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocConfigStyleTest.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
+import org.apache.juneau.html.annotation.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.mock2.*;
import org.junit.*;
@@ -22,31 +23,36 @@ import org.junit.runners.*;
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@SuppressWarnings({"javadoc","serial"})
-public class HtmlDocStyleTest {
+public class HtmlDocConfigStyleTest {
//=================================================================================================================
// Basic tests
//=================================================================================================================
-
@RestResource(htmldoc=@HtmlDoc(style={"a01a","a01b"},stylesheet="a01s",nowrap="false"))
+ @RestResource()
+ @HtmlDocConfig(style={"a01a","a01b"},stylesheet="a01s",nowrap="false")
public static class A extends BasicRestServlet {
@RestMethod(path="/a01")
public Object a01() {
return "OK";
}
- @RestMethod(path="/a02",
htmldoc=@HtmlDoc(style={"a02a","a02b"},stylesheet="a02s"))
+ @RestMethod(path="/a02")
+ @HtmlDocConfig(style={"a02a","a02b"},stylesheet="a02s")
public Object a02() {
return "OK";
}
- @RestMethod(path="/a03",
htmldoc=@HtmlDoc(style={"INHERIT","a03a","a03b"}))
+ @RestMethod(path="/a03")
+ @HtmlDocConfig(style={"INHERIT","a03a","a03b"})
public Object a03() {
return "OK";
}
- @RestMethod(path="/a04",
htmldoc=@HtmlDoc(style={"a04a","INHERIT","a04b"}))
+ @RestMethod(path="/a04")
+ @HtmlDocConfig(style={"a04a","INHERIT","a04b"})
public Object a04() {
return "OK";
}
- @RestMethod(path="/a05",
htmldoc=@HtmlDoc(style={"a05a","a05b","INHERIT"}))
+ @RestMethod(path="/a05")
+ @HtmlDocConfig(style={"a05a","a05b","INHERIT"})
public Object a05() {
return "OK";
}
@@ -78,25 +84,30 @@ public class HtmlDocStyleTest {
// Inheritance
//=================================================================================================================
- @RestResource(htmldoc=@HtmlDoc(style={"b01a","b01b"},stylesheet="b01s"))
+ @RestResource()
+ @HtmlDocConfig(style={"b01a","b01b"},stylesheet="b01s")
public static class B extends A {
@RestMethod(path="/b01")
public Object b01() {
return "OK";
}
- @RestMethod(path="/b02",
htmldoc=@HtmlDoc(style={"b02a","b02b"},stylesheet="b02s"))
+ @RestMethod(path="/b02")
+ @HtmlDocConfig(style={"b02a","b02b"},stylesheet="b02s")
public Object b02() {
return "OK";
}
- @RestMethod(path="/b03",
htmldoc=@HtmlDoc(style={"INHERIT","b03a","b03b"}))
+ @RestMethod(path="/b03")
+ @HtmlDocConfig(style={"INHERIT","b03a","b03b"})
public Object b03() {
return "OK";
}
- @RestMethod(path="/b04",
htmldoc=@HtmlDoc(style={"b04a","INHERIT","b04b"}))
+ @RestMethod(path="/b04")
+ @HtmlDocConfig(style={"b04a","INHERIT","b04b"})
public Object b04() {
return "OK";
}
- @RestMethod(path="/b05",
htmldoc=@HtmlDoc(style={"b05a","b05b","INHERIT"}))
+ @RestMethod(path="/b05")
+ @HtmlDocConfig(style={"b05a","b05b","INHERIT"})
public Object b05() {
return "OK";
}
diff --git
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocFooterTest.java
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocFooterTest.java
index 9a56fe8..bc45569 100644
---
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocFooterTest.java
+++
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocFooterTest.java
@@ -19,9 +19,11 @@ import org.junit.runners.*;
/**
* Tests related to @HtmlDoc(footer) annotation.
+ *
+ * TODO - Remove in 9.0. Replaced by HtmlDocConfigFooterTest.
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-@SuppressWarnings({"javadoc","serial"})
+@SuppressWarnings({"javadoc","serial","deprecation"})
public class HtmlDocFooterTest {
//=================================================================================================================
diff --git
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocHeaderTest.java
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocHeaderTest.java
index 593bc7b..a67a1f5 100644
---
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocHeaderTest.java
+++
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocHeaderTest.java
@@ -19,9 +19,11 @@ import org.junit.runners.*;
/**
* Tests related to @HtmlDoc(header) annotation.
+ *
+ * TODO - Remove in 9.0. Replaced by HtmlDocConfigHeaderTest.
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-@SuppressWarnings({"javadoc","serial"})
+@SuppressWarnings({"javadoc","serial","deprecation"})
public class HtmlDocHeaderTest {
//=================================================================================================================
diff --git
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavTest.java
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavTest.java
index 60c3611..c5af2a5 100644
---
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavTest.java
+++
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavTest.java
@@ -19,9 +19,11 @@ import org.junit.runners.*;
/**
* Tests related to @HtmlDoc(nav) annotation.
+ *
+ * TODO - Remove in 9.0. Replaced by HtmlDocConfigNavTest.
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-@SuppressWarnings({"javadoc","serial"})
+@SuppressWarnings({"javadoc","serial","deprecation"})
public class HtmlDocNavTest {
//=================================================================================================================
diff --git
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavlinksTest.java
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavlinksTest.java
index 68a4572..711ae7b 100644
---
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavlinksTest.java
+++
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavlinksTest.java
@@ -20,9 +20,11 @@ import org.junit.runners.*;
/**
* Tests related to @HtmlDoc(navlinks) annotation.
+ *
+ * TODO - Remove in 9.0. Replaced by HtmlDocConfigNavlinksTest.
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-@SuppressWarnings({"javadoc","serial"})
+@SuppressWarnings({"javadoc","serial","deprecation"})
public class HtmlDocNavlinksTest {
//=================================================================================================================
diff --git
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocScriptTest.java
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocScriptTest.java
index 1cd1e05..82a656b 100644
---
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocScriptTest.java
+++
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocScriptTest.java
@@ -19,9 +19,11 @@ import org.junit.runners.*;
/**
* Tests related to @HtmlDoc(script) annotation.
+ *
+ * TODO - Remove in 9.0. Replaced by HtmlDocConfigScriptTest.
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-@SuppressWarnings({"javadoc","serial"})
+@SuppressWarnings({"javadoc","serial","deprecation"})
public class HtmlDocScriptTest {
//=================================================================================================================
diff --git
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocStyleTest.java
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocStyleTest.java
index 3ef9c34..e618c2e 100644
---
a/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocStyleTest.java
+++
b/juneau-rest/juneau-rest-server-test/src/test/java/org/apache/juneau/rest/annotation/HtmlDocStyleTest.java
@@ -19,9 +19,11 @@ import org.junit.runners.*;
/**
* Tests related to @HtmlDoc(style) annotation.
+ *
+ * TODO - Remove in 9.0. Replaced by HtmlDocConfigStyleTest.
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-@SuppressWarnings({"javadoc","serial"})
+@SuppressWarnings({"javadoc","serial","deprecation"})
public class HtmlDocStyleTest {
//=================================================================================================================
