#398 Fix SearchStore injection

FAForever · Feb 20, 2021 · efbbceb · efbbceb
1 parent 75f4632
commit efbbceb
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/src/main/java/com/faforever/api/config/elide/ElideConfig.java b/src/main/java/com/faforever/api/config/elide/ElideConfig.java
@@ -45,6 +45,7 @@
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
+import javax.persistence.PersistenceContext;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.OffsetDateTime;
@@ -78,7 +79,7 @@ SpringHibernateDataStore springHibernateDataStore(PlatformTransactionManager txM
   }
 
   @Bean
-  DataStore searchStore(SpringHibernateDataStore shds, EntityManagerFactory entityManagerFactory, boolean indexOnStartup) {
+  DataStore searchStore(SpringHibernateDataStore shds, EntityManagerFactory entityManagerFactory) {
     return new SearchDataStore(shds, entityManagerFactory,true);
   }
 

diff --git a/src/main/java/com/faforever/api/data/domain/package-info.java b/src/main/java/com/faforever/api/data/domain/package-info.java
@@ -1,4 +1,20 @@
 /**
  * Contains JPA entity classes, adapted to the needs of JSON-API.
  */
+@AnalyzerDef(name = "case_insensitive",
+  tokenizer = @TokenizerDef(factory = NGramTokenizerFactory.class, params = {
+    @Parameter(name = "minGramSize", value = "3"),
+    @Parameter(name = "maxGramSize", value = "10")
+  }),
+  filters = {
+    @TokenFilterDef(factory = LowerCaseFilterFactory.class)
+  }
+)
 package com.faforever.api.data.domain;
+
+import org.apache.lucene.analysis.core.LowerCaseFilterFactory;
+import org.apache.lucene.analysis.ngram.NGramTokenizerFactory;
+import org.hibernate.search.annotations.AnalyzerDef;
+import org.hibernate.search.annotations.Parameter;
+import org.hibernate.search.annotations.TokenFilterDef;
+import org.hibernate.search.annotations.TokenizerDef;
diff --git a/src/main/java/com/faforever/api/data/package-info.java b/src/main/java/com/faforever/api/data/package-info.java
@@ -8,15 +8,6 @@
 @UpdatePermission(expression = Prefab.NONE)
 @CreatePermission(expression = Prefab.NONE)
 @DeletePermission(expression = Prefab.NONE)
-@AnalyzerDef(name = "case_insensitive",
-  tokenizer = @TokenizerDef(factory = NGramTokenizerFactory.class, params = {
-    @Parameter(name = "minGramSize", value = "3"),
-    @Parameter(name = "maxGramSize", value = "10")
-  }),
-  filters = {
-    @TokenFilterDef(factory = LowerCaseFilterFactory.class)
-  }
-)
 package com.faforever.api.data;
 
 import com.faforever.api.data.checks.Prefab;
@@ -25,9 +16,3 @@
 import com.yahoo.elide.annotation.ReadPermission;
 import com.yahoo.elide.annotation.SharePermission;
 import com.yahoo.elide.annotation.UpdatePermission;
-import org.apache.lucene.analysis.core.LowerCaseFilterFactory;
-import org.apache.lucene.analysis.ngram.NGramTokenizerFactory;
-import org.hibernate.search.annotations.AnalyzerDef;
-import org.hibernate.search.annotations.Parameter;
-import org.hibernate.search.annotations.TokenFilterDef;
-import org.hibernate.search.annotations.TokenizerDef;