Skip to content

Commit

Permalink
upgrade from vertx 3.7.1 to 3.8.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
Robin Duda committed Aug 9, 2019
1 parent dbc63e0 commit 9480fba
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
18 changes: 9 additions & 9 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 +28,24 @@ artifacts {
}

dependencies {
compile 'io.vertx:vertx-core:3.7.1'
compile 'io.vertx:vertx-web:3.7.1'
compile 'io.vertx:vertx-hazelcast:3.7.1'
compile 'io.vertx:vertx-mongo-client:3.7.1'
compile 'io.vertx:vertx-dropwizard-metrics:3.7.1'
compile 'io.vertx:vertx-core:3.8.0'
compile 'io.vertx:vertx-web:3.8.0'
compile 'io.vertx:vertx-hazelcast:3.8.0'
compile 'io.vertx:vertx-mongo-client:3.8.0'
compile 'io.vertx:vertx-dropwizard-metrics:3.8.0'

compile 'de.neuland-bfi:jade4j:1.2.7'
compile 'de.mkammerer:argon2-jvm:2.5'
compile 'org.fusesource.jansi:jansi:1.17.1'
compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.7'
compile 'org.fusesource.jansi:jansi:1.18'
compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.9'

compile 'org.elasticsearch.client:elasticsearch-rest-high-level-client:7.0.0-rc1'
compile 'org.elasticsearch.client:elasticsearch-rest-high-level-client:7.3.0'
compile 'com.googlecode.cqengine:cqengine:3.4.0'

/* keep these in sync with cqengine, used internally. */
compile 'com.esotericsoftware:reflectasm:1.11.7'
compile 'com.esotericsoftware:kryo:5.0.0-RC1'

testCompile 'io.vertx:vertx-unit:3.7.1'
testCompile 'io.vertx:vertx-unit:3.8.0'
testCompile 'junit:junit:4.12'
}
4 changes: 2 additions & 2 deletions core/main/java/com/codingchili/core/context/CoreContext.java
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ default FileSystem fileSystem() {
* @param result handler for the result of the blocking execution.
* @param <T> type parameter.
*/
<T> void blocking(Handler<Future<T>> blocking, Handler<AsyncResult<T>> result);
<T> void blocking(Handler<Promise<T>> blocking, Handler<AsyncResult<T>> result);

/**
* Call to execute the given blocking handler on a worker thread that is
Expand All @@ -123,7 +123,7 @@ default FileSystem fileSystem() {
* @param ordered if true, indicates that the tasks must be completed in the same order as they are started.
* @param result handler for the result that is called asynchronously
*/
<T> void blocking(Handler<Future<T>> blocking, boolean ordered, Handler<AsyncResult<T>> result);
<T> void blocking(Handler<Promise<T>> blocking, boolean ordered, Handler<AsyncResult<T>> result);

/**
* @param aClass added as metadata to all logged events.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -278,12 +278,12 @@ ExecutorService getBlockingExecutor() {
}

@Override
public <T> void blocking(Handler<Future<T>> sync, Handler<AsyncResult<T>> result) {
public <T> void blocking(Handler<Promise<T>> sync, Handler<AsyncResult<T>> result) {
blocking(sync, false, result);
}

@Override
public <T> void blocking(Handler<Future<T>> sync, boolean ordered, Handler<AsyncResult<T>> result) {
public <T> void blocking(Handler<Promise<T>> sync, boolean ordered, Handler<AsyncResult<T>> result) {
vertx.executeBlocking(sync, ordered, result);
}

Expand Down

0 comments on commit 9480fba

Please sign in to comment.