ORM Bootstrap: adapt PreconfiguredServiceRegistryBuilder

quarkusio · Feb 21, 2023 · ec66094 · ec66094
1 parent db20a5e
commit ec66094
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/...a/io/quarkus/hibernate/orm/runtime/boot/registry/PreconfiguredServiceRegistryBuilder.java b/...a/io/quarkus/hibernate/orm/runtime/boot/registry/PreconfiguredServiceRegistryBuilder.java
@@ -51,9 +51,9 @@
  */
 public class PreconfiguredServiceRegistryBuilder {
 
-    private final Map configurationValues = new HashMap();
-    private final List<StandardServiceInitiator> initiators;
-    private final List<ProvidedService> providedServices = new ArrayList<ProvidedService>();
+    private final Map<String, Object> configurationValues = new HashMap<>();
+    private final List<StandardServiceInitiator<?>> initiators;
+    private final List<ProvidedService<?>> providedServices = new ArrayList<ProvidedService<?>>();
     private final Collection<Integrator> integrators;
     private final StandardServiceRegistryImpl destroyedRegistry;
 
@@ -76,7 +76,7 @@ public PreconfiguredServiceRegistryBuilder applySetting(String settingName, Obje
         return this;
     }
 
-    public PreconfiguredServiceRegistryBuilder addInitiator(StandardServiceInitiator initiator) {
+    public PreconfiguredServiceRegistryBuilder addInitiator(StandardServiceInitiator<?> initiator) {
         initiators.add(initiator);
         return this;
     }
@@ -86,7 +86,7 @@ public PreconfiguredServiceRegistryBuilder addIntegrator(Integrator integrator)
         return this;
     }
 
-    public PreconfiguredServiceRegistryBuilder addService(ProvidedService providedService) {
+    public PreconfiguredServiceRegistryBuilder addService(ProvidedService<?> providedService) {
         providedServices.add(providedService);
         return this;
     }
@@ -101,7 +101,7 @@ public StandardServiceRegistryImpl buildNewServiceRegistry() {
         // already recorded as part of #applyIntegrator, #addInitiator, #addService
         // applyServiceContributors( bootstrapServiceRegistry );
 
-        final Map settingsCopy = new HashMap();
+        final Map<String, Object> settingsCopy = new HashMap<>();
         settingsCopy.putAll(configurationValues);
 
         destroyedRegistry.resetAndReactivate(bootstrapServiceRegistry, initiators, providedServices, settingsCopy);
@@ -140,8 +140,8 @@ private BootstrapServiceRegistry buildEmptyBootstrapServiceRegistry() {
      *
      * @return
      */
-    private static List<StandardServiceInitiator> buildQuarkusServiceInitiatorList(RecordedState rs) {
-        final ArrayList<StandardServiceInitiator> serviceInitiators = new ArrayList<StandardServiceInitiator>();
+    private static List<StandardServiceInitiator<?>> buildQuarkusServiceInitiatorList(RecordedState rs) {
+        final ArrayList<StandardServiceInitiator<?>> serviceInitiators = new ArrayList<StandardServiceInitiator<?>>();
 
         //Enforces no bytecode enhancement will happen at runtime:
         serviceInitiators.add(DisabledBytecodeProviderInitiator.INSTANCE);