Merge pull request #10257 from geoand/#10208-do-over

Properly fix issue with primitive id types in Spring Data JPA.

Author: gsmet

extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/StockMethodsAdder.java

@@ -156,7 +156,10 @@ private void generateSave(ClassCreator classCreator, FieldDescriptor entityClass
                             throw new IllegalArgumentException("Id type of '" + entityDotName + "' is invalid.");
                         }
                         if (idType.name().equals(DotNames.PRIMITIVE_LONG)) {
-                            idValue = save.checkCast(idValue, int.class);
+                            ResultHandle longObject = save.invokeStaticMethod(
+                                    MethodDescriptor.ofMethod(Long.class, "valueOf", Long.class, long.class), idValue);
+                            idValue = save.invokeVirtualMethod(MethodDescriptor.ofMethod(Long.class, "intValue", int.class),
+                                    longObject);
                         }
                         BranchResult idValueNonZeroBranch = save.ifNonZero(idValue);
                         idValueSet = idValueNonZeroBranch.trueBranch();

integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Person.java

@@ -28,7 +28,7 @@ public class Person {
     @Id
     @SequenceGenerator(name = "personSeqGen", sequenceName = "personSeq", initialValue = 100, allocationSize = 1)
     @GeneratedValue(generator = "personSeqGen")
-    private Long id;
+    private long id;
 
     @JsonbProperty(nillable = true)
     private String name;
@@ -56,7 +56,7 @@ public Person(String name) {
     public Person() {
     }
 
-    public Long getId() {
+    public long getId() {
         return id;
     }