Skip to content

Выполнены все пункты домашнего задания по занятию Kotlin#6 #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
uatilman wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Выполнены все пункты домашнего задания по занятию Kotlin#6 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1c7b6ae
Change kotlin version to supported
uatilman Aug 25, 2025
f93970a
Implement task#1
uatilman Aug 25, 2025
f6f6992
Implement task#2 mandatory
uatilman Aug 25, 2025
2b5fd77
Implement task#2 optional
uatilman Aug 25, 2025
8a5a8bf
Implement task#3.1 optional
uatilman Aug 25, 2025
c51e823
task#3.1 fix. Implement task#3.2
uatilman Aug 25, 2025
fefc3f0
Implement task#3.3
uatilman Aug 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'org.jetbrains.kotlin.jvm' version '2.2.10'
id 'org.jetbrains.kotlin.jvm' version '2.0.21'
}

kotlin {
Expand Down
40 changes: 17 additions & 23 deletions src/main/kotlin/ru/otus/homework/homework/Coffee.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,32 +20,26 @@ class SimpleCoffee : Coffee {
override fun description() = "Простой кофе"
}

class MilkDecorator(private val coffee: Coffee) : Coffee {
override fun cost(): Int {
TODO("Not yet implemented")
}

override fun description(): String {
TODO("Not yet implemented")
}
}
// Абстрактный базовый класс для декораций
abstract class AbstractDecorator(protected val decoratedCoffee: Coffee) : Coffee {
protected abstract val additionalCost: Int
protected abstract val additionalDescription: String

class SugarDecorator(private val coffee: Coffee) : Coffee {
override fun cost(): Int {
TODO("Not yet implemented")
}
final override fun cost() = decoratedCoffee.cost() + additionalCost
final override fun description() = "${decoratedCoffee.description()}, $additionalDescription"
}

override fun description(): String {
TODO("Not yet implemented")
}
class MilkDecorator(coffee: Coffee) : AbstractDecorator(coffee) {
override val additionalCost = 50
override val additionalDescription = "молоко"
}

class VanillaDecorator(private val coffee: Coffee) : Coffee {
override fun cost(): Int {
TODO("Not yet implemented")
}
class SugarDecorator(decoratedCoffee: Coffee) : AbstractDecorator(decoratedCoffee) {
override val additionalCost = 20
override val additionalDescription = "сахар"
}

override fun description(): String {
TODO("Not yet implemented")
}
class VanillaDecorator(decoratedCoffee: Coffee) : AbstractDecorator(decoratedCoffee) {
override val additionalCost = 70
override val additionalDescription = "ваниль"
}
11 changes: 9 additions & 2 deletions src/main/kotlin/ru/otus/homework/homework/NonEmptyStringDelegate.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
package ru.otus.homework.homework


import kotlin.reflect.KProperty

/**
* Delegate that allows to set non-empty string value
*/
class NonEmptyStringDelegate() {
private var value: String = ""

operator fun getValue(thisRef: Any?, property: KProperty<*>): String {
TODO("Implement `getValue` function")
return value
}

operator fun setValue(thisRef: Any?, property: KProperty<*>, newValue: String) {
TODO("Implement `setValue` function")
if (newValue.isNotBlank()) {
this.value = newValue
} else {
System.err.println("Property ${property.name} cannot be empty")
}
}
}
61 changes: 59 additions & 2 deletions src/main/kotlin/ru/otus/homework/homework/UserProfile.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

package ru.otus.homework.homework

import kotlin.reflect.KProperty

/**
* Профиль пользователя
*/
Expand Down Expand Up @@ -37,7 +39,9 @@ interface UserProfile {
* Creates user profile with logging
*/
fun createWithLogging(fullName: String, email: String): UserProfile.Logging {
TODO("Implement `createWithLogging` function")
return ProfileImplementationWithLogging(
create(fullName, email)
)
}
}
}
Expand All @@ -50,4 +54,57 @@ private val emailRegex = Regex("^[A-Za-z](.*)([@])(.+)(\\.)(.+)")
/**
* Реализация простого [UserProfile].
*/
private class ProfileImplementation(override var fullName: String, override var email: String): UserProfile
private class ProfileImplementation(
fullName: String,
email: String
) : UserProfile {
val vetoable = VetoableEmail()
val nonEmptyStringDelegate = NonEmptyStringDelegate()
override var fullName: String by nonEmptyStringDelegate
override var email: String by vetoable

init {
this.fullName = fullName
this.email = email
}

}

/**
* Реализация [UserProfile.Logging].
*/
private class ProfileImplementationWithLogging(
val userProfile: UserProfile
) : UserProfile.Logging, UserProfile by userProfile {
private val log = mutableListOf<String>()

override var fullName: String
get() = userProfile.fullName
set(value) {
log.add("Changing `fullName` from '${userProfile.fullName}' to '$value'")
userProfile.fullName = value
}

override var email: String
get() = userProfile.email
set(value) {
log.add("Changing `email` from '${userProfile.email}' to '$value'")
userProfile.email = value
}

override fun getLog(): List<String> = log
}

class VetoableEmail {
var email: String = ""
operator fun setValue(thisRef: Any?, property: KProperty<*>, value: String) {
if (value.matches(emailRegex))
email = value
else
System.err.println("veto placed on invalid email $value")
}

operator fun getValue(hisRef: Any?, property: KProperty<*>): String {
return this.email
}
}
2 changes: 1 addition & 1 deletion src/main/kotlin/ru/otus/homework/homework/processList.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ inline fun processList(list: List<Int>, action: (Int) -> Unit) {

fun skipThreeAndPrint(list: List<Int>) {
processList(list) {
if (it == 3) return
if (it == 3) return@processList
println("Processing $it")
}
}