Merge branch 'release/0.8.5'

FAForever · Sep 22, 2017 · aa721de · aa721de
2 parents e30a1d3 + cfe0cd6
commit aa721de
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -109,7 +109,7 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'propdeps'
 
 group = 'faforever'
-version = '0.8.4'
+version = '0.8.5'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8

diff --git a/src/main/java/com/faforever/api/data/DataController.java b/src/main/java/com/faforever/api/data/DataController.java
@@ -114,7 +114,7 @@ private ResponseEntity<String> wrapResponse(ElideResponse response) {
     return ResponseEntity.status(response.getResponseCode()).body(response.getBody());
   }
 
-  private String getJsonApiPath(HttpServletRequest request) {
+  private static String getJsonApiPath(HttpServletRequest request) {
     return ((String) request.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE)).replace(PATH_PREFIX, "");
   }
 

diff --git a/src/main/java/com/faforever/api/data/domain/Achievement.java b/src/main/java/com/faforever/api/data/domain/Achievement.java
@@ -11,7 +11,6 @@
 import javax.persistence.EntityListeners;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
-import javax.persistence.FetchType;
 import javax.persistence.Id;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
@@ -122,7 +121,8 @@ public OffsetDateTime getUpdateTime() {
     return updateTime;
   }
 
-  @OneToOne(mappedBy = "achievement", fetch = FetchType.LAZY)
+  // Fetching eagerly for cheaper JOIN instead of expensive SELECT (each achievement statistics select costs about 1s)
+  @OneToOne(mappedBy = "achievement")
   public AchievementStatistics getStatistics() {
     return statistics;
   }

diff --git a/src/main/java/com/faforever/api/data/domain/AchievementStatistics.java b/src/main/java/com/faforever/api/data/domain/AchievementStatistics.java
@@ -6,6 +6,7 @@
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToOne;
@@ -33,7 +34,7 @@ public String getId() {
     return id;
   }
 
-  @OneToOne
+  @OneToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "achievement_id")
   public Achievement getAchievement() {
     return achievement;