Skip to content

Commit d67329a

Browse files
author
Johannes Duesing
committed
Adapted instance model to reflect latest changes: attribute 'labels' was added.
1 parent bbd97ad commit d67329a

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

src/main/scala/de/upb/cs/swt/delphi/crawler/Configuration.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ class Configuration {
4242
"Default ElasticSearch instance",
4343
ComponentType.ElasticSearch,
4444
None,
45-
InstanceState.Running)
45+
InstanceState.Running,
46+
List.empty[String])
4647
}
4748

4849
val mavenRepoBase: URI = new URI("http://repo1.maven.org/maven2/") // TODO: Create a local demo server "http://localhost:8881/maven2/"

src/main/scala/de/upb/cs/swt/delphi/crawler/instancemanagement/Instance.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ trait JsonSupport extends SprayJsonSupport with DefaultJsonProtocol {
5454
}
5555
}
5656

57-
implicit val instanceFormat : JsonFormat[Instance] = jsonFormat7(Instance)
57+
implicit val instanceFormat : JsonFormat[Instance] = jsonFormat8(Instance)
5858
}
5959

6060
final case class Instance (
@@ -64,7 +64,8 @@ final case class Instance (
6464
name: String,
6565
componentType: InstanceEnums.ComponentType,
6666
dockerId: Option[String],
67-
instanceState: InstanceEnums.State
67+
instanceState: InstanceEnums.State,
68+
labels: List[String]
6869
) {}
6970

7071
object InstanceEnums {

src/main/scala/de/upb/cs/swt/delphi/crawler/instancemanagement/InstanceRegistry.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ object InstanceRegistry extends JsonSupport with AppLogging
251251

252252
private def createInstance(id: Option[Long], controlPort : Int, name : String) : Instance =
253253
Instance(id, InetAddress.getLocalHost.getHostAddress,
254-
controlPort, name, ComponentType.Crawler, None, InstanceState.Running)
254+
controlPort, name, ComponentType.Crawler, None, InstanceState.Running, List.empty[String])
255255

256256

257257
object ReportOperationType extends Enumeration {

0 commit comments

Comments
 (0)