http-service: use spring externalized configuration for oauth id/secret

http-service/src/main/java/net/runelite/http/service/SpringBootWebApplication.java

@@ -59,18 +59,6 @@ public class SpringBootWebApplication extends SpringBootServletInitializer
 
 	}
 
-	@Bean("OAuth Client ID")
-	String oauthClientId() throws NamingException
-	{
-		return (String) getContext().lookup("runelite-oauth-client-id");
-	}
-
-	@Bean("OAuth Client Secret")
-	String oauthClientSecret() throws NamingException
-	{
-		return (String) getContext().lookup("runelite-oauth-client-secret");
-	}
-
 	@Override
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
 	{

http-service/src/main/java/net/runelite/http/service/account/AccountService.java

@@ -49,6 +49,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -97,8 +98,8 @@ public class AccountService
 	@Autowired
 	public AccountService(
 		@Qualifier("Runelite SQL2O") Sql2o sql2o,
-		@Qualifier("OAuth Client ID") String oauthClientId,
-		@Qualifier("OAuth Client Secret") String oauthClientSecret,
+		@Value("${oauth.client-id}") String oauthClientId,
+		@Value("${oauth.client-secret}") String oauthClientSecret,
 		AuthFilter auth
 	)
 	{

http-service/src/test/java/net/runelite/http/service/SpringBootWebApplicationTest.java

@@ -48,18 +48,6 @@ public class SpringBootWebApplicationTest
 
 	}
 
-	@Bean("OAuth Client ID")
-	String oauthClientId()
-	{
-		return "moo";
-	}
-
-	@Bean("OAuth Client Secret")
-	String oauthClientSecret()
-	{
-		return "moo2";
-	}
-
 	@Test
 	@Ignore
 	public void test() throws InterruptedException

http-service/src/test/resources/application.properties

@@ -0,0 +1,2 @@
+oauth.client-id=moo
+oauth.client-secret=cow