From 0b4b07e584438766eb2e37a83452cafa8ede469b Mon Sep 17 00:00:00 2001 From: PALLAVI GOLIWALE Date: Mon, 19 Oct 2015 10:20:26 +0530 Subject: [PATCH 1/2] input server has no options to select, without selecting output server --- shared/src/main/scala/tmt/shared/models/Role.scala | 14 ++++++++------ .../main/scala/tmt/shared/models/RoleIndex.scala | 7 +++++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/shared/src/main/scala/tmt/shared/models/Role.scala b/shared/src/main/scala/tmt/shared/models/Role.scala index babafe4..84bf0fa 100644 --- a/shared/src/main/scala/tmt/shared/models/Role.scala +++ b/shared/src/main/scala/tmt/shared/models/Role.scala @@ -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] @@ -27,7 +27,7 @@ object Role { .concreteType[Metric.type] .concreteType[Frequency.type] .concreteType[Rotator.type] - .concreteType[Empty.type] + .concreteType[Invalid.type] } @@ -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] } diff --git a/shared/src/main/scala/tmt/shared/models/RoleIndex.scala b/shared/src/main/scala/tmt/shared/models/RoleIndex.scala index d407664..cd7abb4 100644 --- a/shared/src/main/scala/tmt/shared/models/RoleIndex.scala +++ b/shared/src/main/scala/tmt/shared/models/RoleIndex.scala @@ -9,7 +9,10 @@ case class RoleIndex(mappings: Seq[RoleMapping]) { def compatibleConsumers(producer: String) = { val outputType = serverNameIndex.getRole(producer).output - inputTypeIndex.getServers(outputType).filterNot(_ == producer) //filter itself to avoid cycles + println("first producer", producer) + val not = inputTypeIndex.getServers(outputType).filterNot(_ == producer) + println("consumers", not) + not //filter itself to avoid cycles } def getServers(role: Role) = index.getOrElse(role, Seq.empty) @@ -27,7 +30,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) { From c316075b69a1e669b2223a218859a280211bb9da Mon Sep 17 00:00:00 2001 From: PALLAVI GOLIWALE Date: Mon, 19 Oct 2015 10:42:33 +0530 Subject: [PATCH 2/2] removing println --- shared/src/main/scala/tmt/shared/models/RoleIndex.scala | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/shared/src/main/scala/tmt/shared/models/RoleIndex.scala b/shared/src/main/scala/tmt/shared/models/RoleIndex.scala index cd7abb4..4f9cfae 100644 --- a/shared/src/main/scala/tmt/shared/models/RoleIndex.scala +++ b/shared/src/main/scala/tmt/shared/models/RoleIndex.scala @@ -9,10 +9,7 @@ case class RoleIndex(mappings: Seq[RoleMapping]) { def compatibleConsumers(producer: String) = { val outputType = serverNameIndex.getRole(producer).output - println("first producer", producer) - val not = inputTypeIndex.getServers(outputType).filterNot(_ == producer) - println("consumers", not) - not //filter itself to avoid cycles + inputTypeIndex.getServers(outputType).filterNot(_ == producer) //filter itself to avoid cycles } def getServers(role: Role) = index.getOrElse(role, Seq.empty)