Skip to content

Commit caf05a5

Browse files
vietjvietj
committed
Remove DeploymentOptions worker property
1 parent 6a94180 commit caf05a5

19 files changed

+38
-109
lines changed

‎src/main/asciidoc/index.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ Worker verticles are designed for calling blocking code, as they won't block any
402402
If you don't want to use a worker verticle to run blocking code, you can also run <<blocking_code, inline blocking code>>
403403
directly while on an event loop.
404404

405-
If you want to deploy a verticle as a worker verticle you do that with {@link io.vertx.core.DeploymentOptions#setWorker}.
405+
If you want to deploy a verticle as a worker verticle you do that with {@link io.vertx.core.DeploymentOptions#setThreadingModel}.
406406

407407
[source,$lang]
408408
----

‎src/main/generated/io/vertx/core/DeploymentOptionsConverter.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, Deploym
3030
obj.setThreadingModel(io.vertx.core.ThreadingModel.valueOf((String)member.getValue()));
3131
}
3232
break;
33-
case "worker":
34-
if (member.getValue() instanceof Boolean) {
35-
obj.setWorker((Boolean)member.getValue());
36-
}
37-
break;
3833
case "ha":
3934
if (member.getValue() instanceof Boolean) {
4035
obj.setHa((Boolean)member.getValue());
@@ -80,7 +75,6 @@ static void toJson(DeploymentOptions obj, java.util.Map<String, Object> json) {
8075
if (obj.getThreadingModel() != null) {
8176
json.put("threadingModel", obj.getThreadingModel().name());
8277
}
83-
json.put("worker", obj.isWorker());
8478
json.put("ha", obj.isHa());
8579
json.put("instances", obj.getInstances());
8680
if (obj.getWorkerPoolName() != null) {

‎src/main/java/examples/CoreExamples.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ public void exampleFutureJoin2(Future<?> future1, Future<?> future2, Future<?> f
218218
}
219219

220220
public void example7_1(Vertx vertx) {
221-
DeploymentOptions options = new DeploymentOptions().setWorker(true);
221+
DeploymentOptions options = new DeploymentOptions().setThreadingModel(ThreadingModel.WORKER);
222222
vertx.deployVerticle("com.mycompany.MyOrderProcessorVerticle", options);
223223
}
224224

‎src/main/java/io/vertx/core/DeploymentOptions.java‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -120,26 +120,6 @@ public DeploymentOptions setThreadingModel(ThreadingModel threadingModel) {
120120
return this;
121121
}
122122

123-
/**
124-
* Should the verticle(s) be deployed as a worker verticle?
125-
*
126-
* @return {@code true} if will be deployed as worker, {@code false} otherwise
127-
*/
128-
public boolean isWorker() {
129-
return threadingModel == ThreadingModel.WORKER;
130-
}
131-
132-
/**
133-
* Set whether the verticle(s) should be deployed as a worker verticle
134-
*
135-
* @param worker {@code true} for worker, {@code false} force event-loop
136-
* @return a reference to this, so the API can be used fluently
137-
*/
138-
public DeploymentOptions setWorker(boolean worker) {
139-
this.threadingModel = worker ? ThreadingModel.WORKER : ThreadingModel.EVENT_LOOP;
140-
return this;
141-
}
142-
143123
/**
144124
* Will the verticle(s) be deployed as HA (highly available) ?
145125
*

‎src/test/java/io/vertx/core/BlockedThreadCheckerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public void start() throws InterruptedException {
115115
try {
116116
catchBlockedThreadEvents(newVertx);
117117
DeploymentOptions deploymentOptions = new DeploymentOptions();
118-
deploymentOptions.setWorker(true);
118+
deploymentOptions.setThreadingModel(ThreadingModel.WORKER);
119119
newVertx.deployVerticle(verticle, deploymentOptions);
120120
await();
121121
expectMessage("vert.x-worker-thread", maxWorkerExecuteTime, maxWorkerExecuteTimeUnit);
@@ -209,7 +209,7 @@ public void start() throws InterruptedException {
209209
complete();
210210
});
211211
DeploymentOptions deploymentOptions = new DeploymentOptions();
212-
deploymentOptions.setWorker(true);
212+
deploymentOptions.setThreadingModel(ThreadingModel.WORKER);
213213
newVertx.deployVerticle(verticle, deploymentOptions);
214214
await();
215215
}

‎src/test/java/io/vertx/core/ContextTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ public void start() throws Exception {
307307
return null;
308308
}).onComplete(onSuccess(v -> complete()));
309309
}
310-
}, new DeploymentOptions().setWorker(worker));
310+
}, new DeploymentOptions().setThreadingModel(ThreadingModel.WORKER));
311311
awaitLatch(latch1);
312312
CountDownLatch latch3 = new CountDownLatch(1);
313313
vertx.deployVerticle(new AbstractVerticle() {
@@ -320,7 +320,7 @@ public void start() throws Exception {
320320
complete();
321321
}));
322322
}
323-
}, new DeploymentOptions().setWorker(worker));
323+
}, new DeploymentOptions().setThreadingModel(ThreadingModel.WORKER));
324324
awaitLatch(latch3);
325325
latch2.countDown();
326326
await();

‎src/test/java/io/vertx/core/DeploymentTest.java‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ public void testOptions() {
5353
JsonObject config = new JsonObject().put("foo", "bar").put("obj", new JsonObject().put("quux", 123));
5454
assertEquals(options, options.setConfig(config));
5555
assertEquals(config, options.getConfig());
56-
assertFalse(options.isWorker());
57-
assertEquals(options, options.setWorker(true));
58-
assertTrue(options.isWorker());
5956
String rand = TestUtils.randomUnicodeString(1000);
6057
assertFalse(options.isHa());
6158
assertEquals(options, options.setHa(true));
@@ -90,14 +87,12 @@ public void testCopyOptions() {
9087
long maxWorkerExecuteTime = TestUtils.randomPositiveLong();
9188
TimeUnit maxWorkerExecuteTimeUnit = TimeUnit.MILLISECONDS;
9289
options.setConfig(config);
93-
options.setWorker(worker);
9490
options.setHa(ha);
9591
options.setWorkerPoolName(poolName);
9692
options.setWorkerPoolSize(poolSize);
9793
options.setMaxWorkerExecuteTime(maxWorkerExecuteTime);
9894
options.setMaxWorkerExecuteTimeUnit(maxWorkerExecuteTimeUnit);
9995
DeploymentOptions copy = new DeploymentOptions(options);
100-
assertEquals(worker, copy.isWorker());
10196
assertNotSame(config, copy.getConfig());
10297
assertEquals("bar", copy.getConfig().getString("foo"));
10398
assertEquals(ha, copy.isHa());
@@ -112,7 +107,6 @@ public void testDefaultJsonOptions() {
112107
DeploymentOptions def = new DeploymentOptions();
113108
DeploymentOptions json = new DeploymentOptions(new JsonObject());
114109
assertEquals(def.getConfig(), json.getConfig());
115-
assertEquals(def.isWorker(), json.isWorker());
116110
assertEquals(def.isHa(), json.isHa());
117111
assertEquals(def.getWorkerPoolName(), json.getWorkerPoolName());
118112
assertEquals(def.getWorkerPoolSize(), json.getWorkerPoolSize());
@@ -141,7 +135,6 @@ public void testJsonOptions() {
141135
json.put("maxWorkerExecuteTime", maxWorkerExecuteTime);
142136
json.put("maxWorkerExecuteTimeUnit", maxWorkerExecuteTimeUnit);
143137
DeploymentOptions options = new DeploymentOptions(json);
144-
assertEquals(worker, options.isWorker());
145138
assertEquals("bar", options.getConfig().getString("foo"));
146139
assertEquals(ha, options.isHa());
147140
assertEquals(poolName, options.getWorkerPoolName());
@@ -164,15 +157,13 @@ public void testToJson() {
164157
long maxWorkerExecuteTime = TestUtils.randomPositiveLong();
165158
TimeUnit maxWorkerExecuteTimeUnit = TimeUnit.MILLISECONDS;
166159
options.setConfig(config);
167-
options.setWorker(worker);
168160
options.setHa(ha);
169161
options.setWorkerPoolName(poolName);
170162
options.setWorkerPoolSize(poolSize);
171163
options.setMaxWorkerExecuteTime(maxWorkerExecuteTime);
172164
options.setMaxWorkerExecuteTimeUnit(maxWorkerExecuteTimeUnit);
173165
JsonObject json = options.toJson();
174166
DeploymentOptions copy = new DeploymentOptions(json);
175-
assertEquals(worker, copy.isWorker());
176167
assertEquals("bar", copy.getConfig().getString("foo"));
177168
assertEquals(ha, copy.isHa());
178169
assertEquals(poolName, copy.getWorkerPoolName());
@@ -231,7 +222,7 @@ public void testDeployFromContext() throws Exception {
231222
@Test
232223
public void testDeployWorkerFromTestThread() throws Exception {
233224
MyVerticle verticle = new MyVerticle();
234-
vertx.deployVerticle(verticle, new DeploymentOptions().setWorker(true)).onComplete(ar -> {
225+
vertx.deployVerticle(verticle, new DeploymentOptions().setThreadingModel(ThreadingModel.WORKER)).onComplete(ar -> {
235226
assertDeployment(1, verticle, null, ar);
236227
assertTrue(verticle.startContext.isWorkerContext());
237228
vertx.undeploy(ar.result()).onComplete(ar2 -> {
@@ -247,7 +238,7 @@ public void testDeployWorkerFromTestThread() throws Exception {
247238
public void testDeployWorkerWithConfig() throws Exception {
248239
MyVerticle verticle = new MyVerticle();
249240
JsonObject conf = generateJSONObject();
250-
vertx.deployVerticle(verticle, new DeploymentOptions().setConfig(conf).setWorker(true)).onComplete(ar -> {
241+
vertx.deployVerticle(verticle, new DeploymentOptions().setConfig(conf).setThreadingModel(ThreadingModel.WORKER)).onComplete(ar -> {
251242
assertDeployment(1, verticle, conf, ar);
252243
assertTrue(verticle.startContext.isWorkerContext());
253244
assertFalse(verticle.startContext.isEventLoopContext());
@@ -278,7 +269,7 @@ public void stop() throws Exception {
278269
assertFalse(Context.isOnEventLoopThread());
279270
}
280271
};
281-
vertx.deployVerticle(verticle, new DeploymentOptions().setWorker(true))
272+
vertx.deployVerticle(verticle, new DeploymentOptions().setThreadingModel(ThreadingModel.WORKER))
282273
.onComplete(onSuccess(res -> {
283274
assertTrue(Context.isOnVertxThread());
284275
assertFalse(Context.isOnWorkerThread());

‎src/test/java/io/vertx/core/NamedWorkerPoolTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public void start() throws Exception {
151151
}, true).onComplete(onSuccess(v -> complete()));
152152
}
153153
}
154-
}, new DeploymentOptions().setWorker(true)).onComplete(onSuccess(v -> {}));
154+
}, new DeploymentOptions().setThreadingModel(ThreadingModel.WORKER)).onComplete(onSuccess(v -> {}));
155155
await();
156156
}
157157

@@ -304,7 +304,7 @@ public void start() {
304304
public void stop() {
305305
threadName.set(Thread.currentThread().getName());
306306
}
307-
}, new DeploymentOptions().setWorker(true).setWorkerPoolName("test-worker")).onComplete(onSuccess(id -> {
307+
}, new DeploymentOptions().setThreadingModel(ThreadingModel.WORKER).setWorkerPoolName("test-worker")).onComplete(onSuccess(id -> {
308308
vertx.undeploy(id).onComplete(onSuccess(v -> {
309309
assertNotNull(threadName.get());
310310
assertTrue(threadName.get().startsWith("test-worker"));
@@ -349,7 +349,7 @@ public void start() throws Exception {
349349
vertx.undeploy(context.deploymentID());
350350
});
351351
}
352-
}, new DeploymentOptions().setWorker(true).setWorkerPoolName(poolName)).onComplete(onSuccess(deployment::set));
352+
}, new DeploymentOptions().setThreadingModel(ThreadingModel.WORKER).setWorkerPoolName(poolName)).onComplete(onSuccess(deployment::set));
353353
assertWaitUntil(() -> thread.get() != null && thread.get().getState() == Thread.State.TERMINATED);
354354
}
355355

‎src/test/java/io/vertx/core/TimerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public void start() throws Exception {
171171
assertTrue(vertx.cancelTimer(id));
172172
testComplete();
173173
}
174-
}, new DeploymentOptions().setWorker(true));
174+
}, new DeploymentOptions().setThreadingModel(ThreadingModel.WORKER));
175175
await();
176176
}
177177

@@ -185,7 +185,7 @@ public void start() throws Exception {
185185
testComplete();
186186
});
187187
}
188-
}, new DeploymentOptions().setWorker(true));
188+
}, new DeploymentOptions().setThreadingModel(ThreadingModel.WORKER));
189189
await();
190190
}
191191

‎src/test/java/io/vertx/core/datagram/DatagramTest.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,7 @@
1212

1313
import io.netty.buffer.ByteBuf;
1414
import io.netty.buffer.UnpooledHeapByteBuf;
15-
import io.vertx.core.AbstractVerticle;
16-
import io.vertx.core.AsyncResult;
17-
import io.vertx.core.Context;
18-
import io.vertx.core.DeploymentOptions;
19-
import io.vertx.core.Handler;
20-
import io.vertx.core.Promise;
21-
import io.vertx.core.Vertx;
15+
import io.vertx.core.*;
2216
import io.vertx.core.buffer.Buffer;
2317
import io.vertx.core.buffer.impl.BufferInternal;
2418
import io.vertx.core.impl.Utils;
@@ -565,7 +559,7 @@ public void start(Promise<Void> startPromise) {
565559
.<Void>mapEmpty()
566560
.onComplete(startPromise);
567561
}
568-
}, new DeploymentOptions().setWorker(true))
562+
}, new DeploymentOptions().setThreadingModel(ThreadingModel.WORKER))
569563
.onComplete(onSuccess(id -> {
570564
peer1 = vertx.createDatagramSocket(new DatagramSocketOptions());
571565
peer1

0 commit comments

Comments
 (0)