Merge pull request #374 from xdev-software/develop

Release

Author: AB-xdev

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 2.5.2
+* Fix ``AnnotatedClassFinder`` returning the annotation and not the annotated class #373
+
 # 2.5.1
 * Use timeout in ``SafeNamedContainerStarter#tryCleanupContainerAfterStartFail`` to prevent app/thread hang #370
 

db-jdbc-spring-orm/src/main/java/software/xdev/tci/db/persistence/SpringEntityManagerControllerFactory.java

@@ -33,11 +33,11 @@
 public abstract class SpringEntityManagerControllerFactory<SELF extends SpringEntityManagerControllerFactory<SELF>>
 	extends EntityManagerControllerFactory<SELF, MutablePersistenceUnitInfo>
 {
-	public SpringEntityManagerControllerFactory()
+	protected SpringEntityManagerControllerFactory()
 	{
 	}
 
-	public SpringEntityManagerControllerFactory(final Supplier<Set<String>> entityClassesFinder)
+	protected SpringEntityManagerControllerFactory(final Supplier<Set<String>> entityClassesFinder)
 	{
 		super(entityClassesFinder);
 	}

db-jdbc-spring-orm/src/main/java/software/xdev/tci/db/persistence/classfinder/AnnotatedClassFinder.java

@@ -35,14 +35,6 @@
 
 public class AnnotatedClassFinder
 {
-	@SuppressWarnings({"java:S1452", "java:S4968"}) // Returned so by stream
-	public List<? extends Class<?>> find(
-		final String basePackage,
-		final Class<? extends Annotation> annotationClazz)
-	{
-		return this.find(Set.of(basePackage), Set.of(annotationClazz));
-	}
-	
 	@SuppressWarnings({"java:S1452", "java:S4968"}) // Returned so by stream
 	public List<? extends Class<?>> find(
 		final Set<String> basePackages,
@@ -101,12 +93,13 @@ protected Class<?> getIfIsCandidate(
 		try
 		{
 			final Class<?> clazz = Class.forName(metadataReader.getClassMetadata().getClassName());
-			return annotationClasses.stream()
-				.filter(annotation -> clazz.getAnnotation(annotation) != null)
-				.findFirst()
-				.orElse(null);
+			if(annotationClasses.stream().anyMatch(annotation ->
+				clazz.getAnnotation(annotation) != null))
+			{
+				return clazz;
+			}
 		}
-		catch(final Exception e)
+		catch(final Exception ignored)
 		{
 			// Nothing
 		}