From d3c12157b0655941ee051f9803d12be9844410b3 Mon Sep 17 00:00:00 2001
From: Tomas Slusny <slusnucky@gmail.com>
Date: Thu, 14 Feb 2019 21:56:57 +0100
Subject: [PATCH] Add development configuration for Spring http-service

- Remove spring boot test (no longer necessary)
- Move test development configuration to main package

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
---
 http-service/pom.xml                          | 12 ++---
 .../resources/application-dev.yaml            |  0
 .../service/SpringBootWebApplicationTest.java | 45 -------------------
 3 files changed, 6 insertions(+), 51 deletions(-)
 rename http-service/src/{test => main}/resources/application-dev.yaml (100%)
 delete mode 100644 http-service/src/test/java/net/runelite/http/service/SpringBootWebApplicationTest.java

diff --git a/http-service/pom.xml b/http-service/pom.xml
index e2c6296431..c297dcedf2 100644
--- a/http-service/pom.xml
+++ b/http-service/pom.xml
@@ -82,6 +82,12 @@
 			<version>${project.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>5.1.43</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.sql2o</groupId>
 			<artifactId>sql2o</artifactId>
@@ -127,12 +133,6 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.43</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>mockwebserver</artifactId>
diff --git a/http-service/src/test/resources/application-dev.yaml b/http-service/src/main/resources/application-dev.yaml
similarity index 100%
rename from http-service/src/test/resources/application-dev.yaml
rename to http-service/src/main/resources/application-dev.yaml
diff --git a/http-service/src/test/java/net/runelite/http/service/SpringBootWebApplicationTest.java b/http-service/src/test/java/net/runelite/http/service/SpringBootWebApplicationTest.java
deleted file mode 100644
index 6adcc0f6f0..0000000000
--- a/http-service/src/test/java/net/runelite/http/service/SpringBootWebApplicationTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2019, Adam <Adam@sigterm.info>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package net.runelite.http.service;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import org.springframework.boot.SpringApplication;
-
-public class SpringBootWebApplicationTest
-{
-	@Test
-	@Ignore
-	public void run() throws InterruptedException
-	{
-		System.setProperty("spring.profiles.active", "dev");
-		SpringApplication.run(SpringBootWebApplication.class);
-
-		for (;;)
-		{
-			Thread.sleep(100L);
-		}
-	}
-}
\ No newline at end of file