Merge pull request #8 from yannbriancon/bug-fix-null-thread-local-value

[Bug fix] null thread local value

Author: yannbriancon

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.yannbriancon</groupId>
     <artifactId>spring-hibernate-query-utils</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <packaging>jar</packaging>
 
     <name>spring-hibernate-query-utils</name>

src/main/java/com/yannbriancon/interceptor/HibernateQueryInterceptor.java

@@ -12,21 +12,22 @@
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.function.Supplier;
 
 @Component
 @EnableConfigurationProperties(HibernateQueryInterceptorProperties.class)
 public class HibernateQueryInterceptor extends EmptyInterceptor {
 
     private transient ThreadLocal<Long> threadQueryCount = new ThreadLocal<>();
 
-    private transient ThreadLocal<Set<String>> threadPreviouslyLoadedEntities = new ThreadLocal<>();
+    private transient ThreadLocal<Set<String>> threadPreviouslyLoadedEntities =
+            ThreadLocal.withInitial(new EmptySetSupplier());
 
     private static final Logger LOGGER = LoggerFactory.getLogger(HibernateQueryInterceptor.class);
 
     private final HibernateQueryInterceptorProperties hibernateQueryInterceptorProperties;
 
     public HibernateQueryInterceptor(HibernateQueryInterceptorProperties hibernateQueryInterceptorProperties) {
-        threadPreviouslyLoadedEntities.set(new HashSet<>());
         this.hibernateQueryInterceptorProperties = hibernateQueryInterceptorProperties;
     }
 
@@ -117,3 +118,9 @@ private void logDetectedNPlusOneQuery(String entityName) {
         }
     }
 }
+
+class EmptySetSupplier implements Supplier<Set<String>> {
+    public Set<String> get(){
+        return new HashSet<>();
+    }
+}