@@ -308,23 +308,21 @@ private BidiConverter fieldToValueConverter(FieldDescriptor fieldDescriptor) {
308308 case SFIXED32 :
309309 case SINT32 :
310310 case INT32 :
311- return unwrapAndConvert (INT_CONVERTER );
311+ return unwrapAndConvert (fieldDescriptor , Long . class , INT_CONVERTER );
312312 case FIXED32 :
313313 case UINT32 :
314314 if (celOptions .enableUnsignedLongs ()) {
315- return unwrapAndConvert (UNSIGNED_UINT32_CONVERTER );
315+ return unwrapAndConvert (fieldDescriptor , UnsignedLong . class , UNSIGNED_UINT32_CONVERTER );
316316 }
317- return unwrapAndConvert (SIGNED_UINT32_CONVERTER );
317+ return unwrapAndConvert (fieldDescriptor , Long . class , SIGNED_UINT32_CONVERTER );
318318 case FIXED64 :
319319 case UINT64 :
320320 if (celOptions .enableUnsignedLongs ()) {
321- return unwrapAndConvert (UNSIGNED_UINT64_CONVERTER );
321+ return unwrapAndConvert (fieldDescriptor , UnsignedLong . class , UNSIGNED_UINT64_CONVERTER );
322322 }
323- return BidiConverter .of (
324- BidiConverter .IDENTITY .forwardConverter (),
325- value -> BidiConverter .IDENTITY .backwardConverter ().convert (maybeUnwrap (value )));
323+ return unwrapAndCheck (fieldDescriptor , Long .class );
326324 case FLOAT :
327- return unwrapAndConvert (DOUBLE_CONVERTER );
325+ return unwrapAndConvert (fieldDescriptor , Double . class , DOUBLE_CONVERTER );
328326 case BYTES :
329327 if (celOptions .evaluateCanonicalTypesToNativeValues ()) {
330328 return BidiConverter .<Object , Object >of (
@@ -336,21 +334,24 @@ private BidiConverter fieldToValueConverter(FieldDescriptor fieldDescriptor) {
336334 BidiConverter .IDENTITY .forwardConverter (),
337335 value -> BidiConverter .IDENTITY .backwardConverter ().convert (maybeUnwrap (value )));
338336 case DOUBLE :
337+ return unwrapAndCheck (fieldDescriptor , Double .class );
339338 case SFIXED64 :
340339 case SINT64 :
341340 case INT64 :
341+ return unwrapAndCheck (fieldDescriptor , Long .class );
342342 case STRING :
343343 case BOOL :
344344 return BidiConverter .of (
345345 BidiConverter .IDENTITY .forwardConverter (),
346346 value -> BidiConverter .IDENTITY .backwardConverter ().convert (maybeUnwrap (value )));
347347 case ENUM :
348- return BidiConverter .<Object , Long >of (
348+ return BidiConverter .<Object , Object >of (
349349 value -> (long ) ((EnumValueDescriptor ) value ).getNumber (),
350- number ->
350+ value ->
351351 fieldDescriptor
352352 .getEnumType ()
353- .findValueByNumberCreatingIfUnknown (intCheckedCast (number )));
353+ .findValueByNumberCreatingIfUnknown (
354+ intCheckedCast ((Long ) unwrapNumber (fieldDescriptor , Long .class , value ))));
354355 case MESSAGE :
355356 return BidiConverter .<MessageOrBuilder , Object >of (
356357 this ::adaptProtoToValue ,
@@ -434,9 +435,31 @@ private Object maybeUnwrap(Object value) {
434435 }
435436
436437 private BidiConverter <Number , Object > unwrapAndConvert (
437- final BidiConverter <Number , Number > original ) {
438+ FieldDescriptor fieldDescriptor , Class <?> celType , BidiConverter <Number , Number > original ) {
438439 return BidiConverter .of (
439440 original .forwardConverter ()::convert ,
440- value -> original .backwardConverter ().convert ((Number ) maybeUnwrap (value )));
441+ value ->
442+ original
443+ .backwardConverter ()
444+ .convert ((Number ) unwrapNumber (fieldDescriptor , celType , value )));
445+ }
446+
447+ private BidiConverter <Object , Object > unwrapAndCheck (
448+ FieldDescriptor fieldDescriptor , Class <?> celType ) {
449+ return BidiConverter .of (
450+ BidiConverter .IDENTITY .forwardConverter (),
451+ value -> unwrapNumber (fieldDescriptor , celType , value ));
452+ }
453+
454+ private Object unwrapNumber (FieldDescriptor fieldDescriptor , Class <?> celType , Object value ) {
455+ Object celValue = maybeUnwrap (value );
456+ if ((celValue instanceof Long || celValue instanceof UnsignedLong || celValue instanceof Double )
457+ && !celType .isInstance (celValue )) {
458+ throw new IllegalArgumentException (
459+ String .format (
460+ "unexpected value type for field '%s' in message '%s'" ,
461+ fieldDescriptor .getName (), fieldDescriptor .getContainingType ().getFullName ()));
462+ }
463+ return celValue ;
441464 }
442465}
0 commit comments