@@ -74,32 +74,27 @@ protected ReadablePeriod _fromObject(final JsonParser p, final DeserializationCo
74
74
int periodValue = treeNode .path (periodType ).asInt ();
75
75
76
76
ReadablePeriod rp ;
77
-
77
+
78
+ // !!! 05-Jan-2021, tatu: Change to switch for 2.13 or later (Java 8)
78
79
if (periodName .equals ( "Seconds" )) {
79
80
rp = Seconds .seconds ( periodValue );
80
- }
81
- else if (periodName .equals ( "Minutes" )) {
81
+ } else if (periodName .equals ( "Minutes" )) {
82
82
rp = Minutes .minutes ( periodValue );
83
- }
84
- else if (periodName .equals ( "Hours" )) {
83
+ } else if (periodName .equals ( "Hours" )) {
85
84
rp = Hours .hours ( periodValue );
86
- }
87
- else if (periodName .equals ( "Days" )) {
85
+ } else if (periodName .equals ( "Days" )) {
88
86
rp = Days .days ( periodValue );
89
- }
90
- else if (periodName .equals ( "Weeks" )) {
87
+ } else if (periodName .equals ( "Weeks" )) {
91
88
rp = Weeks .weeks ( periodValue );
92
- }
93
- else if (periodName .equals ( "Months" )) {
89
+ } else if (periodName .equals ( "Months" )) {
94
90
rp = Months .months ( periodValue );
95
- }
96
- else if (periodName .equals ( "Years" )) {
91
+ } else if (periodName .equals ( "Years" )) {
97
92
rp = Years .years ( periodValue );
98
93
} else {
99
94
ctxt .reportInputMismatch (handledType (),
100
95
"Don't know how to deserialize %s using periodName '%s'" ,
101
96
handledType ().getName (), periodName );
102
- rp = null ; // never gets here
97
+ return null ; // never gets here
103
98
}
104
99
105
100
if (_requireFullPeriod && !(rp instanceof Period )) {
0 commit comments