From 8f450aeff76a43de216e7e90b47533db868adc9b Mon Sep 17 00:00:00 2001 From: Alexander Buntakov Date: Thu, 10 Jun 2021 20:12:09 +0300 Subject: [PATCH] rename Model -> Entity --- .../{AbstractSettingModel.kt => AbstractSettingEntity.kt} | 2 +- .../{SystemSettingModel.kt => SystemSettingEntity.kt} | 2 +- .../settings/repositories/SystemSettingsRepository.kt | 6 +++--- .../touchin/settings/services/SystemSettingsServiceImpl.kt | 6 +++--- .../settings/repositories/SystemSettingRepositoryTest.kt | 4 ++-- .../SystemSettingsServiceImplDeserializationTest.kt | 4 ++-- .../services/SystemSettingsServiceImplSerializationTest.kt | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) rename settings-spring-jpa/src/main/kotlin/ru/touchin/settings/models/{AbstractSettingModel.kt => AbstractSettingEntity.kt} (82%) rename settings-spring-jpa/src/main/kotlin/ru/touchin/settings/models/{SystemSettingModel.kt => SystemSettingEntity.kt} (82%) diff --git a/settings-spring-jpa/src/main/kotlin/ru/touchin/settings/models/AbstractSettingModel.kt b/settings-spring-jpa/src/main/kotlin/ru/touchin/settings/models/AbstractSettingEntity.kt similarity index 82% rename from settings-spring-jpa/src/main/kotlin/ru/touchin/settings/models/AbstractSettingModel.kt rename to settings-spring-jpa/src/main/kotlin/ru/touchin/settings/models/AbstractSettingEntity.kt index ba5d2c6..42d235a 100644 --- a/settings-spring-jpa/src/main/kotlin/ru/touchin/settings/models/AbstractSettingModel.kt +++ b/settings-spring-jpa/src/main/kotlin/ru/touchin/settings/models/AbstractSettingEntity.kt @@ -5,7 +5,7 @@ import javax.persistence.Id import javax.persistence.MappedSuperclass @MappedSuperclass -open class AbstractSettingModel: AuditableEntity() { +open class AbstractSettingEntity: AuditableEntity() { @Id lateinit var key: String diff --git a/settings-spring-jpa/src/main/kotlin/ru/touchin/settings/models/SystemSettingModel.kt b/settings-spring-jpa/src/main/kotlin/ru/touchin/settings/models/SystemSettingEntity.kt similarity index 82% rename from settings-spring-jpa/src/main/kotlin/ru/touchin/settings/models/SystemSettingModel.kt rename to settings-spring-jpa/src/main/kotlin/ru/touchin/settings/models/SystemSettingEntity.kt index 1c21155..8df68d2 100644 --- a/settings-spring-jpa/src/main/kotlin/ru/touchin/settings/models/SystemSettingModel.kt +++ b/settings-spring-jpa/src/main/kotlin/ru/touchin/settings/models/SystemSettingEntity.kt @@ -6,4 +6,4 @@ import javax.persistence.Table @Entity @Table(name = "system_settings", schema = SCHEMA) -class SystemSettingModel : AbstractSettingModel() +class SystemSettingEntity : AbstractSettingEntity() diff --git a/settings-spring-jpa/src/main/kotlin/ru/touchin/settings/repositories/SystemSettingsRepository.kt b/settings-spring-jpa/src/main/kotlin/ru/touchin/settings/repositories/SystemSettingsRepository.kt index d72b572..6034318 100644 --- a/settings-spring-jpa/src/main/kotlin/ru/touchin/settings/repositories/SystemSettingsRepository.kt +++ b/settings-spring-jpa/src/main/kotlin/ru/touchin/settings/repositories/SystemSettingsRepository.kt @@ -3,11 +3,11 @@ package ru.touchin.settings.repositories import org.springframework.data.jpa.repository.JpaRepository import org.springframework.data.repository.findByIdOrNull import ru.touchin.settings.exceptions.SettingNotFoundException -import ru.touchin.settings.models.SystemSettingModel +import ru.touchin.settings.models.SystemSettingEntity -interface SystemSettingsRepository: JpaRepository +interface SystemSettingsRepository: JpaRepository -fun SystemSettingsRepository.findByIdOrThrow(key: String): SystemSettingModel { +fun SystemSettingsRepository.findByIdOrThrow(key: String): SystemSettingEntity { return findByIdOrNull(key) ?: throw SettingNotFoundException(key) } diff --git a/settings-spring-jpa/src/main/kotlin/ru/touchin/settings/services/SystemSettingsServiceImpl.kt b/settings-spring-jpa/src/main/kotlin/ru/touchin/settings/services/SystemSettingsServiceImpl.kt index 30d7969..bc1c09c 100644 --- a/settings-spring-jpa/src/main/kotlin/ru/touchin/settings/services/SystemSettingsServiceImpl.kt +++ b/settings-spring-jpa/src/main/kotlin/ru/touchin/settings/services/SystemSettingsServiceImpl.kt @@ -9,7 +9,7 @@ import org.springframework.transaction.annotation.Transactional import ru.touchin.settings.annotations.SettingMapper import ru.touchin.settings.dto.SystemSetting import ru.touchin.settings.exceptions.CannotParseSettingValueException -import ru.touchin.settings.models.SystemSettingModel +import ru.touchin.settings.models.SystemSettingEntity import ru.touchin.settings.repositories.SystemSettingsRepository import ru.touchin.settings.repositories.findByIdOrThrow @@ -23,7 +23,7 @@ class SystemSettingsServiceImpl( @Transactional override fun save(setting: SystemSetting): SystemSetting { val settingModel = systemSettingsRepository.findByIdOrNull(setting.key) - ?: SystemSettingModel().apply { + ?: SystemSettingEntity().apply { key = setting.key } @@ -34,7 +34,7 @@ class SystemSettingsServiceImpl( return setting } - private fun createSetting(model: SystemSettingModel, clazz: Class): SystemSetting { + private fun createSetting(model: SystemSettingEntity, clazz: Class): SystemSetting { val value = kotlin .runCatching { settingsObjectMapper.readValue(model.value, clazz) diff --git a/settings-spring-jpa/src/test/kotlin/ru/touchin/settings/repositories/SystemSettingRepositoryTest.kt b/settings-spring-jpa/src/test/kotlin/ru/touchin/settings/repositories/SystemSettingRepositoryTest.kt index 2b2c0bf..5b83832 100644 --- a/settings-spring-jpa/src/test/kotlin/ru/touchin/settings/repositories/SystemSettingRepositoryTest.kt +++ b/settings-spring-jpa/src/test/kotlin/ru/touchin/settings/repositories/SystemSettingRepositoryTest.kt @@ -8,7 +8,7 @@ import org.mockito.internal.matchers.apachecommons.ReflectionEquals import org.springframework.beans.factory.annotation.Autowired import ru.touchin.common.spring.test.jpa.repository.RepositoryTest import ru.touchin.settings.exceptions.SettingNotFoundException -import ru.touchin.settings.models.SystemSettingModel +import ru.touchin.settings.models.SystemSettingEntity import javax.persistence.EntityManager @RepositoryTest @@ -23,7 +23,7 @@ internal class SystemSettingRepositoryTest { @Test @DisplayName("Настройки должны сохраняться в базе") fun shouldBeSaved() { - val setting = SystemSettingModel() + val setting = SystemSettingEntity() .apply { key = "max.threads" value = "5" diff --git a/settings-spring-jpa/src/test/kotlin/ru/touchin/settings/services/SystemSettingsServiceImplDeserializationTest.kt b/settings-spring-jpa/src/test/kotlin/ru/touchin/settings/services/SystemSettingsServiceImplDeserializationTest.kt index 59a2dcf..723845d 100644 --- a/settings-spring-jpa/src/test/kotlin/ru/touchin/settings/services/SystemSettingsServiceImplDeserializationTest.kt +++ b/settings-spring-jpa/src/test/kotlin/ru/touchin/settings/services/SystemSettingsServiceImplDeserializationTest.kt @@ -15,7 +15,7 @@ import org.springframework.boot.test.context.SpringBootTest import org.springframework.test.context.ActiveProfiles import ru.touchin.settings.annotations.SettingMapper import ru.touchin.settings.dto.SystemSetting -import ru.touchin.settings.models.SystemSettingModel +import ru.touchin.settings.models.SystemSettingEntity import ru.touchin.settings.repositories.SystemSettingsRepository import java.util.* import javax.annotation.PostConstruct @@ -50,7 +50,7 @@ internal class SystemSettingsServiceImplDeserializationTest { assertTrue(ReflectionEquals(e).matches(a)) }) { doReturn( - Optional.of(SystemSettingModel().apply { + Optional.of(SystemSettingEntity().apply { key = systemSetting.key value = serializedValue }) diff --git a/settings-spring-jpa/src/test/kotlin/ru/touchin/settings/services/SystemSettingsServiceImplSerializationTest.kt b/settings-spring-jpa/src/test/kotlin/ru/touchin/settings/services/SystemSettingsServiceImplSerializationTest.kt index d7052d0..fb76171 100644 --- a/settings-spring-jpa/src/test/kotlin/ru/touchin/settings/services/SystemSettingsServiceImplSerializationTest.kt +++ b/settings-spring-jpa/src/test/kotlin/ru/touchin/settings/services/SystemSettingsServiceImplSerializationTest.kt @@ -14,7 +14,7 @@ import org.springframework.boot.test.context.SpringBootTest import org.springframework.test.context.ActiveProfiles import ru.touchin.settings.annotations.SettingMapper import ru.touchin.settings.dto.SystemSetting -import ru.touchin.settings.models.SystemSettingModel +import ru.touchin.settings.models.SystemSettingEntity import ru.touchin.settings.repositories.SystemSettingsRepository import java.util.* import javax.annotation.PostConstruct @@ -43,8 +43,8 @@ internal class SystemSettingsServiceImplSerializationTest { private fun check(systemSetting: SystemSetting<*>, serializedValue: String) { - doReturn(Optional.empty()).`when`(systemSettingsRepository).findById(any()) - doAnswer { it.getArgument(0) as SystemSettingModel }.`when`(systemSettingsRepository).save(any()) + doReturn(Optional.empty()).`when`(systemSettingsRepository).findById(any()) + doAnswer { it.getArgument(0) as SystemSettingEntity }.`when`(systemSettingsRepository).save(any()) systemSettingsService.save(systemSetting)