Skip to content

Commit 45710b6

Browse files
abelhegedusabelhegedus
committed
started refactoring constants
1 parent f8f8909 commit 45710b6

File tree

4 files changed

+121
-91
lines changed

4 files changed

+121
-91
lines changed

‎com.incquerylabs.vhci.modelaccess.twc.rest/src/main/kotlin/com/incquerylabs/vhci/modelaccess/twc/rest/Crawler.kt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ fun main(args: Array<String>) {
8383

8484
File("server.config").writeText(Json.encode(Server(serverOpt,portOpt.toInt())))
8585
twcMap.put("server_path",serverOpt)
86-
twcMap.put("server_port",portOpt)
86+
twcMap.put("server_port",portOpt.toInt())
8787
println("New Server config")
8888

8989
} else {
@@ -132,10 +132,6 @@ fun main(args: Array<String>) {
132132
}
133133
})
134134

135-
136-
137-
vertx.eventBus().send("twc.rest.twcvert", Json.encode(Message("logout", JsonObject())))
138-
139135
}
140136

141137

‎com.incquerylabs.vhci.modelaccess.twc.rest/src/main/kotlin/com/incquerylabs/vhci/modelaccess/twc/rest/data/Data.kt‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,18 @@ data class Workspace(val id:String, val resources:JsonArray)
1010
data class Resource(val id:String, val workspace_id:String, val branches:JsonArray)
1111
data class Branch(val id:String,val resource_id:String ,val workspace_id:String,val revisions:JsonArray)
1212
data class Revision(val id:Int, val branch_id:String, val resource_id:String ,val workspace_id:String, val elements:JsonArray)
13-
data class Element(val id:String, val branch_id:String, val resource_id:String ,val workspace_id:String, val elements:JsonArray)
13+
data class Element(val id:String, val branch_id:String, val resource_id:String ,val workspace_id:String, val elements:JsonArray)
14+
15+
object DataConstants {
16+
const val WORKSPACE_ID = "workspace_id"
17+
const val RESOURCE_ID = "resource_id"
18+
const val BRANCH_ID = "branch_id"
19+
const val ELEMENT_ID = "element_id"
20+
const val TWCMAP = "twcMap"
21+
const val ELEMENTS = "elements"
22+
const val QUERIES = "queries"
23+
const val TWCVERT_ADDRESS = "twc.rest.twcvert"
24+
const val TWCMAIN_ADDRESS = "twc.rest.main"
25+
const val ERROR = "error"
26+
const val EXIT = "exit"
27+
}

‎com.incquerylabs.vhci.modelaccess.twc.rest/src/main/kotlin/com/incquerylabs/vhci/modelaccess/twc/rest/verticles/MainVerticle.kt‎

Lines changed: 80 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
package com.incquerylabs.vhci.modelaccess.twc.rest.verticles
22

3-
import com.incquerylabs.vhci.modelaccess.twc.rest.data.Message
4-
import com.incquerylabs.vhci.modelaccess.twc.rest.data.User
3+
import com.incquerylabs.vhci.modelaccess.twc.rest.data.*
54
import io.vertx.core.AbstractVerticle
65
import io.vertx.core.json.Json
76
import io.vertx.core.json.JsonObject
87

9-
var sum = 0
10-
var number = 0
11-
var s = 0
12-
var queries = 0
13-
14-
class MainVerticle(val usr:String, val pswd:String) : AbstractVerticle(){
8+
class MainVerticle(val usr: String, val pswd: String) : AbstractVerticle() {
9+
var sum = 0
10+
var number = 0
11+
var s = 0
12+
var queries = 0
1513

1614
override fun start() {
17-
val twcMap = vertx.sharedData().getLocalMap<Any,Any>("twcMap")
15+
val twcMap = vertx.sharedData().getLocalMap<Any, Any>(DataConstants.TWCMAP)
1816
val eb = vertx.eventBus()
19-
vertx.setPeriodic(1000,{
20-
vertx.sharedData().getCounter("queries", { res ->
17+
vertx.setPeriodic(1000, {
18+
vertx.sharedData().getCounter(DataConstants.QUERIES, { res ->
2119
if (res.succeeded()) {
2220
val counter = res.result()
2321
counter.get { res ->
@@ -27,20 +25,20 @@ class MainVerticle(val usr:String, val pswd:String) : AbstractVerticle(){
2725
if (res.succeeded()) {
2826
val counter = res.result()
2927
counter.get { get ->
30-
if(get.succeeded()){
28+
if (get.succeeded()) {
3129
sum = get.result().toInt()
3230

3331
vertx.sharedData().getCounter("number", { res ->
3432
if (res.succeeded()) {
3533
val counter = res.result()
3634
counter.get { get ->
37-
if(get.succeeded()){
35+
if (get.succeeded()) {
3836
number = get.result().toInt()
39-
println("Total: ${queries}/${sum}/${++s} query/response/sec | Now: ${number} elem | AvgSpeed: ${sum/(s)} elem/sec")
40-
counter.compareAndSet(number.toLong(),0,{})
37+
println("Total: ${queries}/${sum}/${++s} query/response/sec | Now: ${number} elem | AvgSpeed: ${sum / (s)} elem/sec")
38+
counter.compareAndSet(number.toLong(), 0, {})
4139

42-
if(queries!=0 && sum!=0 && queries==sum){
43-
eb.send("twc.rest.twcvert",Json.encode(Message("logout",JsonObject())))
40+
if (queries != 0 && sum != 0 && queries == sum) {
41+
eb.send(DataConstants.TWCVERT_ADDRESS, Json.encode(Message("logout", JsonObject())))
4442
}
4543
}
4644
}
@@ -63,8 +61,8 @@ class MainVerticle(val usr:String, val pswd:String) : AbstractVerticle(){
6361
})
6462

6563
})
66-
eb.send("twc.rest.twcvert", Json.encode(Message("login", User("$usr", "$pswd"))))
67-
eb.consumer<Any>("twc.rest.main", { message ->
64+
eb.send(DataConstants.TWCVERT_ADDRESS, Json.encode(Message("login", User("$usr", "$pswd"))))
65+
eb.consumer<Any>(DataConstants.TWCMAIN_ADDRESS, { message ->
6866

6967
val json = JsonObject(message.body().toString())
7068
val data = json.getJsonObject("obj")
@@ -73,108 +71,129 @@ class MainVerticle(val usr:String, val pswd:String) : AbstractVerticle(){
7371
"logged_in" -> {
7472
println("Login complete")
7573

76-
eb.send("twc.rest.twcvert", Json.encode(Message("getWorkspaces", JsonObject())))
74+
eb.send(DataConstants.TWCVERT_ADDRESS, Json.encode(Message("getWorkspaces", JsonObject())))
7775
//eb.send("twc.rest.twcvert", Json.encode(Message("logout", JsonObject())))
7876
}
7977
"repo" -> {
80-
// println("Recieved Repository")
78+
// println("Received Repository")
8179
val repo = JsonObject(twcMap.get("repo") as String)
8280
repo.getJsonArray("workspaces").forEach { ws ->
8381
val id = (ws as JsonObject).getString("@id")
84-
eb.send("twc.rest.twcvert", Json.encode(Message("getResources", JsonObject().put("workspace_id", id))))
82+
eb.send(DataConstants.TWCVERT_ADDRESS, Json.encode(Message("getResources", JsonObject().put(DataConstants.WORKSPACE_ID, id))))
8583
}
8684
}
8785
"workspace" -> {
88-
// println("Recieved Workspace")
86+
// println("Received Workspace")
8987
// println(data)
9088
val workspaceId = data.getString("id")
9189
data.getJsonArray("resources").forEach { res ->
9290
val resourceId = (res as JsonObject).getString("@id")
93-
eb.send("twc.rest.twcvert", Json.encode(Message("getBranches",
91+
eb.send(DataConstants.TWCVERT_ADDRESS, Json.encode(Message("getBranches",
9492
JsonObject()
95-
.put("workspace_id", workspaceId)
96-
.put("resource_id", resourceId))))
93+
.put(DataConstants.WORKSPACE_ID, workspaceId)
94+
.put(DataConstants.RESOURCE_ID, resourceId))))
9795
}
9896
}
9997
"resource" -> {
100-
// println("Recieved Resource")
98+
// println("Received Resource")
10199
// println(data)
102100

103101
val resourceId = data.getString("id")
104-
val workspaceId = data.getString("workspace_id")
102+
val workspaceId = data.getString(DataConstants.WORKSPACE_ID)
105103
data.getJsonArray("branches").forEach { branch ->
106104
val branchId = (branch as JsonObject).getString("@id")
107-
eb.send("twc.rest.twcvert", Json.encode(Message("getRevisions",
105+
eb.send(DataConstants.TWCVERT_ADDRESS, Json.encode(Message("getRevisions",
108106
JsonObject()
109-
.put("workspace_id", workspaceId)
110-
.put("resource_id", resourceId)
111-
.put("branch_id", branchId)
107+
.put(DataConstants.WORKSPACE_ID, workspaceId)
108+
.put(DataConstants.RESOURCE_ID, resourceId)
109+
.put(DataConstants.BRANCH_ID, branchId)
112110
)))
113111
}
114112

115113
}
116114
"branch" -> {
117-
// println("Recieved Branch")
115+
// println("Received Branch")
118116
// println(data)
119117

120118
val branchId = data.getString("id")
121-
val resourceId = data.getString("resource_id")
122-
val workspaceId = data.getString("workspace_id")
119+
val resourceId = data.getString(DataConstants.RESOURCE_ID)
120+
val workspaceId = data.getString(DataConstants.WORKSPACE_ID)
123121
data.getJsonArray("revisions").forEach { rev ->
124122
val revId = (rev as Int)
125-
vertx.eventBus().send("twc.rest.twcvert", Json.encode(Message("getRootElementIds",
123+
vertx.eventBus().send(DataConstants.TWCVERT_ADDRESS, Json.encode(Message("getRootElementIds",
126124
JsonObject()
127-
.put("workspace_id", workspaceId)
128-
.put("resource_id", resourceId)
129-
.put("branch_id", branchId)
125+
.put(DataConstants.WORKSPACE_ID, workspaceId)
126+
.put(DataConstants.RESOURCE_ID, resourceId)
127+
.put(DataConstants.BRANCH_ID, branchId)
130128
.put("rev_id", revId)
131129
)))
132130
}
133131

134132
}
135133
"revision" -> {
136-
// println("Recieved Revision")
134+
// println("Received Revision")
137135
// println(data)
138136

139-
val branchId = data.getString("branch_id")
140-
val resourceId = data.getString("resource_id")
141-
val workspaceId = data.getString("workspace_id")
142-
data.getJsonArray("elements").forEach { element ->
137+
val branchId = data.getString(DataConstants.BRANCH_ID)
138+
val resourceId = data.getString(DataConstants.RESOURCE_ID)
139+
val workspaceId = data.getString(DataConstants.WORKSPACE_ID)
140+
data.getJsonArray(DataConstants.ELEMENTS).forEach { element ->
143141
val elemId = element as String
144-
vertx.eventBus().send("twc.rest.twcvert", Json.encode(Message("getRootElement",
142+
vertx.eventBus().send(DataConstants.TWCVERT_ADDRESS, Json.encode(Message("getRootElement",
145143
JsonObject()
146-
.put("workspace_id", workspaceId)
147-
.put("resource_id", resourceId)
148-
.put("branch_id", branchId)
149-
.put("element_id", elemId)
144+
.put(DataConstants.WORKSPACE_ID, workspaceId)
145+
.put(DataConstants.RESOURCE_ID, resourceId)
146+
.put(DataConstants.BRANCH_ID, branchId)
147+
.put(DataConstants.ELEMENT_ID, elemId)
150148
)))
151149
}
152150

153151
}
154152
"element" -> {
155-
// println("Recieved Element")
153+
// println("Received Element")
154+
// println(data)
155+
156+
val branchId = data.getString(DataConstants.BRANCH_ID)
157+
val resourceId = data.getString(DataConstants.RESOURCE_ID)
158+
val workspaceId = data.getString(DataConstants.WORKSPACE_ID)
159+
// TODO send IDs as a single message
160+
data.getJsonArray(DataConstants.ELEMENTS).forEach { element ->
161+
val element_id = (element as JsonObject).getString("@id")
162+
163+
vertx.eventBus().send(DataConstants.TWCVERT_ADDRESS, Json.encode(Message("getElement",
164+
JsonObject()
165+
.put(DataConstants.WORKSPACE_ID, workspaceId)
166+
.put(DataConstants.RESOURCE_ID, resourceId)
167+
.put(DataConstants.BRANCH_ID, branchId)
168+
.put(DataConstants.ELEMENT_ID, element_id)
169+
)))
170+
}
171+
}
172+
DataConstants.ELEMENTS -> {
173+
// println("Received Elements")
156174
// println(data)
157175

158-
val branchId = data.getString("branch_id")
159-
val resourceId = data.getString("resource_id")
160-
val workspaceId = data.getString("workspace_id")
161-
data.getJsonArray("elements").forEach { element ->
176+
val branchId = data.getString(DataConstants.BRANCH_ID)
177+
val resourceId = data.getString(DataConstants.RESOURCE_ID)
178+
val workspaceId = data.getString(DataConstants.WORKSPACE_ID)
179+
// TODO send IDs as a single message
180+
data.getJsonArray("element_ids").forEach { element ->
162181
val element_id = (element as JsonObject).getString("@id")
163182

164-
vertx.eventBus().send("twc.rest.twcvert", Json.encode(Message("getElement",
183+
vertx.eventBus().send(DataConstants.TWCVERT_ADDRESS, Json.encode(Message("getElement",
165184
JsonObject()
166-
.put("workspace_id", workspaceId)
167-
.put("resource_id", resourceId)
168-
.put("branch_id", branchId)
169-
.put("element_id", element_id)
185+
.put(DataConstants.WORKSPACE_ID, workspaceId)
186+
.put(DataConstants.RESOURCE_ID, resourceId)
187+
.put(DataConstants.BRANCH_ID, branchId)
188+
.put(DataConstants.ELEMENT_ID, element_id)
170189
)))
171190
}
172191
}
173-
"error" -> {
192+
DataConstants.ERROR -> {
174193
println("\nExit")
175194
vertx.close()
176195
}
177-
"exit" -> {
196+
DataConstants.EXIT -> {
178197
println("\nExit")
179198
vertx.close()
180199
}

0 commit comments

Comments
 (0)