From ba85de8b0212fc31a78a277d5f187a4533915ba6 Mon Sep 17 00:00:00 2001
From: Brutus5000 <Brutus5000@gmx.net>
Date: Fri, 25 Dec 2020 23:56:24 +0100
Subject: [PATCH 01/17] Fixes #430 Add matchmaker queue to game

---
 .idea/codeStyles/Project.xml                   | 18 ------------------
 .../com/faforever/api/data/domain/Game.java    | 12 ++++++++++++
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index eec52a17b..e77b02549 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -14,24 +14,6 @@
       <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
       <option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" />
     </JavaCodeStyleSettings>
-    <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
-    </JetCodeStyleSettings>
     <XML>
       <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
     </XML>
diff --git a/src/main/java/com/faforever/api/data/domain/Game.java b/src/main/java/com/faforever/api/data/domain/Game.java
index 2d486086b..bfc632125 100644
--- a/src/main/java/com/faforever/api/data/domain/Game.java
+++ b/src/main/java/com/faforever/api/data/domain/Game.java
@@ -20,6 +20,7 @@
 import javax.persistence.FetchType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
@@ -51,6 +52,7 @@ public class Game {
   private String replayUrl;
   private List<GameReview> reviews;
   private GameReviewsSummary reviewsSummary;
+  private MatchmakerQueue matchmakerQueue;
 
   @Id
   @Column(name = "id")
@@ -135,4 +137,14 @@ public List<GameReview> getReviews() {
   public GameReviewsSummary getReviewsSummary() {
     return reviewsSummary;
   }
+
+  @JoinTable(name = "matchmaker_queue_game",
+    joinColumns = @JoinColumn(name = "game_stats_id"),
+    inverseJoinColumns = @JoinColumn(name = "matchmaker_queue_id")
+  )
+  @ManyToOne
+  @Nullable
+  public MatchmakerQueue getMatchmakerQueue() {
+    return matchmakerQueue;
+  }
 }

From 925d180f2f8acb66873bddb03d67c29440230792 Mon Sep 17 00:00:00 2001
From: Brutus5000 <Brutus5000@gmx.net>
Date: Sat, 26 Dec 2020 19:37:30 +0100
Subject: [PATCH 02/17] Remove snake case in Leaderboard DTO

---
 .../faforever/api/data/domain/Leaderboard.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/faforever/api/data/domain/Leaderboard.java b/src/main/java/com/faforever/api/data/domain/Leaderboard.java
index 6f67ab227..72321b195 100644
--- a/src/main/java/com/faforever/api/data/domain/Leaderboard.java
+++ b/src/main/java/com/faforever/api/data/domain/Leaderboard.java
@@ -15,22 +15,22 @@ public class Leaderboard extends AbstractEntity {
 
   public static final String TYPE_NAME = "leaderboard";
 
-  private String technical_name;
-  private String name_key;
-  private String description_key;
+  private String technicalName;
+  private String nameKey;
+  private String descriptionKey;
 
   @Column(name = "technical_name")
-  public String getTechnical_name() {
-    return technical_name;
+  public String getTechnicalName() {
+    return technicalName;
   }
 
   @Column(name = "name_key")
-  public String getName_key() {
-    return name_key;
+  public String getNameKey() {
+    return nameKey;
   }
 
   @Column(name = "description_key")
-  public String getDescription_key() {
-    return description_key;
+  public String getDescriptionKey() {
+    return descriptionKey;
   }
 }

From f1970df2d48abedca1b517800c06df8a3324ed0c Mon Sep 17 00:00:00 2001
From: Brutus5000 <Brutus5000@gmx.net>
Date: Mon, 28 Dec 2020 20:52:33 +0100
Subject: [PATCH 03/17] Remove matchmakerQueueId from Game

It cripples performance on prod and takes down the server
---
 .../com/faforever/api/data/domain/Game.java   | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/faforever/api/data/domain/Game.java b/src/main/java/com/faforever/api/data/domain/Game.java
index bfc632125..25111b8e1 100644
--- a/src/main/java/com/faforever/api/data/domain/Game.java
+++ b/src/main/java/com/faforever/api/data/domain/Game.java
@@ -20,7 +20,6 @@
 import javax.persistence.FetchType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
@@ -28,7 +27,7 @@
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.time.OffsetDateTime;
-import java.util.List;
+import java.util.Set;
 
 @Entity
 @Table(name = "game_stats")
@@ -48,11 +47,10 @@ public class Game {
   private MapVersion mapVersion;
   private String name;
   private Validity validity;
-  private List<GamePlayerStats> playerStats;
+  private Set<GamePlayerStats> playerStats;
   private String replayUrl;
-  private List<GameReview> reviews;
+  private Set<GameReview> reviews;
   private GameReviewsSummary reviewsSummary;
-  private MatchmakerQueue matchmakerQueue;
 
   @Id
   @Column(name = "id")
@@ -107,7 +105,7 @@ public Validity getValidity() {
 
   @OneToMany(mappedBy = "game")
   @BatchSize(size = 1000)
-  public List<GamePlayerStats> getPlayerStats() {
+  public Set<GamePlayerStats> getPlayerStats() {
     return playerStats;
   }
 
@@ -126,7 +124,7 @@ public String getReplayUrl() {
   @OneToMany(mappedBy = "game")
   @UpdatePermission(expression = Prefab.ALL)
   @BatchSize(size = 1000)
-  public List<GameReview> getReviews() {
+  public Set<GameReview> getReviews() {
     return reviews;
   }
 
@@ -138,13 +136,22 @@ public GameReviewsSummary getReviewsSummary() {
     return reviewsSummary;
   }
 
-  @JoinTable(name = "matchmaker_queue_game",
-    joinColumns = @JoinColumn(name = "game_stats_id"),
-    inverseJoinColumns = @JoinColumn(name = "matchmaker_queue_id")
-  )
-  @ManyToOne
-  @Nullable
-  public MatchmakerQueue getMatchmakerQueue() {
-    return matchmakerQueue;
-  }
+  /**
+   * This ManyToOne relationship leads to a double left outer join through Elide causing an additional full table
+   * scan on the matchmaker_queue table. Even though it has only 3 records, it causes MySql 5.7 and MySQL to run
+   * a list of all games > 1 min on prod where it was ~1 second before.
+   *
+   * This can be fixed by migrating to MariaDB.
+   */
+//  private Integer matchmakerQueueId;
+//
+//  @JoinTable(name = "matchmaker_queue_game",
+//    joinColumns = @JoinColumn(name = "game_stats_id"),
+//    inverseJoinColumns = @JoinColumn(name = "matchmaker_queue_id")
+//  )
+//  @ManyToOne(fetch = FetchType.LAZY)
+//  @Nullable
+//  public Integer getMatchmakerQueueId() {
+//    return matchmakerQueueId;
+//  }
 }

From da5dc9faf78ceffcd32a445878735e6e0249a94b Mon Sep 17 00:00:00 2001
From: Brutus5000 <Brutus5000@gmx.net>
Date: Wed, 10 Feb 2021 22:14:55 +0100
Subject: [PATCH 04/17] Implement support for tokens from FAFs Ory Hydra

Closes #434
---
 .../api/config/FafApiProperties.java          |   1 +
 .../security/oauth2/OAuthJwtConfig.java       |   6 +-
 .../api/security/FafMultiTokenStore.java      | 112 ++++++++++++++++++
 .../FafUserAuthenticationConverter.java       |  36 ++++--
 src/main/resources/config/application-dev.yml |   1 +
 .../resources/config/application-prod.yml     |   1 +
 6 files changed, 145 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/com/faforever/api/security/FafMultiTokenStore.java

diff --git a/src/main/java/com/faforever/api/config/FafApiProperties.java b/src/main/java/com/faforever/api/config/FafApiProperties.java
index 74742f3bc..0fcd3b912 100644
--- a/src/main/java/com/faforever/api/config/FafApiProperties.java
+++ b/src/main/java/com/faforever/api/config/FafApiProperties.java
@@ -53,6 +53,7 @@ public static class Jwt {
     private Path publicKeyPath;
     private int accessTokenValiditySeconds = 3600;
     private int refreshTokenValiditySeconds = 3600;
+    private String hydraJwksUrl;
   }
 
   @Data
diff --git a/src/main/java/com/faforever/api/config/security/oauth2/OAuthJwtConfig.java b/src/main/java/com/faforever/api/config/security/oauth2/OAuthJwtConfig.java
index c000b83f4..45cbaa28d 100644
--- a/src/main/java/com/faforever/api/config/security/oauth2/OAuthJwtConfig.java
+++ b/src/main/java/com/faforever/api/config/security/oauth2/OAuthJwtConfig.java
@@ -1,6 +1,7 @@
 package com.faforever.api.config.security.oauth2;
 
 import com.faforever.api.config.FafApiProperties;
+import com.faforever.api.security.FafMultiTokenStore;
 import com.faforever.api.security.FafUserAuthenticationConverter;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -9,7 +10,6 @@
 import org.springframework.security.oauth2.provider.token.DefaultTokenServices;
 import org.springframework.security.oauth2.provider.token.TokenStore;
 import org.springframework.security.oauth2.provider.token.store.JwtAccessTokenConverter;
-import org.springframework.security.oauth2.provider.token.store.JwtTokenStore;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -33,8 +33,8 @@ public DefaultTokenServices tokenServices(TokenStore tokenStore) {
   }
 
   @Bean
-  public TokenStore tokenStore(JwtAccessTokenConverter jwtAccessTokenConverter) {
-    return new JwtTokenStore(jwtAccessTokenConverter);
+  public TokenStore tokenStore(FafApiProperties properties, JwtAccessTokenConverter jwtAccessTokenConverter) {
+    return new FafMultiTokenStore(properties, jwtAccessTokenConverter);
   }
 
   @Bean
diff --git a/src/main/java/com/faforever/api/security/FafMultiTokenStore.java b/src/main/java/com/faforever/api/security/FafMultiTokenStore.java
new file mode 100644
index 000000000..5349f606f
--- /dev/null
+++ b/src/main/java/com/faforever/api/security/FafMultiTokenStore.java
@@ -0,0 +1,112 @@
+package com.faforever.api.security;
+
+import com.faforever.api.config.FafApiProperties;
+import org.springframework.security.oauth2.common.OAuth2AccessToken;
+import org.springframework.security.oauth2.common.OAuth2RefreshToken;
+import org.springframework.security.oauth2.provider.OAuth2Authentication;
+import org.springframework.security.oauth2.provider.token.TokenStore;
+import org.springframework.security.oauth2.provider.token.store.JwtAccessTokenConverter;
+import org.springframework.security.oauth2.provider.token.store.JwtTokenStore;
+import org.springframework.security.oauth2.provider.token.store.jwk.JwkTokenStore;
+import org.springframework.stereotype.Component;
+
+import java.util.Collection;
+import java.util.Collections;
+
+@Component
+public class FafMultiTokenStore implements TokenStore {
+  /**
+   * The token store for token created by this API (using custom OAuth 2.0 without OpenID Connect)
+   */
+  private final JwtTokenStore classicTokenStore;
+
+  /**
+   * The token store for tokens created by Ory Hydra (OpenID Connect token customized for FAF)
+   */
+  private final JwkTokenStore hydraTokenStore;
+
+  private final FafApiProperties fafApiProperties;
+
+  public FafMultiTokenStore(FafApiProperties fafApiProperties, JwtAccessTokenConverter jwtAccessTokenConverter) {
+    this.fafApiProperties = fafApiProperties;
+
+    classicTokenStore = new JwtTokenStore(jwtAccessTokenConverter);
+    hydraTokenStore = new JwkTokenStore(fafApiProperties.getJwt().getHydraJwksUrl(), jwtAccessTokenConverter);
+  }
+
+  @Override
+  public OAuth2Authentication readAuthentication(OAuth2AccessToken token) {
+    return readAuthentication(token.getValue());
+  }
+
+  @Override
+  public OAuth2Authentication readAuthentication(String token) {
+    try {
+      return classicTokenStore.readAuthentication(token);
+    } catch (Exception e) {
+      return hydraTokenStore.readAuthentication(token);
+    }
+  }
+
+  @Override
+  public void storeAccessToken(OAuth2AccessToken token, OAuth2Authentication authentication) {
+    // no implementation, equal to JwtTokenStore
+  }
+
+  @Override
+  public OAuth2AccessToken readAccessToken(String tokenValue) {
+    try {
+      return classicTokenStore.readAccessToken(tokenValue);
+    } catch (Exception e) {
+      return hydraTokenStore.readAccessToken(tokenValue);
+    }
+  }
+
+  @Override
+  public void removeAccessToken(OAuth2AccessToken token) {
+    // no implementation, equal to JwtTokenStore
+  }
+
+  @Override
+  public void storeRefreshToken(OAuth2RefreshToken refreshToken, OAuth2Authentication authentication) {
+    // no implementation, equal to JwtTokenStore
+  }
+
+  @Override
+  public OAuth2RefreshToken readRefreshToken(String tokenValue) {
+    return null;
+  }
+
+  @Override
+  public OAuth2Authentication readAuthenticationForRefreshToken(OAuth2RefreshToken token) {
+    return null;
+  }
+
+  @Override
+  public void removeRefreshToken(OAuth2RefreshToken token) {
+    // no implementation, equal to JwtTokenStore
+  }
+
+  @Override
+  public void removeAccessTokenUsingRefreshToken(OAuth2RefreshToken refreshToken) {
+    // no implementation, equal to JwtTokenStore
+  }
+
+  @Override
+  public OAuth2AccessToken getAccessToken(OAuth2Authentication authentication) {
+    // equal to JwtTokenStore
+    return null;
+  }
+
+  @Override
+  public Collection<OAuth2AccessToken> findTokensByClientIdAndUserName(String clientId, String userName) {
+    // equal to JwtTokenStore
+    return Collections.emptySet();
+  }
+
+  @Override
+  public Collection<OAuth2AccessToken> findTokensByClientId(String clientId) {
+    // equal to JwtTokenStore
+    return Collections.emptySet();
+  }
+}
diff --git a/src/main/java/com/faforever/api/security/FafUserAuthenticationConverter.java b/src/main/java/com/faforever/api/security/FafUserAuthenticationConverter.java
index c0aea1f0c..1e8f9c189 100644
--- a/src/main/java/com/faforever/api/security/FafUserAuthenticationConverter.java
+++ b/src/main/java/com/faforever/api/security/FafUserAuthenticationConverter.java
@@ -1,5 +1,6 @@
 package com.faforever.api.security;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
@@ -7,12 +8,15 @@
 import org.springframework.security.oauth2.provider.token.DefaultUserAuthenticationConverter;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * Converts a {@link FafUserDetails} from and to an {@link Authentication} for use in a JWT token.
  */
+@Slf4j
 public class FafUserAuthenticationConverter extends DefaultUserAuthenticationConverter {
 
   public static final String USER_ID_KEY = "user_id";
@@ -32,16 +36,30 @@ public class FafUserAuthenticationConverter extends DefaultUserAuthenticationCon
 
   @Override
   public Authentication extractAuthentication(Map<String, ?> map) {
-    if (!map.containsKey(USER_ID_KEY)) {
-      return null;
-    }
+    if (map.containsKey(USER_ID_KEY)) {
+      log.debug("Access token is FAF legacy token");
+
+      int id = (Integer) map.get(USER_ID_KEY);
+      String username = (String) map.get(USERNAME);
+      boolean accountNonLocked = Optional.ofNullable((Boolean) map.get(NON_LOCKED)).orElse(true);
+      Collection<? extends GrantedAuthority> authorities = getAuthorities(map);
+      UserDetails user = new FafUserDetails(id, username, "N/A", accountNonLocked, authorities);
+
+      return new UsernamePasswordAuthenticationToken(user, "N/A", authorities);
+    } else {
+      log.debug("Access token is FAF OpenID Connect token");
 
-    int id = (Integer) map.get(USER_ID_KEY);
-    String username = (String) map.get(USERNAME);
-    boolean accountNonLocked = Optional.ofNullable((Boolean) map.get(NON_LOCKED)).orElse(true);
-    Collection<? extends GrantedAuthority> authorities = getAuthorities(map);
-    UserDetails user = new FafUserDetails(id, username, "N/A", accountNonLocked, authorities);
+      int id = Integer.parseInt((String) map.get("sub"));
+      var ext = (Map<String, Object>) map.get("ext");
+      var roles = (List<String>) ext.get("roles");
+
+      var authorities = roles.stream()
+        .map(role -> (GrantedAuthority) () -> "ROLE_" + role)
+        .collect(Collectors.toList());
+
+      UserDetails user = new FafUserDetails(id, "username", "N/A", false, authorities);
+      return new UsernamePasswordAuthenticationToken(user, "N/A", authorities);
+    }
 
-    return new UsernamePasswordAuthenticationToken(user, "N/A", authorities);
   }
 }
diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml
index 830184697..fc8166c41 100644
--- a/src/main/resources/config/application-dev.yml
+++ b/src/main/resources/config/application-dev.yml
@@ -3,6 +3,7 @@ faf-api:
   jwt:
     secretKeyPath: ${JWT_PRIVATE_KEY_PATH:test-pki-private.key}
     publicKeyPath: ${JWT_PUBLIC_KEY_PATH:test-pki-public.key}
+    hydraJwksUrl: ${JWT_HYDRA_JWKS_URL:https://hydra.test.faforever.com/.well-known/jwks.json}
   map:
     target-directory: ${MAP_UPLOAD_PATH:build/cache/map/maps}
     directory-preview-path-small: ${MAP_PREVIEW_PATH_SMALL:build/cache/map_previews/small}
diff --git a/src/main/resources/config/application-prod.yml b/src/main/resources/config/application-prod.yml
index 67be4f517..eb7e3583b 100644
--- a/src/main/resources/config/application-prod.yml
+++ b/src/main/resources/config/application-prod.yml
@@ -2,6 +2,7 @@ faf-api:
   jwt:
     secretKeyPath: ${JWT_PRIVATE_KEY_PATH}
     publicKeyPath: ${JWT_PUBLIC_KEY_PATH}
+    hydraJwksUrl: ${JWT_HYDRA_JWKS_URL}
   map:
     target-directory: ${MAP_UPLOAD_PATH}
     directory-preview-path-small: ${MAP_PREVIEW_PATH_SMALL}

From 3c5df06baec1bc3de4a2b2a7dff33cf1e3f0bae6 Mon Sep 17 00:00:00 2001
From: Brutus5000 <Brutus5000@gmx.net>
Date: Fri, 19 Feb 2021 00:47:06 +0100
Subject: [PATCH 05/17] Cover OAuth service login without user id

---
 src/inttest/resources/config/application.yml  |  2 ++
 .../api/config/FafApiProperties.java          |  3 ++-
 .../api/security/FafMultiTokenStore.java      | 22 ++++++++++++++-----
 .../FafUserAuthenticationConverter.java       | 10 +++++++--
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/inttest/resources/config/application.yml b/src/inttest/resources/config/application.yml
index 03d7905e9..e30da0b47 100644
--- a/src/inttest/resources/config/application.yml
+++ b/src/inttest/resources/config/application.yml
@@ -29,6 +29,8 @@ faf-api:
   jwt:
     secret-key-path: test-pki-private.key
     public-key-path: test-pki-public.key
+    faf-hydra-jwks-url: https://accounts.google.com/.well-known/openid-configuration
+    faf-hydra-issuer: https://hydra.test.faforever.com/
   map:
     target-directory: "build/cache/map/maps"
     directory-preview-path-small: "build/cache/map_previews/small"
diff --git a/src/main/java/com/faforever/api/config/FafApiProperties.java b/src/main/java/com/faforever/api/config/FafApiProperties.java
index 0fcd3b912..209a60857 100644
--- a/src/main/java/com/faforever/api/config/FafApiProperties.java
+++ b/src/main/java/com/faforever/api/config/FafApiProperties.java
@@ -53,7 +53,8 @@ public static class Jwt {
     private Path publicKeyPath;
     private int accessTokenValiditySeconds = 3600;
     private int refreshTokenValiditySeconds = 3600;
-    private String hydraJwksUrl;
+    private String fafHydraJwksUrl;
+    private String fafHydraIssuer;
   }
 
   @Data
diff --git a/src/main/java/com/faforever/api/security/FafMultiTokenStore.java b/src/main/java/com/faforever/api/security/FafMultiTokenStore.java
index 5349f606f..e50ccae89 100644
--- a/src/main/java/com/faforever/api/security/FafMultiTokenStore.java
+++ b/src/main/java/com/faforever/api/security/FafMultiTokenStore.java
@@ -1,8 +1,13 @@
 package com.faforever.api.security;
 
 import com.faforever.api.config.FafApiProperties;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.jwt.Jwt;
+import org.springframework.security.jwt.JwtHelper;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
 import org.springframework.security.oauth2.common.OAuth2RefreshToken;
+import org.springframework.security.oauth2.common.util.JsonParser;
+import org.springframework.security.oauth2.common.util.JsonParserFactory;
 import org.springframework.security.oauth2.provider.OAuth2Authentication;
 import org.springframework.security.oauth2.provider.token.TokenStore;
 import org.springframework.security.oauth2.provider.token.store.JwtAccessTokenConverter;
@@ -12,9 +17,13 @@
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Map;
+import java.util.Objects;
 
 @Component
 public class FafMultiTokenStore implements TokenStore {
+  private JsonParser objectMapper = JsonParserFactory.create();
+
   /**
    * The token store for token created by this API (using custom OAuth 2.0 without OpenID Connect)
    */
@@ -31,7 +40,7 @@ public FafMultiTokenStore(FafApiProperties fafApiProperties, JwtAccessTokenConve
     this.fafApiProperties = fafApiProperties;
 
     classicTokenStore = new JwtTokenStore(jwtAccessTokenConverter);
-    hydraTokenStore = new JwkTokenStore(fafApiProperties.getJwt().getHydraJwksUrl(), jwtAccessTokenConverter);
+    hydraTokenStore = new JwkTokenStore(fafApiProperties.getJwt().getFafHydraJwksUrl(), jwtAccessTokenConverter);
   }
 
   @Override
@@ -41,10 +50,13 @@ public OAuth2Authentication readAuthentication(OAuth2AccessToken token) {
 
   @Override
   public OAuth2Authentication readAuthentication(String token) {
-    try {
-      return classicTokenStore.readAuthentication(token);
-    } catch (Exception e) {
+    Jwt unverifiedJwt = JwtHelper.decode(token);
+    Map<String, Object> claims = objectMapper.parseMap(unverifiedJwt.getClaims());
+
+    if (Objects.equals(claims.get("iss"), fafApiProperties.getJwt().getFafHydraIssuer())) {
       return hydraTokenStore.readAuthentication(token);
+    } else {
+      return classicTokenStore.readAuthentication(token);
     }
   }
 
@@ -57,7 +69,7 @@ public void storeAccessToken(OAuth2AccessToken token, OAuth2Authentication authe
   public OAuth2AccessToken readAccessToken(String tokenValue) {
     try {
       return classicTokenStore.readAccessToken(tokenValue);
-    } catch (Exception e) {
+    } catch (AccessDeniedException e) {
       return hydraTokenStore.readAccessToken(tokenValue);
     }
   }
diff --git a/src/main/java/com/faforever/api/security/FafUserAuthenticationConverter.java b/src/main/java/com/faforever/api/security/FafUserAuthenticationConverter.java
index 1e8f9c189..0c8da4f0f 100644
--- a/src/main/java/com/faforever/api/security/FafUserAuthenticationConverter.java
+++ b/src/main/java/com/faforever/api/security/FafUserAuthenticationConverter.java
@@ -47,9 +47,15 @@ public Authentication extractAuthentication(Map<String, ?> map) {
 
       return new UsernamePasswordAuthenticationToken(user, "N/A", authorities);
     } else {
-      log.debug("Access token is FAF OpenID Connect token");
+      Object sub = map.get("sub");
+
+      if (sub == null) {
+        log.debug("Access token has no user associated");
+        return null;
+      }
 
-      int id = Integer.parseInt((String) map.get("sub"));
+      log.debug("Access token is FAF OpenID Connect token");
+      int id = Integer.parseInt((String) sub);
       var ext = (Map<String, Object>) map.get("ext");
       var roles = (List<String>) ext.get("roles");
 

From 655ad8e368c22525158c53d88e84dd7ebbacd8d7 Mon Sep 17 00:00:00 2001
From: Brutus5000 <Brutus5000@gmx.net>
Date: Fri, 19 Feb 2021 21:39:50 +0100
Subject: [PATCH 06/17] Fix application.yml variables for Faf Ory Hydra

---
 src/main/resources/config/application-dev.yml  | 3 ++-
 src/main/resources/config/application-prod.yml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml
index fc8166c41..fad2751c8 100644
--- a/src/main/resources/config/application-dev.yml
+++ b/src/main/resources/config/application-dev.yml
@@ -3,7 +3,8 @@ faf-api:
   jwt:
     secretKeyPath: ${JWT_PRIVATE_KEY_PATH:test-pki-private.key}
     publicKeyPath: ${JWT_PUBLIC_KEY_PATH:test-pki-public.key}
-    hydraJwksUrl: ${JWT_HYDRA_JWKS_URL:https://hydra.test.faforever.com/.well-known/jwks.json}
+    fafHydraJwksUrl: ${JWT_FAF_HYDRA_JWKS_URL:https://hydra.test.faforever.com/.well-known/jwks.json}
+    fafHydraIssuer: ${JWT_FAF_HYDRA_ISSUER:https://hydra.test.faforever.com/}
   map:
     target-directory: ${MAP_UPLOAD_PATH:build/cache/map/maps}
     directory-preview-path-small: ${MAP_PREVIEW_PATH_SMALL:build/cache/map_previews/small}
diff --git a/src/main/resources/config/application-prod.yml b/src/main/resources/config/application-prod.yml
index eb7e3583b..eeccd4dcb 100644
--- a/src/main/resources/config/application-prod.yml
+++ b/src/main/resources/config/application-prod.yml
@@ -2,7 +2,8 @@ faf-api:
   jwt:
     secretKeyPath: ${JWT_PRIVATE_KEY_PATH}
     publicKeyPath: ${JWT_PUBLIC_KEY_PATH}
-    hydraJwksUrl: ${JWT_HYDRA_JWKS_URL}
+    fafHydraJwksUrl: ${JWT_FAF_HYDRA_JWKS_URL}
+    fafHydraIssuer: ${JWT_FAF_HYDRA_ISSUER}
   map:
     target-directory: ${MAP_UPLOAD_PATH}
     directory-preview-path-small: ${MAP_PREVIEW_PATH_SMALL}

From 19965556f584fce8162ca3d70ba348a9f8d44004 Mon Sep 17 00:00:00 2001
From: Brutus5000 <Brutus5000@gmx.net>
Date: Fri, 19 Feb 2021 22:15:24 +0100
Subject: [PATCH 07/17] Rather catch all Exceptions

(e.g. we missed InvalidTokenException)
---
 .../java/com/faforever/api/security/FafMultiTokenStore.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/com/faforever/api/security/FafMultiTokenStore.java b/src/main/java/com/faforever/api/security/FafMultiTokenStore.java
index e50ccae89..c75c77a24 100644
--- a/src/main/java/com/faforever/api/security/FafMultiTokenStore.java
+++ b/src/main/java/com/faforever/api/security/FafMultiTokenStore.java
@@ -1,7 +1,6 @@
 package com.faforever.api.security;
 
 import com.faforever.api.config.FafApiProperties;
-import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.jwt.Jwt;
 import org.springframework.security.jwt.JwtHelper;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
@@ -69,7 +68,7 @@ public void storeAccessToken(OAuth2AccessToken token, OAuth2Authentication authe
   public OAuth2AccessToken readAccessToken(String tokenValue) {
     try {
       return classicTokenStore.readAccessToken(tokenValue);
-    } catch (AccessDeniedException e) {
+    } catch (Exception e) {
       return hydraTokenStore.readAccessToken(tokenValue);
     }
   }

From 5843ef9baac81e05781db478cd5a0d8f6a023ba7 Mon Sep 17 00:00:00 2001
From: Ahsan Bagwan <ahsanbagwan@gmail.com>
Date: Thu, 24 Dec 2020 20:51:59 +0530
Subject: [PATCH 08/17] #394 - Configure searchstore in backend

---
 build.gradle                                  |  1 +
 .../api/config/elide/ElideConfig.java         | 16 ++++++++++++
 .../com/faforever/api/data/domain/Avatar.java | 26 +++++++++++++++++++
 .../api/data/domain/AvatarAssignment.java     | 17 ++++++++++++
 4 files changed, 60 insertions(+)

diff --git a/build.gradle b/build.gradle
index 79f83f1bd..bbea9f849 100644
--- a/build.gradle
+++ b/build.gradle
@@ -232,6 +232,7 @@ dependencies {
   implementation("com.yahoo.elide:elide-core:${elideVersion}")
   implementation("com.yahoo.elide:elide-swagger:${elideVersion}")
   implementation("com.yahoo.elide:elide-datastore-hibernate5:${elideVersion}")
+  implementation("com.yahoo.elide:elide-datastore-search:${elideVersion}")
 
   implementation("org.luaj:luaj-jse:${luajVersion}")
   implementation("com.github.micheljung:nocatch:${nocatchVersion}")
diff --git a/src/main/java/com/faforever/api/config/elide/ElideConfig.java b/src/main/java/com/faforever/api/config/elide/ElideConfig.java
index bc1d6b1c4..ad01ecdcd 100644
--- a/src/main/java/com/faforever/api/config/elide/ElideConfig.java
+++ b/src/main/java/com/faforever/api/config/elide/ElideConfig.java
@@ -26,9 +26,11 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yahoo.elide.Elide;
 import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.core.DataStore;
 import com.yahoo.elide.core.EntityDictionary;
 import com.yahoo.elide.core.filter.dialect.CaseSensitivityStrategy;
 import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.datastores.search.SearchDataStore;
 import com.yahoo.elide.jsonapi.JsonApiMapper;
 import com.yahoo.elide.security.checks.Check;
 import com.yahoo.elide.utils.coerce.CoerceUtil;
@@ -41,6 +43,8 @@
 import org.springframework.transaction.PlatformTransactionManager;
 
 import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.OffsetDateTime;
@@ -130,4 +134,16 @@ public EntityDictionary entityDictionary() {
 
     return new EntityDictionary(checks);
   }
+
+  @Bean
+  public Elide initElideSearch(SpringHibernateDataStore springHibernateDataStore) {
+    DataStore store = springHibernateDataStore;
+
+    EntityManagerFactory emf = Persistence.createEntityManagerFactory("searchDataStore");
+
+    boolean indexOnStartup = true;
+    DataStore searchStore = new SearchDataStore(store, emf, indexOnStartup);
+
+    return new Elide(new ElideSettingsBuilder(searchStore).build());
+  }
 }
diff --git a/src/main/java/com/faforever/api/data/domain/Avatar.java b/src/main/java/com/faforever/api/data/domain/Avatar.java
index de1825236..6fa2fd991 100644
--- a/src/main/java/com/faforever/api/data/domain/Avatar.java
+++ b/src/main/java/com/faforever/api/data/domain/Avatar.java
@@ -8,6 +8,18 @@
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.UpdatePermission;
 import lombok.Setter;
+import org.apache.lucene.analysis.core.LowerCaseFilterFactory;
+import org.apache.lucene.analysis.ngram.NGramTokenizerFactory;
+import org.hibernate.search.annotations.Analyze;
+import org.hibernate.search.annotations.Analyzer;
+import org.hibernate.search.annotations.AnalyzerDef;
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.Parameter;
+import org.hibernate.search.annotations.Store;
+import org.hibernate.search.annotations.TokenFilterDef;
+import org.hibernate.search.annotations.TokenizerDef;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -22,6 +34,16 @@
 @Entity
 @Table(name = "avatars_list")
 @Include(rootLevel = true, type = Avatar.TYPE_NAME)
+@Indexed
+@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)
+  }
+)
 @Setter
 @Type(Avatar.TYPE_NAME)
 @EntityListeners(AvatarEnricherListener.class)
@@ -42,10 +64,14 @@ public String getUrl() {
 
   @Column(name = "filename")
   @NotNull
+  @Field(index = Index.YES, analyze = Analyze.YES,
+    store = Store.NO, analyzer = @Analyzer(definition = "case_insensitive"))
   public String getFilename() { return filename; }
 
   @Column(name = "tooltip")
   @UpdatePermission(expression = WriteAvatarCheck.EXPRESSION)
+  @Field(index = Index.YES, analyze = Analyze.YES,
+    store = Store.NO, analyzer = @Analyzer(definition = "case_insensitive"))
   public String getTooltip() {
     return tooltip;
   }
diff --git a/src/main/java/com/faforever/api/data/domain/AvatarAssignment.java b/src/main/java/com/faforever/api/data/domain/AvatarAssignment.java
index 8fea0ae21..233dbeae6 100644
--- a/src/main/java/com/faforever/api/data/domain/AvatarAssignment.java
+++ b/src/main/java/com/faforever/api/data/domain/AvatarAssignment.java
@@ -12,6 +12,13 @@
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.UpdatePermission;
 import lombok.Setter;
+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.Indexed;
+import org.hibernate.search.annotations.Parameter;
+import org.hibernate.search.annotations.TokenFilterDef;
+import org.hibernate.search.annotations.TokenizerDef;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -26,6 +33,16 @@
 @Entity
 @Table(name = "avatars")
 @Include(rootLevel = true, type = AvatarAssignment.TYPE_NAME)
+@Indexed
+@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)
+  }
+)
 @CreatePermission(expression = WriteAvatarCheck.EXPRESSION)
 @DeletePermission(expression = WriteAvatarCheck.EXPRESSION)
 @Audit(action = Action.CREATE, logStatement = "Avatar ''{0}'' has been assigned to player ''{1}''", logExpressions = {"${avatarAssignment.avatar.id}", "${avatarAssignment.player.id}"})

From 32d35e653c97c8b15ff52ec79cc2379c16aa7091 Mon Sep 17 00:00:00 2001
From: Ahsan Bagwan <ahsanbagwan@gmail.com>
Date: Sat, 26 Dec 2020 23:36:55 +0530
Subject: [PATCH 09/17] #398 Reuse Elide config Builder

---
 .../api/config/elide/ElideConfig.java         | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 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
index ad01ecdcd..74a3d41ff 100644
--- a/src/main/java/com/faforever/api/config/elide/ElideConfig.java
+++ b/src/main/java/com/faforever/api/config/elide/ElideConfig.java
@@ -61,7 +61,12 @@ public Elide elide(SpringHibernateDataStore springHibernateDataStore, ObjectMapp
 
     registerAdditionalConverters();
 
-    return new Elide(new ElideSettingsBuilder(springHibernateDataStore)
+    // Wrap store in search store
+    EntityManagerFactory emf = Persistence.createEntityManagerFactory("searchDataStore");
+    boolean indexOnStartup = true;
+    DataStore searchStore = new SearchDataStore(springHibernateDataStore, emf, indexOnStartup);
+
+    return new Elide(new ElideSettingsBuilder(searchStore)
       .withJsonApiMapper(new JsonApiMapper(entityDictionary, objectMapper))
       .withAuditLogger(extendedAuditLogger)
       .withEntityDictionary(entityDictionary)
@@ -134,16 +139,4 @@ public EntityDictionary entityDictionary() {
 
     return new EntityDictionary(checks);
   }
-
-  @Bean
-  public Elide initElideSearch(SpringHibernateDataStore springHibernateDataStore) {
-    DataStore store = springHibernateDataStore;
-
-    EntityManagerFactory emf = Persistence.createEntityManagerFactory("searchDataStore");
-
-    boolean indexOnStartup = true;
-    DataStore searchStore = new SearchDataStore(store, emf, indexOnStartup);
-
-    return new Elide(new ElideSettingsBuilder(searchStore).build());
-  }
 }

From c07e2292f0183b233254e0dd8220ba94fe3e222f Mon Sep 17 00:00:00 2001
From: Ahsan Bagwan <ahsanbagwan@gmail.com>
Date: Sat, 2 Jan 2021 19:35:45 +0530
Subject: [PATCH 10/17] #398 Add Elide search store annotations to relevant
 objs

---
 .../com/faforever/api/data/domain/Map.java    | 24 +++++++++++++++++++
 .../faforever/api/data/domain/MapVersion.java | 24 +++++++++++++++++++
 .../com/faforever/api/data/domain/Mod.java    | 24 +++++++++++++++++++
 .../faforever/api/data/domain/ModVersion.java | 24 +++++++++++++++++++
 4 files changed, 96 insertions(+)

diff --git a/src/main/java/com/faforever/api/data/domain/Map.java b/src/main/java/com/faforever/api/data/domain/Map.java
index 01d8183ab..7922c536d 100644
--- a/src/main/java/com/faforever/api/data/domain/Map.java
+++ b/src/main/java/com/faforever/api/data/domain/Map.java
@@ -5,11 +5,23 @@
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.UpdatePermission;
 import lombok.Setter;
+import org.apache.lucene.analysis.core.LowerCaseFilterFactory;
+import org.apache.lucene.analysis.ngram.NGramTokenizerFactory;
 import org.hibernate.annotations.BatchSize;
 import org.hibernate.annotations.Immutable;
 import org.hibernate.annotations.JoinColumnOrFormula;
 import org.hibernate.annotations.JoinColumnsOrFormulas;
 import org.hibernate.annotations.JoinFormula;
+import org.hibernate.search.annotations.Analyze;
+import org.hibernate.search.annotations.Analyzer;
+import org.hibernate.search.annotations.AnalyzerDef;
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.Parameter;
+import org.hibernate.search.annotations.Store;
+import org.hibernate.search.annotations.TokenFilterDef;
+import org.hibernate.search.annotations.TokenizerDef;
 import org.jetbrains.annotations.Nullable;
 
 import javax.persistence.CascadeType;
@@ -36,6 +48,16 @@
 @Include(rootLevel = true, type = Map.TYPE_NAME)
 @Immutable
 @EntityListeners(MapChangeListener.class)
+@Indexed
+@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)
+  }
+)
 public class Map extends AbstractEntity implements OwnableEntity {
 
   public static final String TYPE_NAME = "map";
@@ -52,6 +74,8 @@ public class Map extends AbstractEntity implements OwnableEntity {
   @Column(name = "display_name", unique = true)
   @Size(max = 100)
   @NotNull
+  @Field(index = Index.YES, analyze = Analyze.YES,
+    store = Store.NO, analyzer = @Analyzer(definition = "case_insensitive"))
   public String getDisplayName() {
     return displayName;
   }
diff --git a/src/main/java/com/faforever/api/data/domain/MapVersion.java b/src/main/java/com/faforever/api/data/domain/MapVersion.java
index 7eb7c1a8b..5218cde04 100644
--- a/src/main/java/com/faforever/api/data/domain/MapVersion.java
+++ b/src/main/java/com/faforever/api/data/domain/MapVersion.java
@@ -11,7 +11,19 @@
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.UpdatePermission;
 import lombok.Setter;
+import org.apache.lucene.analysis.core.LowerCaseFilterFactory;
+import org.apache.lucene.analysis.ngram.NGramTokenizerFactory;
 import org.hibernate.annotations.BatchSize;
+import org.hibernate.search.annotations.Analyze;
+import org.hibernate.search.annotations.Analyzer;
+import org.hibernate.search.annotations.AnalyzerDef;
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.Parameter;
+import org.hibernate.search.annotations.Store;
+import org.hibernate.search.annotations.TokenFilterDef;
+import org.hibernate.search.annotations.TokenizerDef;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -31,6 +43,16 @@
 @EntityListeners(MapVersionEnricher.class)
 @Table(name = "map_version")
 @Include(rootLevel = true, type = MapVersion.TYPE_NAME)
+@Indexed
+@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)
+  }
+)
 public class MapVersion extends AbstractEntity implements OwnableEntity {
 
   public static final String TYPE_NAME = "mapVersion";
@@ -55,6 +77,8 @@ public class MapVersion extends AbstractEntity implements OwnableEntity {
 
   @UpdatePermission(expression = IsEntityOwner.EXPRESSION + " or " + AdminMapCheck.EXPRESSION)
   @Column(name = "description")
+  @Field(index = Index.YES, analyze = Analyze.YES,
+    store = Store.NO, analyzer = @Analyzer(definition = "case_insensitive"))
   public String getDescription() {
     return description;
   }
diff --git a/src/main/java/com/faforever/api/data/domain/Mod.java b/src/main/java/com/faforever/api/data/domain/Mod.java
index 235de3b38..75e894f33 100644
--- a/src/main/java/com/faforever/api/data/domain/Mod.java
+++ b/src/main/java/com/faforever/api/data/domain/Mod.java
@@ -4,10 +4,22 @@
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.UpdatePermission;
 import lombok.Setter;
+import org.apache.lucene.analysis.core.LowerCaseFilterFactory;
+import org.apache.lucene.analysis.ngram.NGramTokenizerFactory;
 import org.hibernate.annotations.Immutable;
 import org.hibernate.annotations.JoinColumnOrFormula;
 import org.hibernate.annotations.JoinColumnsOrFormulas;
 import org.hibernate.annotations.JoinFormula;
+import org.hibernate.search.annotations.Analyze;
+import org.hibernate.search.annotations.Analyzer;
+import org.hibernate.search.annotations.AnalyzerDef;
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.Parameter;
+import org.hibernate.search.annotations.Store;
+import org.hibernate.search.annotations.TokenFilterDef;
+import org.hibernate.search.annotations.TokenizerDef;
 import org.hibernate.validator.constraints.NotEmpty;
 
 import javax.persistence.CascadeType;
@@ -29,6 +41,16 @@
 @Include(rootLevel = true, type = Mod.TYPE_NAME)
 @Immutable
 @Setter
+@Indexed
+@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)
+  }
+)
 public class Mod extends AbstractEntity implements OwnableEntity {
 
   public static final String TYPE_NAME = "mod";
@@ -43,6 +65,8 @@ public class Mod extends AbstractEntity implements OwnableEntity {
   @Column(name = "display_name")
   @Size(max = 100)
   @NotNull
+  @Field(index = Index.YES, analyze = Analyze.YES,
+    store = Store.NO, analyzer = @Analyzer(definition = "case_insensitive"))
   public String getDisplayName() {
     return displayName;
   }
diff --git a/src/main/java/com/faforever/api/data/domain/ModVersion.java b/src/main/java/com/faforever/api/data/domain/ModVersion.java
index fde29702d..aed7c92ba 100644
--- a/src/main/java/com/faforever/api/data/domain/ModVersion.java
+++ b/src/main/java/com/faforever/api/data/domain/ModVersion.java
@@ -10,6 +10,18 @@
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.UpdatePermission;
 import lombok.Setter;
+import org.apache.lucene.analysis.core.LowerCaseFilterFactory;
+import org.apache.lucene.analysis.ngram.NGramTokenizerFactory;
+import org.hibernate.search.annotations.Analyze;
+import org.hibernate.search.annotations.Analyzer;
+import org.hibernate.search.annotations.AnalyzerDef;
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.Parameter;
+import org.hibernate.search.annotations.Store;
+import org.hibernate.search.annotations.TokenFilterDef;
+import org.hibernate.search.annotations.TokenizerDef;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -30,6 +42,16 @@
 @Include(rootLevel = true, type = ModVersion.TYPE_NAME)
 @Setter
 @EntityListeners(ModVersionEnricher.class)
+@Indexed
+@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)
+  }
+)
 public class ModVersion extends AbstractEntity implements OwnableEntity {
 
   public static final String TYPE_NAME = "modVersion";
@@ -60,6 +82,8 @@ public ModType getType() {
   }
 
   @Column(name = "description")
+  @Field(index = Index.YES, analyze = Analyze.YES,
+    store = Store.NO, analyzer = @Analyzer(definition = "case_insensitive"))
   public String getDescription() {
     return description;
   }

From a7cd67debec42096a00201a5df25abfe8e8d199a Mon Sep 17 00:00:00 2001
From: Ahsan Bagwan <ahsanbagwan@gmail.com>
Date: Thu, 7 Jan 2021 23:39:29 +0530
Subject: [PATCH 11/17] #398 Add properties to application.yml

---
 src/main/resources/config/application.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml
index 5302b9db9..bcb770adc 100644
--- a/src/main/resources/config/application.yml
+++ b/src/main/resources/config/application.yml
@@ -44,6 +44,13 @@ spring:
     hibernate:
       naming:
         physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+      search:
+        jmx_enabled: true
+        default:
+          directory_provider: filesystem
+          indexBase: /var/solr
+        generate_statistics: true
+        lucene_version: LUCENE_CURRENT
     properties:
       hibernate:
         current_session_context_class: org.springframework.orm.hibernate5.SpringSessionContext

From 042a77347aaab59acaaccab02009283ab20e25c0 Mon Sep 17 00:00:00 2001
From: Ahsan Bagwan <ahsanbagwan@gmail.com>
Date: Mon, 25 Jan 2021 21:02:01 +0530
Subject: [PATCH 12/17] #398 Move the AnalyzerDef into package-info

---
 .../com/faforever/api/data/domain/Avatar.java     |  9 ---------
 .../api/data/domain/AvatarAssignment.java         |  9 ---------
 .../java/com/faforever/api/data/domain/Map.java   |  9 ---------
 .../com/faforever/api/data/domain/MapVersion.java |  9 ---------
 .../java/com/faforever/api/data/package-info.java | 15 +++++++++++++++
 5 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/src/main/java/com/faforever/api/data/domain/Avatar.java b/src/main/java/com/faforever/api/data/domain/Avatar.java
index 6fa2fd991..065cdca78 100644
--- a/src/main/java/com/faforever/api/data/domain/Avatar.java
+++ b/src/main/java/com/faforever/api/data/domain/Avatar.java
@@ -35,15 +35,6 @@
 @Table(name = "avatars_list")
 @Include(rootLevel = true, type = Avatar.TYPE_NAME)
 @Indexed
-@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)
-  }
-)
 @Setter
 @Type(Avatar.TYPE_NAME)
 @EntityListeners(AvatarEnricherListener.class)
diff --git a/src/main/java/com/faforever/api/data/domain/AvatarAssignment.java b/src/main/java/com/faforever/api/data/domain/AvatarAssignment.java
index 233dbeae6..c83c49153 100644
--- a/src/main/java/com/faforever/api/data/domain/AvatarAssignment.java
+++ b/src/main/java/com/faforever/api/data/domain/AvatarAssignment.java
@@ -34,15 +34,6 @@
 @Table(name = "avatars")
 @Include(rootLevel = true, type = AvatarAssignment.TYPE_NAME)
 @Indexed
-@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)
-  }
-)
 @CreatePermission(expression = WriteAvatarCheck.EXPRESSION)
 @DeletePermission(expression = WriteAvatarCheck.EXPRESSION)
 @Audit(action = Action.CREATE, logStatement = "Avatar ''{0}'' has been assigned to player ''{1}''", logExpressions = {"${avatarAssignment.avatar.id}", "${avatarAssignment.player.id}"})
diff --git a/src/main/java/com/faforever/api/data/domain/Map.java b/src/main/java/com/faforever/api/data/domain/Map.java
index 7922c536d..d8e1f0267 100644
--- a/src/main/java/com/faforever/api/data/domain/Map.java
+++ b/src/main/java/com/faforever/api/data/domain/Map.java
@@ -49,15 +49,6 @@
 @Immutable
 @EntityListeners(MapChangeListener.class)
 @Indexed
-@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)
-  }
-)
 public class Map extends AbstractEntity implements OwnableEntity {
 
   public static final String TYPE_NAME = "map";
diff --git a/src/main/java/com/faforever/api/data/domain/MapVersion.java b/src/main/java/com/faforever/api/data/domain/MapVersion.java
index 5218cde04..878218cd6 100644
--- a/src/main/java/com/faforever/api/data/domain/MapVersion.java
+++ b/src/main/java/com/faforever/api/data/domain/MapVersion.java
@@ -44,15 +44,6 @@
 @Table(name = "map_version")
 @Include(rootLevel = true, type = MapVersion.TYPE_NAME)
 @Indexed
-@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)
-  }
-)
 public class MapVersion extends AbstractEntity implements OwnableEntity {
 
   public static final String TYPE_NAME = "mapVersion";
diff --git a/src/main/java/com/faforever/api/data/package-info.java b/src/main/java/com/faforever/api/data/package-info.java
index fb987542c..0f6c19da7 100644
--- a/src/main/java/com/faforever/api/data/package-info.java
+++ b/src/main/java/com/faforever/api/data/package-info.java
@@ -8,6 +8,15 @@
 @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;
@@ -16,3 +25,9 @@
 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;

From b0965b4b30fac223ce05451c490fba0889d134e5 Mon Sep 17 00:00:00 2001
From: Ahsan Bagwan <ahsanbagwan@gmail.com>
Date: Mon, 25 Jan 2021 23:18:23 +0530
Subject: [PATCH 13/17] #398 Reconcile index annotations

---
 src/main/java/com/faforever/api/data/domain/Avatar.java  | 5 +----
 .../com/faforever/api/data/domain/AvatarAssignment.java  | 1 -
 src/main/java/com/faforever/api/data/domain/Mod.java     | 9 ---------
 .../java/com/faforever/api/data/domain/ModVersion.java   | 9 ---------
 4 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/src/main/java/com/faforever/api/data/domain/Avatar.java b/src/main/java/com/faforever/api/data/domain/Avatar.java
index 065cdca78..f3967119b 100644
--- a/src/main/java/com/faforever/api/data/domain/Avatar.java
+++ b/src/main/java/com/faforever/api/data/domain/Avatar.java
@@ -34,7 +34,6 @@
 @Entity
 @Table(name = "avatars_list")
 @Include(rootLevel = true, type = Avatar.TYPE_NAME)
-@Indexed
 @Setter
 @Type(Avatar.TYPE_NAME)
 @EntityListeners(AvatarEnricherListener.class)
@@ -56,13 +55,11 @@ public String getUrl() {
   @Column(name = "filename")
   @NotNull
   @Field(index = Index.YES, analyze = Analyze.YES,
-    store = Store.NO, analyzer = @Analyzer(definition = "case_insensitive"))
+    store = Store.NO)
   public String getFilename() { return filename; }
 
   @Column(name = "tooltip")
   @UpdatePermission(expression = WriteAvatarCheck.EXPRESSION)
-  @Field(index = Index.YES, analyze = Analyze.YES,
-    store = Store.NO, analyzer = @Analyzer(definition = "case_insensitive"))
   public String getTooltip() {
     return tooltip;
   }
diff --git a/src/main/java/com/faforever/api/data/domain/AvatarAssignment.java b/src/main/java/com/faforever/api/data/domain/AvatarAssignment.java
index c83c49153..a4eb1e7ec 100644
--- a/src/main/java/com/faforever/api/data/domain/AvatarAssignment.java
+++ b/src/main/java/com/faforever/api/data/domain/AvatarAssignment.java
@@ -33,7 +33,6 @@
 @Entity
 @Table(name = "avatars")
 @Include(rootLevel = true, type = AvatarAssignment.TYPE_NAME)
-@Indexed
 @CreatePermission(expression = WriteAvatarCheck.EXPRESSION)
 @DeletePermission(expression = WriteAvatarCheck.EXPRESSION)
 @Audit(action = Action.CREATE, logStatement = "Avatar ''{0}'' has been assigned to player ''{1}''", logExpressions = {"${avatarAssignment.avatar.id}", "${avatarAssignment.player.id}"})
diff --git a/src/main/java/com/faforever/api/data/domain/Mod.java b/src/main/java/com/faforever/api/data/domain/Mod.java
index 75e894f33..dd99f6340 100644
--- a/src/main/java/com/faforever/api/data/domain/Mod.java
+++ b/src/main/java/com/faforever/api/data/domain/Mod.java
@@ -42,15 +42,6 @@
 @Immutable
 @Setter
 @Indexed
-@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)
-  }
-)
 public class Mod extends AbstractEntity implements OwnableEntity {
 
   public static final String TYPE_NAME = "mod";
diff --git a/src/main/java/com/faforever/api/data/domain/ModVersion.java b/src/main/java/com/faforever/api/data/domain/ModVersion.java
index aed7c92ba..c4582f35e 100644
--- a/src/main/java/com/faforever/api/data/domain/ModVersion.java
+++ b/src/main/java/com/faforever/api/data/domain/ModVersion.java
@@ -43,15 +43,6 @@
 @Setter
 @EntityListeners(ModVersionEnricher.class)
 @Indexed
-@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)
-  }
-)
 public class ModVersion extends AbstractEntity implements OwnableEntity {
 
   public static final String TYPE_NAME = "modVersion";

From fd3747e3ba72f40f1682fe2a4035c8bbbc3f4240 Mon Sep 17 00:00:00 2001
From: Ahsan Bagwan <ahsanbagwan@gmail.com>
Date: Mon, 25 Jan 2021 23:52:00 +0530
Subject: [PATCH 14/17] #398 Minor refactor

---
 src/main/java/com/faforever/api/data/domain/Avatar.java   | 8 --------
 .../com/faforever/api/data/domain/AvatarAssignment.java   | 7 -------
 src/main/java/com/faforever/api/data/domain/Map.java      | 6 ------
 .../java/com/faforever/api/data/domain/MapVersion.java    | 6 ------
 .../java/com/faforever/api/data/domain/ModVersion.java    | 6 ------
 5 files changed, 33 deletions(-)

diff --git a/src/main/java/com/faforever/api/data/domain/Avatar.java b/src/main/java/com/faforever/api/data/domain/Avatar.java
index f3967119b..d56ac7565 100644
--- a/src/main/java/com/faforever/api/data/domain/Avatar.java
+++ b/src/main/java/com/faforever/api/data/domain/Avatar.java
@@ -8,18 +8,10 @@
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.UpdatePermission;
 import lombok.Setter;
-import org.apache.lucene.analysis.core.LowerCaseFilterFactory;
-import org.apache.lucene.analysis.ngram.NGramTokenizerFactory;
 import org.hibernate.search.annotations.Analyze;
-import org.hibernate.search.annotations.Analyzer;
-import org.hibernate.search.annotations.AnalyzerDef;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
-import org.hibernate.search.annotations.Indexed;
-import org.hibernate.search.annotations.Parameter;
 import org.hibernate.search.annotations.Store;
-import org.hibernate.search.annotations.TokenFilterDef;
-import org.hibernate.search.annotations.TokenizerDef;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
diff --git a/src/main/java/com/faforever/api/data/domain/AvatarAssignment.java b/src/main/java/com/faforever/api/data/domain/AvatarAssignment.java
index a4eb1e7ec..8fea0ae21 100644
--- a/src/main/java/com/faforever/api/data/domain/AvatarAssignment.java
+++ b/src/main/java/com/faforever/api/data/domain/AvatarAssignment.java
@@ -12,13 +12,6 @@
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.UpdatePermission;
 import lombok.Setter;
-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.Indexed;
-import org.hibernate.search.annotations.Parameter;
-import org.hibernate.search.annotations.TokenFilterDef;
-import org.hibernate.search.annotations.TokenizerDef;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/src/main/java/com/faforever/api/data/domain/Map.java b/src/main/java/com/faforever/api/data/domain/Map.java
index d8e1f0267..71d022de5 100644
--- a/src/main/java/com/faforever/api/data/domain/Map.java
+++ b/src/main/java/com/faforever/api/data/domain/Map.java
@@ -5,8 +5,6 @@
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.UpdatePermission;
 import lombok.Setter;
-import org.apache.lucene.analysis.core.LowerCaseFilterFactory;
-import org.apache.lucene.analysis.ngram.NGramTokenizerFactory;
 import org.hibernate.annotations.BatchSize;
 import org.hibernate.annotations.Immutable;
 import org.hibernate.annotations.JoinColumnOrFormula;
@@ -14,14 +12,10 @@
 import org.hibernate.annotations.JoinFormula;
 import org.hibernate.search.annotations.Analyze;
 import org.hibernate.search.annotations.Analyzer;
-import org.hibernate.search.annotations.AnalyzerDef;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
 import org.hibernate.search.annotations.Indexed;
-import org.hibernate.search.annotations.Parameter;
 import org.hibernate.search.annotations.Store;
-import org.hibernate.search.annotations.TokenFilterDef;
-import org.hibernate.search.annotations.TokenizerDef;
 import org.jetbrains.annotations.Nullable;
 
 import javax.persistence.CascadeType;
diff --git a/src/main/java/com/faforever/api/data/domain/MapVersion.java b/src/main/java/com/faforever/api/data/domain/MapVersion.java
index 878218cd6..2e35b00f9 100644
--- a/src/main/java/com/faforever/api/data/domain/MapVersion.java
+++ b/src/main/java/com/faforever/api/data/domain/MapVersion.java
@@ -11,19 +11,13 @@
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.UpdatePermission;
 import lombok.Setter;
-import org.apache.lucene.analysis.core.LowerCaseFilterFactory;
-import org.apache.lucene.analysis.ngram.NGramTokenizerFactory;
 import org.hibernate.annotations.BatchSize;
 import org.hibernate.search.annotations.Analyze;
 import org.hibernate.search.annotations.Analyzer;
-import org.hibernate.search.annotations.AnalyzerDef;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
 import org.hibernate.search.annotations.Indexed;
-import org.hibernate.search.annotations.Parameter;
 import org.hibernate.search.annotations.Store;
-import org.hibernate.search.annotations.TokenFilterDef;
-import org.hibernate.search.annotations.TokenizerDef;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/src/main/java/com/faforever/api/data/domain/ModVersion.java b/src/main/java/com/faforever/api/data/domain/ModVersion.java
index c4582f35e..0dccb9630 100644
--- a/src/main/java/com/faforever/api/data/domain/ModVersion.java
+++ b/src/main/java/com/faforever/api/data/domain/ModVersion.java
@@ -10,18 +10,12 @@
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.UpdatePermission;
 import lombok.Setter;
-import org.apache.lucene.analysis.core.LowerCaseFilterFactory;
-import org.apache.lucene.analysis.ngram.NGramTokenizerFactory;
 import org.hibernate.search.annotations.Analyze;
 import org.hibernate.search.annotations.Analyzer;
-import org.hibernate.search.annotations.AnalyzerDef;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
 import org.hibernate.search.annotations.Indexed;
-import org.hibernate.search.annotations.Parameter;
 import org.hibernate.search.annotations.Store;
-import org.hibernate.search.annotations.TokenFilterDef;
-import org.hibernate.search.annotations.TokenizerDef;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

From 75f463288efad77dce51399d7196709d2c6f64db Mon Sep 17 00:00:00 2001
From: Ahsan Bagwan <ahsanbagwan@gmail.com>
Date: Wed, 27 Jan 2021 23:46:42 +0530
Subject: [PATCH 15/17] #398 Refactor ElideConfig

---
 .../faforever/api/config/elide/ElideConfig.java    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 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
index 74a3d41ff..c3beb2136 100644
--- a/src/main/java/com/faforever/api/config/elide/ElideConfig.java
+++ b/src/main/java/com/faforever/api/config/elide/ElideConfig.java
@@ -56,17 +56,12 @@ public class ElideConfig {
   public static final String DEFAULT_CACHE_NAME = "Elide.defaultCache";
 
   @Bean
-  public Elide elide(SpringHibernateDataStore springHibernateDataStore, ObjectMapper objectMapper, EntityDictionary entityDictionary, ExtendedAuditLogger extendedAuditLogger) {
+  public Elide elide(DataStore dataStore, ObjectMapper objectMapper, EntityDictionary entityDictionary, ExtendedAuditLogger extendedAuditLogger) {
     RSQLFilterDialect rsqlFilterDialect = new RSQLFilterDialect(entityDictionary, new CaseSensitivityStrategy.UseColumnCollation());
 
     registerAdditionalConverters();
 
-    // Wrap store in search store
-    EntityManagerFactory emf = Persistence.createEntityManagerFactory("searchDataStore");
-    boolean indexOnStartup = true;
-    DataStore searchStore = new SearchDataStore(springHibernateDataStore, emf, indexOnStartup);
-
-    return new Elide(new ElideSettingsBuilder(searchStore)
+    return new Elide(new ElideSettingsBuilder(dataStore)
       .withJsonApiMapper(new JsonApiMapper(entityDictionary, objectMapper))
       .withAuditLogger(extendedAuditLogger)
       .withEntityDictionary(entityDictionary)
@@ -82,6 +77,11 @@ SpringHibernateDataStore springHibernateDataStore(PlatformTransactionManager txM
     return new SpringHibernateDataStore(txManager, beanFactory, entityManager, false, true, ScrollMode.FORWARD_ONLY);
   }
 
+  @Bean
+  DataStore searchStore(SpringHibernateDataStore shds, EntityManagerFactory entityManagerFactory, boolean indexOnStartup) {
+    return new SearchDataStore(shds, entityManagerFactory,true);
+  }
+
   /**
    * See https://github.com/yahoo/elide/issues/428.
    */

From efbbcebe3f4f851b34a1e74c8c33b4dee6cd9b45 Mon Sep 17 00:00:00 2001
From: Ahsan Bagwan <ahsanbagwan@gmail.com>
Date: Thu, 28 Jan 2021 23:10:17 +0530
Subject: [PATCH 16/17] #398 Fix SearchStore injection

---
 .../faforever/api/config/elide/ElideConfig.java  |  3 ++-
 .../faforever/api/data/domain/package-info.java  | 16 ++++++++++++++++
 .../com/faforever/api/data/package-info.java     | 15 ---------------
 3 files changed, 18 insertions(+), 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
index c3beb2136..a1a976957 100644
--- 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
index 16798b5af..3d80668d8 100644
--- 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
index 0f6c19da7..fb987542c 100644
--- 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;

From 51c6e864a66cd22bb5bf74a3d4d8d25c796fb219 Mon Sep 17 00:00:00 2001
From: Ahsan Bagwan <ahsanbagwan@gmail.com>
Date: Thu, 28 Jan 2021 23:58:00 +0530
Subject: [PATCH 17/17] #398 Refactor as per comments from kubko

---
 .../com/faforever/api/config/elide/ElideConfig.java    | 10 ++++------
 1 file changed, 4 insertions(+), 6 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
index a1a976957..1d6c27d4f 100644
--- a/src/main/java/com/faforever/api/config/elide/ElideConfig.java
+++ b/src/main/java/com/faforever/api/config/elide/ElideConfig.java
@@ -44,8 +44,6 @@
 
 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;
@@ -57,12 +55,12 @@ public class ElideConfig {
   public static final String DEFAULT_CACHE_NAME = "Elide.defaultCache";
 
   @Bean
-  public Elide elide(DataStore dataStore, ObjectMapper objectMapper, EntityDictionary entityDictionary, ExtendedAuditLogger extendedAuditLogger) {
+  public Elide elide(SearchDataStore searchStore, ObjectMapper objectMapper, EntityDictionary entityDictionary, ExtendedAuditLogger extendedAuditLogger) {
     RSQLFilterDialect rsqlFilterDialect = new RSQLFilterDialect(entityDictionary, new CaseSensitivityStrategy.UseColumnCollation());
 
     registerAdditionalConverters();
 
-    return new Elide(new ElideSettingsBuilder(dataStore)
+    return new Elide(new ElideSettingsBuilder(searchStore)
       .withJsonApiMapper(new JsonApiMapper(entityDictionary, objectMapper))
       .withAuditLogger(extendedAuditLogger)
       .withEntityDictionary(entityDictionary)
@@ -79,8 +77,8 @@ SpringHibernateDataStore springHibernateDataStore(PlatformTransactionManager txM
   }
 
   @Bean
-  DataStore searchStore(SpringHibernateDataStore shds, EntityManagerFactory entityManagerFactory) {
-    return new SearchDataStore(shds, entityManagerFactory,true);
+  SearchDataStore searchStore(SpringHibernateDataStore springHibernateDataStore, EntityManagerFactory entityManagerFactory) {
+    return new SearchDataStore(springHibernateDataStore, entityManagerFactory,true);
   }
 
   /**