Polishing.

Add additional conversions for Number that do not require the use of a conversion service.

Original Pull Request: #3367

Author: mp911de

src/main/java/org/springframework/data/javapoet/LordOfTheStrings.java

@@ -858,10 +858,37 @@ public static class TypedReturnBuilder extends ReturnBuilderSupport {
 		 */
 		@Contract("_ -> this")
 		public TypedReturnBuilder number(String resultToReturn) {
+
 			return whenBoxedLong("$1L != null ? $1L.longValue() : null", resultToReturn)
 					.whenLong("$1L != null ? $1L.longValue() : 0L", resultToReturn)
 					.whenBoxedInteger("$1L != null ? $1L.intValue() : null", resultToReturn)
-					.whenInt("$1L != null ? $1L.intValue() : 0", resultToReturn);
+					.whenInt("$1L != null ? $1L.intValue() : 0", resultToReturn)
+					.whenBoxed(Byte.class, "$1L != null ? $1L.byteValue() : null", resultToReturn)
+					.when(byte.class, "$1L != null ? $1L.byteValue() : 0", resultToReturn)
+					.whenBoxed(Short.class, "$1L != null ? $1L.shortValue() : null", resultToReturn)
+					.when(short.class, "$1L != null ? $1L.shortValue() : 0", resultToReturn)
+					.whenBoxed(Double.class, "$1L != null ? $1L.doubleValue() : null", resultToReturn)
+					.when(double.class, "$1L != null ? $1L.doubleValue() : 0", resultToReturn)
+					.whenBoxed(Float.class, "$1L != null ? $1L.floatValue() : null", resultToReturn)
+					.when(float.class, "$1L != null ? $1L.floatValue() : 0f", resultToReturn);
+		}
+
+		/**
+		 * Add return statements for numeric types if the given {@code resultToReturn} points to a non-nullable
+		 * {@link Number}. Considers all primitive numeric types assuming that {@code resultToReturn} is never
+		 * {@literal null}.
+		 *
+		 * @param resultToReturn the argument or variable name holding the result.
+		 * @return {@code this} builder.
+		 */
+		@Contract("_ -> this")
+		public TypedReturnBuilder nonNullableNumber(String resultToReturn) {
+			return whenPrimitiveOrBoxed(long.class, "$1L.longValue()", resultToReturn)
+					.whenPrimitiveOrBoxed(int.class, "$1L.intValue()", resultToReturn)
+					.whenPrimitiveOrBoxed(short.class, "$1L.shortValue()", resultToReturn)
+					.whenPrimitiveOrBoxed(byte.class, "$1L.byteValue()", resultToReturn)
+					.whenPrimitiveOrBoxed(float.class, "$1L.floatValue()", resultToReturn)
+					.whenPrimitiveOrBoxed(double.class, "$1L.doubleValue()", resultToReturn);
 		}
 
 		/**

src/test/java/org/springframework/data/javapoet/JavaPoetUnitTests.java

@@ -188,6 +188,50 @@ void shouldRenderConditionalNumericReturn() {
 
 		block = LordOfTheStrings.returning(Integer.class).number("someNumericVariable").otherwise(":-[").build();
 		assertThat(block).hasToString("return someNumericVariable != null ? someNumericVariable.intValue() : null");
+
+		block = LordOfTheStrings.returning(Short.class).number("someNumericVariable").otherwise(":-[").build();
+		assertThat(block).hasToString("return someNumericVariable != null ? someNumericVariable.shortValue() : null");
+
+		block = LordOfTheStrings.returning(short.class).number("someNumericVariable").otherwise(":-[").build();
+		assertThat(block).hasToString("return someNumericVariable != null ? someNumericVariable.shortValue() : 0");
+
+		block = LordOfTheStrings.returning(Byte.class).number("someNumericVariable").otherwise(":-[").build();
+		assertThat(block).hasToString("return someNumericVariable != null ? someNumericVariable.byteValue() : null");
+
+		block = LordOfTheStrings.returning(Float.class).number("someNumericVariable").otherwise(":-[").build();
+		assertThat(block).hasToString("return someNumericVariable != null ? someNumericVariable.floatValue() : null");
+
+		block = LordOfTheStrings.returning(float.class).number("someNumericVariable").otherwise(":-[").build();
+		assertThat(block).hasToString("return someNumericVariable != null ? someNumericVariable.floatValue() : 0f");
+	}
+
+	@Test // GH-3357
+	void shouldRenderConditionalSafeNumericReturn() {
+
+		CodeBlock block = LordOfTheStrings.returning(boolean.class).nonNullableNumber("someNumericVariable")
+				.otherwise(":-[").build();
+		assertThat(block).hasToString("return :-[");
+
+		block = LordOfTheStrings.returning(long.class).nonNullableNumber("someNumericVariable").otherwise(":-[").build();
+		assertThat(block).hasToString("return someNumericVariable.longValue()");
+
+		block = LordOfTheStrings.returning(Long.class).nonNullableNumber("someNumericVariable").otherwise(":-[").build();
+		assertThat(block).hasToString("return someNumericVariable.longValue()");
+
+		block = LordOfTheStrings.returning(Integer.class).nonNullableNumber("someNumericVariable").otherwise(":-[").build();
+		assertThat(block).hasToString("return someNumericVariable.intValue()");
+
+		block = LordOfTheStrings.returning(short.class).nonNullableNumber("someNumericVariable").otherwise(":-[").build();
+		assertThat(block).hasToString("return someNumericVariable.shortValue()");
+
+		block = LordOfTheStrings.returning(byte.class).nonNullableNumber("someNumericVariable").otherwise(":-[").build();
+		assertThat(block).hasToString("return someNumericVariable.byteValue()");
+
+		block = LordOfTheStrings.returning(Double.class).nonNullableNumber("someNumericVariable").otherwise(":-[").build();
+		assertThat(block).hasToString("return someNumericVariable.doubleValue()");
+
+		block = LordOfTheStrings.returning(Float.class).nonNullableNumber("someNumericVariable").otherwise(":-[").build();
+		assertThat(block).hasToString("return someNumericVariable.floatValue()");
 	}
 
 	@Test // GH-3357