Remove unused connection factory bean

DreamExposure · Aug 28, 2023 · ad43c3e · ad43c3e
1 parent d2ec903
commit ad43c3e
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 54 deletions.
diff --git a/cam/src/main/kotlin/org/dreamexposure/discal/cam/config/WebFluxConfig.kt b/cam/src/main/kotlin/org/dreamexposure/discal/cam/config/WebFluxConfig.kt
@@ -1,11 +1,6 @@
 package org.dreamexposure.discal.cam.config
 
-import io.r2dbc.spi.ConnectionFactories
-import io.r2dbc.spi.ConnectionFactory
-import io.r2dbc.spi.ConnectionFactoryOptions
-import org.dreamexposure.discal.core.config.Config
 import org.dreamexposure.discal.core.utils.GlobalVal
-import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.http.codec.ServerCodecConfigurer
 import org.springframework.http.codec.json.KotlinSerializationJsonDecoder
@@ -17,19 +12,6 @@ import org.springframework.web.reactive.config.WebFluxConfigurer
 @EnableWebFlux
 class WebFluxConfig: WebFluxConfigurer {
 
-    @Bean(name = ["mysqlDatasource"])
-    fun mysqlConnectionFactory(): ConnectionFactory {
-        return ConnectionFactories.get(ConnectionFactoryOptions.builder()
-            .option(ConnectionFactoryOptions.DRIVER, "pool")
-            .option(ConnectionFactoryOptions.PROTOCOL, "mysql")
-            .option(ConnectionFactoryOptions.HOST, Config.SQL_HOST.getString())
-            .option(ConnectionFactoryOptions.PORT, Config.SQL_PORT.getInt())
-            .option(ConnectionFactoryOptions.USER, Config.SQL_USER.getString())
-            .option(ConnectionFactoryOptions.PASSWORD, Config.SQL_PASS.getString())
-            .option(ConnectionFactoryOptions.DATABASE, Config.SQL_DB.getString())
-                .build())
-    }
-
     override fun configureHttpMessageCodecs(configurer: ServerCodecConfigurer) {
         val codecs = configurer.defaultCodecs()
         codecs.kotlinSerializationJsonDecoder(KotlinSerializationJsonDecoder(GlobalVal.JSON_FORMAT))

diff --git a/client/src/main/kotlin/org/dreamexposure/discal/client/config/WebFluxConfig.kt b/client/src/main/kotlin/org/dreamexposure/discal/client/config/WebFluxConfig.kt
@@ -1,14 +1,9 @@
 package org.dreamexposure.discal.client.config
 
-import io.r2dbc.spi.ConnectionFactories
-import io.r2dbc.spi.ConnectionFactory
-import io.r2dbc.spi.ConnectionFactoryOptions
-import org.dreamexposure.discal.core.config.Config
 import org.dreamexposure.discal.core.utils.GlobalVal
 import org.springframework.boot.web.server.ConfigurableWebServerFactory
 import org.springframework.boot.web.server.ErrorPage
 import org.springframework.boot.web.server.WebServerFactoryCustomizer
-import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpStatus
 import org.springframework.http.codec.ServerCodecConfigurer
@@ -31,19 +26,6 @@ class WebFluxConfig : WebFluxConfigurer, WebServerFactoryCustomizer<Configurable
                 .allowedOrigins("*")
     }
 
-    @Bean(name = ["mysqlDatasource"])
-    fun mysqlConnectionFactory(): ConnectionFactory {
-        return ConnectionFactories.get(ConnectionFactoryOptions.builder()
-            .option(ConnectionFactoryOptions.DRIVER, "pool")
-            .option(ConnectionFactoryOptions.PROTOCOL, "mysql")
-            .option(ConnectionFactoryOptions.HOST, Config.SQL_HOST.getString())
-            .option(ConnectionFactoryOptions.PORT, Config.SQL_PORT.getInt())
-            .option(ConnectionFactoryOptions.USER, Config.SQL_USER.getString())
-            .option(ConnectionFactoryOptions.PASSWORD, Config.SQL_PASS.getString())
-            .option(ConnectionFactoryOptions.DATABASE, Config.SQL_DB.getString())
-                .build())
-    }
-
     override fun configureHttpMessageCodecs(configurer: ServerCodecConfigurer) {
         val codecs = configurer.defaultCodecs()
         codecs.kotlinSerializationJsonDecoder(KotlinSerializationJsonDecoder(GlobalVal.JSON_FORMAT))

diff --git a/server/src/main/kotlin/org/dreamexposure/discal/server/config/WebFluxConfig.kt b/server/src/main/kotlin/org/dreamexposure/discal/server/config/WebFluxConfig.kt
@@ -1,14 +1,9 @@
 package org.dreamexposure.discal.server.config
 
-import io.r2dbc.spi.ConnectionFactories
-import io.r2dbc.spi.ConnectionFactory
-import io.r2dbc.spi.ConnectionFactoryOptions
-import org.dreamexposure.discal.core.config.Config
 import org.dreamexposure.discal.core.utils.GlobalVal
 import org.springframework.boot.web.server.ConfigurableWebServerFactory
 import org.springframework.boot.web.server.ErrorPage
 import org.springframework.boot.web.server.WebServerFactoryCustomizer
-import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpStatus
 import org.springframework.http.codec.ServerCodecConfigurer
@@ -34,19 +29,6 @@ class WebFluxConfig : WebServerFactoryCustomizer<ConfigurableWebServerFactory>,
                 .maxAge(600)
     }
 
-    @Bean(name = ["mysqlDatasource"])
-    fun mysqlConnectionFactory(): ConnectionFactory {
-        return ConnectionFactories.get(ConnectionFactoryOptions.builder()
-            .option(ConnectionFactoryOptions.DRIVER, "pool")
-            .option(ConnectionFactoryOptions.PROTOCOL, "mysql")
-            .option(ConnectionFactoryOptions.HOST, Config.SQL_HOST.getString())
-            .option(ConnectionFactoryOptions.PORT, Config.SQL_PORT.getInt())
-            .option(ConnectionFactoryOptions.USER, Config.SQL_USER.getString())
-            .option(ConnectionFactoryOptions.PASSWORD, Config.SQL_PASS.getString())
-            .option(ConnectionFactoryOptions.DATABASE, Config.SQL_DB.getString())
-                .build())
-    }
-
     override fun configureHttpMessageCodecs(configurer: ServerCodecConfigurer) {
         val codecs = configurer.defaultCodecs()
         codecs.kotlinSerializationJsonDecoder(KotlinSerializationJsonDecoder(GlobalVal.JSON_FORMAT))