Skip to content
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.

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

Release 2.4.x #70

Merged
merged 3 commits into from
May 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions example-context/example-service/example-it/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,12 @@
<version>${event-store.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>uk.gov.justice.event-store</groupId>
<artifactId>event-store-management-command-handler-extension</artifactId>
<version>${event-store.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@
import uk.gov.justice.services.test.utils.core.messaging.Poller;
import uk.gov.justice.services.test.utils.persistence.DatabaseCleaner;

import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import uk.gov.justice.services.example.cakeshop.it.helpers.ApiResponse;
import uk.gov.justice.services.example.cakeshop.it.helpers.CommandSender;
import uk.gov.justice.services.example.cakeshop.it.helpers.EventFactory;
import uk.gov.justice.services.example.cakeshop.it.helpers.EventSender;
import uk.gov.justice.services.example.cakeshop.it.helpers.JmsBootstrapper;
import uk.gov.justice.services.example.cakeshop.it.helpers.Querier;
import uk.gov.justice.services.example.cakeshop.it.helpers.RestEasyClientFactory;
Expand All @@ -26,10 +27,8 @@
import java.util.UUID;

import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.TextMessage;
import javax.jms.Topic;
import javax.json.JsonObject;
import javax.ws.rs.client.Client;

Expand All @@ -44,6 +43,7 @@ public class MultipleEventListenerCakeShopIT {

private final EventFactory eventFactory = new EventFactory();
private final JmsBootstrapper jmsBootstrapper = new JmsBootstrapper();
private final EventSender eventSender = new EventSender();

private Client client;
private Querier querier;
Expand All @@ -69,12 +69,7 @@ public void shouldReturnRecipeFromOtherEventListener() throws Exception {

//adding 1 recipe as other event
final UUID recipeId2 = randomUUID();

try (final Session jmsSession = jmsBootstrapper.jmsSession()) {
final Topic topic = jmsSession.createTopic("other.event");

try (final MessageProducer producer = jmsSession.createProducer(topic);) {

final String topicName = "other.event";
final JsonObject jsonObject = createObjectBuilder()
.add("recipeId", recipeId2.toString())
.add("name", "Chocolate muffin")
Expand All @@ -95,15 +90,7 @@ public void shouldReturnRecipeFromOtherEventListener() throws Exception {
.build(),
jsonObject);

@SuppressWarnings("deprecation") final String json = jsonEnvelope.toDebugStringPrettyPrint();
final TextMessage message = jmsSession.createTextMessage();

message.setText(json);
message.setStringProperty("CPPNAME", "other.recipe-added");

producer.send(message);
}
}
eventSender.sendToTopic(jsonEnvelope, topicName);

await().until(() -> {
final String responseBody = querier.recipesQueryResult(singletonList(new BasicNameValuePair("pagesize", "30"))).body();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package uk.gov.justice.services.example.cakeshop.it.helpers;

import uk.gov.justice.services.messaging.JsonEnvelope;

import javax.jms.JMSException;
import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.TextMessage;
import javax.jms.Topic;

public class EventSender {

private final JmsBootstrapper jmsBootstrapper = new JmsBootstrapper();

public void sendToTopic(final JsonEnvelope jsonEnvelope, final String topicName) throws JMSException {
try (final Session jmsSession = jmsBootstrapper.jmsSession()) {
final Topic topic = jmsSession.createTopic(topicName);

try (final MessageProducer producer = jmsSession.createProducer(topic);) {

@SuppressWarnings("deprecation") final String json = jsonEnvelope.toDebugStringPrettyPrint();
final TextMessage message = jmsSession.createTextMessage();

message.setText(json);
message.setStringProperty("CPPNAME", jsonEnvelope.metadata().name());

producer.send(message);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,8 @@
<managed-executor-services>
<managed-executor-service name="default"
jndi-name="java:jboss/ee/concurrency/executor/default"
core-threads="20"
max-threads="250"
context-service="default" hung-task-threshold="60000"
keepalive-time="5000"/>
</managed-executor-services>
Expand Down
5 changes: 5 additions & 0 deletions example-context/example-service/example-single/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@
<artifactId>event-store-management-commands</artifactId>
<version>${event-store.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.justice.event-store</groupId>
<artifactId>event-store-management-command-handler-extension</artifactId>
<version>${event-store.version}</version>
</dependency>

<!-- Test Dependencies -->
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

<framework-api.version>4.1.0</framework-api.version>
<framework.version>6.4.0</framework.version>
<event-store.version>2.4.2</event-store.version>
<event-store.version>2.4.9</event-store.version>
<framework-generators.version>2.4.0</framework-generators.version>
<file.service.version>1.17.12</file.service.version>

Expand Down