Skip to content
This repository was archived by the owner on Jun 28, 2019. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 8 additions & 6 deletions shared/src/main/scala/tmt/shared/models/Role.scala
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ object Role {
case object Frequency extends Role("frequency", ItemType.Metric, ItemType.Frequency)
case object Rotator extends Role("rotator", ItemType.Image, ItemType.Image)

case object Empty extends Role("empty", ItemType.Empty, ItemType.Empty)
case object Invalid extends Role("invalid", ItemType.Invalid, ItemType.Invalid)

val values: Seq[Role] = Seq(Source, Copier, Filter, Metric, Frequency, Rotator, Empty)
val values: Seq[Role] = Seq(Source, Copier, Filter, Metric, Frequency, Rotator, Invalid)

def withName(name: String) = values.find(_.entryName == name).getOrElse(Empty)
def withName(name: String) = values.find(_.entryName == name).getOrElse(Invalid)

implicit val rolePickler: PicklerPair[Role] = CompositePickler[Role]
.concreteType[Source.type]
Expand All @@ -27,7 +27,7 @@ object Role {
.concreteType[Metric.type]
.concreteType[Frequency.type]
.concreteType[Rotator.type]
.concreteType[Empty.type]
.concreteType[Invalid.type]

}

Expand All @@ -40,14 +40,16 @@ object ItemType {
case object Metric extends ItemType("metric")
case object Frequency extends ItemType("frequency")
case object Empty extends ItemType("empty")
case object Invalid extends ItemType("invalid")

val values: Seq[ItemType] = Seq(Image, Metric, Frequency, Empty)
val values: Seq[ItemType] = Seq(Image, Metric, Frequency, Empty, Invalid)

def withName(name: String) = values.find(_.entryName == name).getOrElse(Empty)
def withName(name: String) = values.find(_.entryName == name).getOrElse(Invalid)

implicit val itemTypePickler = CompositePickler[ItemType]
.concreteType[Image.type]
.concreteType[Metric.type]
.concreteType[Frequency.type]
.concreteType[Empty.type]
.concreteType[Invalid.type]
}
2 changes: 1 addition & 1 deletion shared/src/main/scala/tmt/shared/models/RoleIndex.scala
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ object RoleIndex {

case class ServerNameIndex(mappings: Seq[RoleMapping]) {
private val index = mappings.map(x => x.server -> x.role).toMap
def getRole(server: String) = index.getOrElse(server, Role.Empty)
def getRole(server: String) = index.getOrElse(server, Role.Invalid)
}

case class ItemTypeIndex(mappings: Seq[RoleMapping], f: Role => ItemType) {
Expand Down