server: fix migration to spring 4

Author: Onotole1

01_di/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Fri Oct 30 13:18:19 MSK 2020
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

01_di/server/build.gradle.kts

@@ -21,7 +21,6 @@ dependencies {
     implementation("com.github.javafaker:javafaker:1.0.2") {
         exclude(module = "snakeyaml")
     }
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation("org.apache.tika:tika-core:3.2.3")
     implementation("com.google.firebase:firebase-admin:9.7.0")

01_di/server/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

01_di/server/src/main/kotlin/ru/netology/nmedia/entity/UserEntity.kt

@@ -25,5 +25,5 @@ data class UserEntity(
     override fun isCredentialsNonExpired(): Boolean = true
     override fun isEnabled(): Boolean = true
 
-    fun toDto() = User(id, login, name, avatar, authorities.map(GrantedAuthority::getAuthority))
+    fun toDto() = User(id, login, name, avatar, authorities.mapNotNull(GrantedAuthority::getAuthority))
 }

01_di/server/src/main/kotlin/ru/netology/nmedia/extensions/Security.kt

@@ -3,5 +3,5 @@ package ru.netology.nmedia.extensions
 import org.springframework.security.core.context.SecurityContextHolder
 import ru.netology.nmedia.dto.User
 
-fun principal() = SecurityContextHolder.getContext().authentication.principal as User
-fun principalOrNull() = SecurityContextHolder.getContext()?.authentication?.principal as? User?
+fun principal() = requireNotNull(SecurityContextHolder.getContext().authentication).principal as User
+fun principalOrNull() = SecurityContextHolder.getContext().authentication?.principal as? User?

01_di/server/src/main/kotlin/ru/netology/nmedia/service/PostService.kt

@@ -57,7 +57,7 @@ class PostService(
                         likedByMe = false,
                         published = OffsetDateTime.now().toEpochSecond()
                     )
-                ).copy(author = userRepository.getById(principal.id))
+                ).copy(author = userRepository.getReferenceById(principal.id))
             )
             .let {
                 if (it.author.id != principal.id) {

01_di/server/src/main/kotlin/ru/netology/nmedia/service/PushService.kt

@@ -1,13 +1,13 @@
 package ru.netology.nmedia.service
 
-import com.fasterxml.jackson.databind.ObjectMapper
 import com.google.firebase.messaging.FirebaseMessaging
 import com.google.firebase.messaging.Message
 import jakarta.transaction.Transactional
 import org.springframework.context.annotation.Lazy
 import org.springframework.stereotype.Service
 import ru.netology.nmedia.dto.PushMessage
 import ru.netology.nmedia.repository.PushTokenRepository
+import tools.jackson.databind.ObjectMapper
 
 @Service
 @Transactional

01_di/server/src/main/kotlin/ru/netology/nmedia/service/ScheduledPostGeneratorService.kt

@@ -16,7 +16,7 @@ class ScheduledPostGeneratorService(
 
     @Scheduled(initialDelay = 60 * 1000, fixedRate = 5 * 60 * 1000)
     fun generate() {
-        val user = userService.getByLogin("got")
+        val user = userService.getByLogin("got") ?: return
 
         postService.saveInitial(
             Post(

01_di/server/src/main/kotlin/ru/netology/nmedia/service/UserService.kt

@@ -37,7 +37,7 @@ class UserService(
         UserEntity(
             0L,
             login,
-            passwordEncoder.encode(pass),
+            requireNotNull(passwordEncoder.encode(pass)),
             name,
             avatar,
         )
@@ -56,7 +56,7 @@ class UserService(
             UserEntity(
                 0L,
                 login,
-                passwordEncoder.encode(pass),
+                requireNotNull(passwordEncoder.encode(pass)),
                 name,
                 avatar?.id ?: "", // TODO:
             )
@@ -78,16 +78,16 @@ class UserService(
             token
         } ?: throw NotFoundException()
 
-    fun getByLogin(login: String): User = userRepository
+    fun getByLogin(login: String): User? = userRepository
         .findByLogin(login)
-        ?.toDto() ?: throw NotFoundException()
+        ?.toDto()
 
     fun getByToken(token: String): User? = tokenRepository
         .findByIdOrNull(token)
         ?.user
         ?.toDto()
 
-    override fun loadUserByUsername(username: String?): UserDetails =
+    override fun loadUserByUsername(username: String): UserDetails =
         userRepository.findByLogin(username) ?: throw UsernameNotFoundException(username)
 
     fun saveInitialToken(userId: Long, value: String): Token =

02_arch/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Feb 07 20:04:31 NOVT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME