Merge pull request #447 from AVSystem/spring5

Spring 5 upgrade

Author: ddworak

project/Commons.scala

@@ -31,7 +31,7 @@ object Commons extends ProjectGroup("commons") {
   val scalacheckVersion = "1.16.0"
   val jettyVersion = "9.4.51.v20230217"
   val mongoVersion = "4.9.1"
-  val springVersion = "4.3.26.RELEASE"
+  val springVersion = "5.3.28"
   val typesafeConfigVersion = "1.4.2"
   val commonsIoVersion = "1.3.2" // test only
   val scalaLoggingVersion = "3.9.5"
@@ -341,7 +341,6 @@ object Commons extends ProjectGroup("commons") {
       jvmCommonSettings,
       libraryDependencies ++= Seq(
         "com.google.guava" % "guava" % guavaVersion,
-        "com.typesafe.akka" %% "akka-actor" % akkaVersion,
         "com.typesafe.akka" %% "akka-stream" % akkaVersion,
         "com.typesafe.scala-logging" %% "scala-logging" % scalaLoggingVersion,
         "io.monix" %% "monix" % monixVersion,
@@ -364,6 +363,7 @@ object Commons extends ProjectGroup("commons") {
       jvmCommonSettings,
       libraryDependencies ++= Seq(
         "org.springframework" % "spring-context" % springVersion,
+        "com.google.code.findbugs" % "jsr305" % jsr305Version % Optional,
       ),
     )
 

spring/src/main/scala/com/avsystem/commons/spring/HoconBeanDefinitionReader.scala

@@ -20,7 +20,7 @@ class HoconBeanDefinitionReader(registry: BeanDefinitionRegistry)
   import com.typesafe.config.ConfigValueType._
 
   private implicit class ConfigValueExtensions(value: ConfigValue) {
-    def as[T: HoconType] =
+    def as[T: HoconType]: T =
       implicitly[HoconType[T]].get(value)
   }
 

spring/src/main/scala/com/avsystem/commons/spring/HoconType.scala

@@ -5,7 +5,7 @@ import com.typesafe.config._
 
 trait HoconType[T] {
 
-  protected def requireNonNull(value: ConfigValue) = {
+  protected def requireNonNull(value: ConfigValue): ConfigValue = {
     require(value != null, s"No value found")
     value
   }

spring/src/main/scala/com/avsystem/commons/spring/ScalaDefaultValuesInjector.scala

@@ -2,12 +2,12 @@ package com.avsystem.commons
 package spring
 
 import java.lang.reflect.{Constructor, Method, Modifier}
-
 import org.springframework.beans.factory.config.ConstructorArgumentValues.ValueHolder
 import org.springframework.beans.factory.config.{BeanDefinition, BeanDefinitionHolder, ConfigurableListableBeanFactory}
 import org.springframework.beans.factory.support._
 import org.springframework.core.{ParameterNameDiscoverer, StandardReflectionParameterNameDiscoverer}
 
+import scala.annotation.tailrec
 import scala.beans.BeanProperty
 import scala.reflect.{ScalaLongSignature, ScalaSignature}
 
@@ -48,6 +48,7 @@ class ScalaDefaultValuesInjector extends BeanDefinitionRegistryPostProcessor {
       .foreach(n => traverse(registry.getBeanDefinition(n)))
   }
 
+  @tailrec
   private def isScalaClass(cls: Class[_]): Boolean = cls.getEnclosingClass match {
     case null => cls.getAnnotation(classOf[ScalaSignature]) != null ||
       cls.getAnnotation(classOf[ScalaLongSignature]) != null