Skip to content

Commit 1b154c6

Browse files
committed
update api to get rid of jdbc schema provider
1 parent 23061cc commit 1b154c6

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemApi.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package app.softnetwork.resource.api
22

33
import akka.actor.typed.ActorSystem
44
import app.softnetwork.persistence.jdbc.query.{JdbcJournalProvider, JdbcOffsetProvider}
5-
import app.softnetwork.persistence.jdbc.schema.JdbcSchemaProvider
5+
import app.softnetwork.persistence.schema.SchemaProvider
66
import app.softnetwork.resource.model.Resource
77
import app.softnetwork.resource.persistence.query.{
88
GenericResourceToExternalProcessorStream,
@@ -11,7 +11,7 @@ import app.softnetwork.resource.persistence.query.{
1111
import app.softnetwork.resource.service.{GenericResourceService, LocalFileSystemResourceService}
1212
import com.typesafe.config.Config
1313

14-
trait ResourceToLocalFileSystemApi extends ResourceApi with JdbcSchemaProvider {
14+
trait ResourceToLocalFileSystemApi extends ResourceApi { _: SchemaProvider =>
1515
override def resourceToExternalProcessorStream
1616
: ActorSystem[_] => GenericResourceToExternalProcessorStream[Resource] =
1717
sys =>
Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,22 @@
11
package app.softnetwork.resource.api
22

3-
import app.softnetwork.persistence.jdbc.schema.JdbcSchemaTypes.Postgres
4-
import app.softnetwork.persistence.schema.SchemaType
3+
import akka.actor
4+
import akka.actor.typed.ActorSystem
5+
import app.softnetwork.persistence.jdbc.schema.{JdbcSchema, JdbcSchemaTypes}
6+
import app.softnetwork.persistence.schema.{Schema, SchemaProvider, SchemaType}
7+
import app.softnetwork.persistence.typed._
8+
import com.typesafe.config.Config
59
import org.slf4j.{Logger, LoggerFactory}
610

7-
object ResourceToLocalFileSystemPostgresLauncher extends ResourceToLocalFileSystemApi {
11+
object ResourceToLocalFileSystemPostgresLauncher
12+
extends ResourceToLocalFileSystemApi
13+
with SchemaProvider {
814
lazy val log: Logger = LoggerFactory getLogger getClass.getName
915

10-
override val schemaType: SchemaType = Postgres
16+
override def schema: ActorSystem[_] => Schema = sys =>
17+
new JdbcSchema {
18+
override def schemaType: SchemaType = JdbcSchemaTypes.Postgres
19+
override implicit def classicSystem: actor.ActorSystem = sys
20+
override def config: Config = ResourceToLocalFileSystemPostgresLauncher.this.config
21+
}
1122
}

0 commit comments

Comments
 (0)