Skip to content

Commit 6b7bfd7

Browse files
steveniemitzsteve
authored andcommitted
Fix #283
1 parent bae1bf7 commit 6b7bfd7

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

src/scala/main/ly/stealth/mesos/kafka/json/Model.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,9 @@ class ClusterDeserializer extends StdDeserializer[Cluster](classOf[Cluster]) {
243243
val model = p.readValueAs(classOf[ClusterModel])
244244
val c = new Cluster()
245245
c.frameworkId = model.frameworkId
246-
for (b <- model.brokers)
247-
c.addBroker(b)
248-
246+
Option(model.brokers).toList
247+
.flatten
248+
.foreach(c.addBroker)
249249
c
250250
}
251251
}

src/test/ly/stealth/mesos/kafka/ClusterTest.scala

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,14 @@ class ClusterTest extends KafkaMesosTestCase {
6565
assertEquals(2, read.getBrokers.size())
6666
}
6767

68+
@Test
69+
def load_empty_cluster: Unit = {
70+
val jsData = "{\"version\":\"0.10.1.0-SNAPSHOT\"}"
71+
val cluster = JsonUtil.fromJson[Cluster](jsData)
72+
assertNotNull(cluster.getBrokers)
73+
assertEquals(0, cluster.getBrokers.size())
74+
}
75+
6876
@Test
6977
def toJson_fromJson {
7078
val broker0 = cluster.addBroker(new Broker("0"))

0 commit comments

Comments
 (0)