Skip to content

Commit 541f9de

Browse files
committed
Post-merge clean up
1 parent 3d45522 commit 541f9de

File tree

1 file changed

+16
-27
lines changed

1 file changed

+16
-27
lines changed

src/main/java/com/fasterxml/jackson/annotation/JacksonInject.java

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,15 @@
5050
* @return {@link OptBoolean#FALSE} to throw an exception; {@link OptBoolean#TRUE}
5151
* to avoid throwing it; or {@link OptBoolean#DEFAULT} to use configure defaults
5252
* (which are same as {@link OptBoolean#FALSE} for Jackson 2.x)
53-
*
54-
* @since 2.20
5553
*/
5654
public OptBoolean optional() default OptBoolean.DEFAULT;
5755

5856
/*
59-
/**********************************************************
60-
/* Value class used to enclose information, allow for
61-
/* merging of layered configuration settings, and eventually
62-
/* decouple higher level handling from Annotation types
63-
/* (which can not be implemented etc.)
64-
/**********************************************************
57+
/**********************************************************************
58+
/* Value class used to enclose information, allow for merging of layered
59+
/* configuration settings, and eventually decouple higher level handling
60+
/* from Annotation types (which can not be implemented etc.)
61+
/**********************************************************************
6562
*/
6663

6764
/**
@@ -98,23 +95,15 @@ public Class<JacksonInject> valueFor() {
9895
}
9996

10097
/*
101-
/**********************************************************
98+
/******************************************************************
10299
/* Factory methods
103-
/**********************************************************
100+
/******************************************************************
104101
*/
105102

106103
public static Value empty() {
107104
return EMPTY;
108105
}
109106

110-
@Deprecated //since 2.20
111-
public static Value construct(Object id, Boolean useInput) {
112-
return construct(id, useInput, null);
113-
}
114-
115-
/**
116-
* @since 2.20
117-
*/
118107
public static Value construct(Object id, Boolean useInput, Boolean optional) {
119108
if ("".equals(id)) {
120109
id = null;
@@ -137,9 +126,9 @@ public static Value forId(Object id) {
137126
}
138127

139128
/*
140-
/**********************************************************
129+
/******************************************************************
141130
/* Mutant factory methods
142-
/**********************************************************
131+
/******************************************************************
143132
*/
144133

145134
public Value withId(Object id) {
@@ -176,9 +165,9 @@ public Value withOptional(Boolean optional) {
176165
}
177166

178167
/*
179-
/**********************************************************
168+
/******************************************************************
180169
/* Accessors
181-
/**********************************************************
170+
/******************************************************************
182171
*/
183172

184173
public Object getId() { return _id; }
@@ -194,9 +183,9 @@ public boolean willUseInput(boolean defaultSetting) {
194183
}
195184

196185
/*
197-
/**********************************************************
198-
/* Std method overrides
199-
/**********************************************************
186+
/******************************************************************
187+
/* Standard method overrides
188+
/******************************************************************
200189
*/
201190

202191
@Override
@@ -238,9 +227,9 @@ public boolean equals(Object o) {
238227
}
239228

240229
/*
241-
/**********************************************************
230+
/******************************************************************
242231
/* Other
243-
/**********************************************************
232+
/******************************************************************
244233
*/
245234

246235
private static boolean _empty(Object id, Boolean useInput, Boolean optional) {

0 commit comments

Comments
 (0)