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 b51c5a7 REST refactoring.
b51c5a7 is described below
commit b51c5a770fb0f36b158fd7b3d6fb0d12555c9763
Author: JamesBognar <[email protected]>
AuthorDate: Sun Feb 21 18:00:13 2021 -0500
REST refactoring.
---
.../main/ConfigurablePropertyCodeGenerator.java | 230 ++++++++++-----------
.../apache/juneau/assertions/ArrayAssertion.java | 6 +
.../apache/juneau/assertions/BeanAssertion.java | 8 +-
.../apache/juneau/assertions/BooleanAssertion.java | 6 +
.../juneau/assertions/ByteArrayAssertion.java | 6 +
.../juneau/assertions/CollectionAssertion.java | 6 +
.../juneau/assertions/ComparableAssertion.java | 6 +
.../apache/juneau/assertions/DateAssertion.java | 6 +
.../juneau/assertions/FluentArrayAssertion.java | 6 +
.../apache/juneau/assertions/FluentAssertion.java | 6 +
.../juneau/assertions/FluentBaseAssertion.java | 6 +
.../juneau/assertions/FluentBeanAssertion.java | 6 +
.../juneau/assertions/FluentBooleanAssertion.java | 6 +
.../assertions/FluentByteArrayAssertion.java | 6 +
.../assertions/FluentCollectionAssertion.java | 6 +
.../assertions/FluentComparableAssertion.java | 8 +-
.../juneau/assertions/FluentDateAssertion.java | 6 +
.../juneau/assertions/FluentIntegerAssertion.java | 6 +
.../juneau/assertions/FluentListAssertion.java | 6 +
.../juneau/assertions/FluentLongAssertion.java | 6 +
.../juneau/assertions/FluentMapAssertion.java | 6 +
.../juneau/assertions/FluentObjectAssertion.java | 6 +
.../juneau/assertions/FluentStringAssertion.java | 6 +
.../assertions/FluentThrowableAssertion.java | 6 +
.../assertions/FluentZonedDateTimeAssertion.java | 6 +
.../apache/juneau/assertions/IntegerAssertion.java | 6 +
.../apache/juneau/assertions/ListAssertion.java | 6 +
.../apache/juneau/assertions/LongAssertion.java | 6 +
.../org/apache/juneau/assertions/MapAssertion.java | 6 +
.../apache/juneau/assertions/ObjectAssertion.java | 8 +-
.../apache/juneau/assertions/StringAssertion.java | 6 +
.../juneau/assertions/ThrowableAssertion.java | 8 +-
.../juneau/assertions/ZonedDateTimeAssertion.java | 6 +
.../juneau/rest/mock/MockRestClientBuilder.java | 2 +
34 files changed, 312 insertions(+), 120 deletions(-)
diff --git a/juneau-all/src/java/main/ConfigurablePropertyCodeGenerator.java
b/juneau-all/src/java/main/ConfigurablePropertyCodeGenerator.java
index e16cf75..fcb993f 100644
--- a/juneau-all/src/java/main/ConfigurablePropertyCodeGenerator.java
+++ b/juneau-all/src/java/main/ConfigurablePropertyCodeGenerator.java
@@ -50,173 +50,171 @@ import org.apache.juneau.xml.*;
public class ConfigurablePropertyCodeGenerator {
static Class<?>[] classes = new Class<?>[]{
+ Accepted.class,
+ AlreadyReported.class,
+ AnnotationBuilder.class,
+ ArrayAssertion.class,
+ Assertion.class,
+ BadRequest.class,
+ BasicHeader.class,
+ BasicHttpEntity.class,
+ BasicHttpResource.class,
+ BasicNameValuePair.class,
BasicRuntimeException.class,
+ BeanAssertion.class,
BeanContextBuilder.class,
+ BeanSessionArgs.class,
BeanTraverseBuilder.class,
+ BooleanAssertion.class,
+ ByteArrayAssertion.class,
+ CollectionAssertion.class,
+ ComparableAssertion.class,
ConfigBuilder.class,
ConfigClasspathStoreBuilder.class,
ConfigFileStoreBuilder.class,
ConfigMemoryStoreBuilder.class,
ConfigStoreBuilder.class,
+ Conflict.class,
+ ConstructorInfo.class,
ContextBuilder.class,
+ Continue.class,
+ Created.class,
CsvParserBuilder.class,
CsvSerializerBuilder.class,
+ DateAssertion.class,
+ EarlyHints.class,
+ ExecutableInfo.class,
+ ExpectationFailed.class,
+ FailedDependency.class,
+ FluentArrayAssertion.class,
+ FluentAssertion.class,
+ FluentBaseAssertion.class,
+ FluentBeanAssertion.class,
+ FluentBooleanAssertion.class,
+ FluentByteArrayAssertion.class,
+ FluentCollectionAssertion.class,
+ FluentComparableAssertion.class,
+ FluentDateAssertion.class,
+ FluentIntegerAssertion.class,
+ FluentListAssertion.class,
+ FluentLongAssertion.class,
+ FluentMapAssertion.class,
+ FluentObjectAssertion.class,
+ FluentStringAssertion.class,
+ FluentThrowableAssertion.class,
+ FluentZonedDateTimeAssertion.class,
+ Forbidden.class,
+ Found.class,
+ Gone.class,
HtmlDocSerializerBuilder.class,
HtmlParserBuilder.class,
HtmlSchemaSerializerBuilder.class,
HtmlSerializerBuilder.class,
HtmlStrippedDocSerializerBuilder.class,
+ HttpException.class,
+ HttpResponse.class,
+ HttpVersionNotSupported.class,
+ IMUsed.class,
InputStreamParserBuilder.class,
+ InsufficientStorage.class,
+ IntegerAssertion.class,
+ InternalServerError.class,
JsonParserBuilder.class,
JsonSchemaGeneratorBuilder.class,
JsonSchemaSerializerBuilder.class,
JsonSerializerBuilder.class,
JsoParserBuilder.class,
JsoSerializerBuilder.class,
+ LengthRequired.class,
+ ListAssertion.class,
+ Locked.class,
+ LongAssertion.class,
+ LoopDetected.class,
+ MapAssertion.class,
+ MethodInfo.class,
+ MethodNotAllowed.class,
+ MisdirectedRequest.class,
MockRestClientBuilder.class,
+ MockRestClientBuilder.class,
+ MovedPermanently.class,
MsgPackParserBuilder.class,
MsgPackSerializerBuilder.class,
+ MultipleChoices.class,
+ MultiStatus.class,
+ NetworkAuthenticationRequired.class,
+ NoContent.class,
+ NonAuthoritiveInformation.class,
+ NotAcceptable.class,
+ NotExtended.class,
+ NotFound.class,
+ NotImplemented.class,
+ NotModified.class,
+ ObjectAssertion.class,
+ Ok.class,
OpenApiParserBuilder.class,
OpenApiSerializerBuilder.class,
OutputStreamSerializerBuilder.class,
ParserBuilder.class,
ParserGroupBuilder.class,
+ ParserSessionArgs.class,
+ PartialContent.class,
+ PayloadTooLarge.class,
+ PermanentRedirect.class,
PlainTextParserBuilder.class,
PlainTextSerializerBuilder.class,
+ PreconditionFailed.class,
+ PreconditionRequired.class,
+ Processing.class,
+ RangeNotSatisfiable.class,
RdfParserBuilder.class,
RdfSerializerBuilder.class,
ReaderParserBuilder.class,
+ RequestHeaderFieldsTooLarge.class,
+ ResetContent.class,
RestClientBuilder.class,
- MockRestClientBuilder.class,
RestContextBuilder.class,
RestOperationContextBuilder.class,
+ SeeOther.class,
+ SerializedHeader.class,
+ SerializedHttpEntity.class,
+ SerializedNameValuePair.class,
SerializerBuilder.class,
SerializerGroupBuilder.class,
+ SerializerSessionArgs.class,
+ ServiceUnavailable.class,
+ SessionArgs.class,
SimpleJsonParserBuilder.class,
SimpleJsonSerializerBuilder.class,
SoapXmlSerializerBuilder.class,
- UonParserBuilder.class,
- UonSerializerBuilder.class,
- UrlEncodingParserBuilder.class,
- UrlEncodingSerializerBuilder.class,
- WriterSerializerBuilder.class,
- XmlParserBuilder.class,
- XmlSerializerBuilder.class,
- BadRequest.class,
- Conflict.class,
- ExpectationFailed.class,
- FailedDependency.class,
- Forbidden.class,
- Gone.class,
- HttpException.class,
- HttpVersionNotSupported.class,
- InsufficientStorage.class,
- InternalServerError.class,
- LengthRequired.class,
- Locked.class,
- LoopDetected.class,
- MethodNotAllowed.class,
- MisdirectedRequest.class,
- NetworkAuthenticationRequired.class,
- NotAcceptable.class,
- NotExtended.class,
- NotFound.class,
- NotImplemented.class,
- PayloadTooLarge.class,
- PreconditionFailed.class,
- PreconditionRequired.class,
- RangeNotSatisfiable.class,
- RequestHeaderFieldsTooLarge.class,
- ServiceUnavailable.class,
+ StringAssertion.class,
+ SwitchingProtocols.class,
+ TargetedAnnotationBuilder.class,
+ TargetedAnnotationCBuilder.class,
+ TargetedAnnotationMBuilder.class,
+ TargetedAnnotationMFBuilder.class,
+ TargetedAnnotationTBuilder.class,
+ TargetedAnnotationTMBuilder.class,
+ TargetedAnnotationTMFBuilder.class,
+ TargetedAnnotationTMFCBuilder.class,
+ TemporaryRedirect.class,
+ ThrowableAssertion.class,
TooManyRequests.class,
Unauthorized.class,
UnavailableForLegalReasons.class,
UnprocessableEntity.class,
UnsupportedMediaType.class,
+ UonParserBuilder.class,
+ UonSerializerBuilder.class,
UpgradeRequired.class,
UriTooLong.class,
- VariantAlsoNegotiates.class,
- Accepted.class,
- AlreadyReported.class,
- Continue.class,
- Created.class,
- EarlyHints.class,
- Found.class,
- HttpResponse.class,
- IMUsed.class,
- MovedPermanently.class,
- MultipleChoices.class,
- MultiStatus.class,
- NoContent.class,
- NonAuthoritiveInformation.class,
- NotModified.class,
- Ok.class,
- PartialContent.class,
- PermanentRedirect.class,
- Processing.class,
- ResetContent.class,
- SeeOther.class,
- SwitchingProtocols.class,
- TemporaryRedirect.class,
+ UrlEncodingParserBuilder.class,
+ UrlEncodingSerializerBuilder.class,
UseProxy.class,
- SessionArgs.class,
- BeanSessionArgs.class,
- SerializerSessionArgs.class,
- ParserSessionArgs.class,
-
- Assertion.class,
- FluentAssertion.class,
- FluentDateAssertion.class,
- FluentIntegerAssertion.class,
- FluentLongAssertion.class,
- FluentStringAssertion.class,
- FluentThrowableAssertion.class,
- FluentObjectAssertion.class,
- FluentComparableAssertion.class,
- FluentArrayAssertion.class,
- FluentCollectionAssertion.class,
- FluentListAssertion.class,
- FluentZonedDateTimeAssertion.class,
- FluentBooleanAssertion.class,
- FluentBeanAssertion.class,
- FluentMapAssertion.class,
-
- DateAssertion.class,
- IntegerAssertion.class,
- LongAssertion.class,
- StringAssertion.class,
- ThrowableAssertion.class,
- ObjectAssertion.class,
- ComparableAssertion.class,
- ArrayAssertion.class,
- CollectionAssertion.class,
- ListAssertion.class,
+ VariantAlsoNegotiates.class,
+ WriterSerializerBuilder.class,
+ XmlParserBuilder.class,
+ XmlSerializerBuilder.class,
ZonedDateTimeAssertion.class,
- BooleanAssertion.class,
- BeanAssertion.class,
- MapAssertion.class,
-
- BasicHeader.class,
- BasicNameValuePair.class,
- BasicHttpEntity.class,
- BasicHttpResource.class,
- SerializedNameValuePair.class,
- SerializedHeader.class,
- SerializedHttpEntity.class,
-
- ExecutableInfo.class,
- ConstructorInfo.class,
- MethodInfo.class,
-
- AnnotationBuilder.class,
- TargetedAnnotationBuilder.class,
- TargetedAnnotationTBuilder.class,
- TargetedAnnotationTMBuilder.class,
- TargetedAnnotationTMFBuilder.class,
- TargetedAnnotationCBuilder.class,
- TargetedAnnotationMBuilder.class,
- TargetedAnnotationMFBuilder.class,
- TargetedAnnotationTMFCBuilder.class,
};
static Set<Class<?>> ignoreClasses = ASet.of(
@@ -250,7 +248,7 @@ public class ConfigurablePropertyCodeGenerator {
for (Class<?> c : classes) {
File f = findClassFile(c);
if (f == null)
- continue;
+ throw new RuntimeException("Couldn't find class
" + c.getName());
System.out.println("Processing " + f.getName());
String s = IOUtils.read(f);
@@ -385,7 +383,7 @@ public class ConfigurablePropertyCodeGenerator {
private static File findClassFile(Class<?> c) throws IOException {
String path = c.getName().replace('.', '/') + ".java";
for (String sp : SOURCE_PATHS) {
- File f = new File("../../"+sp+"/src/main/java/" + path);
+ File f = new File("../"+sp+"/src/main/java/" + path);
if (f.exists())
return f;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java
index 3ed7b5b..f3e1085 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java
@@ -70,5 +70,11 @@ public class ArrayAssertion extends
FluentArrayAssertion<ArrayAssertion> {
return this;
}
+ @Override /* GENERATED - Assertion */
+ public ArrayAssertion throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/BeanAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/BeanAssertion.java
index 92282de..16906af 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/BeanAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/BeanAssertion.java
@@ -25,7 +25,7 @@ import org.apache.juneau.internal.*;
*
* @param <V> The bean type.
*/
-@FluentSetters(returns="BeanAssertion")
+@FluentSetters(returns="BeanAssertion<V>")
public class BeanAssertion<V> extends
FluentBeanAssertion<Object,BeanAssertion<V>> {
/**
@@ -72,5 +72,11 @@ public class BeanAssertion<V> extends
FluentBeanAssertion<Object,BeanAssertion<V
return this;
}
+ @Override /* GENERATED - Assertion */
+ public BeanAssertion<V> throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/BooleanAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/BooleanAssertion.java
index 7c8be34..3f18d8e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/BooleanAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/BooleanAssertion.java
@@ -64,5 +64,11 @@ public class BooleanAssertion extends
FluentBooleanAssertion<BooleanAssertion> {
return this;
}
+ @Override /* GENERATED - Assertion */
+ public BooleanAssertion throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java
index c8febfa..a4edb9d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java
@@ -70,5 +70,11 @@ public class ByteArrayAssertion extends
FluentByteArrayAssertion<ByteArrayAssert
return this;
}
+ @Override /* GENERATED - Assertion */
+ public ByteArrayAssertion throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java
index 5c88067..c38db1b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java
@@ -73,5 +73,11 @@ public class CollectionAssertion extends
FluentCollectionAssertion<CollectionAss
return this;
}
+ @Override /* GENERATED - Assertion */
+ public CollectionAssertion throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ComparableAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ComparableAssertion.java
index 350df8d..5820f55 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ComparableAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ComparableAssertion.java
@@ -65,5 +65,11 @@ public class ComparableAssertion extends
FluentComparableAssertion<Comparable,Co
return this;
}
+ @Override /* GENERATED - Assertion */
+ public ComparableAssertion throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/DateAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/DateAssertion.java
index 724cff7..f18a94e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/DateAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/DateAssertion.java
@@ -72,5 +72,11 @@ public class DateAssertion extends
FluentDateAssertion<DateAssertion> {
return this;
}
+ @Override /* GENERATED - Assertion */
+ public DateAssertion throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
index c942d4b..bfe2d4d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
@@ -182,5 +182,11 @@ public class FluentArrayAssertion<R> extends
FluentBaseAssertion<Object,R> {
return this;
}
+ @Override /* GENERATED - Assertion */
+ public FluentArrayAssertion<R> throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentAssertion.java
index 23605a2..eca42e6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentAssertion.java
@@ -64,5 +64,11 @@ public abstract class FluentAssertion<R> extends Assertion {
return this;
}
+ @Override /* GENERATED - Assertion */
+ public FluentAssertion<R> throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentBaseAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentBaseAssertion.java
index caf322e..ca7c8ab 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentBaseAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentBaseAssertion.java
@@ -432,5 +432,11 @@ public class FluentBaseAssertion<V,R> extends
FluentAssertion<R> {
return this;
}
+ @Override /* GENERATED - Assertion */
+ public FluentBaseAssertion<V,R> throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java
index 5c4623a..fcbc1a5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java
@@ -116,5 +116,11 @@ public class FluentBeanAssertion<V,R> extends
FluentBaseAssertion<Object,R> {
return this;
}
+ @Override /* GENERATED - Assertion */
+ public FluentBeanAssertion<V,R> throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java
index 2e0e14c..2727821 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java
@@ -93,5 +93,11 @@ public class FluentBooleanAssertion<R> extends
FluentComparableAssertion<Boolean
return this;
}
+ @Override /* GENERATED - Assertion */
+ public FluentBooleanAssertion<R> throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java
index 7850b04..76ecd0b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java
@@ -147,5 +147,11 @@ public class FluentByteArrayAssertion<R> extends
FluentArrayAssertion<R> {
return this;
}
+ @Override /* GENERATED - Assertion */
+ public FluentByteArrayAssertion<R> throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
index 4f37ff2..66d956a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
@@ -142,5 +142,11 @@ public class FluentCollectionAssertion<R> extends
FluentBaseAssertion<Collection
return this;
}
+ @Override /* GENERATED - Assertion */
+ public FluentCollectionAssertion<R> throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
index 8343636..05df64e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* @param <V> The value type
* @param <R> The return type.
*/
-@FluentSetters(returns="FluentComparableAssertion<R>")
+@FluentSetters(returns="FluentComparableAssertion<V,R>")
@SuppressWarnings("rawtypes")
public class FluentComparableAssertion<V extends Comparable,R> extends
FluentBaseAssertion<V,R> {
@@ -212,5 +212,11 @@ public class FluentComparableAssertion<V extends
Comparable,R> extends FluentBas
return this;
}
+ @Override /* GENERATED - Assertion */
+ public FluentComparableAssertion<V,R> throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
index 003ca2b..b4845df 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
@@ -161,5 +161,11 @@ public class FluentDateAssertion<R> extends
FluentComparableAssertion<Date,R> {
return this;
}
+ @Override /* GENERATED - Assertion */
+ public FluentDateAssertion<R> throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java
index fb50067..8e67d0e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java
@@ -88,5 +88,11 @@ public class FluentIntegerAssertion<R> extends
FluentComparableAssertion<Integer
return this;
}
+ @Override /* GENERATED - Assertion */
+ public FluentIntegerAssertion<R> throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java
index f5d8b14..eb708e9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java
@@ -107,5 +107,11 @@ public class FluentListAssertion<R> extends
FluentCollectionAssertion<R> {
return this;
}
+ @Override /* GENERATED - Assertion */
+ public FluentListAssertion<R> throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java
index aa9eeca..0d35af6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java
@@ -97,5 +97,11 @@ public class FluentLongAssertion<R> extends
FluentComparableAssertion<Long,R> {
return this;
}
+ @Override /* GENERATED - Assertion */
+ public FluentLongAssertion<R> throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
index dbbd40c..56e1ecf 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
@@ -176,5 +176,11 @@ public class FluentMapAssertion<R> extends
FluentBaseAssertion<Map,R> {
return this;
}
+ @Override /* GENERATED - Assertion */
+ public FluentMapAssertion<R> throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
index 05da399..250655b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
@@ -189,5 +189,11 @@ public class FluentObjectAssertion<V,R> extends
FluentBaseAssertion<V,R> {
return this;
}
+ @Override /* GENERATED - Assertion */
+ public FluentObjectAssertion<V,R> throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
index 56ec3dd..4b3ca1c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
@@ -542,5 +542,11 @@ public class FluentStringAssertion<R> extends
FluentBaseAssertion<String,R> {
return this;
}
+ @Override /* GENERATED - Assertion */
+ public FluentStringAssertion<R> throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
index 8773082..866acb1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
@@ -274,5 +274,11 @@ public class FluentThrowableAssertion<V extends
Throwable,R> extends FluentBaseA
return this;
}
+ @Override /* GENERATED - Assertion */
+ public FluentThrowableAssertion<V,R> throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
index c3c1a0d..41ed346 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
@@ -161,5 +161,11 @@ public class FluentZonedDateTimeAssertion<R> extends
FluentComparableAssertion<Z
return this;
}
+ @Override /* GENERATED - Assertion */
+ public FluentZonedDateTimeAssertion<R> throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java
index 76e8b04..0aa1c7b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java
@@ -70,5 +70,11 @@ public class IntegerAssertion extends
FluentIntegerAssertion<IntegerAssertion> {
return this;
}
+ @Override /* GENERATED - Assertion */
+ public IntegerAssertion throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ListAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ListAssertion.java
index daf5c8f..c6a179b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ListAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ListAssertion.java
@@ -73,5 +73,11 @@ public class ListAssertion extends
FluentListAssertion<ListAssertion> {
return this;
}
+ @Override /* GENERATED - Assertion */
+ public ListAssertion throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/LongAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/LongAssertion.java
index 65974fd..f12d25c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/LongAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/LongAssertion.java
@@ -70,5 +70,11 @@ public class LongAssertion extends
FluentLongAssertion<LongAssertion> {
return this;
}
+ @Override /* GENERATED - Assertion */
+ public LongAssertion throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/MapAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/MapAssertion.java
index dbe5fff..be8eef9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/MapAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/MapAssertion.java
@@ -73,5 +73,11 @@ public class MapAssertion extends
FluentMapAssertion<MapAssertion> {
return this;
}
+ @Override /* GENERATED - Assertion */
+ public MapAssertion throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java
index 6e4f831..7c3cb68 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java
@@ -25,7 +25,7 @@ import org.apache.juneau.internal.*;
*
* @param <V> The object type.
*/
-@FluentSetters(returns="ObjectAssertion")
+@FluentSetters(returns="ObjectAssertion<V>")
public class ObjectAssertion<V> extends
FluentObjectAssertion<V,ObjectAssertion<V>> {
/**
@@ -72,5 +72,11 @@ public class ObjectAssertion<V> extends
FluentObjectAssertion<V,ObjectAssertion<
return this;
}
+ @Override /* GENERATED - Assertion */
+ public ObjectAssertion<V> throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/StringAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/StringAssertion.java
index a531c10..81941e2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/StringAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/StringAssertion.java
@@ -72,6 +72,12 @@ public class StringAssertion extends
FluentStringAssertion<StringAssertion> {
return this;
}
+ @Override /* GENERATED - Assertion */
+ public StringAssertion throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
@Override /* GENERATED - FluentStringAssertion */
public StringAssertion javaStrings() {
super.javaStrings();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java
index f9324f2..09d0d8f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java
@@ -25,7 +25,7 @@ import org.apache.juneau.internal.*;
*
* @param <V> The throwable type.
*/
-@FluentSetters(returns="ThrowableAssertion")
+@FluentSetters(returns="ThrowableAssertion<V>")
public class ThrowableAssertion<V extends Throwable> extends
FluentThrowableAssertion<V,ThrowableAssertion<V>> {
/**
@@ -72,5 +72,11 @@ public class ThrowableAssertion<V extends Throwable> extends
FluentThrowableAsse
return this;
}
+ @Override /* GENERATED - Assertion */
+ public ThrowableAssertion<V> throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java
index 9972a70..9a41a08 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java
@@ -72,5 +72,11 @@ public class ZonedDateTimeAssertion extends
FluentZonedDateTimeAssertion<ZonedDa
return this;
}
+ @Override /* GENERATED - Assertion */
+ public ZonedDateTimeAssertion throwable(Class<? extends
java.lang.RuntimeException> value) {
+ super.throwable(value);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClientBuilder.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClientBuilder.java
index 0919ddd..2c5a579 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClientBuilder.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClientBuilder.java
@@ -33,6 +33,7 @@ import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.http.*;
import org.apache.juneau.httppart.*;
+import org.apache.juneau.internal.*;
import org.apache.juneau.marshall.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.reflect.*;
@@ -62,6 +63,7 @@ import org.apache.http.protocol.*;
* <li class='link'>{@doc juneau-rest-mock}
* </ul>
*/
+@FluentSetters(ignore="debug")
public class MockRestClientBuilder extends RestClientBuilder {
/**
