chore: fix cherry-picks

Author: triceo

core/core-impl/src/main/java/ai/timefold/solver/core/impl/domain/solution/cloner/FieldAccessingSolutionCloner.java

@@ -72,10 +72,11 @@ public Object gizmoFallbackDeepClone(Object originalValue, Map<Object, Object> o
         }
         Queue<Unprocessed> unprocessedQueue = new ArrayDeque<>();
         Class<?> fieldType = originalValue.getClass();
-        if (originalValue instanceof Collection<?> collection) {
-            return cloneCollection(fieldType, collection, originalToCloneMap, unprocessedQueue);
-        } else if (originalValue instanceof Map<?, ?> map) {
-            return cloneMap(fieldType, map, originalToCloneMap, unprocessedQueue);
+        if (originalValue instanceof Collection<?>) {
+            return cloneCollection(fieldType, (Collection<? extends Object>) originalValue, originalToCloneMap,
+                    unprocessedQueue);
+        } else if (originalValue instanceof Map<?, ?>) {
+            return cloneMap(fieldType, (Map<?, ?>) originalValue, originalToCloneMap, unprocessedQueue);
         } else if (originalValue.getClass().isArray()) {
             return cloneArray(fieldType, originalValue, originalToCloneMap, unprocessedQueue);
         } else {

core/core-impl/src/main/java/ai/timefold/solver/core/impl/domain/solution/cloner/gizmo/GizmoSolutionClonerImplementor.java

@@ -852,7 +852,7 @@ private void writeDeepCloneEntityOrFactInstructions(BytecodeCreator bytecodeCrea
         List<Class<?>> deepClonedSubclasses = deepClonedClassesSortedSet.stream()
                 .filter(deeplyClonedFieldClass::isAssignableFrom)
                 .filter(type -> DeepCloningUtils.isClassDeepCloned(solutionDescriptor.getSolutionDescriptor(), type))
-                .toList();
+                .collect(Collectors.toList());
         BytecodeCreator currentBranch = bytecodeCreator;
         // If the field holds an instance of one of the field's declared type's subtypes, clone the subtype instead.
         for (Class<?> deepClonedSubclass : deepClonedSubclasses) {
@@ -870,18 +870,18 @@ private void writeDeepCloneEntityOrFactInstructions(BytecodeCreator bytecodeCrea
         // We are certain that the instance is of the same type as the declared field type.
         // (Or is an undeclared subclass of the planning entity)
         switch (unhandledCloneType) {
-            case SHALLOW -> {
+            case SHALLOW:
                 currentBranch.assign(cloneResultHolder, toClone);
-            }
-            case DEEP -> {
+                break;
+            case DEEP:
                 ResultHandle cloneObj = currentBranch.invokeStaticMethod(
                         MethodDescriptor.ofMethod(
                                 GizmoSolutionClonerFactory.getGeneratedClassName(solutionDescriptor.getSolutionDescriptor()),
                                 getEntityHelperMethodName(deeplyClonedFieldClass), deeplyClonedFieldClass,
                                 deeplyClonedFieldClass, Map.class),
                         toClone, createdCloneMap);
                 currentBranch.assign(cloneResultHolder, cloneObj);
-            }
+                break;
         }
     }
 

core/core-impl/src/main/java/ai/timefold/solver/core/impl/domain/solution/descriptor/SolutionDescriptor.java

@@ -589,8 +589,8 @@ private void initSolutionCloner(DescriptorPolicy descriptorPolicy) {
                 .get(GizmoSolutionClonerFactory.getGeneratedClassName(this))
                 : solutionCloner;
 
-        if (solutionCloner instanceof GizmoSolutionCloner<Solution_> gizmoSolutionCloner) {
-            gizmoSolutionCloner.setSolutionDescriptor(this);
+        if (solutionCloner instanceof GizmoSolutionCloner) {
+            ((GizmoSolutionCloner<Solution_>) solutionCloner).setSolutionDescriptor(this);
         }
         if (solutionCloner == null) {
             switch (descriptorPolicy.getDomainAccessType()) {

quarkus-integration/quarkus/deployment/src/test/java/ai/timefold/solver/quarkus/TimefoldProcessorExtendedShadowSolutionSolveTest.java

@@ -6,7 +6,7 @@
 
 import java.util.concurrent.ExecutionException;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import ai.timefold.solver.core.api.solver.SolverJob;
 import ai.timefold.solver.core.api.solver.SolverManager;

quarkus-integration/quarkus/deployment/src/test/java/ai/timefold/solver/quarkus/TimefoldProcessorShadowVariableSolveTest.java

@@ -8,7 +8,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import ai.timefold.solver.core.api.score.ScoreManager;
 import ai.timefold.solver.core.api.score.buildin.simple.SimpleScore;