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 5b4ebb4 Clean up unnecessary @BeanIgnore annotations.
5b4ebb4 is described below
commit 5b4ebb47fcfb37d29a598d1439805fb0acf10db9
Author: JamesBognar <james.bog...@salesforce.com>
AuthorDate: Tue Feb 23 09:39:41 2021 -0500
Clean up unnecessary @BeanIgnore annotations.
---
TODO.txt | 3 ++
.../apache/juneau/config/event/ConfigEvent.java | 2 -
.../apache/juneau/dto/jsonschema/JsonSchema.java | 10 ----
.../src/main/java/org/apache/juneau/BeanMeta.java | 1 -
.../java/org/apache/juneau/BeanPropertyMeta.java | 1 -
.../src/main/java/org/apache/juneau/ClassMeta.java | 4 +-
.../src/main/java/org/apache/juneau/Context.java | 1 -
.../java/org/apache/juneau/http/BasicHeader.java | 2 +-
.../org/apache/juneau/http/BasicHttpEntity.java | 2 +
.../org/apache/juneau/http/BasicNameValuePair.java | 2 +-
.../apache/juneau/http/BasicNamedAttribute.java | 2 +
.../java/org/apache/juneau/http/MediaRange.java | 2 -
.../juneau/http/exception/HttpException.java | 2 +-
.../apache/juneau/http/header/BasicDateHeader.java | 2 -
.../org/apache/juneau/http/header/ContentType.java | 2 -
.../org/apache/juneau/http/response/Found.java | 2 -
.../apache/juneau/http/response/HttpResponse.java | 2 +-
.../juneau/http/response/MovedPermanently.java | 2 -
.../juneau/http/response/PermanentRedirect.java | 2 -
.../org/apache/juneau/http/response/SeeOther.java | 2 -
.../juneau/http/response/TemporaryRedirect.java | 2 -
.../java/org/apache/juneau/reflect/ClassInfo.java | 1 -
.../org/apache/juneau/reflect/ConstructorInfo.java | 2 -
.../java/org/apache/juneau/reflect/FieldInfo.java | 2 -
.../java/org/apache/juneau/reflect/MethodInfo.java | 1 -
.../java/org/apache/juneau/reflect/ParamInfo.java | 3 +-
.../java/org/apache/juneau/transform/PojoSwap.java | 1 -
.../org/apache/juneau/rest/RequestPathParams.java | 2 -
.../java/org/apache/juneau/rest/RestContext.java | 4 --
.../apache/juneau/rest/util/UrlPathMatcher.java | 2 -
.../java/org/apache/juneau/PojoExamplesTest.java | 2 +-
.../juneau/config/ConfigMapListenerTest.java | 62 +++++++++++-----------
32 files changed, 45 insertions(+), 87 deletions(-)
diff --git a/TODO.txt b/TODO.txt
index 5051df9..6dd1bce 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -11,3 +11,6 @@ HttpResponse should use list of Headers and have a
headers(Header...) method.
HttpResponse should allow you to set code.
HttpException subclasses can set status, but does it use code?
HttpException should use list of Headers and have a headers(Header...) method.
+
+JsonSchema should have fluent getters and setters.
+Assertions should display to stderr by default.
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/event/ConfigEvent.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/event/ConfigEvent.java
index 22ecee9..3acfc7b 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/event/ConfigEvent.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/event/ConfigEvent.java
@@ -17,13 +17,11 @@ import static
org.apache.juneau.config.event.ConfigEventType.*;
import java.util.*;
-import org.apache.juneau.annotation.*;
import org.apache.juneau.internal.*;
/**
* Represents a change to a config.
*/
-@BeanIgnore
public class ConfigEvent {
private final ConfigEventType type;
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java
index 1fbf719..e323c9e 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java
@@ -95,7 +95,6 @@ public class JsonSchema {
*
* @return The value of the <property>name</property> property on this
bean, or <jk>null</jk> if it is not set.
*/
- @BeanIgnore
public String getName() {
return name;
}
@@ -106,7 +105,6 @@ public class JsonSchema {
* @param name The new value for the <property>name</property> property
on this bean.
* @return This object (for method chaining).
*/
- @BeanIgnore
public JsonSchema setName(String name) {
this.name = name;
return this;
@@ -231,7 +229,6 @@ public class JsonSchema {
* @return
* The currently set value, or <jk>null</jk> if the property is
not set, or is set as a {@link JsonTypeArray}.
*/
- @BeanIgnore
public JsonType getTypeAsJsonType() {
return typeJsonType;
}
@@ -244,7 +241,6 @@ public class JsonSchema {
*
* @return The currently set value, or <jk>null</jk> if the property is
not set, or is set as a {@link JsonType}.
*/
- @BeanIgnore
public JsonTypeArray getTypeAsJsonTypeArray() {
return typeJsonTypeArray;
}
@@ -554,7 +550,6 @@ public class JsonSchema {
*
* @return The currently set value, or <jk>null</jk> if the property is
not set, or is set as a {@link JsonSchemaArray}.
*/
- @BeanIgnore
public JsonSchema getItemsAsSchema() {
return itemsSchema;
}
@@ -567,7 +562,6 @@ public class JsonSchema {
*
* @return The currently set value, or <jk>null</jk> if the property is
not set, or is set as a {@link JsonSchema}.
*/
- @BeanIgnore
public JsonSchemaArray getItemsAsSchemaArray() {
return itemsSchemaArray;
}
@@ -832,7 +826,6 @@ public class JsonSchema {
*
* @return The currently set value, or <jk>null</jk> if the property is
not set, or is set as a {@link JsonSchemaArray}.
*/
- @BeanIgnore
public Boolean getAdditionalItemsAsBoolean() {
return additionalItemsBoolean;
}
@@ -846,7 +839,6 @@ public class JsonSchema {
*
* @return The currently set value, or <jk>null</jk> if the property is
not set, or is set as a {@link Boolean}.
*/
- @BeanIgnore
public List<JsonSchema> getAdditionalItemsAsSchemaArray() {
return additionalItemsSchemaArray;
}
@@ -1112,7 +1104,6 @@ public class JsonSchema {
*
* @return The currently set value, or <jk>null</jk> if the property is
not set, or is set as a {@link JsonSchema}.
*/
- @BeanIgnore
public Boolean getAdditionalPropertiesAsBoolean() {
return additionalPropertiesBoolean;
}
@@ -1126,7 +1117,6 @@ public class JsonSchema {
*
* @return The currently set value, or <jk>null</jk> if the property is
not set, or is set as a {@link Boolean}.
*/
- @BeanIgnore
public JsonSchema getAdditionalPropertiesAsSchema() {
return additionalPropertiesSchema;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
index 7497fea..0c28d92 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
@@ -552,7 +552,6 @@ public class BeanMeta<T> {
*
* @return The {@link ClassMeta} of this bean.
*/
- @BeanIgnore
public final ClassMeta<T> getClassMeta() {
return classMeta;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
index 3d30a98..6978f86 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
@@ -419,7 +419,6 @@ public final class BeanPropertyMeta {
*
* @return The bean meta that this property belongs to.
*/
- @BeanIgnore
public BeanMeta<?> getBeanMeta() {
return beanMeta;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
index d8f5f28..626c937 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
@@ -492,7 +492,7 @@ public final class ClassMeta<T> implements Type {
for (MethodInfo m : ci.getDeclaredMethods()) {
if (bc.hasAnnotation(Example.class, m)) {
if (! (m.isStatic() &&
m.hasFuzzyParamTypes(BeanSession.class) &&
ci.isParentOf(m.getReturnType().inner())))
- throw new
ClassMetaRuntimeException(c, "@Example used on invalid method ''{0}''. Must be
static and return an instance of the declaring class.", m);
+ throw new
ClassMetaRuntimeException(c, "@Example used on invalid method ''{0}''. Must be
static and return an instance of the declaring class.", m.toString());
m.setAccessible();
exampleMethod = m.inner();
}
@@ -943,7 +943,6 @@ public final class ClassMeta<T> implements Type {
* <br>Required because the swap used may depend on the media type
being serialized or parsed.
* @return The serialized class type, or this object if no swap is
associated with the class.
*/
- @BeanIgnore
public ClassMeta<?> getSerializedClassMeta(BeanSession session) {
PojoSwap<T,?> ps = getSwap(session);
return (ps == null ? this : ps.getSwapClassMeta(session));
@@ -958,7 +957,6 @@ public final class ClassMeta<T> implements Type {
* @return The serialized class type, or this object if no swap is
associated with the class.
*/
@SuppressWarnings({"unchecked","rawtypes"})
- @BeanIgnore
public T getExample(BeanSession session) {
try {
if (example != null)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
index 355cdc0..cd1a69f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
@@ -365,7 +365,6 @@ public abstract class Context {
*
* @return The property store associated with this context.
*/
- @BeanIgnore
public final ContextProperties getContextProperties() {
return properties;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHeader.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHeader.java
index 7439489..819d8f8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHeader.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHeader.java
@@ -44,8 +44,8 @@ import org.apache.juneau.reflect.*;
* Fluent assertions.
* </ul>
*/
-@BeanIgnore
@FluentSetters
+@BeanIgnore
public class BasicHeader implements Header, Cloneable, Serializable {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHttpEntity.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHttpEntity.java
index 6ab4c98..88cf16b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHttpEntity.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHttpEntity.java
@@ -16,6 +16,7 @@ import java.io.*;
import java.util.function.*;
import org.apache.http.*;
+import org.apache.juneau.annotation.*;
import org.apache.juneau.assertions.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.internal.*;
@@ -38,6 +39,7 @@ import org.apache.juneau.internal.*;
* </ul>
*/
@FluentSetters
+@BeanIgnore
public class BasicHttpEntity extends org.apache.http.entity.BasicHttpEntity {
private Object content;
private boolean cache;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicNameValuePair.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicNameValuePair.java
index 4c7db15..ed3e40c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicNameValuePair.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicNameValuePair.java
@@ -39,8 +39,8 @@ import org.apache.juneau.reflect.*;
* Fluent assertions.
* </ul>
*/
-@BeanIgnore
@FluentSetters
+@BeanIgnore
public class BasicNameValuePair implements NameValuePair, Headerable {
private final String name;
private final Object value;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicNamedAttribute.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicNamedAttribute.java
index 60e9f3b..b9767c4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicNamedAttribute.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicNamedAttribute.java
@@ -18,11 +18,13 @@ import java.util.*;
import java.util.function.*;
import org.apache.http.*;
+import org.apache.juneau.annotation.*;
import org.apache.juneau.assertions.*;
/**
* Implementation of a named object.
*/
+@BeanIgnore
public class BasicNamedAttribute implements NamedAttribute {
private final String name;
private final Object value;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaRange.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaRange.java
index 8e1ec92..c8680de 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaRange.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaRange.java
@@ -15,7 +15,6 @@ package org.apache.juneau.http;
import java.util.*;
import org.apache.http.*;
-import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
@@ -27,7 +26,6 @@ import org.apache.juneau.collections.*;
* <li class='extlink'>{@doc ExtRFC2616}
* </ul>
*/
-@BeanIgnore
public class MediaRange extends MediaType {
private final NameValuePair[] extensions;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/HttpException.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/HttpException.java
index 3aac9b0..fe6a771 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/HttpException.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/HttpException.java
@@ -32,6 +32,7 @@ import org.apache.juneau.internal.*;
* automatically-generated <c>404</c>, <c>405</c>, and <c>500</c> statuses.
*/
@Response
+@BeanIgnore
@FluentSetters
public class HttpException extends BasicRuntimeException {
@@ -191,7 +192,6 @@ public class HttpException extends BasicRuntimeException {
* @return The headers associated with this exception.
*/
@ResponseHeader("*")
- @BeanIgnore
public Map<String,Object> getHeaders() {
return headers;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicDateHeader.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicDateHeader.java
index f627ea9..afcd71f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicDateHeader.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicDateHeader.java
@@ -21,7 +21,6 @@ import java.time.*;
import java.util.*;
import java.util.function.*;
-import org.apache.juneau.annotation.*;
import org.apache.juneau.assertions.*;
import org.apache.juneau.http.*;
@@ -38,7 +37,6 @@ import org.apache.juneau.http.*;
* <li class='extlink'>{@doc ExtRFC2616}
* </ul>
*/
-@BeanIgnore
public class BasicDateHeader extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentType.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentType.java
index d191dd0..9cecbfb 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentType.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentType.java
@@ -17,7 +17,6 @@ import static org.apache.juneau.internal.StringUtils.*;
import java.util.function.*;
-import org.apache.juneau.annotation.*;
import org.apache.juneau.http.*;
import org.apache.juneau.http.annotation.Header;
import org.apache.juneau.internal.*;
@@ -53,7 +52,6 @@ import org.apache.juneau.internal.*;
* </ul>
*/
@Header("Content-Type")
-@BeanIgnore
public class ContentType extends BasicMediaTypeHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Found.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Found.java
index 9d6f31b..df89082 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Found.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Found.java
@@ -16,7 +16,6 @@ import java.net.*;
import static org.apache.juneau.http.response.Found.*;
-import org.apache.juneau.annotation.BeanIgnore;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.internal.*;
@@ -31,7 +30,6 @@ import org.apache.juneau.internal.*;
* However, some Web applications and frameworks use the 302 status code as if
it were the 303.
*/
@Response(code=CODE, description=MESSAGE)
-@BeanIgnore
@FluentSetters
public class Found extends HttpResponse {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/HttpResponse.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/HttpResponse.java
index 4c0ac41..8f726c3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/HttpResponse.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/HttpResponse.java
@@ -26,6 +26,7 @@ import org.apache.juneau.internal.*;
* Consists simply of a simple string message.
*/
@Response
+@BeanIgnore
@FluentSetters
public abstract class HttpResponse {
@@ -60,7 +61,6 @@ public abstract class HttpResponse {
* @return The headers associated with this exception.
*/
@ResponseHeader("*")
- @BeanIgnore
public Map<String,Object> getHeaders() {
return headers;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/MovedPermanently.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/MovedPermanently.java
index 607d658..5459ef2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/MovedPermanently.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/MovedPermanently.java
@@ -16,7 +16,6 @@ import static
org.apache.juneau.http.response.MovedPermanently.*;
import java.net.*;
-import org.apache.juneau.annotation.BeanIgnore;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.internal.*;
@@ -27,7 +26,6 @@ import org.apache.juneau.internal.*;
* This and all future requests should be directed to the given URI.
*/
@Response(code=CODE, description=MESSAGE)
-@BeanIgnore
@FluentSetters
public class MovedPermanently extends HttpResponse {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/PermanentRedirect.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/PermanentRedirect.java
index b2af709..1cf411a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/PermanentRedirect.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/PermanentRedirect.java
@@ -16,7 +16,6 @@ import static
org.apache.juneau.http.response.PermanentRedirect.*;
import java.net.*;
-import org.apache.juneau.annotation.BeanIgnore;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.internal.*;
@@ -28,7 +27,6 @@ import org.apache.juneau.internal.*;
* So, for example, submitting a form to a permanently redirected resource may
continue smoothly.
*/
@Response(code=CODE, description=MESSAGE)
-@BeanIgnore
@FluentSetters
public class PermanentRedirect extends HttpResponse {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/SeeOther.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/SeeOther.java
index b0fc5b9..10fa6d2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/SeeOther.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/SeeOther.java
@@ -16,7 +16,6 @@ import static org.apache.juneau.http.response.SeeOther.*;
import java.net.*;
-import org.apache.juneau.annotation.BeanIgnore;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.internal.*;
@@ -28,7 +27,6 @@ import org.apache.juneau.internal.*;
* When received in response to a POST (or PUT/DELETE), the client should
presume that the server has received the data and should issue a new GET
request to the given URI.
*/
@Response(code=CODE, description=MESSAGE)
-@BeanIgnore
@FluentSetters
public class SeeOther extends HttpResponse {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/TemporaryRedirect.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/TemporaryRedirect.java
index 4722935..98b306f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/TemporaryRedirect.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/TemporaryRedirect.java
@@ -16,7 +16,6 @@ import static
org.apache.juneau.http.response.TemporaryRedirect.*;
import java.net.*;
-import org.apache.juneau.annotation.BeanIgnore;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.internal.*;
@@ -29,7 +28,6 @@ import org.apache.juneau.internal.*;
* For example, a POST request should be repeated using another POST request.
*/
@Response(code=CODE, description=MESSAGE)
-@BeanIgnore
@FluentSetters
public class TemporaryRedirect extends HttpResponse {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
index 654608d..0d46965 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
@@ -53,7 +53,6 @@ import org.apache.juneau.internal.*;
* }
* </p>
*/
-@BeanIgnore
public final class ClassInfo {
private final Type t;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConstructorInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConstructorInfo.java
index 1373d5b..e8f7558 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConstructorInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConstructorInfo.java
@@ -18,13 +18,11 @@ import java.lang.annotation.*;
import java.lang.reflect.*;
import org.apache.juneau.*;
-import org.apache.juneau.annotation.*;
import org.apache.juneau.internal.*;
/**
* Lightweight utility class for introspecting information about a constructor.
*/
-@BeanIgnore
@FluentSetters
public final class ConstructorInfo extends ExecutableInfo implements
Comparable<ConstructorInfo> {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/FieldInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/FieldInfo.java
index 2e6f3ca..82d00496 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/FieldInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/FieldInfo.java
@@ -18,12 +18,10 @@ import java.lang.annotation.*;
import java.lang.reflect.*;
import org.apache.juneau.*;
-import org.apache.juneau.annotation.*;
/**
* Lightweight utility class for introspecting information about a field.
*/
-@BeanIgnore
public final class FieldInfo implements Comparable<FieldInfo> {
private final Field f;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
index 49484da..59c7d82 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
@@ -27,7 +27,6 @@ import org.apache.juneau.internal.*;
/**
* Lightweight utility class for introspecting information about a method.
*/
-@BeanIgnore
@FluentSetters
public final class MethodInfo extends ExecutableInfo implements
Comparable<MethodInfo> {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ParamInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ParamInfo.java
index 8d92627..a98a12a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ParamInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ParamInfo.java
@@ -23,7 +23,6 @@ import org.apache.juneau.annotation.*;
/**
* Lightweight utility class for introspecting information about a method
parameter.
*/
-@BeanIgnore
public final class ParamInfo {
private final ExecutableInfo eInfo;
@@ -235,7 +234,7 @@ public final class ParamInfo {
/**
* Returns <jk>true</jk> if the parameter type is an exact match for
the specified class.
- *
+ *
* @param c The type to check.
* @return <jk>true</jk> if the parameter type is an exact match for
the specified class.
*/
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/PojoSwap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/PojoSwap.java
index c586077..417e03c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/PojoSwap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/PojoSwap.java
@@ -98,7 +98,6 @@ import org.apache.juneau.serializer.*;
* @param <S> The swapped form of the class.
*/
@SuppressWarnings({"unchecked","rawtypes"})
-@BeanIgnore
public abstract class PojoSwap<T,S> {
/**
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestPathParams.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestPathParams.java
index a270aa8..fcb748b 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestPathParams.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestPathParams.java
@@ -24,13 +24,11 @@ import org.apache.juneau.httppart.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.rest.util.*;
import org.apache.juneau.svl.*;
-import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
/**
* Represents the path parameters in an HTTP request.
*/
-@BeanIgnore
public class RequestPathParams {
private final RestCall call;
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 f1c64dc..ce7c3aa 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
@@ -6064,7 +6064,6 @@ public class RestContext extends BeanContext {
* The resource object.
* <br>Never <jk>null</jk>.
*/
- @BeanIgnore
public Object getResource() {
return resource.get();
}
@@ -7053,7 +7052,6 @@ public class RestContext extends BeanContext {
*
* @return The HTTP request object, or <jk>null</jk> if it hasn't been
created.
*/
- @BeanIgnore
public RestRequest getRequest() {
return getCall().getRestRequest();
}
@@ -7063,7 +7061,6 @@ public class RestContext extends BeanContext {
*
* @return The HTTP response object, or <jk>null</jk> if it hasn't been
created.
*/
- @BeanIgnore
public RestResponse getResponse() {
return getCall().getRestResponse();
}
@@ -7074,7 +7071,6 @@ public class RestContext extends BeanContext {
* @return The HTTP call for the current request, never <jk>null</jk>?
* @throws InternalServerError If no active request exists on the
current thread.
*/
- @BeanIgnore
public RestCall getCall() {
RestCall rc = call.get();
if (rc == null)
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathMatcher.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathMatcher.java
index ab8890c..9e0cb6a 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathMatcher.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathMatcher.java
@@ -18,7 +18,6 @@ import static org.apache.juneau.internal.FileUtils.*;
import java.util.*;
import java.util.regex.*;
-import org.apache.juneau.annotation.*;
import org.apache.juneau.rest.annotation.*;
/**
@@ -27,7 +26,6 @@ import org.apache.juneau.rest.annotation.*;
* <p>
* Handles aspects of matching and precedence ordering.
*/
-@BeanIgnore
public abstract class UrlPathMatcher implements Comparable<UrlPathMatcher> {
/**
diff --git a/juneau-utest/src/test/java/org/apache/juneau/PojoExamplesTest.java
b/juneau-utest/src/test/java/org/apache/juneau/PojoExamplesTest.java
index 79bf37b..a81b2b4 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/PojoExamplesTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/PojoExamplesTest.java
@@ -321,7 +321,7 @@ public class PojoExamplesTest {
@Test
public void testInvalidUsesOfExample() throws Exception {
BeanSession bs = BeanContext.create().build().createSession();
- assertThrown(()->bs.getClassMeta(F1.class)).contains("invalid
method 'example(String)'");
+
assertThrown(()->bs.getClassMeta(F1.class)).stderr().contains("invalid method
'example(String)'");
assertThrown(()->bs.getClassMeta(F2.class)).contains("invalid
method 'example()'");
assertThrown(()->bs.getClassMeta(F3.class)).contains("invalid
field","$F3.F3");
assertThrown(()->bs.getClassMeta(F4.class)).contains("invalid
field ","$F4.f4");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigMapListenerTest.java
b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigMapListenerTest.java
index 7f9cf05..1eab908 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigMapListenerTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigMapListenerTest.java
@@ -42,7 +42,7 @@ public class ConfigMapListenerTest {
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws Exception
{
- assertObject(events).asJson().is("['SET(foo =
baz)']");
+ assertObject(events).asString().is("[SET(foo =
baz)]");
}
};
@@ -69,7 +69,7 @@ public class ConfigMapListenerTest {
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws Exception
{
- assertObject(events).asJson().is("['SET(S1/foo
= baz)']");
+ assertObject(events).asString().is("[SET(S1/foo
= baz)]");
}
};
@@ -98,7 +98,7 @@ public class ConfigMapListenerTest {
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws Exception
{
- assertObject(events).asJson().is("['SET(k =
vb)','SET(S1/k1 = v1b)']");
+ assertObject(events).asString().is("[SET(k =
vb), SET(S1/k1 = v1b)]");
}
};
@@ -124,7 +124,7 @@ public class ConfigMapListenerTest {
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws Exception
{
- assertObject(events).asJson().is("['SET(k^* =
kb # C)','SET(S1/k1^* = k1b # C1)']");
+ assertObject(events).asString().is("[SET(k^* =
kb # C), SET(S1/k1^* = k1b # C1)]");
}
};
@@ -156,7 +156,7 @@ public class ConfigMapListenerTest {
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws Exception
{
- assertObject(events).asJson().is("['SET(k^* =
kb # Cb)','SET(S1/k1^* = k1b # Cb1)']");
+ assertObject(events).asString().is("[SET(k^* =
kb # Cb), SET(S1/k1^* = k1b # Cb1)]");
}
};
@@ -189,7 +189,7 @@ public class ConfigMapListenerTest {
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws Exception
{
-
assertObject(events).asJson().is("['REMOVE_ENTRY(k)','REMOVE_ENTRY(S1/k1)']");
+
assertObject(events).asString().is("[REMOVE_ENTRY(k), REMOVE_ENTRY(S1/k1)]");
}
};
@@ -221,7 +221,7 @@ public class ConfigMapListenerTest {
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws Exception
{
-
assertObject(events).asJson().is("['REMOVE_ENTRY(k)','REMOVE_ENTRY(S1/k1)']");
+
assertObject(events).asString().is("[REMOVE_ENTRY(k), REMOVE_ENTRY(S1/k1)]");
}
};
@@ -251,7 +251,7 @@ public class ConfigMapListenerTest {
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws Exception
{
- assertObject(events).asJson().is("['SET(S3/k3 =
v3)']");
+ assertObject(events).asString().is("[SET(S3/k3
= v3)]");
}
};
@@ -286,7 +286,7 @@ public class ConfigMapListenerTest {
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws Exception
{
- assertObject(events).asJson().is("['SET(S3/k3 =
v3)']");
+ assertObject(events).asString().is("[SET(S3/k3
= v3)]");
}
};
@@ -331,7 +331,7 @@ public class ConfigMapListenerTest {
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws Exception
{
-
assertObject(events).asJson().is("['REMOVE_ENTRY(k)','REMOVE_ENTRY(S1/k1)','REMOVE_ENTRY(S2/k2)']");
+
assertObject(events).asString().is("[REMOVE_ENTRY(k), REMOVE_ENTRY(S1/k1),
REMOVE_ENTRY(S2/k2)]");
}
};
@@ -362,7 +362,7 @@ public class ConfigMapListenerTest {
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws Exception
{
- assertObject(events).asJson().is("['SET(k = v #
cv)','SET(S1/k1 = v1 # cv1)','SET(S2/k2 = v2 # cv2)']");
+ assertObject(events).asString().is("[SET(k = v
# cv), SET(S1/k1 = v1 # cv1), SET(S2/k2 = v2 # cv2)]");
}
};
@@ -402,13 +402,13 @@ public class ConfigMapListenerTest {
final CountDownLatch latch = new CountDownLatch(2);
final Queue<String> eventList = new ConcurrentLinkedQueue<>();
- eventList.add("['SET(S1/k1 = v1b)']");
- eventList.add("['SET(S2/k2 = v2b)']");
+ eventList.add("[SET(S1/k1 = v1b)]");
+ eventList.add("[SET(S2/k2 = v2b)]");
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws Exception
{
-
assertObject(events).asJson().is(eventList.poll());
+
assertObject(events).asString().is(eventList.poll());
}
};
@@ -440,13 +440,13 @@ public class ConfigMapListenerTest {
final CountDownLatch latch = new CountDownLatch(2);
final Queue<String> eventList = new ConcurrentLinkedQueue<>();
- eventList.add("['SET(S1/k1 = v1b)']");
- eventList.add("['SET(S1/k1 = v1c)']");
+ eventList.add("[SET(S1/k1 = v1b)]");
+ eventList.add("[SET(S1/k1 = v1c)]");
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws Exception
{
-
assertObject(events).asJson().is(eventList.poll());
+
assertObject(events).asString().is(eventList.poll());
}
};
@@ -487,13 +487,13 @@ public class ConfigMapListenerTest {
try {
final CountDownLatch latch = new CountDownLatch(2);
final Queue<String> eventList = new
ConcurrentLinkedQueue<>();
- eventList.add("['SET(S1/k1 = v1b)']");
- eventList.add("['SET(S1/k1 = v1c)']");
+ eventList.add("[SET(S1/k1 = v1b)]");
+ eventList.add("[SET(S1/k1 = v1c)]");
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws
Exception {
-
assertObject(events).asJson().is(eventList.poll());
+
assertObject(events).asString().is(eventList.poll());
}
};
@@ -525,21 +525,21 @@ public class ConfigMapListenerTest {
try {
final CountDownLatch latch = new CountDownLatch(10);
final Queue<String> eventList = new
ConcurrentLinkedQueue<>();
- eventList.add("['SET(S1/k1 = v1b)']");
- eventList.add("['SET(S1/k1 = v1c)']");
- eventList.add("['SET(S1/k1 = v1d)']");
- eventList.add("['SET(S1/k1 = v1e)']");
- eventList.add("['SET(S1/k1 = v1f)']");
- eventList.add("['SET(S1/k1 = v1g)']");
- eventList.add("['SET(S1/k1 = v1h)']");
- eventList.add("['SET(S1/k1 = v1i)']");
- eventList.add("['SET(S1/k1 = v1j)']");
- eventList.add("['SET(S1/k1 = v1k)']");
+ eventList.add("[SET(S1/k1 = v1b)]");
+ eventList.add("[SET(S1/k1 = v1c)]");
+ eventList.add("[SET(S1/k1 = v1d)]");
+ eventList.add("[SET(S1/k1 = v1e)]");
+ eventList.add("[SET(S1/k1 = v1f)]");
+ eventList.add("[SET(S1/k1 = v1g)]");
+ eventList.add("[SET(S1/k1 = v1h)]");
+ eventList.add("[SET(S1/k1 = v1i)]");
+ eventList.add("[SET(S1/k1 = v1j)]");
+ eventList.add("[SET(S1/k1 = v1k)]");
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws
Exception {
-
assertObject(events).asJson().is(eventList.poll());
+
assertObject(events).asString().is(eventList.poll());
}
};
