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 c630c62 Remove deprecated code.
c630c62 is described below
commit c630c62e30bfdeff7f360e0ed9f5f9cc81f752d9
Author: JamesBognar <[email protected]>
AuthorDate: Tue Oct 13 12:47:45 2020 -0400
Remove deprecated code.
---
.../juneau/html/HtmlSchemaSerializerBuilder.java | 42 ----------------
.../apache/juneau/html/HtmlSerializerBuilder.java | 56 ----------------------
2 files changed, 98 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerBuilder.java
index 55e1694..117ddf6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerBuilder.java
@@ -111,20 +111,6 @@ public class HtmlSchemaSerializerBuilder extends
HtmlSerializerBuilder {
/**
* <i><l>HtmlSchemaSerializer</l> configuration property: </i>
Allow nested descriptions.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #allowNestedDescriptions()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @FluentSetter
- @Deprecated
- public HtmlSchemaSerializerBuilder allowNestedDescriptions(boolean
value) {
- return set(JSONSCHEMA_allowNestedDescriptions, value);
- }
-
- /**
- * <i><l>HtmlSchemaSerializer</l> configuration property: </i>
Allow nested descriptions.
- *
* <p>
* Identifies whether nested descriptions are allowed in schema
definitions.
*
@@ -142,20 +128,6 @@ public class HtmlSchemaSerializerBuilder extends
HtmlSerializerBuilder {
/**
* <i><l>HtmlSchemaSerializer</l> configuration property: </i>
Allow nested examples.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #allowNestedExamples()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @FluentSetter
- @Deprecated
- public HtmlSchemaSerializerBuilder allowNestedExamples(boolean value) {
- return set(JSONSCHEMA_allowNestedExamples, value);
- }
-
- /**
- * <i><l>HtmlSchemaSerializer</l> configuration property: </i>
Allow nested examples.
- *
* <p>
* Identifies whether nested examples are allowed in schema definitions.
*
@@ -244,20 +216,6 @@ public class HtmlSchemaSerializerBuilder extends
HtmlSerializerBuilder {
/**
* <i><l>HtmlSchemaSerializer</l> configuration property: </i>
Use bean definitions.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #useBeanDefs()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @FluentSetter
- @Deprecated
- public HtmlSchemaSerializerBuilder useBeanDefs(boolean value) {
- return set(JSONSCHEMA_useBeanDefs, value);
- }
-
- /**
- * <i><l>HtmlSchemaSerializer</l> configuration property: </i>
Use bean definitions.
- *
* <p>
* When enabled, schemas on beans will be serialized as the following:
* <p class='bcode w800'>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
index 479b5c8..9ce0718 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
@@ -59,20 +59,6 @@ public class HtmlSerializerBuilder extends
XmlSerializerBuilder {
/**
* <i><l>HtmlSerializer</l> configuration property: </i> Add
key/value headers on bean/map tables.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #addKeyValueTableHeaders()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @FluentSetter
- @Deprecated
- public HtmlSerializerBuilder addKeyValueTableHeaders(boolean value) {
- return set(HTML_addKeyValueTableHeaders, value);
- }
-
- /**
- * <i><l>HtmlSerializer</l> configuration property: </i> Add
key/value headers on bean/map tables.
- *
* <p>
* Shortcut for calling
<code>addKeyValueTableHeaders(<jk>true</jk>)</code>.
*
@@ -90,20 +76,6 @@ public class HtmlSerializerBuilder extends
XmlSerializerBuilder {
/**
* <i><l>HtmlSerializer</l> configuration property: </i> Look for
URLs in {@link String Strings}.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #dontDetectLinksInStrings()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @FluentSetter
- @Deprecated
- public HtmlSerializerBuilder detectLinksInStrings(boolean value) {
- return set(HTML_detectLinksInStrings, value);
- }
-
- /**
- * <i><l>HtmlSerializer</l> configuration property: </i> Look for
URLs in {@link String Strings}.
- *
* <p>
* If a string looks like a URL (e.g. starts with <js>"http://";</js> or
<js>"https://";</js>), then treat it like a URL
* and make it into a hyperlink based on the rules specified by {@link
HtmlSerializer#HTML_uriAnchorText}.
@@ -142,20 +114,6 @@ public class HtmlSerializerBuilder extends
XmlSerializerBuilder {
/**
* <i><l>HtmlSerializer</l> configuration property: </i> Look for
link labels in URIs.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #dontDetectLabelParameters()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @FluentSetter
- @Deprecated
- public HtmlSerializerBuilder detectLabelParameters(boolean value) {
- return set(HTML_detectLabelParameters, value);
- }
-
- /**
- * <i><l>HtmlSerializer</l> configuration property: </i> Look for
link labels in URIs.
- *
* <p>
* If the URL has a label parameter (e.g. <js>"?label=foobar"</js>),
then use that as the anchor text of the link.
*
@@ -191,20 +149,6 @@ public class HtmlSerializerBuilder extends
XmlSerializerBuilder {
return set(HTML_uriAnchorText, value);
}
- /**
- * <i><l>HtmlSerializer</l> configuration property: </i> Anchor
text source.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #uriAnchorText(AnchorText)}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @FluentSetter
- @Deprecated
- public HtmlSerializerBuilder uriAnchorText(String value) {
- return set(HTML_uriAnchorText, value);
- }
-
// <FluentSetters>
@Override /* GENERATED - ContextBuilder */
