Skip to content

Commit 88b6682

Browse files
mcwebamcweba
committed
Renamed queue operations for better unity and understandability
1 parent 6062d0f commit 88b6682

File tree

11 files changed

+201
-201
lines changed

11 files changed

+201
-201
lines changed

‎README.md‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,13 @@ Response Data
103103
}
104104
```
105105

106-
#### queueCount
106+
#### getQueuesCount
107107

108108
Request Data
109109

110110
```
111111
{
112-
"operation": "queueCount"
112+
"operation": "getQueuesCount"
113113
}
114114
```
115115

@@ -122,12 +122,12 @@ Response Data
122122
}
123123
```
124124

125-
#### queueItemCount
125+
#### getQueueItemsCount
126126

127127
Request Data
128128
```
129129
{
130-
"operation": "queueItemCount",
130+
"operation": "getQueueItemsCount",
131131
"payload": {
132132
"queuename": <str QUEUENAME>
133133
}
@@ -186,12 +186,12 @@ Response Data
186186
}
187187
```
188188

189-
#### getListRange
189+
#### getQueueItems
190190

191191
Request Data
192192
```
193193
{
194-
"operation": "getListRange",
194+
"operation": "getQueueItems",
195195
"payload": {
196196
"queuename": <str QUEUENAME>,
197197
"limit": <str LIMIT>
@@ -208,12 +208,12 @@ Response Data
208208
}
209209
```
210210

211-
#### addItem
211+
#### addQueueItem
212212

213213
Request Data
214214
```
215215
{
216-
"operation": "addItem",
216+
"operation": "addQueueItem",
217217
"payload": {
218218
"queuename": <str QUEUENAME>,
219219
"buffer": <str BUFFERDATA>
@@ -228,12 +228,12 @@ Response Data
228228
}
229229
```
230230

231-
#### getItem
231+
#### getQueueItem
232232

233233
Request Data
234234
```
235235
{
236-
"operation": "getItem",
236+
"operation": "getQueueItem",
237237
"payload": {
238238
"queuename": <str QUEUENAME>,
239239
"index": <int INDEX>
@@ -249,12 +249,12 @@ Response Data
249249
}
250250
```
251251

252-
#### replaceItem
252+
#### replaceQueueItem
253253

254254
Request Data
255255
```
256256
{
257-
"operation": "replaceItem",
257+
"operation": "replaceQueueItem",
258258
"payload": {
259259
"queuename": <str QUEUENAME>,
260260
"buffer": <str BUFFERDATA>,
@@ -270,12 +270,12 @@ Response Data
270270
}
271271
```
272272

273-
#### deleteItem
273+
#### deleteQueueItem
274274

275275
Request Data
276276
```
277277
{
278-
"operation": "deleteItem",
278+
"operation": "deleteQueueItem",
279279
"payload": {
280280
"queuename": <str QUEUENAME>,
281281
"index": <int INDEX>

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
modowner=org.swisspush
22
modname=redisques
3-
version=2.1.2
3+
version=2.1.3
44

55
gradleVersion=2.3
66
vertxVersion=3.2.0

‎src/main/java/org/swisspush/redisques/RedisQues.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -170,19 +170,19 @@ public void handle(final Message<JsonObject> event) {
170170
reply.put(STATUS, OK);
171171
});
172172
break;
173-
case getListRange:
173+
case getQueueItems:
174174
String keyListRange = queuesPrefix + event.body().getJsonObject(PAYLOAD).getString(QUEUENAME);
175175
int maxQueueItemCountIndex = getMaxQueueItemCountIndex(event.body().getJsonObject(PAYLOAD).getString(LIMIT));
176176
redisClient.llen(keyListRange, countReply -> {
177-
redisClient.lrange(keyListRange, 0, maxQueueItemCountIndex, new GetListRangeHandler(event, countReply.result()));
177+
redisClient.lrange(keyListRange, 0, maxQueueItemCountIndex, new GetQueueItemsHandler(event, countReply.result()));
178178
});
179179
break;
180-
case addItem:
180+
case addQueueItem:
181181
String key1 = queuesPrefix + event.body().getJsonObject(PAYLOAD).getString(QUEUENAME);
182182
String valueAddItem = event.body().getJsonObject(PAYLOAD).getString(BUFFER);
183-
redisClient.rpush(key1, valueAddItem, new AddItemHandler(event));
183+
redisClient.rpush(key1, valueAddItem, new AddQueueItemHandler(event));
184184
break;
185-
case deleteItem:
185+
case deleteQueueItem:
186186
String keyLset = queuesPrefix + event.body().getJsonObject(PAYLOAD).getString(QUEUENAME);
187187
int indexLset = event.body().getJsonObject(PAYLOAD).getInteger(INDEX);
188188
redisClient.lset(keyLset, indexLset, "TO_DELETE", event1 -> {
@@ -194,16 +194,16 @@ public void handle(final Message<JsonObject> event) {
194194
}
195195
});
196196
break;
197-
case getItem:
197+
case getQueueItem:
198198
String key = queuesPrefix + event.body().getJsonObject(PAYLOAD).getString(QUEUENAME);
199199
int index = event.body().getJsonObject(PAYLOAD).getInteger(INDEX);
200-
redisClient.lindex(key, index, new GetItemHandler(event));
200+
redisClient.lindex(key, index, new GetQueueItemHandler(event));
201201
break;
202-
case replaceItem:
202+
case replaceQueueItem:
203203
String keyReplaceItem = queuesPrefix + event.body().getJsonObject(PAYLOAD).getString(QUEUENAME);
204204
int indexReplaceItem = event.body().getJsonObject(PAYLOAD).getInteger(INDEX);
205205
String bufferReplaceItem = event.body().getJsonObject(PAYLOAD).getString(BUFFER);
206-
redisClient.lset(keyReplaceItem, indexReplaceItem, bufferReplaceItem, new ReplaceItemHandler(event));
206+
redisClient.lset(keyReplaceItem, indexReplaceItem, bufferReplaceItem, new ReplaceQueueItemHandler(event));
207207
break;
208208
case deleteAllQueueItems:
209209
redisClient.del(queuesPrefix + event.body().getJsonObject(PAYLOAD).getString(QUEUENAME), new DeleteAllQueueItems(event));
@@ -226,12 +226,12 @@ public void handle(final Message<JsonObject> event) {
226226
case deleteLock:
227227
redisClient.hdel(redisques_locks, event.body().getJsonObject(PAYLOAD).getString(QUEUENAME), new DeleteLockHandler(event));
228228
break;
229-
case queueItemCount:
230-
redisClient.llen(queuesPrefix + event.body().getJsonObject(PAYLOAD).getString(QUEUENAME), new QueueItemCountHandler(event));
229+
case getQueueItemsCount:
230+
redisClient.llen(queuesPrefix + event.body().getJsonObject(PAYLOAD).getString(QUEUENAME), new GetQueueItemsCountHandler(event));
231231
break;
232-
case queueCount:
232+
case getQueuesCount:
233233
long timestamp = System.currentTimeMillis() - MAX_AGE_MILLISECONDS;
234-
redisClient.zcount(redisPrefix + "queues", timestamp, Double.MAX_VALUE, new QueueCountHandler(event));
234+
redisClient.zcount(redisPrefix + "queues", timestamp, Double.MAX_VALUE, new GetQueuesCountHandler(event));
235235
break;
236236
default:
237237
unsupportedOperation(operation, event);

‎src/main/java/org/swisspush/redisques/handler/AddItemHandler.java‎ renamed to ‎src/main/java/org/swisspush/redisques/handler/AddQueueItemHandler.java‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
package org.swisspush.redisques.handler;
2-
3-
import io.vertx.core.AsyncResult;
4-
import io.vertx.core.Handler;
5-
import io.vertx.core.eventbus.Message;
6-
import io.vertx.core.json.JsonObject;
7-
8-
import static org.swisspush.redisques.util.RedisquesAPI.*;
9-
10-
/**
11-
* Class AddItemHandler.
12-
*
13-
* @author baldim
14-
*/
15-
public class AddItemHandler implements Handler<AsyncResult<Long>> {
16-
private Message<JsonObject> event;
17-
18-
public AddItemHandler(Message<JsonObject> event) {
19-
this.event = event;
20-
}
21-
22-
@Override
23-
public void handle(AsyncResult<Long> reply) {
24-
if(reply.succeeded()){
25-
event.reply(new JsonObject().put(STATUS, OK));
26-
} else {
27-
event.reply(new JsonObject().put(STATUS, ERROR));
28-
}
29-
}
30-
}
1+
package org.swisspush.redisques.handler;
2+
3+
import io.vertx.core.AsyncResult;
4+
import io.vertx.core.Handler;
5+
import io.vertx.core.eventbus.Message;
6+
import io.vertx.core.json.JsonObject;
7+
8+
import static org.swisspush.redisques.util.RedisquesAPI.*;
9+
10+
/**
11+
* Class AddQueueItemHandler.
12+
*
13+
* @author baldim, https://github.com/mcweba [Marc-Andre Weber]
14+
*/
15+
public class AddQueueItemHandler implements Handler<AsyncResult<Long>> {
16+
private Message<JsonObject> event;
17+
18+
public AddQueueItemHandler(Message<JsonObject> event) {
19+
this.event = event;
20+
}
21+
22+
@Override
23+
public void handle(AsyncResult<Long> reply) {
24+
if(reply.succeeded()){
25+
event.reply(new JsonObject().put(STATUS, OK));
26+
} else {
27+
event.reply(new JsonObject().put(STATUS, ERROR));
28+
}
29+
}
30+
}

‎src/main/java/org/swisspush/redisques/handler/GetItemHandler.java‎ renamed to ‎src/main/java/org/swisspush/redisques/handler/GetQueueItemHandler.java‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
package org.swisspush.redisques.handler;
2-
3-
import io.vertx.core.AsyncResult;
4-
import static org.swisspush.redisques.util.RedisquesAPI.*;
5-
import io.vertx.core.Handler;
6-
import io.vertx.core.eventbus.Message;
7-
import io.vertx.core.json.JsonObject;
8-
9-
/**
10-
* Class GetItemHandler.
11-
*
12-
* @author baldim
13-
*/
14-
public class GetItemHandler implements Handler<AsyncResult<String>> {
15-
private Message<JsonObject> event;
16-
17-
public GetItemHandler(Message<JsonObject> event) {
18-
this.event = event;
19-
}
20-
21-
@Override
22-
public void handle(AsyncResult<String> reply) {
23-
if (reply.result() != null) {
24-
event.reply(new JsonObject().put(STATUS, OK).put(VALUE, reply.result()));
25-
} else {
26-
event.reply(new JsonObject().put(STATUS, ERROR));
27-
}
28-
}
29-
}
1+
package org.swisspush.redisques.handler;
2+
3+
import io.vertx.core.AsyncResult;
4+
import static org.swisspush.redisques.util.RedisquesAPI.*;
5+
import io.vertx.core.Handler;
6+
import io.vertx.core.eventbus.Message;
7+
import io.vertx.core.json.JsonObject;
8+
9+
/**
10+
* Class GetQueueItemHandler.
11+
*
12+
* @author baldim, https://github.com/mcweba [Marc-Andre Weber]
13+
*/
14+
public class GetQueueItemHandler implements Handler<AsyncResult<String>> {
15+
private Message<JsonObject> event;
16+
17+
public GetQueueItemHandler(Message<JsonObject> event) {
18+
this.event = event;
19+
}
20+
21+
@Override
22+
public void handle(AsyncResult<String> reply) {
23+
if (reply.result() != null) {
24+
event.reply(new JsonObject().put(STATUS, OK).put(VALUE, reply.result()));
25+
} else {
26+
event.reply(new JsonObject().put(STATUS, ERROR));
27+
}
28+
}
29+
}

‎src/main/java/org/swisspush/redisques/handler/QueueItemCountHandler.java‎ renamed to ‎src/main/java/org/swisspush/redisques/handler/GetQueueItemsCountHandler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
import static org.swisspush.redisques.util.RedisquesAPI.*;
88

99
/**
10-
* Class QueueItemCountHandler.
10+
* Class GetQueueItemsCountHandler.
1111
*
1212
* @author https://github.com/mcweba [Marc-Andre Weber]
1313
*/
14-
public class QueueItemCountHandler implements Handler<AsyncResult<Long>> {
14+
public class GetQueueItemsCountHandler implements Handler<AsyncResult<Long>> {
1515
private Message<JsonObject> event;
1616

17-
public QueueItemCountHandler(Message<JsonObject> event) {
17+
public GetQueueItemsCountHandler(Message<JsonObject> event) {
1818
this.event = event;
1919
}
2020

‎src/main/java/org/swisspush/redisques/handler/GetListRangeHandler.java‎ renamed to ‎src/main/java/org/swisspush/redisques/handler/GetQueueItemsHandler.java‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
package org.swisspush.redisques.handler;
2-
3-
import io.vertx.core.AsyncResult;
4-
import io.vertx.core.json.JsonArray;
5-
import static org.swisspush.redisques.util.RedisquesAPI.*;
6-
import io.vertx.core.Handler;
7-
import io.vertx.core.eventbus.Message;
8-
import io.vertx.core.json.JsonObject;
9-
10-
/**
11-
* Class GetListRangeHandler.
12-
*
13-
* @author baldim, webermarca
14-
*/
15-
public class GetListRangeHandler implements Handler<AsyncResult<JsonArray>> {
16-
private Message<JsonObject> event;
17-
private Long queueItemCount;
18-
19-
public GetListRangeHandler(Message<JsonObject> event, Long queueItemCount) {
20-
this.event = event;
21-
this.queueItemCount = queueItemCount;
22-
}
23-
24-
@Override
25-
public void handle(AsyncResult<JsonArray> reply) {
26-
if(reply.succeeded()){
27-
JsonArray resultArray = reply.result();
28-
JsonArray countInfo = new JsonArray();
29-
countInfo.add(resultArray.size());
30-
countInfo.add(queueItemCount);
31-
event.reply(new JsonObject().put(STATUS, OK).put(VALUE, resultArray).put(INFO, countInfo));
32-
} else {
33-
event.reply(new JsonObject().put(STATUS, ERROR));
34-
}
35-
}
36-
}
1+
package org.swisspush.redisques.handler;
2+
3+
import io.vertx.core.AsyncResult;
4+
import io.vertx.core.json.JsonArray;
5+
import static org.swisspush.redisques.util.RedisquesAPI.*;
6+
import io.vertx.core.Handler;
7+
import io.vertx.core.eventbus.Message;
8+
import io.vertx.core.json.JsonObject;
9+
10+
/**
11+
* Class GetQueueItemsHandler.
12+
*
13+
* @author baldim, https://github.com/mcweba [Marc-Andre Weber]
14+
*/
15+
public class GetQueueItemsHandler implements Handler<AsyncResult<JsonArray>> {
16+
private Message<JsonObject> event;
17+
private Long queueItemCount;
18+
19+
public GetQueueItemsHandler(Message<JsonObject> event, Long queueItemCount) {
20+
this.event = event;
21+
this.queueItemCount = queueItemCount;
22+
}
23+
24+
@Override
25+
public void handle(AsyncResult<JsonArray> reply) {
26+
if(reply.succeeded()){
27+
JsonArray resultArray = reply.result();
28+
JsonArray countInfo = new JsonArray();
29+
countInfo.add(resultArray.size());
30+
countInfo.add(queueItemCount);
31+
event.reply(new JsonObject().put(STATUS, OK).put(VALUE, resultArray).put(INFO, countInfo));
32+
} else {
33+
event.reply(new JsonObject().put(STATUS, ERROR));
34+
}
35+
}
36+
}

0 commit comments

Comments
 (0)