Closes #50 - annotated service for resolving the bean issue

AbsaOSS · Oct 23, 2023 · 0e84b16 · 0e84b16
1 parent 3241f97
commit 0e84b16
Show file tree

Hide file tree

Showing 71 changed files with 6 additions and 10 deletions.
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/byte-buddy-1.12.10.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/byte-buddy-1.12.10.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/classgraph-4.8.83.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/classgraph-4.8.83.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/classmate-1.5.1.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/classmate-1.5.1.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/commons_2.12-1.0.0.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/commons_2.12-1.0.0.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/config-1.4.2.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/config-1.4.2.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/jackson-annotations-2.14.2.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/jackson-annotations-2.14.2.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/jackson-core-2.14.2.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/jackson-core-2.14.2.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/jackson-databind-2.14.2.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/jackson-databind-2.14.2.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/jackson-datatype-jdk8-2.13.0.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/jackson-datatype-jdk8-2.13.0.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/jackson-datatype-jsr310-2.13.0.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/jackson-datatype-jsr310-2.13.0.jar
diff --git a/...tifacts/atumServer2_12_war_exploded/WEB-INF/lib/jackson-module-parameter-names-2.13.0.jar b/...tifacts/atumServer2_12_war_exploded/WEB-INF/lib/jackson-module-parameter-names-2.13.0.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/jackson-module-scala_2.12-2.14.2.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/jackson-module-scala_2.12-2.14.2.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/jakarta.annotation-api-1.3.5.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/jakarta.annotation-api-1.3.5.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/jul-to-slf4j-1.7.32.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/jul-to-slf4j-1.7.32.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/log4j-api-2.14.1.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/log4j-api-2.14.1.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/log4j-to-slf4j-2.14.1.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/log4j-to-slf4j-2.14.1.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/logback-classic-1.2.7.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/logback-classic-1.2.7.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/logback-core-1.2.7.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/logback-core-1.2.7.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/mapstruct-1.3.1.Final.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/mapstruct-1.3.1.Final.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/objenesis-3.2.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/objenesis-3.2.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/paranamer-2.8.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/paranamer-2.8.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/scala-java8-compat_2.12-1.0.2.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/scala-java8-compat_2.12-1.0.2.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/scala-library-2.12.12.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/scala-library-2.12.12.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/scala-xml_2.12-2.1.0.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/scala-xml_2.12-2.1.0.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/slf4j-api-1.7.32.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/slf4j-api-1.7.32.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/snakeyaml-1.29.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/snakeyaml-1.29.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spark-commons-spark3.3_2.12-0.6.0.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spark-commons-spark3.3_2.12-0.6.0.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spark-hats_2.12-0.2.2.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spark-hats_2.12-0.2.2.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spark-hofs_2.12-0.4.0.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spark-hofs_2.12-0.4.0.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-aop-5.3.13.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-aop-5.3.13.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-beans-5.3.13.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-beans-5.3.13.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-boot-2.6.1.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-boot-2.6.1.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-boot-autoconfigure-2.6.1.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-boot-autoconfigure-2.6.1.jar
diff --git a/...cts/atumServer2_12_war_exploded/WEB-INF/lib/spring-boot-configuration-processor-2.6.1.jar b/...cts/atumServer2_12_war_exploded/WEB-INF/lib/spring-boot-configuration-processor-2.6.1.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-boot-starter-2.6.1.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-boot-starter-2.6.1.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-boot-starter-json-2.6.1.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-boot-starter-json-2.6.1.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-boot-starter-logging-2.6.1.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-boot-starter-logging-2.6.1.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-boot-starter-tomcat-2.6.1.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-boot-starter-tomcat-2.6.1.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-boot-starter-web-2.6.1.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-boot-starter-web-2.6.1.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-context-5.3.13.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-context-5.3.13.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-core-5.3.13.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-core-5.3.13.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-expression-5.3.13.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-expression-5.3.13.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-jcl-5.3.13.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-jcl-5.3.13.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-plugin-core-2.0.0.RELEASE.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-plugin-core-2.0.0.RELEASE.jar
diff --git a/...rtifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-plugin-metadata-2.0.0.RELEASE.jar b/...rtifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-plugin-metadata-2.0.0.RELEASE.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-web-5.3.13.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-web-5.3.13.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-webmvc-5.3.13.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/spring-webmvc-5.3.13.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/springfox-bean-validators-3.0.0.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/springfox-bean-validators-3.0.0.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/springfox-boot-starter-3.0.0.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/springfox-boot-starter-3.0.0.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/springfox-core-3.0.0.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/springfox-core-3.0.0.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/springfox-data-rest-3.0.0.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/springfox-data-rest-3.0.0.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/springfox-oas-3.0.0.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/springfox-oas-3.0.0.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/springfox-schema-3.0.0.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/springfox-schema-3.0.0.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/springfox-spi-3.0.0.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/springfox-spi-3.0.0.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/springfox-spring-web-3.0.0.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/springfox-spring-web-3.0.0.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/springfox-spring-webflux-3.0.0.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/springfox-spring-webflux-3.0.0.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/springfox-spring-webmvc-3.0.0.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/springfox-spring-webmvc-3.0.0.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/springfox-swagger-common-3.0.0.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/springfox-swagger-common-3.0.0.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/springfox-swagger-ui-3.0.0.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/springfox-swagger-ui-3.0.0.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/springfox-swagger2-3.0.0.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/springfox-swagger2-3.0.0.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/swagger-annotations-1.5.20.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/swagger-annotations-1.5.20.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/swagger-annotations-2.1.2.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/swagger-annotations-2.1.2.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/swagger-models-1.5.20.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/swagger-models-1.5.20.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/swagger-models-2.1.2.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/swagger-models-2.1.2.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/tomcat-embed-el-9.0.55.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/tomcat-embed-el-9.0.55.jar
diff --git a/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/tomcat-embed-websocket-9.0.55.jar b/out/artifacts/atumServer2_12_war_exploded/WEB-INF/lib/tomcat-embed-websocket-9.0.55.jar
diff --git a/server/src/main/scala/za/co/absa/atum/web/api/config/BaseConfig.scala b/server/src/main/scala/za/co/absa/atum/web/api/config/BaseConfig.scala
@@ -16,7 +16,7 @@
 
 package za.co.absa.atum.web.api.config
 
-import org.springframework.boot.context.properties.{ConfigurationProperties}
+import org.springframework.boot.context.properties.ConfigurationProperties
 
 @ConfigurationProperties(prefix = "atum.web.api.config")
 class BaseConfig(

diff --git a/server/src/main/scala/za/co/absa/atum/web/api/controller/BaseApiController.scala b/server/src/main/scala/za/co/absa/atum/web/api/controller/BaseApiController.scala
@@ -24,16 +24,10 @@ import za.co.absa.atum.web.api.implicits._
 import za.co.absa.atum.web.api.payload.MessagePayload
 import za.co.absa.atum.web.api.service.BaseApiService
 import za.co.absa.atum.web.model.BaseApiModel
-
 import java.net.URI
 import java.util.{Optional, UUID}
 import java.util.concurrent.CompletableFuture
 //import javax.servlet.http.HttpServletRequest
-
-//import java.net.URI
-//import java.util.concurrent.CompletableFuture
-//import java.util.{Optional, UUID}
-//import javax.servlet.http.HttpServletRequest
 import scala.concurrent.ExecutionContext.Implicits.global
 
 abstract class BaseApiController[C <: BaseApiModel](baseApiService: BaseApiService[C]) {

diff --git a/server/src/main/scala/za/co/absa/atum/web/api/controller/CheckPointController.scala b/server/src/main/scala/za/co/absa/atum/web/api/controller/CheckPointController.scala
@@ -26,7 +26,7 @@ import za.co.absa.atum.web.api.service.CheckPointService
 @RestController
 class CheckPointController {
 
-  @Autowired
+  @Autowired()
   private val checkpointService: CheckPointService = null
 
   @PostMapping(Array("/save-checkpoint"))

diff --git a/server/src/main/scala/za/co/absa/atum/web/api/service/CheckPointService.scala b/server/src/main/scala/za/co/absa/atum/web/api/service/CheckPointService.scala
@@ -17,10 +17,13 @@
 package za.co.absa.atum.web.api.service
 
 import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.context.annotation.Bean
+import org.springframework.stereotype.Service
 import za.co.absa.atum.model.dto.CheckpointDTO
 import za.co.absa.atum.web.api.database.Runs
 
-
+@Service
+@Bean
 class CheckPointService {
   @Autowired
   private val checkpointRepository: Runs = null

diff --git a/server/src/main/scala/za/co/absa/atum/web/api/service/PostgresAccessProvider.scala b/server/src/main/scala/za/co/absa/atum/web/api/service/PostgresAccessProvider.scala
@@ -24,7 +24,6 @@ import za.co.absa.atum.web.api.database.Runs
 import za.co.absa.atum.web.api.service.utils.ExecutorsProvider
 import za.co.absa.fadb.slick.SlickPgEngine
 
-
 @Component
 class PostgresAccessProvider@Autowired()( executors: ExecutorsProvider ) {