Autowired JDA instance to Controller classes

Author: jasonlessenich

src/main/java/net/javadiscord/javabot/api/routes/JDAEntity.java

@@ -2,14 +2,15 @@
 
 import com.github.benmanes.caffeine.cache.Caffeine;
 import lombok.extern.slf4j.Slf4j;
+import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.Guild;
 import net.javadiscord.javabot.Bot;
 import net.javadiscord.javabot.api.response.ApiResponseBuilder;
 import net.javadiscord.javabot.api.response.ApiResponses;
 import net.javadiscord.javabot.api.routes.CaffeineCache;
-import net.javadiscord.javabot.api.routes.JDAEntity;
 import net.javadiscord.javabot.api.routes.metrics.model.MetricsData;
 import net.javadiscord.javabot.data.config.guild.MetricsConfig;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -24,16 +25,21 @@
  */
 @Slf4j
 @RestController
-public class MetricsController extends CaffeineCache<Long, MetricsData> implements JDAEntity {
+public class MetricsController extends CaffeineCache<Long, MetricsData> {
+	private final JDA jda;
 
 	/**
 	 * The constructor of this class which initializes the {@link Caffeine} cache.
+	 *
+	 * @param jda The {@link Autowired} {@link JDA} instance to use.
 	 */
-	public MetricsController() {
+	@Autowired
+	public MetricsController(final JDA jda) {
 		super(Caffeine.newBuilder()
 				.expireAfterWrite(15, TimeUnit.MINUTES)
 				.build()
 		);
+		this.jda = jda;
 	}
 
 	/**
@@ -47,7 +53,7 @@ public MetricsController() {
 			produces = MediaType.APPLICATION_JSON_VALUE
 	)
 	public ResponseEntity<String> getMetrics(@PathVariable(value = "guild_id") String guildId) {
-		Guild guild = getJDA().getGuildById(guildId);
+		Guild guild = jda.getGuildById(guildId);
 		if (guild == null) {
 			return new ResponseEntity<>(ApiResponses.INVALID_GUILD_IN_REQUEST, HttpStatus.BAD_REQUEST);
 		}

src/main/java/net/javadiscord/javabot/api/routes/metrics/MetricsController.java

@@ -1,15 +1,16 @@
 package net.javadiscord.javabot.api.routes.qotw_leaderboard;
 
 import com.github.benmanes.caffeine.cache.Caffeine;
+import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.Guild;
 import net.javadiscord.javabot.Bot;
 import net.javadiscord.javabot.api.response.ApiResponseBuilder;
 import net.javadiscord.javabot.api.response.ApiResponses;
 import net.javadiscord.javabot.api.routes.CaffeineCache;
-import net.javadiscord.javabot.api.routes.JDAEntity;
 import net.javadiscord.javabot.api.routes.qotw_leaderboard.model.QOTWMemberData;
 import net.javadiscord.javabot.systems.qotw.QOTWPointsService;
 import net.javadiscord.javabot.util.Checks;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -25,16 +26,21 @@
  * Handles all GET-Requests on the {guild_id}/qotw/leaderboard route.
  */
 @RestController
-public class QOTWLeaderboardController extends CaffeineCache<Long, List<QOTWMemberData>> implements JDAEntity {
+public class QOTWLeaderboardController extends CaffeineCache<Long, List<QOTWMemberData>> {
+	private final JDA jda;
 
 	/**
 	 * The constructor of this class which initializes the {@link Caffeine} cache.
+	 *
+	 * @param jda The {@link JDA} instance to use.
 	 */
-	public QOTWLeaderboardController() {
+	@Autowired
+	public QOTWLeaderboardController(final JDA jda) {
 		super(Caffeine.newBuilder()
 				.expireAfterWrite(10, TimeUnit.MINUTES)
 				.build()
 		);
+		this.jda = jda;
 	}
 
 	/**
@@ -53,7 +59,7 @@ public ResponseEntity<String> getQOTWLeaderboard(
 			@PathVariable(value = "guild_id") String guildId,
 			@RequestParam(value = "amount", defaultValue = "3") String amountParam
 	) {
-		Guild guild = getJDA().getGuildById(guildId);
+		Guild guild = jda.getGuildById(guildId);
 		if (guild == null) {
 			return new ResponseEntity<>(ApiResponses.INVALID_GUILD_IN_REQUEST, HttpStatus.BAD_REQUEST);
 		}

src/main/java/net/javadiscord/javabot/api/routes/qotw_leaderboard/QOTWLeaderboardController.java

@@ -1,13 +1,13 @@
 package net.javadiscord.javabot.api.routes.user_profile;
 
 import com.github.benmanes.caffeine.cache.Caffeine;
+import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.User;
 import net.javadiscord.javabot.Bot;
 import net.javadiscord.javabot.api.response.ApiResponseBuilder;
 import net.javadiscord.javabot.api.response.ApiResponses;
 import net.javadiscord.javabot.api.routes.CaffeineCache;
-import net.javadiscord.javabot.api.routes.JDAEntity;
 import net.javadiscord.javabot.api.routes.user_profile.model.HelpAccountData;
 import net.javadiscord.javabot.api.routes.user_profile.model.UserProfileData;
 import net.javadiscord.javabot.systems.help.HelpExperienceService;
@@ -20,6 +20,7 @@
 import net.javadiscord.javabot.systems.user_preferences.model.UserPreference;
 import net.javadiscord.javabot.util.ExceptionLogger;
 import net.javadiscord.javabot.util.Pair;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -38,16 +39,21 @@
  * Handles all GET-Requests on the {guild_id}/{user_id} route.
  */
 @RestController
-public class UserProfileController extends CaffeineCache<Pair<Long, Long>, UserProfileData> implements JDAEntity {
+public class UserProfileController extends CaffeineCache<Pair<Long, Long>, UserProfileData> {
+	private final JDA jda;
 
 	/**
 	 * The constructor of this class which initializes the {@link Caffeine} cache.
+	 *
+	 * @param jda The {@link Autowired} {@link JDA} instance to use.
 	 */
-	public UserProfileController() {
+	@Autowired
+	public UserProfileController(final JDA jda) {
 		super(Caffeine.newBuilder()
 				.expireAfterWrite(10, TimeUnit.MINUTES)
 				.build()
 		);
+		this.jda = jda;
 	}
 
 	/**
@@ -65,11 +71,11 @@ public ResponseEntity<String> getUserProfile(
 			@PathVariable(value = "guild_id") String guildId,
 			@PathVariable(value = "user_id") String userId
 	) {
-		Guild guild = getJDA().getGuildById(guildId);
+		Guild guild = jda.getGuildById(guildId);
 		if (guild == null) {
 			return new ResponseEntity<>(ApiResponses.INVALID_GUILD_IN_REQUEST, HttpStatus.BAD_REQUEST);
 		}
-		User user = getJDA().retrieveUserById(userId).complete();
+		User user = jda.retrieveUserById(userId).complete();
 		if (user == null) {
 			return new ResponseEntity<>(ApiResponses.INVALID_USER_IN_REQUEST, HttpStatus.BAD_REQUEST);
 		}

src/main/java/net/javadiscord/javabot/api/routes/user_profile/UserProfileController.java

@@ -0,0 +1,17 @@
+package net.javadiscord.javabot.data;
+
+import net.dv8tion.jda.api.JDA;
+import net.javadiscord.javabot.Bot;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * This class holds all configuration settings and {@link Bean}s.
+ */
+@Configuration
+public class SpringConfig {
+	@Bean
+	public JDA getJDA() {
+		return Bot.getDih4jda().getJDA();
+	}
+}