Skip to content

use Rx versions instead of callbacks #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

use Rx versions instead of callbacks #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-rx-java</artifactId>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-unit</artifactId>
Expand Down Expand Up @@ -95,14 +100,14 @@
<configuration>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Main-Class>io.vertx.core.Launcher</Main-Class>
<Main-Verticle>${main.verticle}</Main-Verticle>
</manifestEntries>
</transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/services/io.vertx.core.spi.VerticleFactory</resource>
</transformer>
</transformers>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/tidyjava/example/ActivityModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import com.tidyjava.example.gateways.ActivityGatewayImpl;
import com.tidyjava.example.usecases.listActivities.ListActivitiesInputBoundary;
import com.tidyjava.example.usecases.listActivities.ListActivitiesUseCase;
import io.vertx.core.Vertx;
import io.vertx.core.json.JsonObject;
import io.vertx.ext.jdbc.JDBCClient;
import io.vertx.rxjava.core.Vertx;
import io.vertx.rxjava.ext.jdbc.JDBCClient;

public class ActivityModule extends AbstractModule {
private final Vertx vertx;
Expand Down
49 changes: 17 additions & 32 deletions src/main/java/com/tidyjava/example/MainVerticle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,22 @@
import com.tidyjava.example.usecases.listActivities.ListActivitiesInputBoundary;
import com.tidyjava.example.usecases.listActivities.ListActivitiesUseCase;
import com.tidyjava.example.usecases.listActivities.ListActivitiesView;
import io.vertx.core.AbstractVerticle;
import io.vertx.ext.jdbc.JDBCClient;
import io.vertx.ext.sql.SQLConnection;
import io.vertx.ext.web.Router;
import io.vertx.core.Future;
import io.vertx.rxjava.core.AbstractVerticle;
import io.vertx.rxjava.ext.jdbc.JDBCClient;
import io.vertx.rxjava.ext.sql.SQLConnection;
import io.vertx.rxjava.ext.web.Router;
import rx.Single;

public class MainVerticle extends AbstractVerticle {

@Override
public void start() {
initDatabase();

public void start(Future<Void> startFuture) throws Exception {
initDatabase().subscribe(c -> {
startFuture.complete();
}, startFuture::fail);
Router router = Router.router(vertx);

Injector injector = Guice.createInjector(new ActivityModule(vertx, config()));

ListActivitiesInputBoundary listActivitiesUseCase = injector.getInstance(ListActivitiesUseCase.class);
Expand All @@ -26,33 +30,14 @@ public void start() {
});

vertx.createHttpServer()
.requestHandler(router::accept)
.listen(8080);
.requestHandler(router::accept)
.listen(8080);
}

private void initDatabase() {
private Single<SQLConnection> initDatabase() {
JDBCClient client = JDBCClient.createShared(vertx, config());

client.getConnection(res -> {
if (res.succeeded()) {
SQLConnection connection = res.result();
connection.update("CREATE TABLE ACTIVITIES(ID VARCHAR(255) PRIMARY KEY, NAME VARCHAR(255));", upres -> {
if (upres.succeeded()) {
System.out.println("Success 1!");
} else {
System.out.println("Almost 1!");
}
});
connection.update("INSERT INTO ACTIVITIES(id, name) VALUES ('id1', 'name1');", upres -> {
if (upres.succeeded()) {
System.out.println("Success 2!");
} else {
System.out.println("Almost 2!");
}
});
} else {
System.out.println("Holy Moly!");
}
});
return client.rxGetConnection()
.flatMap(connection -> connection.rxUpdate("CREATE TABLE ACTIVITIES(ID VARCHAR(255) PRIMARY KEY, NAME VARCHAR(255));").map(r -> connection))
.flatMap(connection -> connection.rxUpdate("INSERT INTO ACTIVITIES(id, name) VALUES ('id1', 'name1');").map(r -> connection));
}
}
4 changes: 3 additions & 1 deletion src/main/java/com/tidyjava/example/gateways/ActivityGateway.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package com.tidyjava.example.gateways;

import com.sun.xml.internal.bind.v2.runtime.unmarshaller.XsiNilLoader;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need for this import, eh?

import com.tidyjava.example.callback.Callback;
import com.tidyjava.example.entities.Activity;
import rx.Single;

import java.util.List;

public interface ActivityGateway {
void findAll(Callback<List<Activity>> callback);
Single<List<Activity>> findAll();
}
40 changes: 10 additions & 30 deletions src/main/java/com/tidyjava/example/gateways/ActivityGatewayImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
package com.tidyjava.example.gateways;

import com.tidyjava.example.callback.Callback;
import com.tidyjava.example.entities.Activity;
import io.vertx.core.json.JsonObject;
import io.vertx.ext.jdbc.JDBCClient;
import io.vertx.ext.sql.SQLConnection;
import io.vertx.rxjava.ext.jdbc.JDBCClient;
import rx.Single;

import javax.inject.Inject;
import java.util.List;
import java.util.function.Consumer;
import java.util.stream.Collectors;

public class ActivityGatewayImpl implements ActivityGateway {
Expand All @@ -20,32 +18,14 @@ public ActivityGatewayImpl(JDBCClient jdbcClient) {
}

@Override
public void findAll(Callback<List<Activity>> callback) {
getConnection(connection -> connection.query("SELECT * FROM Activities;", asyncRs -> {
if (asyncRs.succeeded()) {
List<Activity> activities = asyncRs.result()
.getRows()
.stream()
.map(this::toActivity)
.collect(Collectors.toList());

callback.success(activities);
} else {
callback.failure(asyncRs.cause());
}
}), callback::failure);
}

private void getConnection(Consumer<SQLConnection> sqlConnectionConsumer, Consumer<Throwable> onFailure) {
jdbcClient.getConnection(asyncConn -> {
if (asyncConn.succeeded()) {
SQLConnection connection = asyncConn.result();
sqlConnectionConsumer.accept(connection);
connection.close();
} else {
onFailure.accept(asyncConn.cause());
}
});
public Single<List<Activity>> findAll() {
return jdbcClient.rxGetConnection()
.flatMap(connection -> connection.rxQuery("SELECT * FROM Activities;"))
.map(result -> result
.getRows()
.stream()
.map(this::toActivity)
.collect(Collectors.toList()));
}

private Activity toActivity(JsonObject row) {
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/com/tidyjava/example/usecases/listActivities/ListActivitiesUseCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.tidyjava.example.usecases.listActivities;

import com.tidyjava.example.callback.Callback;
import com.tidyjava.example.entities.Activity;
import com.tidyjava.example.gateways.ActivityGateway;

Expand All @@ -18,16 +17,17 @@ public ListActivitiesUseCase(ActivityGateway activityGateway) {

@Override
public void listActivities(ListActivitiesOutputBoundary presenter) {
activityGateway.findAll(Callback.of(
activities -> presenter.success(toResponseModel(activities)),
presenter::failure));
activityGateway
.findAll()
.map(this::toResponseModel)
.subscribe(presenter::success, presenter::failure);
}

private List<ActivityDetails> toResponseModel(List<Activity> activities) {
return activities
.stream()
.map(Activity::getName)
.map(ActivityDetails::new)
.collect(Collectors.toList());
.stream()
.map(Activity::getName)
.map(ActivityDetails::new)
.collect(Collectors.toList());
}
}
4 changes: 2 additions & 2 deletions src/main/java/com/tidyjava/example/usecases/listActivities/ListActivitiesView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.tidyjava.example.usecases.listActivities;

import io.vertx.ext.web.RoutingContext;
import io.vertx.ext.web.templ.FreeMarkerTemplateEngine;
import io.vertx.rxjava.ext.web.RoutingContext;
import io.vertx.rxjava.ext.web.templ.FreeMarkerTemplateEngine;

import java.util.List;

Expand Down
9 changes: 7 additions & 2 deletions src/test/java/com/tidyjava/example/MainVerticleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package com.tidyjava.example;

import io.vertx.core.DeploymentOptions;
import io.vertx.core.Vertx;
import io.vertx.core.json.JsonObject;
import io.vertx.ext.unit.Async;
import io.vertx.ext.unit.TestContext;
import io.vertx.ext.unit.junit.VertxUnitRunner;
Expand All @@ -16,8 +18,11 @@ public class MainVerticleTest {

@Before
public void setUp(TestContext tc) {
JsonObject config = new JsonObject();
config.put("url", "jdbc:h2:mem:test");
config.put("driver_class", "org.h2.Driver");
vertx = Vertx.vertx();
vertx.deployVerticle(MainVerticle.class.getName(), tc.asyncAssertSuccess());
vertx.deployVerticle(MainVerticle.class.getName(), new DeploymentOptions().setConfig(config), tc.asyncAssertSuccess());
}

@After
Expand All @@ -37,4 +42,4 @@ public void testThatTheServerIsStarted(TestContext tc) {
});
}

}
}