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 656c88e Remove deprecated code.
656c88e is described below
commit 656c88ea082dcd0a3f99bbca90a67e3c80c1feb0
Author: JamesBognar <[email protected]>
AuthorDate: Tue Oct 13 12:58:15 2020 -0400
Remove deprecated code.
---
.../apache/juneau/http/HttpMethodName_Test.java | 27 ----------
.../org/apache/juneau/http/HttpMethodName.java | 62 ----------------------
.../httppart/bean/RequestBeanPropertyMeta.java | 22 --------
.../httppart/bean/ResponseBeanPropertyMeta.java | 22 --------
.../org/apache/juneau/json/JsonParserBuilder.java | 14 -----
.../juneau/json/JsonSchemaSerializerBuilder.java | 42 ---------------
.../apache/juneau/json/JsonSerializerBuilder.java | 29 +---------
.../jsonschema/JsonSchemaGeneratorBuilder.java | 42 ---------------
.../juneau/parser/InputStreamParserBuilder.java | 14 -----
.../org/apache/juneau/parser/ParserBuilder.java | 54 -------------------
10 files changed, 1 insertion(+), 327 deletions(-)
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/http/HttpMethodName_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/http/HttpMethodName_Test.java
deleted file mode 100644
index fc5e7d9..0000000
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/http/HttpMethodName_Test.java
+++ /dev/null
@@ -1,27 +0,0 @@
-//
***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file *
-// * distributed with this work for additional information regarding copyright
ownership. The ASF licenses this file *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance *
-// * with the License. You may obtain a copy of the License at
*
-// *
*
-// * http://www.apache.org/licenses/LICENSE-2.0
*
-// *
*
-// * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
-// * specific language governing permissions and limitations under the
License. *
-//
***************************************************************************************************************************
-package org.apache.juneau.http;
-
-import static org.junit.runners.MethodSorters.*;
-
-import org.junit.*;
-
-@FixMethodOrder(NAME_ASCENDING)
-public class HttpMethodName_Test {
-
- @SuppressWarnings("deprecation")
- @Test
- public void a01_basic() throws Exception {
- new HttpMethodName();
- }
-}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethodName.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethodName.java
deleted file mode 100644
index 9981ba5..0000000
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethodName.java
+++ /dev/null
@@ -1,62 +0,0 @@
-//
***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file *
-// * distributed with this work for additional information regarding copyright
ownership. The ASF licenses this file *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance *
-// * with the License. You may obtain a copy of the License at
*
-// *
*
-// * http://www.apache.org/licenses/LICENSE-2.0
*
-// *
*
-// * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
-// * specific language governing permissions and limitations under the
License. *
-//
***************************************************************************************************************************
-package org.apache.juneau.http;
-
-/**
- * Represents valid HTTP 1.1 method name static strings per the RFC 2616 spec.
- *
- * <ul class='seealso'>
- * <li class='extlink'>{@doc ExtRFC2616}
- * </ul>
- *
- * @deprecated Use {@link HttpMethod}.
- */
-@Deprecated
-public class HttpMethodName {
-
- /** {@doc ExtRFC2616.section9#sec9.2 OPTIONS} */
- public static final String OPTIONS = "OPTIONS";
-
- /** {@doc ExtRFC2616.section9#sec9.3 GET} */
- public static final String GET = "GET";
-
- /** {@doc ExtRFC2616.section9#sec9.4 HEAD} */
- public static final String HEAD = "HEAD";
-
- /** {@doc ExtRFC2616.section9#sec9.5 POST} */
- public static final String POST = "POST";
-
- /** {@doc ExtRFC2616.section9#sec9.6 PUT} */
- public static final String PUT = "PUT";
-
- /** {@doc ExtRFC2616.section9#sec9.7 DELETE} */
- public static final String DELETE = "DELETE";
-
- /** {@doc ExtRFC2616.section9#sec9.8 TRACE} */
- public static final String TRACE = "TRACE";
-
- /** {@doc ExtRFC2616.section9#sec9.9 CONNECT} */
- public static final String CONNECT = "CONNECT";
-
- /** {@doc https://tools.ietf.org/html/rfc5789 PATCH} */
- public static final String PATCH = "PATCH";
-
- /** Special case for a REST method that implements a REST-RPC
interface. */
- public static final String RRPC = "RRPC";
-
- /** A non-standard value. */
- public static final String OTHER = "OTHER";
-
- /** Represents any HTTP method. */
- public static final String ANY = "*";
-}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanPropertyMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanPropertyMeta.java
index fcd0327..9287e66 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanPropertyMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanPropertyMeta.java
@@ -115,17 +115,6 @@ public class RequestBeanPropertyMeta {
* @param _default The default serializer to use if not defined on the
annotation.
* @return The serializer to use for serializing the bean property
value.
*/
- @Deprecated
- public HttpPartSerializer getSerializer(HttpPartSerializer _default) {
- return serializer == null ? _default : serializer;
- }
-
- /**
- * Returns the serializer to use for serializing the bean property
value.
- *
- * @param _default The default serializer to use if not defined on the
annotation.
- * @return The serializer to use for serializing the bean property
value.
- */
public HttpPartSerializerSession
getSerializer(HttpPartSerializerSession _default) {
return serializer == null ? _default :
serializer.createPartSession(null);
}
@@ -136,17 +125,6 @@ public class RequestBeanPropertyMeta {
* @param _default The default parsing to use if not defined on the
annotation.
* @return The parsing to use for serializing the bean property value.
*/
- @Deprecated
- public HttpPartParser getParser(HttpPartParser _default) {
- return parser == null ? _default : parser;
- }
-
- /**
- * Returns the parser to use for parsing the bean property value.
- *
- * @param _default The default parsing to use if not defined on the
annotation.
- * @return The parsing to use for serializing the bean property value.
- */
public HttpPartParserSession getParser(HttpPartParserSession _default) {
return parser == null ? _default :
parser.createPartSession(null);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanPropertyMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanPropertyMeta.java
index b71c8c0..5db236e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanPropertyMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanPropertyMeta.java
@@ -121,17 +121,6 @@ public class ResponseBeanPropertyMeta {
* @param _default The default serializer to use if not defined on the
annotation.
* @return The serializer to use for serializing the bean property
value.
*/
- @Deprecated
- public HttpPartSerializer getSerializer(HttpPartSerializer _default) {
- return serializer == null ? _default : serializer;
- }
-
- /**
- * Returns the serializer to use for serializing the bean property
value.
- *
- * @param _default The default serializer to use if not defined on the
annotation.
- * @return The serializer to use for serializing the bean property
value.
- */
public HttpPartSerializerSession
getSerializer(HttpPartSerializerSession _default) {
return serializer == null ? _default :
serializer.createPartSession(null);
}
@@ -142,17 +131,6 @@ public class ResponseBeanPropertyMeta {
* @param _default The default parser to use if not defined on the
annotation.
* @return The parser to use for parsing the bean property value.
*/
- @Deprecated
- public HttpPartParser getParser(HttpPartParser _default) {
- return parser == null ? _default : parser;
- }
-
- /**
- * Returns the parser to use for parsing the bean property value.
- *
- * @param _default The default parser to use if not defined on the
annotation.
- * @return The parser to use for parsing the bean property value.
- */
public HttpPartParserSession getParser(HttpPartParserSession _default) {
return parser == null ? _default :
parser.createPartSession(null);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserBuilder.java
index f8789d9..511262e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserBuilder.java
@@ -59,20 +59,6 @@ public class JsonParserBuilder extends ReaderParserBuilder {
/**
* <i><l>JsonParser</l> configuration property: </i> Validate end.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #validateEnd()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @Deprecated
- @FluentSetter
- public JsonParserBuilder validateEnd(boolean value) {
- return set(JSON_validateEnd, value);
- }
-
- /**
- * <i><l>JsonParser</l> configuration property: </i> Validate end.
- *
* <p>
* Shortcut for calling <code>validateEnd(<jk>true</jk>)</code>.
*
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerBuilder.java
index e4f9c13..7833226 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerBuilder.java
@@ -110,20 +110,6 @@ public class JsonSchemaSerializerBuilder extends
JsonSerializerBuilder {
/**
* <i><l>JsonSchemaSerializer</l> configuration property: </i>
Allow nested descriptions.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #allowNestedDescriptions()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @FluentSetter
- @Deprecated
- public JsonSchemaSerializerBuilder allowNestedDescriptions(boolean
value) {
- return set(JSONSCHEMA_allowNestedDescriptions, value);
- }
-
- /**
- * <i><l>JsonSchemaSerializer</l> configuration property: </i>
Allow nested descriptions.
- *
* <p>
* Identifies whether nested descriptions are allowed in schema
definitions.
*
@@ -141,20 +127,6 @@ public class JsonSchemaSerializerBuilder extends
JsonSerializerBuilder {
/**
* <i><l>JsonSchemaSerializer</l> configuration property: </i>
Allow nested examples.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #allowNestedExamples()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @FluentSetter
- @Deprecated
- public JsonSchemaSerializerBuilder allowNestedExamples(boolean value) {
- return set(JSONSCHEMA_allowNestedExamples, value);
- }
-
- /**
- * <i><l>JsonSchemaSerializer</l> configuration property: </i>
Allow nested examples.
- *
* <p>
* Identifies whether nested examples are allowed in schema definitions.
*
@@ -243,20 +215,6 @@ public class JsonSchemaSerializerBuilder extends
JsonSerializerBuilder {
/**
* <i><l>JsonSchemaSerializer</l> configuration property: </i>
Use bean definitions.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #useBeanDefs()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @FluentSetter
- @Deprecated
- public JsonSchemaSerializerBuilder useBeanDefs(boolean value) {
- return set(JSONSCHEMA_useBeanDefs, value);
- }
-
- /**
- * <i><l>JsonSchemaSerializer</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/json/JsonSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java
index 2356801..1b3d15b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java
@@ -56,19 +56,6 @@ public class JsonSerializerBuilder extends
WriterSerializerBuilder {
// Properties
//-----------------------------------------------------------------------------------------------------------------
- /**
- * <i><l>JsonSerializer</l> configuration property: </i> Prefix
solidus <js>'/'</js> characters with escapes.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #escapeSolidus()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @FluentSetter
- @Deprecated
- public JsonSerializerBuilder escapeSolidus(boolean value) {
- return set(JSON_escapeSolidus, value);
- }
/**
* <i><l>JsonSerializer</l> configuration property: </i> Prefix
solidus <js>'/'</js> characters with escapes.
@@ -90,20 +77,6 @@ public class JsonSerializerBuilder extends
WriterSerializerBuilder {
/**
* <i><l>JsonSerializer</l> configuration property: </i> Simple
JSON mode.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #simple()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @FluentSetter
- @Deprecated
- public JsonSerializerBuilder simple(boolean value) {
- return set(JSON_simpleMode, value);
- }
-
- /**
- * <i><l>JsonSerializer</l> configuration property: </i> Simple
JSON mode.
- *
* <p>
* Shortcut for calling <code>simple(<jk>true</jk>)</code>.
*
@@ -115,7 +88,7 @@ public class JsonSerializerBuilder extends
WriterSerializerBuilder {
*/
@FluentSetter
public JsonSerializerBuilder simple() {
- return simple(true);
+ return set(JSON_simpleMode, true);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorBuilder.java
index 402f715..c88b1e6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorBuilder.java
@@ -108,20 +108,6 @@ public class JsonSchemaGeneratorBuilder extends
BeanTraverseBuilder {
/**
* <i><l>JsonSchemaGenerator</l> configuration property: </i>
Allow nested descriptions.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #allowNestedDescriptions()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @FluentSetter
- @Deprecated
- public JsonSchemaGeneratorBuilder allowNestedDescriptions(boolean
value) {
- return set(JSONSCHEMA_allowNestedDescriptions, value);
- }
-
- /**
- * <i><l>JsonSchemaGenerator</l> configuration property: </i>
Allow nested descriptions.
- *
* <p>
* Identifies whether nested descriptions are allowed in schema
definitions.
*
@@ -139,20 +125,6 @@ public class JsonSchemaGeneratorBuilder extends
BeanTraverseBuilder {
/**
* <i><l>JsonSchemaGenerator</l> configuration property: </i>
Allow nested examples.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #allowNestedExamples()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @FluentSetter
- @Deprecated
- public JsonSchemaGeneratorBuilder allowNestedExamples(boolean value) {
- return set(JSONSCHEMA_allowNestedExamples, value);
- }
-
- /**
- * <i><l>JsonSchemaGenerator</l> configuration property: </i>
Allow nested examples.
- *
* <p>
* Identifies whether nested examples are allowed in schema definitions.
*
@@ -268,20 +240,6 @@ public class JsonSchemaGeneratorBuilder extends
BeanTraverseBuilder {
/**
* <i><l>JsonSchemaGenerator</l> configuration property: </i> Use
bean definitions.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #useBeanDefs()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @FluentSetter
- @Deprecated
- public JsonSchemaGeneratorBuilder useBeanDefs(boolean value) {
- return set(JSONSCHEMA_useBeanDefs, value);
- }
-
- /**
- * <i><l>JsonSchemaGenerator</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/parser/InputStreamParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserBuilder.java
index 964c81c..6aecc9d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserBuilder.java
@@ -83,20 +83,6 @@ public class InputStreamParserBuilder extends ParserBuilder {
return set(ISPARSER_binaryFormat, value);
}
- /**
- * <i><l>InputStreamParser</l> configuration property: </i>
Binary input format.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #binaryFormat(BinaryFormat)}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @Deprecated
- @FluentSetter
- public InputStreamParserBuilder binaryFormat(String value) {
- return set(ISPARSER_binaryFormat, BinaryFormat.valueOf(value));
- }
-
// <FluentSetters>
@Override /* GENERATED - ContextBuilder */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserBuilder.java
index 1dbcab8..c4b94a7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserBuilder.java
@@ -54,19 +54,6 @@ public class ParserBuilder extends BeanContextBuilder {
// Properties
//-----------------------------------------------------------------------------------------------------------------
- /**
- * <i><l>Parser</l> configuration property: </i> Auto-close
streams.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #autoCloseStreams()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @Deprecated
- @FluentSetter
- public ParserBuilder autoCloseStreams(boolean value) {
- return set(PARSER_autoCloseStreams, value);
- }
/**
* <i><l>Parser</l> configuration property: </i> Auto-close
streams.
@@ -192,19 +179,6 @@ public class ParserBuilder extends BeanContextBuilder {
return set(PARSER_listener, value);
}
- /**
- * <i><l>Parser</l> configuration property: </i> Strict mode.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #strict()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @Deprecated
- @FluentSetter
- public ParserBuilder strict(boolean value) {
- return set(PARSER_strict, value);
- }
/**
* <i><l>Parser</l> configuration property: </i> Strict mode.
@@ -271,20 +245,6 @@ public class ParserBuilder extends BeanContextBuilder {
/**
* <i><l>Parser</l> configuration property: </i> Trim parsed
strings.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #trimStrings()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @Deprecated
- @FluentSetter
- public ParserBuilder trimStrings(boolean value) {
- return set(PARSER_trimStrings, value);
- }
-
- /**
- * <i><l>Parser</l> configuration property: </i> Trim parsed
strings.
- *
* <p>
* When enabled, string values will be trimmed of whitespace using
{@link String#trim()} before being added to
* the POJO.
@@ -319,20 +279,6 @@ public class ParserBuilder extends BeanContextBuilder {
/**
* <i><l>Parser</l> configuration property: </i> Unbuffered.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #unbuffered()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @Deprecated
- @FluentSetter
- public ParserBuilder unbuffered(boolean value) {
- return set(PARSER_unbuffered, value);
- }
-
- /**
- * <i><l>Parser</l> configuration property: </i> Unbuffered.
- *
* <p>
* When enabled, don't use internal buffering during parsing.
*
