Skip to content

Commit 076ddb1

Browse files
committed
Remove 3 deprecations that need to wait until 2.11
1 parent 7b06d43 commit 076ddb1

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2110,11 +2110,10 @@ public boolean isEnabled(MapperFeature f) {
21102110
// ok to use either one, should be kept in sync
21112111
return _serializationConfig.isEnabled(f);
21122112
}
2113-
2114-
/**
2115-
* @deprecated Since 2.10 use {@code JsonMapper.builder().configure(...)} (or similarly for other datatypes)
2116-
*/
2117-
@Deprecated
2113+
2114+
// Note: planned to be deprecated in 2.11 (not needed with 2.10):
2115+
// @deprecated Since 2.10 use {@code JsonMapper.builder().configure(...)} (or similarly for other datatypes)
2116+
// @Deprecated
21182117
public ObjectMapper configure(MapperFeature f, boolean state) {
21192118
_serializationConfig = state ?
21202119
_serializationConfig.with(f) : _serializationConfig.without(f);
@@ -2123,20 +2122,18 @@ public ObjectMapper configure(MapperFeature f, boolean state) {
21232122
return this;
21242123
}
21252124

2126-
/**
2127-
* @deprecated Since 2.10 use {@code JsonMapper.builder().Enable(...)} (or similarly for other datatypes)
2128-
*/
2129-
@Deprecated
2125+
// Note: planned to be deprecated in 2.11 (not needed with 2.10):
2126+
// @deprecated Since 2.10 use {@code JsonMapper.builder().Enable(...)} (or similarly for other datatypes)
2127+
// @Deprecated
21302128
public ObjectMapper enable(MapperFeature... f) {
21312129
_deserializationConfig = _deserializationConfig.with(f);
21322130
_serializationConfig = _serializationConfig.with(f);
21332131
return this;
21342132
}
21352133

2136-
/**
2137-
* @deprecated Since 2.10 use {@code JsonMapper.builder().disable(...)} (or similarly for other datatypes)
2138-
*/
2139-
@Deprecated
2134+
// Note: planned to be deprecated in 2.11 (not needed with 2.10):
2135+
// @deprecated Since 2.10 use {@code JsonMapper.builder().disable(...)} (or similarly for other datatypes)
2136+
// @Deprecated
21402137
public ObjectMapper disable(MapperFeature... f) {
21412138
_deserializationConfig = _deserializationConfig.without(f);
21422139
_serializationConfig = _serializationConfig.without(f);

0 commit comments

Comments
 (0)