fix BundleEntity impl scan, update spring version

Author: destan

pom.xml

@@ -4,9 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.kodgemisi.cigdem</groupId>
+    <groupId>com.github.kodgemisi</groupId>
     <artifactId>database-resource-bundle-message-source-starter</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.0-RC1</version>
 
     <name>Database Resource Bundle Message Source Spring Boot Starter</name>
     <url>https://github.com/kodgemisi/database-resource-bundle-message-source-starter</url>
@@ -29,7 +29,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.1.0.RELEASE</version>
+                <version>2.2.1.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

src/main/java/com/kodgemisi/cigdem/databasebasedmessagesource/DatabaseResourceBundleAutoconfiguration.java

@@ -20,17 +20,21 @@
 
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import javax.persistence.metamodel.EntityType;
 import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Set;
 
 /**
  * Created on May, 2018
  *
  * @author destan
  */
+@Slf4j
 @Configuration
 @AutoConfigureBefore(MessageSourceAutoConfiguration.class)
-@Slf4j
 class DatabaseResourceBundleAutoconfiguration {
 
 	@Bean
@@ -42,7 +46,7 @@ MessageSourceProperties messageSourceProperties() {
 	@Bean
 	@ConditionalOnMissingBean(BundleContentLoaderStrategy.class)
 	BundleContentLoaderStrategy bundleContentLoaderStrategy(EntityManager entityManager) throws ClassNotFoundException {
-		return new JpaBundleContentLoaderStrategy<>(entityManager, findBundleEntityConcreteClass());
+		return new JpaBundleContentLoaderStrategy<>(entityManager, findBundleEntityConcreteClass(entityManager));
 	}
 
 	@Bean
@@ -80,39 +84,24 @@ private MessageSource createMessageSource(MessageSourceProperties properties, Bu
 	}
 
 	@SuppressWarnings("unchecked")
-	private Class<? extends BundleEntity> findBundleEntityConcreteClass() throws ClassNotFoundException {
-		final ClassPathScanningCandidateComponentProvider scanner = new ClassPathScanningCandidateComponentProvider(false);
-
-		scanner.addIncludeFilter(new AnnotationTypeFilter(Entity.class));
-		scanner.addIncludeFilter(new AssignableTypeFilter(BundleEntity.class));
+	private Class<? extends BundleEntity> findBundleEntityConcreteClass(EntityManager entityManager) throws ClassNotFoundException {
 
-		final StopWatch stopWatch = new StopWatch();
-		stopWatch.start("findCandidateComponents with 'com'");
+		final List<Class<?>> entities = new ArrayList<>();
 
-		Set<BeanDefinition> entities = scanner.findCandidateComponents(
-				"com");//first try this because giving a base significantly improves performance
-		if (entities.isEmpty()) {
-			stopWatch.stop();
-			stopWatch.start("findCandidateComponents with '*'");
-			entities = scanner.findCandidateComponents("");
+		for (EntityType<?> entity : entityManager.getMetamodel().getEntities()) {
+			if (BundleEntity.class.isAssignableFrom(entity.getJavaType())) {
+				entities.add(entity.getJavaType());
+			}
 		}
-		stopWatch.stop();
 
-		log.debug("Scanned in {}", stopWatch.prettyPrint());
+		if (entities.size() == 1) {
+			return (Class<? extends BundleEntity>) entities.get(0);
+		}
 
 		if (entities.size() > 1) {
 			throw new IllegalStateException("There must be exactly one implementation of BundleEntity annotated with @Entity.");
 		}
 
-		for (BeanDefinition bd : entities) {
-			try {
-				return (Class<? extends BundleEntity>) Class.forName(bd.getBeanClassName());
-			}
-			catch (ClassNotFoundException e) {
-				log.error(e.getMessage(), e);
-			}
-		}
-
 		throw new ClassNotFoundException("There should be one class annotated with @Entity and implements BundleEntity.");
 	}
 

src/main/java/com/kodgemisi/cigdem/databasebasedmessagesource/DatabaseResourceBundleMessageSource.java

@@ -3,6 +3,7 @@
 import com.kodgemisi.cigdem.databaseresourcbundle.BundleContentLoaderStrategy;
 import com.kodgemisi.cigdem.databaseresourcbundle.DatabaseResourceBundleControl;
 import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import org.springframework.context.support.ResourceBundleMessageSource;
 
 import java.io.Reader;
@@ -16,7 +17,7 @@
  *
  * @author destan
  */
-@AllArgsConstructor
+@RequiredArgsConstructor
 public class DatabaseResourceBundleMessageSource extends ResourceBundleMessageSource {
 
 	private final BundleContentLoaderStrategy bundleContentLoaderStrategy;

src/main/java/com/kodgemisi/cigdem/databasebasedmessagesource/JpaBundleContentLoaderStrategy.java

@@ -2,6 +2,7 @@
 
 import com.kodgemisi.cigdem.databaseresourcbundle.BundleContentLoaderStrategy;
 import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import javax.persistence.EntityManager;
@@ -24,7 +25,7 @@
  * @author destan
  */
 @Slf4j
-@AllArgsConstructor
+@RequiredArgsConstructor
 public class JpaBundleContentLoaderStrategy<E extends BundleEntity> implements BundleContentLoaderStrategy {
 
 	private final EntityManager entityManager;