Fix dataSource selection when importing -- use bean name as it identifies the domain, not it's dataSource name

Author: woj-tek

src/main/java/tigase/db/util/SchemaManager.java

@@ -1139,6 +1139,10 @@ public Class<?> getImplementation() {
 			return implementation;
 		}
 
+		public String getBeanName() {
+			return beanConfig.getBeanName();
+		}
+
 		@Override
 		public String toString() {
 			return beanConfig.getBeanName() + "[dataSource=" + dataSource.getName() + ", class=" + implementation + "]";

src/main/java/tigase/db/util/importexport/RepositoryHolder.java

@@ -25,9 +25,12 @@
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
+import java.util.logging.Logger;
 
 public class RepositoryHolder {
 
+	Logger log = Logger.getLogger(RepositoryHolder.class.getName());
+
 	private record RepoCacheKey(Class<?> ifc, String name) {
 
 	}
@@ -58,6 +61,9 @@ public <X> X getRepository(Class<X> ifc, String name)
 					.toList();
 			SchemaManager.RepoInfo repoInfo = findRepoInfo(matchingClasses, name).or(
 					() -> findRepoInfo(matchingClasses, "default")).orElseThrow();
+
+			log.info("Using repository bean: " + repoInfo + " to import domain: " + name);
+
 			repo = prepareRepository((X) dataSourceHelper.createRepository(repoInfo));
 			repoCache.put(key, repo);
 		}
@@ -84,6 +90,9 @@ protected <X> X prepareRepository(X repo)
 	}
 
 	private Optional<SchemaManager.RepoInfo> findRepoInfo(List<SchemaManager.RepoInfo> repoInfos, String name) {
-		return repoInfos.stream().filter(repoInfo -> name.equals(repoInfo.getDataSource().getName())).findFirst();
+		return repoInfos.stream().filter(repoInfo -> {
+			log.info("Checking import domain name " + name + " against repository (bean): " + repoInfo);
+            return name.equals(repoInfo.getBeanName());
+        }).findFirst();
 	}
 }

src/main/java/tigase/db/util/importexport/RepositoryManager.java

@@ -183,10 +183,6 @@ private void initialize(CommandlineParameter fileParam, Properties properties)
 
 		List<SchemaManager.RepoInfo> repositories = SchemaManager.getRepositories(kernel, repoBeans, config);
 
-		Map<String, SchemaManager.RepoInfo> userRepoMap = repositories.stream()
-				.filter(repoInfo -> UserRepository.class.isAssignableFrom(repoInfo.getImplementation()))
-				.collect(Collectors.toMap(repoInfo -> repoInfo.getDataSource().getName(), Function.identity()));
-
 		dataSourceHelper = new DataSourceHelper(
 				repositories.stream().map(SchemaManager.RepoInfo::getDataSource).distinct().toList());
 		repositoryHolder = new RepositoryHolder(dataSourceHelper, repositories);