Fix CustomBaseRepositoryBean - not initialized in some cases (#2241)

Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/CustomBaseRepositoryFactoryBean.java

@@ -12,9 +12,11 @@ package org.eclipse.hawkbit.repository.jpa;
 import jakarta.persistence.EntityManager;
 
 import org.eclipse.hawkbit.repository.BaseRepositoryTypeProvider;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean;
 import org.springframework.data.repository.Repository;
 import org.springframework.data.repository.core.support.RepositoryFactorySupport;
+import org.springframework.lang.NonNull;
 
 /**
  * A {@link JpaRepositoryFactoryBean} extension that allow injection of custom repository factories by using a
@@ -23,20 +25,24 @@ import org.springframework.data.repository.core.support.RepositoryFactorySupport
 @SuppressWarnings("java:S119") // java:S119 - ID is inherited from JpaRepositoryFactoryBean
 public class CustomBaseRepositoryFactoryBean<T extends Repository<S, ID>, S, ID> extends JpaRepositoryFactoryBean<T, S, ID> {
 
-    private final BaseRepositoryTypeProvider baseRepoProvider;
+    private BaseRepositoryTypeProvider baseRepoProvider;
 
     /**
      * Creates a new {@link JpaRepositoryFactoryBean} for the given repository interface.
      *
      * @param repositoryInterface must not be {@literal null}.
      */
-    public CustomBaseRepositoryFactoryBean(final Class<? extends T> repositoryInterface, final BaseRepositoryTypeProvider baseRepoProvider) {
+    public CustomBaseRepositoryFactoryBean(final Class<? extends T> repositoryInterface) {
         super(repositoryInterface);
+    }
+
+    @Autowired // if it is a constructor injection sometimes doesn't work - base repo provider is not available at construct time
+    public void setBaseRepoProvider(final BaseRepositoryTypeProvider baseRepoProvider) {
         this.baseRepoProvider = baseRepoProvider;
     }
 
     @Override
-    protected RepositoryFactorySupport createRepositoryFactory(final EntityManager entityManager) {
+    protected RepositoryFactorySupport createRepositoryFactory(@NonNull final EntityManager entityManager) {
         final RepositoryFactorySupport rfs = super.createRepositoryFactory(entityManager);
         rfs.setRepositoryBaseClass(baseRepoProvider.getBaseRepositoryType(getObjectType()));
         return rfs;

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/RepositoryApplicationConfiguration.java

@@ -187,7 +187,6 @@ import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.integration.support.locks.LockRegistry;
 import org.springframework.lang.NonNull;
-import org.springframework.orm.jpa.vendor.Database;
 import org.springframework.retry.annotation.EnableRetry;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.PlatformTransactionManager;
@@ -459,8 +458,7 @@ public class RepositoryApplicationConfiguration {
     }
 
     /**
-     * @return the singleton instance of the
-     *         {@link AfterTransactionCommitExecutorHolder}
+     * @return the singleton instance of the {@link AfterTransactionCommitExecutorHolder}
      */
     @Bean
     AfterTransactionCommitExecutorHolder afterTransactionCommitExecutorHolder() {
@@ -475,6 +473,17 @@ public class RepositoryApplicationConfiguration {
         return new ExceptionMappingAspectHandler();
     }
 
+    /**
+     * Default {@link BaseRepositoryTypeProvider} bean always provides the NoCountBaseRepository
+     *
+     * @return a {@link BaseRepositoryTypeProvider} bean
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    BaseRepositoryTypeProvider baseRepositoryTypeProvider() {
+        return new HawkbitBaseRepository.RepositoryTypeProvider();
+    }
+
     /**
      * {@link JpaSystemManagement} bean.
      *
@@ -1027,18 +1036,6 @@ public class RepositoryApplicationConfiguration {
                 tenantAware, lockRegistry, systemSecurityContext);
     }
 
-    /**
-     * Default {@link BaseRepositoryTypeProvider} bean always provides the
-     * NoCountBaseRepository
-     *
-     * @return a {@link BaseRepositoryTypeProvider} bean
-     */
-    @Bean
-    @ConditionalOnMissingBean
-    BaseRepositoryTypeProvider baseRepositoryTypeProvider() {
-        return new HawkbitBaseRepository.RepositoryTypeProvider();
-    }
-
     /**
      * Default artifact encryption service bean that internally uses
      * {@link ArtifactEncryption} and {@link ArtifactEncryptionSecretsStore} beans