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 27934b7 Combine HttpPart packages.
27934b7 is described below
commit 27934b78802d2db03b146b112842bc51f1bae95f
Author: JamesBognar <[email protected]>
AuthorDate: Mon Jul 2 11:16:46 2018 -0400
Combine HttpPart packages.
---
.../apache/juneau/httppart/UonPartParserTest.java | 1 -
.../java/org/apache/juneau/dto/LinkString.java | 1 -
.../.settings/org.eclipse.jdt.core.prefs | 12 +-
.../org/apache/juneau/http/annotation/Body.java | 3 +-
.../apache/juneau/http/annotation/FormData.java | 3 +-
.../org/apache/juneau/http/annotation/Header.java | 3 +-
.../org/apache/juneau/http/annotation/Path.java | 3 +-
.../org/apache/juneau/http/annotation/Query.java | 3 +-
.../juneau/http/annotation/ResponseHeader.java | 3 +-
.../org/apache/juneau/httppart/HttpPartParser.java | 4 +-
.../org/apache/juneau/httppart/HttpPartSchema.java | 3 +-
.../apache/juneau/httppart/HttpPartSerializer.java | 6 +-
.../OapiPartParser.java => OpenApiPartParser.java} | 18 +-
...rBuilder.java => OpenApiPartParserBuilder.java} | 164 ++++++++--------
...tSerializer.java => OpenApiPartSerializer.java} | 18 +-
...Builder.java => OpenPartSerializerBuilder.java} | 206 ++++++++++-----------
.../{uon => }/SimpleUonPartSerializer.java | 2 +-
.../{uon => }/SimpleUonPartSerializerBuilder.java | 2 +-
.../juneau/httppart/{uon => }/UonPartParser.java | 3 +-
.../httppart/{uon => }/UonPartParserBuilder.java | 2 +-
.../httppart/{uon => }/UonPartSerializer.java | 3 +-
.../{uon => }/UonPartSerializerBuilder.java | 2 +-
.../rest/test/client/RequestBeanProxyTest.java | 1 -
.../rest/test/client/ThirdPartyProxyTest.java | 4 +-
.../apache/juneau/rest/client/NameValuePairs.java | 3 +-
.../org/apache/juneau/rest/client/RestCall.java | 10 +-
.../org/apache/juneau/rest/client/RestClient.java | 1 -
.../juneau/rest/client/RestClientBuilder.java | 2 +-
.../rest/client/SerializedNameValuePair.java | 3 +-
.../org/apache/juneau/rest/RequestFormData.java | 13 +-
.../org/apache/juneau/rest/RequestHeaders.java | 7 +-
.../org/apache/juneau/rest/RequestPathMatch.java | 5 +-
.../java/org/apache/juneau/rest/RequestQuery.java | 11 +-
.../java/org/apache/juneau/rest/RestContext.java | 16 +-
.../org/apache/juneau/rest/RestContextBuilder.java | 12 +-
.../juneau/rest/annotation/RestResource.java | 1 -
36 files changed, 266 insertions(+), 288 deletions(-)
diff --git
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/UonPartParserTest.java
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/UonPartParserTest.java
index 7c6cb44..6a60856 100755
---
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/UonPartParserTest.java
+++
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/UonPartParserTest.java
@@ -17,7 +17,6 @@ import static org.junit.Assert.*;
import java.util.*;
import org.apache.juneau.*;
-import org.apache.juneau.httppart.uon.*;
import org.apache.juneau.json.*;
import org.junit.*;
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/LinkString.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/LinkString.java
index b2f0ecc..5add137 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/LinkString.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/LinkString.java
@@ -20,7 +20,6 @@ import org.apache.juneau.annotation.*;
import org.apache.juneau.html.*;
import org.apache.juneau.html.annotation.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.httppart.uon.*;
import org.apache.juneau.utils.*;
/**
diff --git a/juneau-core/juneau-marshall/.settings/org.eclipse.jdt.core.prefs
b/juneau-core/juneau-marshall/.settings/org.eclipse.jdt.core.prefs
index 318838c..f22162a 100644
--- a/juneau-core/juneau-marshall/.settings/org.eclipse.jdt.core.prefs
+++ b/juneau-core/juneau-marshall/.settings/org.eclipse.jdt.core.prefs
@@ -2,8 +2,11 @@ eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
@@ -14,6 +17,7 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -64,12 +68,14 @@
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
org.eclipse.jdt.core.compiler.problem.nullReference=warning
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
@@ -86,12 +92,16 @@
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
@@ -100,7 +110,7 @@
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExcepti
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedImport=info
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
index 5beb1a9..5ddb651 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
@@ -22,7 +22,6 @@ import java.util.logging.*;
import org.apache.juneau.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.httppart.oapi.*;
import org.apache.juneau.json.*;
import org.apache.juneau.jsonschema.*;
import org.apache.juneau.remoteable.*;
@@ -570,7 +569,7 @@ public @interface Body {
* Specifies the {@link HttpPartParser} class used for parsing values
from strings.
*
* <p>
- * The default value for this parser is inherited from the
servlet/method which defaults to {@link OapiPartParser}.
+ * The default value for this parser is inherited from the
servlet/method which defaults to {@link OpenApiPartParser}.
* <br>You can use {@link SimplePartParser} to parse POJOs that are
directly convertible from <code>Strings</code>.
*/
Class<? extends HttpPartParser> parser() default
HttpPartParser.Null.class;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
index 134b18c..fa835a1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
@@ -20,7 +20,6 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.httppart.oapi.*;
import org.apache.juneau.json.*;
import org.apache.juneau.remoteable.*;
import org.apache.juneau.urlencoding.*;
@@ -282,7 +281,7 @@ public @interface FormData {
* Specifies the {@link HttpPartParser} class used for parsing values
from strings.
*
* <p>
- * The default value for this parser is inherited from the
servlet/method which defaults to {@link OapiPartParser}.
+ * The default value for this parser is inherited from the
servlet/method which defaults to {@link OpenApiPartParser}.
* <br>You can use {@link SimplePartParser} to parse POJOs that are
directly convertible from <code>Strings</code>.
*/
Class<? extends HttpPartParser> parser() default
HttpPartParser.Null.class;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
index 04077d3..2087808 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
@@ -20,7 +20,6 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.httppart.oapi.*;
import org.apache.juneau.json.*;
import org.apache.juneau.remoteable.*;
import org.apache.juneau.urlencoding.*;
@@ -254,7 +253,7 @@ public @interface Header {
* Specifies the {@link HttpPartParser} class used for parsing values
from strings.
*
* <p>
- * The default value for this parser is inherited from the
servlet/method which defaults to {@link OapiPartParser}.
+ * The default value for this parser is inherited from the
servlet/method which defaults to {@link OpenApiPartParser}.
* <br>You can use {@link SimplePartParser} to parse POJOs that are
directly convertible from <code>Strings</code>.
*/
Class<? extends HttpPartParser> parser() default
HttpPartParser.Null.class;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
index 22d5bdd..ba0849a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
@@ -19,7 +19,6 @@ import java.lang.annotation.*;
import org.apache.juneau.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.httppart.oapi.*;
import org.apache.juneau.json.*;
import org.apache.juneau.remoteable.*;
import org.apache.juneau.urlencoding.*;
@@ -232,7 +231,7 @@ public @interface Path {
* Specifies the {@link HttpPartParser} class used for parsing values
from strings.
*
* <p>
- * The default value for this parser is inherited from the
servlet/method which defaults to {@link OapiPartParser}.
+ * The default value for this parser is inherited from the
servlet/method which defaults to {@link OpenApiPartParser}.
* <br>You can use {@link SimplePartParser} to parse POJOs that are
directly convertible from <code>Strings</code>.
*/
Class<? extends HttpPartParser> parser() default
HttpPartParser.Null.class;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
index 2f2e972..d6a5e04 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
@@ -20,7 +20,6 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.httppart.oapi.*;
import org.apache.juneau.json.*;
import org.apache.juneau.remoteable.*;
import org.apache.juneau.urlencoding.*;
@@ -278,7 +277,7 @@ public @interface Query {
* Specifies the {@link HttpPartParser} class used for parsing values
from strings.
*
* <p>
- * The default value for this parser is inherited from the
servlet/method which defaults to {@link OapiPartParser}.
+ * The default value for this parser is inherited from the
servlet/method which defaults to {@link OpenApiPartParser}.
* <br>You can use {@link SimplePartParser} to parse POJOs that are
directly convertible from <code>Strings</code>.
*/
Class<? extends HttpPartParser> parser() default
HttpPartParser.Null.class;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeader.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeader.java
index e036d3a..0455f6e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeader.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeader.java
@@ -18,7 +18,6 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.httppart.oapi.*;
import org.apache.juneau.json.*;
import org.apache.juneau.utils.*;
@@ -130,7 +129,7 @@ public @interface ResponseHeader {
* Specifies the {@link HttpPartSerializer} class used for serializing
values.
*
* <p>
- * The default value for this parser is inherited from the
servlet/method which defaults to {@link OapiPartSerializer}.
+ * The default value for this parser is inherited from the
servlet/method which defaults to {@link OpenApiPartSerializer}.
*/
Class<? extends HttpPartSerializer> serializer() default
HttpPartSerializer.Null.class;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParser.java
index 7233045..fd93f84 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParser.java
@@ -21,8 +21,8 @@ import org.apache.juneau.parser.*;
* <p>
* The following default implementations are provided:
* <ul class='doctree'>
- * <li class='jc'>{@link org.apache.juneau.httppart.oapi.OapiPartParser} -
Parts encoded in based on OpenAPI schema.
- * <li class='jc'>{@link org.apache.juneau.httppart.uon.UonPartParser} -
Parts encoded in UON notation.
+ * <li class='jc'>{@link org.apache.juneau.httppart.OpenApiPartParser} -
Parts encoded in based on OpenAPI schema.
+ * <li class='jc'>{@link org.apache.juneau.httppart.UonPartParser} - Parts
encoded in UON notation.
* <li class='jc'>{@link org.apache.juneau.httppart.SimplePartParser} -
Parts encoded in plain text.
* </ul>
*
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
index 3468687..8e4a65f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
@@ -22,7 +22,6 @@ import java.util.regex.*;
import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.httppart.oapi.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.utils.*;
@@ -46,7 +45,7 @@ public class HttpPartSchema {
// Predefined instances
//-------------------------------------------------------------------------------------------------------------------
- /** Reusable instance of {@link OapiPartSerializer}, all default
settings. */
+ /** Reusable instance of {@link OpenApiPartSerializer}, all default
settings. */
public static final HttpPartSchema DEFAULT =
HttpPartSchema.create().allowEmptyValue(true).build();
final String name;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializer.java
index 54e1aa7..7aa1d19 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializer.java
@@ -24,9 +24,9 @@ import org.apache.juneau.serializer.*;
* <p>
* The following default implementations are provided:
* <ul class='doctree'>
- * <li class='jc'>{@link
org.apache.juneau.httppart.oapi.OapiPartSerializer} - Parts encoded based on
OpenAPI schema.
- * <li class='jc'>{@link org.apache.juneau.httppart.uon.UonPartSerializer}
- Parts encoded in UON notation.
- * <li class='jc'>{@link
org.apache.juneau.httppart.uon.SimpleUonPartSerializer} - Parts encoded in UON
notation, but
+ * <li class='jc'>{@link org.apache.juneau.httppart.OpenApiPartSerializer}
- Parts encoded based on OpenAPI schema.
+ * <li class='jc'>{@link org.apache.juneau.httppart.UonPartSerializer} -
Parts encoded in UON notation.
+ * <li class='jc'>{@link
org.apache.juneau.httppart.SimpleUonPartSerializer} - Parts encoded in UON
notation, but
* strings are treated as plain-text and arrays/collections are
serialized as comma-delimited lists.
* <li class='jc'>{@link org.apache.juneau.httppart.SimplePartSerializer}
- Parts encoded in plain text.
* </ul>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/oapi/OapiPartParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/OpenApiPartParser.java
similarity index 91%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/oapi/OapiPartParser.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/OpenApiPartParser.java
index d01fa04..90532ba 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/oapi/OapiPartParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/OpenApiPartParser.java
@@ -10,39 +10,37 @@
// * "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.httppart.oapi;
+package org.apache.juneau.httppart;
import static org.apache.juneau.internal.StringUtils.*;
import org.apache.juneau.*;
-import org.apache.juneau.httppart.*;
-import org.apache.juneau.httppart.uon.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.parser.*;
/**
* OpenAPI part parser.
*/
-public class OapiPartParser extends UonPartParser {
+public class OpenApiPartParser extends UonPartParser {
//-------------------------------------------------------------------------------------------------------------------
// Configurable properties
//-------------------------------------------------------------------------------------------------------------------
- private static final String PREFIX = "OapiPartParser.";
+ private static final String PREFIX = "OpenApiPartParser.";
/**
* Configuration property: OpenAPI schema description.
*
* <h5 class='section'>Property:</h5>
* <ul>
- * <li><b>Name:</b> <js>"OapiPartParser.schema"</js>
+ * <li><b>Name:</b> <js>"OpenApiPartParser.schema"</js>
* <li><b>Data type:</b> <code>HttpPartSchema</code>
* <li><b>Default:</b> <jk>false</jk>
* <li><b>Session-overridable:</b> <jk>false</jk>
* <li><b>Methods:</b>
* <ul>
- * <li class='jm'>{@link
OapiPartParserBuilder#schema(HttpPartSchema)}
+ * <li class='jm'>{@link
OpenApiPartParserBuilder#schema(HttpPartSchema)}
* </ul>
* </ul>
*
@@ -57,8 +55,8 @@ public class OapiPartParser extends UonPartParser {
// Predefined instances
//-------------------------------------------------------------------------------------------------------------------
- /** Reusable instance of {@link OapiPartParser}. */
- public static final OapiPartParser DEFAULT = new
OapiPartParser(PropertyStore.DEFAULT);
+ /** Reusable instance of {@link OpenApiPartParser}. */
+ public static final OpenApiPartParser DEFAULT = new
OpenApiPartParser(PropertyStore.DEFAULT);
//-------------------------------------------------------------------------------------------------------------------
@@ -72,7 +70,7 @@ public class OapiPartParser extends UonPartParser {
*
* @param ps The property store containing all the settings for this
object.
*/
- public OapiPartParser(PropertyStore ps) {
+ public OpenApiPartParser(PropertyStore ps) {
super(
ps.builder().build()
);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/oapi/OapiPartParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/OpenApiPartParserBuilder.java
similarity index 62%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/oapi/OapiPartParserBuilder.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/OpenApiPartParserBuilder.java
index 28c4b43..b10f7f9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/oapi/OapiPartParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/OpenApiPartParserBuilder.java
@@ -10,29 +10,27 @@
// * "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.httppart.oapi;
+package org.apache.juneau.httppart;
-import static org.apache.juneau.httppart.oapi.OapiPartParser.*;
+import static org.apache.juneau.httppart.OpenApiPartParser.*;
import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.http.*;
-import org.apache.juneau.httppart.*;
-import org.apache.juneau.httppart.uon.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.uon.*;
import org.apache.juneau.urlencoding.*;
/**
- * Builder class for building instances of {@link OapiPartParser}.
+ * Builder class for building instances of {@link OpenApiPartParser}.
*/
-public class OapiPartParserBuilder extends UonPartParserBuilder {
+public class OpenApiPartParserBuilder extends UonPartParserBuilder {
/**
* Constructor, default settings.
*/
- public OapiPartParserBuilder() {
+ public OpenApiPartParserBuilder() {
super();
}
@@ -41,13 +39,13 @@ public class OapiPartParserBuilder extends
UonPartParserBuilder {
*
* @param ps The initial configuration settings for this builder.
*/
- public OapiPartParserBuilder(PropertyStore ps) {
+ public OpenApiPartParserBuilder(PropertyStore ps) {
super(ps);
}
@Override /* ContextBuilder */
- public OapiPartParser build() {
- return build(OapiPartParser.class);
+ public OpenApiPartParser build() {
+ return build(OpenApiPartParser.class);
}
@@ -72,431 +70,431 @@ public class OapiPartParserBuilder extends
UonPartParserBuilder {
* <br>Default is <jk>false</jk> for {@link UonParser},
<jk>true</jk> for {@link UrlEncodingParser}
* @return This object (for method chaining).
*/
- public OapiPartParserBuilder schema(HttpPartSchema value) {
+ public OpenApiPartParserBuilder schema(HttpPartSchema value) {
return set(OAPI_schema, value);
}
@Override /* UonParserBuilder */
- public OapiPartParserBuilder decoding(boolean value) {
- return set(UON_decoding, value);
+ public OpenApiPartParserBuilder decoding(boolean value) {
+ return set(UonParser.UON_decoding, value);
}
@Override /* ParserBuilder */
- public OapiPartParserBuilder fileCharset(String value) {
+ public OpenApiPartParserBuilder fileCharset(String value) {
super.fileCharset(value);
return this;
}
@Override /* ParserBuilder */
- public OapiPartParserBuilder inputStreamCharset(String value) {
+ public OpenApiPartParserBuilder inputStreamCharset(String value) {
super.inputStreamCharset(value);
return this;
}
@Override /* ParserBuilder */
- public OapiPartParserBuilder listener(Class<? extends ParserListener>
value) {
+ public OpenApiPartParserBuilder listener(Class<? extends
ParserListener> value) {
super.listener(value);
return this;
}
@Override /* ParserBuilder */
- public OapiPartParserBuilder strict(boolean value) {
+ public OpenApiPartParserBuilder strict(boolean value) {
super.strict(value);
return this;
}
@Override /* ParserBuilder */
- public OapiPartParserBuilder strict() {
+ public OpenApiPartParserBuilder strict() {
super.strict();
return this;
}
@Override /* ParserBuilder */
- public OapiPartParserBuilder trimStrings(boolean value) {
+ public OpenApiPartParserBuilder trimStrings(boolean value) {
super.trimStrings(value);
return this;
}
@Override /* ParserBuilder */
- public OapiPartParserBuilder trimStrings() {
+ public OpenApiPartParserBuilder trimStrings() {
super.trimStrings();
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder beanClassVisibility(Visibility value) {
+ public OpenApiPartParserBuilder beanClassVisibility(Visibility value) {
super.beanClassVisibility(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder beanConstructorVisibility(Visibility
value) {
+ public OpenApiPartParserBuilder beanConstructorVisibility(Visibility
value) {
super.beanConstructorVisibility(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder beanDictionary(boolean append,
Object...values) {
+ public OpenApiPartParserBuilder beanDictionary(boolean append,
Object...values) {
super.beanDictionary(append, values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder beanDictionary(Class<?>...values) {
+ public OpenApiPartParserBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder beanDictionary(Object...values) {
+ public OpenApiPartParserBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder beanDictionaryRemove(Object...values) {
+ public OpenApiPartParserBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder beanFieldVisibility(Visibility value) {
+ public OpenApiPartParserBuilder beanFieldVisibility(Visibility value) {
super.beanFieldVisibility(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder beanFilters(boolean append,
Object...values) {
+ public OpenApiPartParserBuilder beanFilters(boolean append,
Object...values) {
super.beanFilters(append, values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder beanFilters(Class<?>...values) {
+ public OpenApiPartParserBuilder beanFilters(Class<?>...values) {
super.beanFilters(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder beanFilters(Object...values) {
+ public OpenApiPartParserBuilder beanFilters(Object...values) {
super.beanFilters(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder beanFiltersRemove(Object...values) {
+ public OpenApiPartParserBuilder beanFiltersRemove(Object...values) {
super.beanFiltersRemove(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder beanMapPutReturnsOldValue(boolean value) {
+ public OpenApiPartParserBuilder beanMapPutReturnsOldValue(boolean
value) {
super.beanMapPutReturnsOldValue(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder beanMapPutReturnsOldValue() {
+ public OpenApiPartParserBuilder beanMapPutReturnsOldValue() {
super.beanMapPutReturnsOldValue();
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder beanMethodVisibility(Visibility value) {
+ public OpenApiPartParserBuilder beanMethodVisibility(Visibility value) {
super.beanMethodVisibility(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder beansRequireDefaultConstructor(boolean
value) {
+ public OpenApiPartParserBuilder beansRequireDefaultConstructor(boolean
value) {
super.beansRequireDefaultConstructor(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder beansRequireDefaultConstructor() {
+ public OpenApiPartParserBuilder beansRequireDefaultConstructor() {
super.beansRequireDefaultConstructor();
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder beansRequireSerializable(boolean value) {
+ public OpenApiPartParserBuilder beansRequireSerializable(boolean value)
{
super.beansRequireSerializable(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder beansRequireSerializable() {
+ public OpenApiPartParserBuilder beansRequireSerializable() {
super.beansRequireSerializable();
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder beansRequireSettersForGetters(boolean
value) {
+ public OpenApiPartParserBuilder beansRequireSettersForGetters(boolean
value) {
super.beansRequireSettersForGetters(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder beansRequireSettersForGetters() {
+ public OpenApiPartParserBuilder beansRequireSettersForGetters() {
super.beansRequireSettersForGetters();
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder beansRequireSomeProperties(boolean value) {
+ public OpenApiPartParserBuilder beansRequireSomeProperties(boolean
value) {
super.beansRequireSomeProperties(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder beanTypePropertyName(String value) {
+ public OpenApiPartParserBuilder beanTypePropertyName(String value) {
super.beanTypePropertyName(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder debug() {
+ public OpenApiPartParserBuilder debug() {
super.debug();
return this;
}
@Override /* BeanContextBuilder */
- public <T> OapiPartParserBuilder example(Class<T> c, T o) {
+ public <T> OpenApiPartParserBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder
ignoreInvocationExceptionsOnGetters(boolean value) {
+ public OpenApiPartParserBuilder
ignoreInvocationExceptionsOnGetters(boolean value) {
super.ignoreInvocationExceptionsOnGetters(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder ignoreInvocationExceptionsOnGetters() {
+ public OpenApiPartParserBuilder ignoreInvocationExceptionsOnGetters() {
super.ignoreInvocationExceptionsOnGetters();
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder
ignoreInvocationExceptionsOnSetters(boolean value) {
+ public OpenApiPartParserBuilder
ignoreInvocationExceptionsOnSetters(boolean value) {
super.ignoreInvocationExceptionsOnSetters(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder ignoreInvocationExceptionsOnSetters() {
+ public OpenApiPartParserBuilder ignoreInvocationExceptionsOnSetters() {
super.ignoreInvocationExceptionsOnSetters();
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder ignorePropertiesWithoutSetters(boolean
value) {
+ public OpenApiPartParserBuilder ignorePropertiesWithoutSetters(boolean
value) {
super.ignorePropertiesWithoutSetters(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder ignoreUnknownBeanProperties(boolean value)
{
+ public OpenApiPartParserBuilder ignoreUnknownBeanProperties(boolean
value) {
super.ignoreUnknownBeanProperties(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder ignoreUnknownBeanProperties() {
+ public OpenApiPartParserBuilder ignoreUnknownBeanProperties() {
super.ignoreUnknownBeanProperties();
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder ignoreUnknownNullBeanProperties(boolean
value) {
+ public OpenApiPartParserBuilder ignoreUnknownNullBeanProperties(boolean
value) {
super.ignoreUnknownNullBeanProperties(value);
return this;
}
@Override /* BeanContextBuilder */
- public <T> OapiPartParserBuilder implClass(Class<T> interfaceClass,
Class<? extends T> implClass) {
+ public <T> OpenApiPartParserBuilder implClass(Class<T> interfaceClass,
Class<? extends T> implClass) {
super.implClass(interfaceClass, implClass);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder implClasses(Map<String,Class<?>> values) {
+ public OpenApiPartParserBuilder implClasses(Map<String,Class<?>>
values) {
super.implClasses(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder locale(Locale value) {
+ public OpenApiPartParserBuilder locale(Locale value) {
super.locale(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder mediaType(MediaType value) {
+ public OpenApiPartParserBuilder mediaType(MediaType value) {
super.mediaType(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder notBeanClasses(boolean append,
Object...values) {
+ public OpenApiPartParserBuilder notBeanClasses(boolean append,
Object...values) {
super.notBeanClasses(append, values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder notBeanClasses(Class<?>...values) {
+ public OpenApiPartParserBuilder notBeanClasses(Class<?>...values) {
super.notBeanClasses(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder notBeanClasses(Object...values) {
+ public OpenApiPartParserBuilder notBeanClasses(Object...values) {
super.notBeanClasses(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder notBeanClassesRemove(Object...values) {
+ public OpenApiPartParserBuilder notBeanClassesRemove(Object...values) {
super.notBeanClassesRemove(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder notBeanPackages(boolean append,
Object...values) {
+ public OpenApiPartParserBuilder notBeanPackages(boolean append,
Object...values) {
super.notBeanPackages(append, values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder notBeanPackages(Object...values) {
+ public OpenApiPartParserBuilder notBeanPackages(Object...values) {
super.notBeanPackages(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder notBeanPackages(String...values) {
+ public OpenApiPartParserBuilder notBeanPackages(String...values) {
super.notBeanPackages(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder notBeanPackagesRemove(Object...values) {
+ public OpenApiPartParserBuilder notBeanPackagesRemove(Object...values) {
super.notBeanPackagesRemove(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder pojoSwaps(boolean append, Object...values)
{
+ public OpenApiPartParserBuilder pojoSwaps(boolean append,
Object...values) {
super.pojoSwaps(append, values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder pojoSwaps(Class<?>...values) {
+ public OpenApiPartParserBuilder pojoSwaps(Class<?>...values) {
super.pojoSwaps(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder pojoSwaps(Object...values) {
+ public OpenApiPartParserBuilder pojoSwaps(Object...values) {
super.pojoSwaps(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder pojoSwapsRemove(Object...values) {
+ public OpenApiPartParserBuilder pojoSwapsRemove(Object...values) {
super.pojoSwapsRemove(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder sortProperties(boolean value) {
+ public OpenApiPartParserBuilder sortProperties(boolean value) {
super.sortProperties(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder sortProperties() {
+ public OpenApiPartParserBuilder sortProperties() {
super.sortProperties();
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder timeZone(TimeZone value) {
+ public OpenApiPartParserBuilder timeZone(TimeZone value) {
super.timeZone(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder useEnumNames() {
+ public OpenApiPartParserBuilder useEnumNames() {
super.useEnumNames();
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder useInterfaceProxies(boolean value) {
+ public OpenApiPartParserBuilder useInterfaceProxies(boolean value) {
super.useInterfaceProxies(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder useJavaBeanIntrospector(boolean value) {
+ public OpenApiPartParserBuilder useJavaBeanIntrospector(boolean value) {
super.useJavaBeanIntrospector(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartParserBuilder useJavaBeanIntrospector() {
+ public OpenApiPartParserBuilder useJavaBeanIntrospector() {
super.useJavaBeanIntrospector();
return this;
}
@Override /* ContextBuilder */
- public OapiPartParserBuilder set(String name, Object value) {
+ public OpenApiPartParserBuilder set(String name, Object value) {
super.set(name, value);
return this;
}
@Override /* ContextBuilder */
- public OapiPartParserBuilder set(boolean append, String name, Object
value) {
+ public OpenApiPartParserBuilder set(boolean append, String name, Object
value) {
super.set(append, name, value);
return this;
}
@Override /* ContextBuilder */
- public OapiPartParserBuilder set(Map<String,Object> properties) {
+ public OpenApiPartParserBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
}
@Override /* ContextBuilder */
- public OapiPartParserBuilder add(Map<String,Object> properties) {
+ public OpenApiPartParserBuilder add(Map<String,Object> properties) {
super.add(properties);
return this;
}
@Override /* ContextBuilder */
- public OapiPartParserBuilder addTo(String name, Object value) {
+ public OpenApiPartParserBuilder addTo(String name, Object value) {
super.addTo(name, value);
return this;
}
@Override /* ContextBuilder */
- public OapiPartParserBuilder addTo(String name, String key, Object
value) {
+ public OpenApiPartParserBuilder addTo(String name, String key, Object
value) {
super.addTo(name, key, value);
return this;
}
@Override /* ContextBuilder */
- public OapiPartParserBuilder removeFrom(String name, Object value) {
+ public OpenApiPartParserBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
}
@Override /* ContextBuilder */
- public OapiPartParserBuilder apply(PropertyStore copyFrom) {
+ public OpenApiPartParserBuilder apply(PropertyStore copyFrom) {
super.apply(copyFrom);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/oapi/OapiPartSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/OpenApiPartSerializer.java
similarity index 86%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/oapi/OapiPartSerializer.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/OpenApiPartSerializer.java
index 8435294..d78b87f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/oapi/OapiPartSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/OpenApiPartSerializer.java
@@ -10,11 +10,9 @@
// * "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.httppart.oapi;
+package org.apache.juneau.httppart;
import org.apache.juneau.*;
-import org.apache.juneau.httppart.*;
-import org.apache.juneau.httppart.uon.*;
import org.apache.juneau.internal.*;
/**
@@ -24,26 +22,26 @@ import org.apache.juneau.internal.*;
* This serializer uses UON notation for all parts by default. This allows
for arbitrary POJOs to be losslessly
* serialized as any of the specified HTTP types.
*/
-public class OapiPartSerializer extends UonPartSerializer {
+public class OpenApiPartSerializer extends UonPartSerializer {
//-------------------------------------------------------------------------------------------------------------------
// Configurable properties
//-------------------------------------------------------------------------------------------------------------------
- private static final String PREFIX = "OapiPartSerializer.";
+ private static final String PREFIX = "OpenApiPartSerializer.";
/**
* Configuration property: OpenAPI schema description.
*
* <h5 class='section'>Property:</h5>
* <ul>
- * <li><b>Name:</b> <js>"OapiPartSerializer.schema"</js>
+ * <li><b>Name:</b> <js>"OpenApiPartSerializer.schema"</js>
* <li><b>Data type:</b> <code>HttpPartSchema</code>
* <li><b>Default:</b> <jk>false</jk>
* <li><b>Session-overridable:</b> <jk>false</jk>
* <li><b>Methods:</b>
* <ul>
- * <li class='jm'>{@link
OapiPartSerializerBuilder#schema(HttpPartSchema)}
+ * <li class='jm'>{@link
OpenPartSerializerBuilder#schema(HttpPartSchema)}
* </ul>
* </ul>
*
@@ -58,8 +56,8 @@ public class OapiPartSerializer extends UonPartSerializer {
// Predefined instances
//-------------------------------------------------------------------------------------------------------------------
- /** Reusable instance of {@link OapiPartSerializer}, all default
settings. */
- public static final OapiPartSerializer DEFAULT = new
OapiPartSerializer(PropertyStore.DEFAULT);
+ /** Reusable instance of {@link OpenApiPartSerializer}, all default
settings. */
+ public static final OpenApiPartSerializer DEFAULT = new
OpenApiPartSerializer(PropertyStore.DEFAULT);
//-------------------------------------------------------------------------------------------------------------------
@@ -74,7 +72,7 @@ public class OapiPartSerializer extends UonPartSerializer {
* @param ps
* The property store containing all the settings for this object.
*/
- public OapiPartSerializer(PropertyStore ps) {
+ public OpenApiPartSerializer(PropertyStore ps) {
super(
ps.builder()
.set(UON_encoding, false)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/oapi/OapiPartSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/OpenPartSerializerBuilder.java
similarity index 65%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/oapi/OapiPartSerializerBuilder.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/OpenPartSerializerBuilder.java
index 1770881..1cba386 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/oapi/OapiPartSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/OpenPartSerializerBuilder.java
@@ -10,16 +10,14 @@
// * "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.httppart.oapi;
+package org.apache.juneau.httppart;
-import static org.apache.juneau.httppart.oapi.OapiPartSerializer.*;
+import static org.apache.juneau.httppart.OpenApiPartSerializer.*;
import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.http.*;
-import org.apache.juneau.httppart.*;
-import org.apache.juneau.httppart.uon.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.uon.*;
import org.apache.juneau.urlencoding.*;
@@ -27,12 +25,12 @@ import org.apache.juneau.urlencoding.*;
/**
* Builder class for building instances of {@link UonPartSerializer}.
*/
-public class OapiPartSerializerBuilder extends UonPartSerializerBuilder {
+public class OpenPartSerializerBuilder extends UonPartSerializerBuilder {
/**
* Constructor, default settings.
*/
- public OapiPartSerializerBuilder() {
+ public OpenPartSerializerBuilder() {
super();
}
@@ -41,13 +39,13 @@ public class OapiPartSerializerBuilder extends
UonPartSerializerBuilder {
*
* @param ps The initial configuration settings for this builder.
*/
- public OapiPartSerializerBuilder(PropertyStore ps) {
+ public OpenPartSerializerBuilder(PropertyStore ps) {
super(ps);
}
@Override /* ContextBuilder */
- public OapiPartSerializer build() {
- return build(OapiPartSerializer.class);
+ public OpenApiPartSerializer build() {
+ return build(OpenApiPartSerializer.class);
}
@@ -72,569 +70,569 @@ public class OapiPartSerializerBuilder extends
UonPartSerializerBuilder {
* <br>Default is <jk>false</jk> for {@link UonParser},
<jk>true</jk> for {@link UrlEncodingParser}
* @return This object (for method chaining).
*/
- public OapiPartSerializerBuilder schema(HttpPartSchema value) {
+ public OpenPartSerializerBuilder schema(HttpPartSchema value) {
return set(OAPI_schema, value);
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder addBeanTypes(boolean value) {
+ public OpenPartSerializerBuilder addBeanTypes(boolean value) {
super.addBeanTypes(value);
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder addBeanTypes() {
+ public OpenPartSerializerBuilder addBeanTypes() {
super.addBeanTypes();
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder addRootType(boolean value) {
+ public OpenPartSerializerBuilder addRootType(boolean value) {
super.addRootType(value);
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder addRootType() {
+ public OpenPartSerializerBuilder addRootType() {
super.addRootType();
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder detectRecursions(boolean value) {
+ public OpenPartSerializerBuilder detectRecursions(boolean value) {
super.detectRecursions(value);
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder detectRecursions() {
+ public OpenPartSerializerBuilder detectRecursions() {
super.detectRecursions();
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder ignoreRecursions(boolean value) {
+ public OpenPartSerializerBuilder ignoreRecursions(boolean value) {
super.ignoreRecursions(value);
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder ignoreRecursions() {
+ public OpenPartSerializerBuilder ignoreRecursions() {
super.ignoreRecursions();
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder initialDepth(int value) {
+ public OpenPartSerializerBuilder initialDepth(int value) {
super.initialDepth(value);
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder listener(Class<? extends
SerializerListener> value) {
+ public OpenPartSerializerBuilder listener(Class<? extends
SerializerListener> value) {
super.listener(value);
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder maxDepth(int value) {
+ public OpenPartSerializerBuilder maxDepth(int value) {
super.maxDepth(value);
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder maxIndent(int value) {
+ public OpenPartSerializerBuilder maxIndent(int value) {
super.maxIndent(value);
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder quoteChar(char value) {
+ public OpenPartSerializerBuilder quoteChar(char value) {
super.quoteChar(value);
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder sortCollections(boolean value) {
+ public OpenPartSerializerBuilder sortCollections(boolean value) {
super.sortCollections(value);
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder sortCollections() {
+ public OpenPartSerializerBuilder sortCollections() {
super.sortCollections();
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder sortMaps(boolean value) {
+ public OpenPartSerializerBuilder sortMaps(boolean value) {
super.sortMaps(value);
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder sortMaps() {
+ public OpenPartSerializerBuilder sortMaps() {
super.sortMaps();
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder sq() {
+ public OpenPartSerializerBuilder sq() {
super.sq();
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder trimEmptyCollections(boolean value) {
+ public OpenPartSerializerBuilder trimEmptyCollections(boolean value) {
super.trimEmptyCollections(value);
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder trimEmptyCollections() {
+ public OpenPartSerializerBuilder trimEmptyCollections() {
super.trimEmptyCollections();
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder trimEmptyMaps(boolean value) {
+ public OpenPartSerializerBuilder trimEmptyMaps(boolean value) {
super.trimEmptyMaps(value);
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder trimEmptyMaps() {
+ public OpenPartSerializerBuilder trimEmptyMaps() {
super.trimEmptyMaps();
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder trimNullProperties(boolean value) {
+ public OpenPartSerializerBuilder trimNullProperties(boolean value) {
super.trimNullProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder trimStrings(boolean value) {
+ public OpenPartSerializerBuilder trimStrings(boolean value) {
super.trimStrings(value);
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder trimStrings() {
+ public OpenPartSerializerBuilder trimStrings() {
super.trimStrings();
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder uriContext(UriContext value) {
+ public OpenPartSerializerBuilder uriContext(UriContext value) {
super.uriContext(value);
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder uriRelativity(UriRelativity value) {
+ public OpenPartSerializerBuilder uriRelativity(UriRelativity value) {
super.uriRelativity(value);
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder uriResolution(UriResolution value) {
+ public OpenPartSerializerBuilder uriResolution(UriResolution value) {
super.uriResolution(value);
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder useWhitespace(boolean value) {
+ public OpenPartSerializerBuilder useWhitespace(boolean value) {
super.useWhitespace(value);
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder useWhitespace() {
+ public OpenPartSerializerBuilder useWhitespace() {
super.useWhitespace();
return this;
}
@Override /* SerializerBuilder */
- public OapiPartSerializerBuilder ws() {
+ public OpenPartSerializerBuilder ws() {
super.ws();
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder beanClassVisibility(Visibility value) {
+ public OpenPartSerializerBuilder beanClassVisibility(Visibility value) {
super.beanClassVisibility(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder beanConstructorVisibility(Visibility
value) {
+ public OpenPartSerializerBuilder beanConstructorVisibility(Visibility
value) {
super.beanConstructorVisibility(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder beanDictionary(boolean append,
Object...values) {
+ public OpenPartSerializerBuilder beanDictionary(boolean append,
Object...values) {
super.beanDictionary(append, values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder beanDictionary(Class<?>...values) {
+ public OpenPartSerializerBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder beanDictionary(Object...values) {
+ public OpenPartSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder beanDictionaryRemove(Object...values) {
+ public OpenPartSerializerBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder beanFieldVisibility(Visibility value) {
+ public OpenPartSerializerBuilder beanFieldVisibility(Visibility value) {
super.beanFieldVisibility(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder beanFilters(boolean append,
Object...values) {
+ public OpenPartSerializerBuilder beanFilters(boolean append,
Object...values) {
super.beanFilters(append, values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder beanFilters(Class<?>...values) {
+ public OpenPartSerializerBuilder beanFilters(Class<?>...values) {
super.beanFilters(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder beanFilters(Object...values) {
+ public OpenPartSerializerBuilder beanFilters(Object...values) {
super.beanFilters(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder beanFiltersRemove(Object...values) {
+ public OpenPartSerializerBuilder beanFiltersRemove(Object...values) {
super.beanFiltersRemove(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder beanMapPutReturnsOldValue(boolean
value) {
+ public OpenPartSerializerBuilder beanMapPutReturnsOldValue(boolean
value) {
super.beanMapPutReturnsOldValue(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder beanMapPutReturnsOldValue() {
+ public OpenPartSerializerBuilder beanMapPutReturnsOldValue() {
super.beanMapPutReturnsOldValue();
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder beanMethodVisibility(Visibility value)
{
+ public OpenPartSerializerBuilder beanMethodVisibility(Visibility value)
{
super.beanMethodVisibility(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder beansRequireDefaultConstructor(boolean
value) {
+ public OpenPartSerializerBuilder beansRequireDefaultConstructor(boolean
value) {
super.beansRequireDefaultConstructor(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder beansRequireDefaultConstructor() {
+ public OpenPartSerializerBuilder beansRequireDefaultConstructor() {
super.beansRequireDefaultConstructor();
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder beansRequireSerializable(boolean
value) {
+ public OpenPartSerializerBuilder beansRequireSerializable(boolean
value) {
super.beansRequireSerializable(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder beansRequireSerializable() {
+ public OpenPartSerializerBuilder beansRequireSerializable() {
super.beansRequireSerializable();
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder beansRequireSettersForGetters(boolean
value) {
+ public OpenPartSerializerBuilder beansRequireSettersForGetters(boolean
value) {
super.beansRequireSettersForGetters(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder beansRequireSettersForGetters() {
+ public OpenPartSerializerBuilder beansRequireSettersForGetters() {
super.beansRequireSettersForGetters();
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder beansRequireSomeProperties(boolean
value) {
+ public OpenPartSerializerBuilder beansRequireSomeProperties(boolean
value) {
super.beansRequireSomeProperties(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder beanTypePropertyName(String value) {
+ public OpenPartSerializerBuilder beanTypePropertyName(String value) {
super.beanTypePropertyName(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder debug() {
+ public OpenPartSerializerBuilder debug() {
super.debug();
return this;
}
@Override /* BeanContextBuilder */
- public <T> OapiPartSerializerBuilder example(Class<T> c, T o) {
+ public <T> OpenPartSerializerBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder
ignoreInvocationExceptionsOnGetters(boolean value) {
+ public OpenPartSerializerBuilder
ignoreInvocationExceptionsOnGetters(boolean value) {
super.ignoreInvocationExceptionsOnGetters(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder ignoreInvocationExceptionsOnGetters() {
+ public OpenPartSerializerBuilder ignoreInvocationExceptionsOnGetters() {
super.ignoreInvocationExceptionsOnGetters();
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder
ignoreInvocationExceptionsOnSetters(boolean value) {
+ public OpenPartSerializerBuilder
ignoreInvocationExceptionsOnSetters(boolean value) {
super.ignoreInvocationExceptionsOnSetters(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder ignoreInvocationExceptionsOnSetters() {
+ public OpenPartSerializerBuilder ignoreInvocationExceptionsOnSetters() {
super.ignoreInvocationExceptionsOnSetters();
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder ignorePropertiesWithoutSetters(boolean
value) {
+ public OpenPartSerializerBuilder ignorePropertiesWithoutSetters(boolean
value) {
super.ignorePropertiesWithoutSetters(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder ignoreUnknownBeanProperties(boolean
value) {
+ public OpenPartSerializerBuilder ignoreUnknownBeanProperties(boolean
value) {
super.ignoreUnknownBeanProperties(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder ignoreUnknownBeanProperties() {
+ public OpenPartSerializerBuilder ignoreUnknownBeanProperties() {
super.ignoreUnknownBeanProperties();
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder
ignoreUnknownNullBeanProperties(boolean value) {
+ public OpenPartSerializerBuilder
ignoreUnknownNullBeanProperties(boolean value) {
super.ignoreUnknownNullBeanProperties(value);
return this;
}
@Override /* BeanContextBuilder */
- public <T> OapiPartSerializerBuilder implClass(Class<T> interfaceClass,
Class<? extends T> implClass) {
+ public <T> OpenPartSerializerBuilder implClass(Class<T> interfaceClass,
Class<? extends T> implClass) {
super.implClass(interfaceClass, implClass);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder implClasses(Map<String,Class<?>>
values) {
+ public OpenPartSerializerBuilder implClasses(Map<String,Class<?>>
values) {
super.implClasses(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder locale(Locale value) {
+ public OpenPartSerializerBuilder locale(Locale value) {
super.locale(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder mediaType(MediaType value) {
+ public OpenPartSerializerBuilder mediaType(MediaType value) {
super.mediaType(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder notBeanClasses(boolean append,
Object...values) {
+ public OpenPartSerializerBuilder notBeanClasses(boolean append,
Object...values) {
super.notBeanClasses(append, values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder notBeanClasses(Class<?>...values) {
+ public OpenPartSerializerBuilder notBeanClasses(Class<?>...values) {
super.notBeanClasses(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder notBeanClasses(Object...values) {
+ public OpenPartSerializerBuilder notBeanClasses(Object...values) {
super.notBeanClasses(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder notBeanClassesRemove(Object...values) {
+ public OpenPartSerializerBuilder notBeanClassesRemove(Object...values) {
super.notBeanClassesRemove(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder notBeanPackages(boolean append,
Object...values) {
+ public OpenPartSerializerBuilder notBeanPackages(boolean append,
Object...values) {
super.notBeanPackages(append, values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder notBeanPackages(Object...values) {
+ public OpenPartSerializerBuilder notBeanPackages(Object...values) {
super.notBeanPackages(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder notBeanPackages(String...values) {
+ public OpenPartSerializerBuilder notBeanPackages(String...values) {
super.notBeanPackages(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder notBeanPackagesRemove(Object...values)
{
+ public OpenPartSerializerBuilder notBeanPackagesRemove(Object...values)
{
super.notBeanPackagesRemove(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder pojoSwaps(boolean append,
Object...values) {
+ public OpenPartSerializerBuilder pojoSwaps(boolean append,
Object...values) {
super.pojoSwaps(append, values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder pojoSwaps(Class<?>...values) {
+ public OpenPartSerializerBuilder pojoSwaps(Class<?>...values) {
super.pojoSwaps(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder pojoSwaps(Object...values) {
+ public OpenPartSerializerBuilder pojoSwaps(Object...values) {
super.pojoSwaps(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder pojoSwapsRemove(Object...values) {
+ public OpenPartSerializerBuilder pojoSwapsRemove(Object...values) {
super.pojoSwapsRemove(values);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder sortProperties(boolean value) {
+ public OpenPartSerializerBuilder sortProperties(boolean value) {
super.sortProperties(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder sortProperties() {
+ public OpenPartSerializerBuilder sortProperties() {
super.sortProperties();
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder timeZone(TimeZone value) {
+ public OpenPartSerializerBuilder timeZone(TimeZone value) {
super.timeZone(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder useEnumNames() {
+ public OpenPartSerializerBuilder useEnumNames() {
super.useEnumNames();
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder useInterfaceProxies(boolean value) {
+ public OpenPartSerializerBuilder useInterfaceProxies(boolean value) {
super.useInterfaceProxies(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder useJavaBeanIntrospector(boolean value)
{
+ public OpenPartSerializerBuilder useJavaBeanIntrospector(boolean value)
{
super.useJavaBeanIntrospector(value);
return this;
}
@Override /* BeanContextBuilder */
- public OapiPartSerializerBuilder useJavaBeanIntrospector() {
+ public OpenPartSerializerBuilder useJavaBeanIntrospector() {
super.useJavaBeanIntrospector();
return this;
}
@Override /* ContextBuilder */
- public OapiPartSerializerBuilder set(String name, Object value) {
+ public OpenPartSerializerBuilder set(String name, Object value) {
super.set(name, value);
return this;
}
@Override /* ContextBuilder */
- public OapiPartSerializerBuilder set(boolean append, String name,
Object value) {
+ public OpenPartSerializerBuilder set(boolean append, String name,
Object value) {
super.set(append, name, value);
return this;
}
@Override /* ContextBuilder */
- public OapiPartSerializerBuilder set(Map<String,Object> properties) {
+ public OpenPartSerializerBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
}
@Override /* ContextBuilder */
- public OapiPartSerializerBuilder add(Map<String,Object> properties) {
+ public OpenPartSerializerBuilder add(Map<String,Object> properties) {
super.add(properties);
return this;
}
@Override /* ContextBuilder */
- public OapiPartSerializerBuilder addTo(String name, Object value) {
+ public OpenPartSerializerBuilder addTo(String name, Object value) {
super.addTo(name, value);
return this;
}
@Override /* ContextBuilder */
- public OapiPartSerializerBuilder addTo(String name, String key, Object
value) {
+ public OpenPartSerializerBuilder addTo(String name, String key, Object
value) {
super.addTo(name, key, value);
return this;
}
@Override /* ContextBuilder */
- public OapiPartSerializerBuilder removeFrom(String name, Object value) {
+ public OpenPartSerializerBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
}
@Override /* ContextBuilder */
- public OapiPartSerializerBuilder apply(PropertyStore copyFrom) {
+ public OpenPartSerializerBuilder apply(PropertyStore copyFrom) {
super.apply(copyFrom);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/uon/SimpleUonPartSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimpleUonPartSerializer.java
similarity index 97%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/uon/SimpleUonPartSerializer.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimpleUonPartSerializer.java
index 5c4c211..e04bacc 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/uon/SimpleUonPartSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimpleUonPartSerializer.java
@@ -10,7 +10,7 @@
// * "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.httppart.uon;
+package org.apache.juneau.httppart;
import org.apache.juneau.*;
import org.apache.juneau.uon.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/uon/SimpleUonPartSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimpleUonPartSerializerBuilder.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/uon/SimpleUonPartSerializerBuilder.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimpleUonPartSerializerBuilder.java
index 7971dca..f459fbf 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/uon/SimpleUonPartSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimpleUonPartSerializerBuilder.java
@@ -10,7 +10,7 @@
// * "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.httppart.uon;
+package org.apache.juneau.httppart;
import java.util.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/uon/UonPartParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartParser.java
similarity index 96%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/uon/UonPartParser.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartParser.java
index 94d170b..6a32280 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/uon/UonPartParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartParser.java
@@ -10,12 +10,11 @@
// * "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.httppart.uon;
+package org.apache.juneau.httppart;
import static org.apache.juneau.internal.StringUtils.*;
import org.apache.juneau.*;
-import org.apache.juneau.httppart.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.uon.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/uon/UonPartParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartParserBuilder.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/uon/UonPartParserBuilder.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartParserBuilder.java
index f55cb1f..ba21dc2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/uon/UonPartParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartParserBuilder.java
@@ -10,7 +10,7 @@
// * "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.httppart.uon;
+package org.apache.juneau.httppart;
import static org.apache.juneau.uon.UonParser.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/uon/UonPartSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartSerializer.java
similarity index 96%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/uon/UonPartSerializer.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartSerializer.java
index 5b4088e..458d1b6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/uon/UonPartSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartSerializer.java
@@ -10,12 +10,11 @@
// * "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.httppart.uon;
+package org.apache.juneau.httppart;
import java.io.*;
import org.apache.juneau.*;
-import org.apache.juneau.httppart.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.uon.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/uon/UonPartSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartSerializerBuilder.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/uon/UonPartSerializerBuilder.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartSerializerBuilder.java
index d48443d..e617c30 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/uon/UonPartSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartSerializerBuilder.java
@@ -10,7 +10,7 @@
// * "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.httppart.uon;
+package org.apache.juneau.httppart;
import java.util.*;
diff --git
a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/RequestBeanProxyTest.java
b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/RequestBeanProxyTest.java
index 4e50e00..776a21a 100644
---
a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/RequestBeanProxyTest.java
+++
b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/RequestBeanProxyTest.java
@@ -23,7 +23,6 @@ import java.util.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.httppart.uon.*;
import org.apache.juneau.remoteable.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
index 09fbbcc..ed1e36f 100644
---
a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
+++
b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
@@ -12,9 +12,10 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.test.client;
-import static org.apache.juneau.microservice.testutils.TestUtils.*;
import static org.apache.juneau.rest.testutils.Constants.*;
+import static org.apache.juneau.testutils.TestUtils.*;
import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import java.util.*;
import java.util.concurrent.atomic.*;
@@ -23,7 +24,6 @@ import org.apache.juneau.annotation.*;
import org.apache.juneau.html.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.httppart.uon.*;
import org.apache.juneau.jena.*;
import org.apache.juneau.json.*;
import org.apache.juneau.msgpack.*;
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/NameValuePairs.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/NameValuePairs.java
index 36a5f99..66c637d 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/NameValuePairs.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/NameValuePairs.java
@@ -20,7 +20,6 @@ import org.apache.http.*;
import org.apache.http.client.entity.*;
import org.apache.http.message.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.httppart.oapi.*;
import org.apache.juneau.urlencoding.*;
/**
@@ -83,7 +82,7 @@ public final class NameValuePairs extends
LinkedList<NameValuePair> {
* The schema object that defines the format of the output.
* <br>If <jk>null</jk>, defaults to the schema defined on the
parser.
* <br>If that's also <jk>null</jk>, defaults to {@link
HttpPartSchema#DEFAULT}.
- * <br>Ignored if the serializer parser is not a subclass of
{@link OapiPartSerializer}.
+ * <br>Ignored if the serializer parser is not a subclass of
{@link OpenApiPartSerializer}.
* @return This object (for method chaining).
*/
public NameValuePairs append(String name, Object value,
HttpPartSerializer serializer, HttpPartSchema schema) {
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCall.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCall.java
index 6fba539..4101193 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCall.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCall.java
@@ -37,8 +37,6 @@ import org.apache.juneau.*;
import org.apache.juneau.encoders.*;
import org.apache.juneau.http.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.httppart.oapi.*;
-import org.apache.juneau.httppart.uon.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.parser.ParseException;
@@ -202,7 +200,7 @@ public final class RestCall extends BeanSession implements
Closeable {
* The schema object that defines the format of the output.
* <br>If <jk>null</jk>, defaults to the schema defined on the
serializer.
* <br>If that's also <jk>null</jk>, defaults to {@link
HttpPartSchema#DEFAULT}.
- * <br>Ignored if the part serializer is not a subclass of {@link
OapiPartSerializer}.
+ * <br>Ignored if the part serializer is not a subclass of {@link
OpenApiPartSerializer}.
* @return This object (for method chaining).
* @throws RestCallException
*/
@@ -320,7 +318,7 @@ public final class RestCall extends BeanSession implements
Closeable {
* The schema object that defines the format of the output.
* <br>If <jk>null</jk>, defaults to the schema defined on the
serializer.
* <br>If that's also <jk>null</jk>, defaults to {@link
HttpPartSchema#DEFAULT}.
- * <br>Ignored if the part serializer is not a subclass of {@link
OapiPartSerializer}.
+ * <br>Ignored if the part serializer is not a subclass of {@link
OpenApiPartSerializer}.
* @return This object (for method chaining).
* @throws RestCallException
*/
@@ -434,7 +432,7 @@ public final class RestCall extends BeanSession implements
Closeable {
* The schema object that defines the format of the output.
* <br>If <jk>null</jk>, defaults to the schema defined on the
serializer.
* <br>If that's also <jk>null</jk>, defaults to {@link
HttpPartSchema#DEFAULT}.
- * <br>Ignored if the part serializer is not a subclass of {@link
OapiPartSerializer}.
+ * <br>Ignored if the part serializer is not a subclass of {@link
OpenApiPartSerializer}.
* @return This object (for method chaining).
* @throws RestCallException If variable could not be found in path.
*/
@@ -579,7 +577,7 @@ public final class RestCall extends BeanSession implements
Closeable {
* The schema object that defines the format of the output.
* <br>If <jk>null</jk>, defaults to the schema defined on the
serializer.
* <br>If that's also <jk>null</jk>, defaults to {@link
HttpPartSchema#DEFAULT}.
- * <br>Ignored if the part serializer is not a subclass of {@link
OapiPartSerializer}.
+ * <br>Ignored if the part serializer is not a subclass of {@link
OpenApiPartSerializer}.
* @return This object (for method chaining).
* @throws RestCallException
*/
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index 1824e2b..1d44d8c 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -31,7 +31,6 @@ import org.apache.http.impl.client.*;
import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.httppart.uon.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
import org.apache.juneau.parser.*;
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
index 905a60c..b28b1de 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.parser.InputStreamParser.*;
import static org.apache.juneau.parser.ReaderParser.*;
import static org.apache.juneau.rest.client.RestClient.*;
import static org.apache.juneau.serializer.OutputStreamSerializer.*;
+import static org.apache.juneau.serializer.WriterSerializer.*;
import static org.apache.juneau.uon.UonSerializer.*;
import java.lang.reflect.*;
@@ -48,7 +49,6 @@ import org.apache.juneau.*;
import org.apache.juneau.html.*;
import org.apache.juneau.http.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.httppart.uon.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
import org.apache.juneau.msgpack.*;
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/SerializedNameValuePair.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/SerializedNameValuePair.java
index f7f53f0..42d8e84 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/SerializedNameValuePair.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/SerializedNameValuePair.java
@@ -14,7 +14,6 @@ package org.apache.juneau.rest.client;
import org.apache.http.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.httppart.oapi.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.urlencoding.*;
@@ -47,7 +46,7 @@ public final class SerializedNameValuePair implements
NameValuePair {
* The schema object that defines the format of the output.
* <br>If <jk>null</jk>, defaults to the schema defined on the
serializer.
* <br>If that's also <jk>null</jk>, defaults to {@link
HttpPartSchema#DEFAULT}.
- * <br>Ignored if the part serializer is not a subclass of {@link
OapiPartSerializer}.
+ * <br>Ignored if the part serializer is not a subclass of {@link
OpenApiPartSerializer}.
*/
public SerializedNameValuePair(String name, Object value,
HttpPartSerializer serializer, HttpPartSchema schema) {
this.name = name;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestFormData.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestFormData.java
index 20dc423..c4a5f0a 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestFormData.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestFormData.java
@@ -23,7 +23,6 @@ import javax.servlet.http.*;
import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.httppart.oapi.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
import org.apache.juneau.parser.*;
@@ -262,7 +261,7 @@ public class RequestFormData extends
LinkedHashMap<String,String[]> {
* The schema object that defines the format of the input.
* <br>If <jk>null</jk>, defaults to the schema defined on the
parser.
* <br>If that's also <jk>null</jk>, defaults to {@link
HttpPartSchema#DEFAULT}.
- * <br>Ignored if the part parser is not a subclass of {@link
OapiPartParser}.
+ * <br>Ignored if the part parser is not a subclass of {@link
OpenApiPartParser}.
* @param name The parameter name.
* @param type The class type to convert the parameter value to.
* @param <T> The class type to convert the parameter value to.
@@ -299,7 +298,7 @@ public class RequestFormData extends
LinkedHashMap<String,String[]> {
* The schema object that defines the format of the input.
* <br>If <jk>null</jk>, defaults to the schema defined on the
parser.
* <br>If that's also <jk>null</jk>, defaults to {@link
HttpPartSchema#DEFAULT}.
- * <br>Ignored if the part parser is not a subclass of {@link
OapiPartParser}.
+ * <br>Ignored if the part parser is not a subclass of {@link
OpenApiPartParser}.
* @param name The parameter name.
* @param def The default value if the parameter was not specified or
is <jk>null</jk>.
* @param type The class type to convert the parameter value to.
@@ -342,7 +341,7 @@ public class RequestFormData extends
LinkedHashMap<String,String[]> {
* The schema object that defines the format of the input.
* <br>If <jk>null</jk>, defaults to the schema defined on the
parser.
* <br>If that's also <jk>null</jk>, defaults to {@link
HttpPartSchema#DEFAULT}.
- * <br>Ignored if the part parser is not a subclass of {@link
OapiPartParser}.
+ * <br>Ignored if the part parser is not a subclass of {@link
OpenApiPartParser}.
* @param name The parameter name.
* @param type The class type to convert the parameter value to.
* @return The parameter value converted to the specified class type.
@@ -413,7 +412,7 @@ public class RequestFormData extends
LinkedHashMap<String,String[]> {
* The schema object that defines the format of the input.
* <br>If <jk>null</jk>, defaults to the schema defined on the
parser.
* <br>If that's also <jk>null</jk>, defaults to {@link
HttpPartSchema#DEFAULT}.
- * <br>Ignored if the part parser is not a subclass of {@link
OapiPartParser}.
+ * <br>Ignored if the part parser is not a subclass of {@link
OpenApiPartParser}.
* @param name The parameter name.
* @param type
* The type of object to create.
@@ -461,7 +460,7 @@ public class RequestFormData extends
LinkedHashMap<String,String[]> {
* The schema object that defines the format of the input.
* <br>If <jk>null</jk>, defaults to the schema defined on the
parser.
* <br>If that's also <jk>null</jk>, defaults to {@link
HttpPartSchema#DEFAULT}.
- * <br>Ignored if the part parser is not a subclass of {@link
OapiPartParser}.
+ * <br>Ignored if the part parser is not a subclass of {@link
OpenApiPartParser}.
* @param name The parameter name.
* @param type
* The type of object to create.
@@ -513,7 +512,7 @@ public class RequestFormData extends
LinkedHashMap<String,String[]> {
* The schema object that defines the format of the input.
* <br>If <jk>null</jk>, defaults to the schema defined on the
parser.
* <br>If that's also <jk>null</jk>, defaults to {@link
HttpPartSchema#DEFAULT}.
- * <br>Ignored if the part parser is not a subclass of {@link
OapiPartParser}.
+ * <br>Ignored if the part parser is not a subclass of {@link
OpenApiPartParser}.
* @param name The parameter name.
* @param type
* The type of object to create.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHeaders.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHeaders.java
index 44d2a9e..62840b3 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHeaders.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHeaders.java
@@ -22,7 +22,6 @@ import org.apache.juneau.*;
import org.apache.juneau.http.*;
import org.apache.juneau.http.Date;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.httppart.oapi.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
import org.apache.juneau.parser.*;
@@ -268,7 +267,7 @@ public class RequestHeaders extends
TreeMap<String,String[]> {
* The schema object that defines the format of the input.
* <br>If <jk>null</jk>, defaults to the schema defined on the
parser.
* <br>If that's also <jk>null</jk>, defaults to {@link
HttpPartSchema#DEFAULT}.
- * <br>Ignored if the part parser is not a subclass of {@link
OapiPartParser}.
+ * <br>Ignored if the part parser is not a subclass of {@link
OpenApiPartParser}.
* @param name The HTTP header name.
* @param type The class type to convert the header value to.
* @param <T> The class type to convert the header value to.
@@ -305,7 +304,7 @@ public class RequestHeaders extends
TreeMap<String,String[]> {
* The schema object that defines the format of the input.
* <br>If <jk>null</jk>, defaults to the schema defined on the
parser.
* <br>If that's also <jk>null</jk>, defaults to {@link
HttpPartSchema#DEFAULT}.
- * <br>Ignored if the part parser is not a subclass of {@link
OapiPartParser}.
+ * <br>Ignored if the part parser is not a subclass of {@link
OpenApiPartParser}.
* @param name The HTTP header name.
* @param def The default value if the header was not specified or is
<jk>null</jk>.
* @param type The class type to convert the header value to.
@@ -372,7 +371,7 @@ public class RequestHeaders extends
TreeMap<String,String[]> {
* The schema object that defines the format of the input.
* <br>If <jk>null</jk>, defaults to the schema defined on the
parser.
* <br>If that's also <jk>null</jk>, defaults to {@link
HttpPartSchema#DEFAULT}.
- * <br>Ignored if the part parser is not a subclass of {@link
OapiPartParser}.
+ * <br>Ignored if the part parser is not a subclass of {@link
OpenApiPartParser}.
* @param name
* The HTTP header name.
* @param type
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestPathMatch.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestPathMatch.java
index 760e660..e34d591 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestPathMatch.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestPathMatch.java
@@ -19,7 +19,6 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.httppart.oapi.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.rest.exception.*;
@@ -158,7 +157,7 @@ public class RequestPathMatch extends
TreeMap<String,String> {
* The schema object that defines the format of the input.
* <br>If <jk>null</jk>, defaults to the schema defined on the
parser.
* <br>If that's also <jk>null</jk>, defaults to {@link
HttpPartSchema#DEFAULT}.
- * <br>Ignored if the part parser is not a subclass of {@link
OapiPartParser}.
+ * <br>Ignored if the part parser is not a subclass of {@link
OpenApiPartParser}.
* @param name The attribute name.
* @param type The class type to convert the attribute value to.
* @param <T> The class type to convert the attribute value to.
@@ -234,7 +233,7 @@ public class RequestPathMatch extends
TreeMap<String,String> {
* The schema object that defines the format of the input.
* <br>If <jk>null</jk>, defaults to the schema defined on the
parser.
* <br>If that's also <jk>null</jk>, defaults to {@link
HttpPartSchema#DEFAULT}.
- * <br>Ignored if the part parser is not a subclass of {@link
OapiPartParser}.
+ * <br>Ignored if the part parser is not a subclass of {@link
OpenApiPartParser}.
* @param name The attribute name.
* @param type
* The type of object to create.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestQuery.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestQuery.java
index d288a23..78938c3 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestQuery.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestQuery.java
@@ -22,7 +22,6 @@ import javax.servlet.http.*;
import org.apache.juneau.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.httppart.oapi.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
import org.apache.juneau.parser.*;
@@ -261,7 +260,7 @@ public final class RequestQuery extends
LinkedHashMap<String,String[]> {
* The schema object that defines the format of the input.
* <br>If <jk>null</jk>, defaults to the schema defined on the
parser.
* <br>If that's also <jk>null</jk>, defaults to {@link
HttpPartSchema#DEFAULT}.
- * <br>Ignored if the part parser is not a subclass of {@link
OapiPartParser}.
+ * <br>Ignored if the part parser is not a subclass of {@link
OpenApiPartParser}.
* @param name The parameter name.
* @param type The class type to convert the parameter value to.
* @param <T> The class type to convert the parameter value to.
@@ -298,7 +297,7 @@ public final class RequestQuery extends
LinkedHashMap<String,String[]> {
* The schema object that defines the format of the input.
* <br>If <jk>null</jk>, defaults to the schema defined on the
parser.
* <br>If that's also <jk>null</jk>, defaults to {@link
HttpPartSchema#DEFAULT}.
- * <br>Ignored if the part parser is not a subclass of {@link
OapiPartParser}.
+ * <br>Ignored if the part parser is not a subclass of {@link
OpenApiPartParser}.
* @param name The parameter name.
* @param def The default value if the parameter was not specified or
is <jk>null</jk>.
* @param type The class type to convert the parameter value to.
@@ -372,7 +371,7 @@ public final class RequestQuery extends
LinkedHashMap<String,String[]> {
* The schema object that defines the format of the input.
* <br>If <jk>null</jk>, defaults to the schema defined on the
parser.
* <br>If that's also <jk>null</jk>, defaults to {@link
HttpPartSchema#DEFAULT}.
- * <br>Ignored if the part parser is not a subclass of {@link
OapiPartParser}.
+ * <br>Ignored if the part parser is not a subclass of {@link
OpenApiPartParser}.
* @param name The parameter name.
* @param type
* The type of object to create.
@@ -421,7 +420,7 @@ public final class RequestQuery extends
LinkedHashMap<String,String[]> {
* The schema object that defines the format of the input.
* <br>If <jk>null</jk>, defaults to the schema defined on the
parser.
* <br>If that's also <jk>null</jk>, defaults to {@link
HttpPartSchema#DEFAULT}.
- * <br>Ignored if the part parser is not a subclass of {@link
OapiPartParser}.
+ * <br>Ignored if the part parser is not a subclass of {@link
OpenApiPartParser}.
* @param name The parameter name.
* @param type
* The type of object to create.
@@ -492,7 +491,7 @@ public final class RequestQuery extends
LinkedHashMap<String,String[]> {
* The schema object that defines the format of the input.
* <br>If <jk>null</jk>, defaults to the schema defined on the
parser.
* <br>If that's also <jk>null</jk>, defaults to {@link
HttpPartSchema#DEFAULT}.
- * <br>Ignored if the part parser is not a subclass of {@link
OapiPartParser}.
+ * <br>Ignored if the part parser is not a subclass of {@link
OpenApiPartParser}.
* @param name The query parameter name.
* @param type
* The type of object to create.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index 9c0fe35..1ceebd1 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -15,8 +15,8 @@ package org.apache.juneau.rest;
import static javax.servlet.http.HttpServletResponse.*;
import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
-import static org.apache.juneau.internal.ReflectionUtils.*;
import static org.apache.juneau.internal.IOUtils.*;
+import static org.apache.juneau.internal.ReflectionUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
import java.io.*;
@@ -39,8 +39,6 @@ import org.apache.juneau.htmlschema.*;
import org.apache.juneau.http.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.httppart.oapi.*;
-import org.apache.juneau.httppart.uon.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
import org.apache.juneau.jsonschema.*;
@@ -1737,7 +1735,7 @@ public final class RestContext extends BeanContext {
* <ul>
* <li><b>Name:</b> <js>"RestContext.partParser.o"</js>
* <li><b>Data type:</b> <code>{@link HttpPartParser} |
Class<? <jk>extends</jk> {@link HttpPartParser}></code>
- * <li><b>Default:</b> {@link OapiPartSerializer}
+ * <li><b>Default:</b> {@link OpenApiPartSerializer}
* <li><b>Session-overridable:</b> <jk>false</jk>
* <li><b>Annotations:</b>
* <ul>
@@ -1755,7 +1753,7 @@ public final class RestContext extends BeanContext {
* Specifies the {@link HttpPartParser} to use for parsing headers,
query/form parameters, and URI parts.
*
* <p>
- * The default value is {@link OapiPartParser} which allows for both
plain-text and URL-Encoded-Object-Notation values.
+ * The default value is {@link OpenApiPartParser} which allows for both
plain-text and URL-Encoded-Object-Notation values.
* <br>If your parts contain text that can be confused with UON (e.g.
<js>"(foo)"</js>), you can switch to
* {@link SimplePartParser} which treats everything as plain text.
*
@@ -1805,7 +1803,7 @@ public final class RestContext extends BeanContext {
* <ul>
* <li><b>Name:</b> <js>"RestContext.partSerializer.o"</js>
* <li><b>Data type:</b> <code>{@link HttpPartSerializer} |
Class<? <jk>extends</jk> {@link HttpPartSerializer}></code>
- * <li><b>Default:</b> {@link OapiPartSerializer}
+ * <li><b>Default:</b> {@link OpenApiPartSerializer}
* <li><b>Session-overridable:</b> <jk>false</jk>
* <li><b>Annotations:</b>
* <ul>
@@ -1823,7 +1821,7 @@ public final class RestContext extends BeanContext {
* Specifies the {@link HttpPartSerializer} to use for serializing
headers, query/form parameters, and URI parts.
*
* <p>
- * The default value is {@link OapiPartSerializer} which serializes
based on OpenAPI rules, but defaults to UON notation for beans and maps, and
+ * The default value is {@link OpenApiPartSerializer} which serializes
based on OpenAPI rules, but defaults to UON notation for beans and maps, and
* plain text for everything else.
* <br>Other options include:
* <ul>
@@ -2923,8 +2921,8 @@ public final class RestContext extends BeanContext {
properties = builder.properties;
serializers =
SerializerGroup.create().append(getInstanceArrayProperty(REST_serializers,
Serializer.class, new Serializer[0], true, resource, ps)).build();
parsers =
ParserGroup.create().append(getInstanceArrayProperty(REST_parsers,
Parser.class, new Parser[0], true, resource, ps)).build();
- partSerializer =
getInstanceProperty(REST_partSerializer, HttpPartSerializer.class,
OapiPartSerializer.class, true, resource, ps);
- partParser = getInstanceProperty(REST_partSerializer,
HttpPartParser.class, OapiPartParser.class, true, resource, ps);
+ partSerializer =
getInstanceProperty(REST_partSerializer, HttpPartSerializer.class,
OpenApiPartSerializer.class, true, resource, ps);
+ partParser = getInstanceProperty(REST_partSerializer,
HttpPartParser.class, OpenApiPartParser.class, true, resource, ps);
jsonSchemaSerializer = new JsonSchemaSerializer(ps);
encoders = new
EncoderGroupBuilder().append(getInstanceArrayProperty(REST_encoders,
Encoder.class, new Encoder[0], true, resource, ps)).build();
beanContext = BeanContext.create().apply(ps).build();
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
index 88e62af..e7c5cbc 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
@@ -12,10 +12,11 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest;
+import static org.apache.juneau.BeanContext.*;
import static org.apache.juneau.internal.ArrayUtils.*;
+import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.internal.ReflectionUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
-import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.parser.Parser.*;
import static org.apache.juneau.rest.RestContext.*;
import static org.apache.juneau.rest.util.RestUtils.*;
@@ -33,7 +34,6 @@ import org.apache.juneau.config.vars.*;
import org.apache.juneau.encoders.*;
import org.apache.juneau.http.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.httppart.oapi.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.rest.annotation.*;
@@ -1281,7 +1281,7 @@ public class RestContextBuilder extends
BeanContextBuilder implements ServletCon
*
* @param value
* The new value for this setting.
- * <br>The default is {@link OapiPartParser}.
+ * <br>The default is {@link OpenApiPartParser}.
* @return This object (for method chaining).
*/
public RestContextBuilder partParser(Class<? extends HttpPartParser>
value) {
@@ -1301,7 +1301,7 @@ public class RestContextBuilder extends
BeanContextBuilder implements ServletCon
*
* @param value
* The new value for this setting.
- * <br>The default is {@link OapiPartParser}.
+ * <br>The default is {@link OpenApiPartParser}.
* @return This object (for method chaining).
*/
public RestContextBuilder partParser(HttpPartParser value) {
@@ -1321,7 +1321,7 @@ public class RestContextBuilder extends
BeanContextBuilder implements ServletCon
*
* @param value
* The new value for this setting.
- * <br>The default is {@link OapiPartSerializer}.
+ * <br>The default is {@link OpenApiPartSerializer}.
* @return This object (for method chaining).
*/
public RestContextBuilder partSerializer(Class<? extends
HttpPartSerializer> value) {
@@ -1341,7 +1341,7 @@ public class RestContextBuilder extends
BeanContextBuilder implements ServletCon
*
* @param value
* The new value for this setting.
- * <br>The default is {@link OapiPartSerializer}.
+ * <br>The default is {@link OpenApiPartSerializer}.
* @return This object (for method chaining).
*/
public RestContextBuilder partSerializer(HttpPartSerializer value) {
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResource.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResource.java
index f3bee28..9337288 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResource.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResource.java
@@ -21,7 +21,6 @@ import org.apache.juneau.*;
import org.apache.juneau.config.*;
import org.apache.juneau.encoders.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.httppart.uon.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.serializer.*;
