Add secrets config

.gitignore

@@ -4,6 +4,7 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
+src/main/resources/secrets.properties
 
 ### STS ###
 .apt_generated

build.gradle.kts

@@ -53,6 +53,7 @@ dependencies {
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 
     detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.7")
+    annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
 }
 
 kotlin {
@@ -64,3 +65,4 @@ kotlin {
 tasks.withType<Test> {
     useJUnitPlatform()
 }
+

src/main/kotlin/concept/stc/SpringThymeleafCoroutinesApplication.kt → src/main/kotlin/concept/stc/STCApplication.kt

@@ -1,17 +1,20 @@
 package concept.stc
 
+import concept.stc.config.OmdbApiConfigProperties
 import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.boot.runApplication
 
 /**
  * Application entry point.
  */
 @SpringBootApplication
-class SpringThymeleafCoroutinesApplication
+@EnableConfigurationProperties(OmdbApiConfigProperties::class)
+class STCApplication
 
 /**
  * Application entry point.
  */
 fun main(args: Array<String>) {
-    runApplication<SpringThymeleafCoroutinesApplication>(args = args)
+    runApplication<STCApplication>(args = args)
 }

src/main/kotlin/concept/stc/config/OmdbApiConfigProperties.kt

@@ -0,0 +1,15 @@
+package concept.stc.config
+
+import org.springframework.boot.context.properties.ConfigurationProperties
+
+/**
+ * Config definition for Open Movie Database (OMDB) API properties.
+ *
+ * @property baseUrl the api base url.
+ * @property apiKey the api key.
+ */
+@ConfigurationProperties(prefix = "omdb")
+data class OmdbApiConfigProperties(
+    val baseUrl: String,
+    val apiKey: String
+)

src/main/kotlin/concept/stc/data/remote/ApiClient.kt

@@ -0,0 +1,32 @@
+package concept.stc.data.remote
+
+import concept.stc.config.OmdbApiConfigProperties
+import kotlinx.coroutines.reactive.awaitFirst
+import org.springframework.stereotype.Component
+import org.springframework.web.reactive.function.client.WebClient
+
+/**
+ * Api client for external API.
+ *
+ * @param configProperties the API config properties.
+ */
+@Component
+class ApiClient(
+    private val configProperties: OmdbApiConfigProperties
+) {
+
+    private val webClient = WebClient.create(configProperties.baseUrl)
+
+    /**
+     * Get movies list from the external API.
+     *
+     * @param query the search query.
+     */
+    suspend fun getMovies(query: String) {
+        webClient.get()
+            .uri("/?apikey={apiKey}&s={query}", configProperties.apiKey, query)
+            .retrieve()
+            .bodyToMono(String::class.java)
+            .awaitFirst()
+    }
+}

src/main/resources/application.properties

@@ -1,3 +1,6 @@
+spring.config.import=optional:secrets.properties
+omdb.base-url=https://www.omdbapi.com
+
 spring.application.name=spring-thymeleaf-coroutines
 logging.level.org.springframework.jdbc.datasource.init.ScriptUtils=debug
-spring.jpa.hibernate.ddl-auto=none
+spring.jpa.hibernate.ddl-auto=none

src/main/resources/schema.sql

@@ -1,4 +1,4 @@
-CREATE TABLE movies (
+CREATE TABLE  IF NOT EXISTS movies (
     id INTEGER PRIMARY KEY AUTO_INCREMENT,
     title VARCHAR(255),
     movie_year VARCHAR(4),

src/test/kotlin/concept/stc/config/OmdbApiConfigIntegrationTest.kt

@@ -0,0 +1,24 @@
+package concept.stc.config
+
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace
+import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment
+import kotlin.test.Test
+import kotlin.test.assertTrue
+
+@SpringBootTest(webEnvironment = WebEnvironment.NONE)
+@AutoConfigureTestDatabase(replace = Replace.ANY)
+class OmdbApiConfigIntegrationTest {
+
+    @Autowired
+    private lateinit var configProperties: OmdbApiConfigProperties
+
+    @Test
+    fun `when getting properties, given config, then values are not empty`() {
+        assertTrue(configProperties.baseUrl.isNotEmpty())
+        // Be sure that "secrets.properties" contains the api key
+        // assertTrue(configProperties.apiKey.isNotEmpty())
+    }
+}

src/test/kotlin/concept/stc/data/local/MovieRepositoryIntegrationTest.kt

@@ -26,7 +26,7 @@ class MovieRepositoryIntegrationTest {
     }
 
     @Test
-    fun `when saving movie, given entity, then saved with not null id`() = runTest {
+    fun `when saving movie, given entity, then saved id is not null`() = runTest {
         // Given
         val entity = _entity.copy(imdbID = "test123")