Skip to content

Commit 80313cd

Browse files
nprycedmcg
npryce
authored and
dmcg
committed
open-to-sealed.0 : baseline for new open to sealed classes refactoring
1 parent 1d281b0 commit 80313cd

File tree

15 files changed

+384
-0
lines changed

15 files changed

+384
-0
lines changed

‎src/main/java/travelator/Id.kt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package travelator
2+
3+
import java.util.*
4+
5+
data class Id<out T> constructor(private val raw: String) {
6+
override fun toString(): String {
7+
return raw
8+
}
9+
10+
companion object {
11+
@JvmStatic
12+
fun <T> raw(id: Id<T>) = id.raw
13+
14+
@JvmStatic
15+
fun <T> derivedFrom(id: Id<*>) = Id<T>(id.raw)
16+
17+
@JvmStatic
18+
fun <T> mint() = Id<T>(UUID.randomUUID().toString())
19+
}
20+
}

‎src/main/java/travelator/Location.kt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package travelator
2+
3+
import travelator.geo.Position
4+
5+
data class Location(
6+
val id: Id<Location>,
7+
val localName: String,
8+
val userReadableName: String,
9+
val position: Position
10+
)

‎src/main/java/travelator/calendar/Calendar.kt

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package travelator.calendar
2+
3+
import travelator.Id
4+
import travelator.Location
5+
import java.net.URI
6+
import java.time.ZonedDateTime
7+
8+
data class Calendar(
9+
val id: Id<Calendar>,
10+
val events: Collection<CalendarEvent>
11+
) {
12+
companion object
13+
}
14+
15+
data class CalendarEvent(
16+
val id : Id<CalendarEvent> = Id.mint(),
17+
val start: ZonedDateTime,
18+
val end: ZonedDateTime? = null,
19+
val description: String,
20+
val icon: URI? = null,
21+
val location: Location? = null,
22+
val alarms: List<Alarm> = emptyList()
23+
)
24+
25+
data class Alarm(
26+
val time: ZonedDateTime,
27+
val description: String? = null
28+
)

‎src/main/java/travelator/geo/MapOverlay.kt

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
package travelator.geo
2+
3+
import travelator.Id
4+
import travelator.itinerary.TravelMethod
5+
import java.net.URI
6+
import java.util.Locale.ROOT
7+
8+
sealed class MapOverlay {
9+
abstract val id: Id<*>?
10+
}
11+
12+
data class PointOverlay(
13+
val position: Position,
14+
val text: String,
15+
val icon: URI ? = null,
16+
override val id: Id<*>? = null,
17+
) : MapOverlay()
18+
19+
data class PathOverlay(
20+
val path: List<Position>,
21+
val text: String,
22+
override val id: Id<*>? = null
23+
): MapOverlay()
24+
25+
data class AreaOverlay(
26+
val perimeter: List<Position>,
27+
val text: String,
28+
override val id: Id<*>? = null
29+
) : MapOverlay()
30+
31+
data class OverlayGroup(
32+
val elements: List<MapOverlay>,
33+
override val id: Id<*>? = null
34+
) : MapOverlay()
35+
36+
object StandardIcons {
37+
val HOTEL = URI("urn:icon:hotel")
38+
val RESTAURANT = URI("urn:icon:hotel")
39+
val ATTRACTION = URI("urn:icon:attraction")
40+
val START = URI("urn:icon:start")
41+
val END = URI("urn:icon:end")
42+
43+
fun iconFor(travelMethod: TravelMethod): URI =
44+
URI("urn:icon:travel:${travelMethod.name.toLowerCase(ROOT)}")
45+
}

‎src/main/java/travelator/geo/Position.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package travelator.geo
2+
3+
data class Position(val lat: Double, val lon: Double)

‎src/main/java/travelator/itinerary/Accommodation.kt

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package travelator.itinerary
2+
3+
import travelator.Id
4+
import travelator.Location
5+
import travelator.geo.PointOverlay
6+
import travelator.geo.StandardIcons
7+
import travelator.money.Money
8+
import java.time.Duration
9+
import java.time.Period
10+
import java.time.ZonedDateTime
11+
12+
data class Accommodation(
13+
override val id: Id<Accommodation>,
14+
val location: Location,
15+
val checkInFrom: ZonedDateTime,
16+
val checkOutBefore: ZonedDateTime,
17+
val pricePerNight: Money
18+
) : ItineraryItem {
19+
val nights = Period.between(checkInFrom.toLocalDate(), checkOutBefore.toLocalDate()).days
20+
val totalPrice: Money = pricePerNight * nights
21+
22+
override val description
23+
get() = "$nights nights at ${location.userReadableName}"
24+
override val costs
25+
get() = listOf(totalPrice)
26+
override val mapOverlay
27+
get() = PointOverlay(
28+
id = id,
29+
position = location.position,
30+
text = location.userReadableName,
31+
icon = StandardIcons.HOTEL
32+
)
33+
34+
}

‎src/main/java/travelator/itinerary/Attraction.kt

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package travelator.itinerary
2+
3+
import travelator.Id
4+
import travelator.Location
5+
import travelator.geo.PointOverlay
6+
import travelator.geo.StandardIcons
7+
import travelator.money.Money
8+
9+
data class Attraction(
10+
override val id: Id<Attraction>,
11+
val location: Location,
12+
val notes: String
13+
) : ItineraryItem {
14+
override val description get() =
15+
location.userReadableName
16+
17+
override val costs get() =
18+
emptyList<Money>()
19+
20+
override val mapOverlay get() =
21+
PointOverlay(
22+
position = location.position,
23+
text = description,
24+
icon = StandardIcons.ATTRACTION,
25+
id = id
26+
)
27+
28+
}

‎src/main/java/travelator/itinerary/Itinerary.kt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package travelator.itinerary
2+
3+
import travelator.Id
4+
import travelator.geo.OverlayGroup
5+
6+
data class Itinerary(
7+
val id: Id<Itinerary>,
8+
val items: List<ItineraryItem>
9+
) : Iterable<ItineraryItem> by items
10+
11+
val Itinerary.mapOverlay
12+
get() = OverlayGroup(
13+
id = id,
14+
elements = items.map { it.mapOverlay })
15+
16+
val Itinerary.costs
17+
get() = flatMap(ItineraryItem::costs)

‎src/main/java/travelator/itinerary/ItineraryItem.kt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package travelator.itinerary
2+
3+
import travelator.Id
4+
import travelator.geo.MapOverlay
5+
import travelator.money.Money
6+
7+
interface ItineraryItem {
8+
val id: Id<ItineraryItem>
9+
val description: String
10+
val costs: List<Money>
11+
val mapOverlay: MapOverlay
12+
}

‎src/main/java/travelator/itinerary/ItineraryItems.java

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package travelator.itinerary;
2+
3+
public class ItineraryItems {
4+
public static void example(ItineraryItem item) {
5+
if (item instanceof Journey) {
6+
var journey = (Journey) item;
7+
return
8+
;
9+
} else if (item instanceof Accommodation) {
10+
var accommodation = (Accommodation) item;
11+
return
12+
;
13+
} else if (item instanceof RestaurantBooking) {
14+
var restaurant = (RestaurantBooking) item;
15+
return
16+
;
17+
} else {
18+
throw new IllegalStateException("should never happen");
19+
}
20+
}
21+
}

0 commit comments

Comments
 (0)