Make dataSource lazy to avoid initialization before needed

Since we now start the applications when generating typescript we need
to be able to build the component registry without connecting to a
database.

This patch moves the actual database connecting to `DBMigrator` and
make the `dataSource` member lazy so it isn't accessed before needed.

Author: jnatten

article-api/src/main/scala/no/ndla/articleapi/ComponentRegistry.scala

@@ -83,9 +83,7 @@ class ComponentRegistry(properties: ArticleApiProperties)
   )
   override val DBUtil: DBUtility = new DBUtility
 
-  override val dataSource: HikariDataSource = DataSource.getHikariDataSource
-  DataSource.connectToDatabase()
-
+  lazy val dataSource: HikariDataSource            = DataSource.getHikariDataSource
   lazy val internController                        = new InternController
   lazy val articleControllerV2                     = new ArticleControllerV2
   lazy val healthController: TapirHealthController = new TapirHealthController

article-api/src/test/scala/no/ndla/articleapi/repository/ArticleRepositoryTest.scala

@@ -41,7 +41,7 @@ class ArticleRepositoryTest
 
   override def beforeAll(): Unit = {
     super.beforeAll()
-    ConnectionPool.singleton(new DataSourceConnectionPool(dataSource))
+    DataSource.connectToDatabase()
     if (serverIsListening) {
       migrator.migrate()
     }

audio-api/src/main/scala/no/ndla/audioapi/ComponentRegistry.scala

@@ -66,8 +66,7 @@ class ComponentRegistry(properties: AudioApiProperties)
     new V5__AddAgreementToAudio,
     new V6__TranslateUntranslatedAuthors
   )
-  override val dataSource: HikariDataSource = DataSource.getHikariDataSource
-  DataSource.connectToDatabase()
+  override lazy val dataSource: HikariDataSource = DataSource.getHikariDataSource
 
   lazy val s3Client           = new NdlaS3Client(props.StorageName, props.StorageRegion)
   lazy val s3TranscribeClient = new NdlaS3Client(props.TranscribeStorageName, props.TranscribeStorageRegion)

audio-api/src/main/scala/no/ndla/audioapi/repository/AudioRepository.scala

@@ -24,8 +24,6 @@ trait AudioRepository {
   val audioRepository: AudioRepository
 
   class AudioRepository extends StrictLogging with Repository[AudioMetaInformation] {
-    ConnectionPool.singleton(new DataSourceConnectionPool(dataSource))
-
     def audioCount(implicit session: DBSession = ReadOnlyAutoSession): Long =
       sql"select count(*) from ${AudioMetaInformation.table}"
         .map(rs => rs.long("count"))

concept-api/src/main/scala/no/ndla/conceptapi/ComponentRegistry.scala

@@ -67,8 +67,7 @@ class ComponentRegistry(properties: ConceptApiProperties)
     new V25__SubjectNameAsTagsPublished(props)
   )
 
-  override val dataSource: HikariDataSource = DataSource.getHikariDataSource
-  DataSource.connectToDatabase()
+  override lazy val dataSource: HikariDataSource = DataSource.getHikariDataSource
 
   lazy val draftConceptRepository     = new DraftConceptRepository
   lazy val publishedConceptRepository = new PublishedConceptRepository

database/src/main/scala/no/ndla/database/DBMigrator.scala

@@ -17,6 +17,8 @@ trait DBMigrator {
 
   case class DBMigrator(migrations: JavaMigration*) {
     def migrate(): Unit = {
+      DataSource.connectToDatabase()
+
       val config = Flyway
         .configure()
         .javaMigrations(migrations*)

draft-api/src/main/scala/no/ndla/draftapi/ComponentRegistry.scala

@@ -98,9 +98,8 @@ class ComponentRegistry(properties: DraftApiProperties)
     new V57__MigrateSavedSearch,
     new V66__SetHideBylineForImagesNotCopyrighted
   )
-  override val dataSource: HikariDataSource = DataSource.getHikariDataSource
+  override lazy val dataSource: HikariDataSource = DataSource.getHikariDataSource
   override val DBUtil: DBUtility            = new DBUtility
-  DataSource.connectToDatabase()
 
   lazy val draftRepository    = new DraftRepository
   lazy val userDataRepository = new UserDataRepository

frontpage-api/src/main/scala/no/ndla/frontpageapi/ComponentRegistry.scala

@@ -41,8 +41,7 @@ class ComponentRegistry(properties: FrontpageApiProperties)
     with SwaggerDocControllerConfig {
   override val props: FrontpageApiProperties = properties
   override val migrator: DBMigrator          = DBMigrator()
-  override val dataSource: HikariDataSource  = DataSource.getHikariDataSource
-  DataSource.connectToDatabase()
+  override lazy val dataSource: HikariDataSource  = DataSource.getHikariDataSource
 
   override val clock = new SystemClock
 

image-api/src/main/scala/no/ndla/imageapi/ComponentRegistry.scala

@@ -72,8 +72,7 @@ class ComponentRegistry(properties: ImageApiProperties)
     new V6__AddAgreementToImages,
     new V7__TranslateUntranslatedAuthors
   )
-  override val dataSource: HikariDataSource = DataSource.getHikariDataSource
-  DataSource.connectToDatabase()
+  override lazy val dataSource: HikariDataSource = DataSource.getHikariDataSource
 
   lazy val s3Client = new NdlaS3Client(props.StorageName, props.StorageRegion)
 

learningpath-api/src/main/scala/no/ndla/learningpathapi/ComponentRegistry.scala

@@ -86,8 +86,7 @@ class ComponentRegistry(properties: LearningpathApiProperties)
     new V31__ArenaDefaultEnabledOrgs,
     new V33__AiDefaultEnabledOrgs
   )
-  override val dataSource: HikariDataSource = DataSource.getHikariDataSource
-  DataSource.connectToDatabase()
+  override lazy val dataSource: HikariDataSource = DataSource.getHikariDataSource
 
   lazy val learningPathRepository = new LearningPathRepository
   lazy val readService            = new ReadService

myndla-api/src/main/scala/no/ndla/myndlaapi/ComponentRegistry.scala

@@ -94,8 +94,7 @@ class ComponentRegistry(properties: MyNdlaApiProperties)
   lazy val DBUtil                                               = new DBUtility
 
   override val migrator: DBMigrator         = DBMigrator(v16__MigrateResourcePaths)
-  override val dataSource: HikariDataSource = DataSource.getHikariDataSource
-  DataSource.connectToDatabase()
+  override lazy val dataSource: HikariDataSource = DataSource.getHikariDataSource
 
   val swagger = new SwaggerController(
     List(