Skip to content

Commit

Permalink
fixed RabbitMQ calls
Browse files Browse the repository at this point in the history
  • Loading branch information
alexsilaghi committed Mar 4, 2024
1 parent d0b4c93 commit 042e380
Show file tree
Hide file tree
Showing 6 changed files with 172 additions and 99 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,6 @@ public class Headers {
public static final String PROJECT_ID = PREFIX + "projectId";

public static final String ACCESS_TOKEN = PREFIX + "accessToken";

public static final String METHOD = PREFIX + "methodName";
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;

import javax.annotation.PreDestroy;
import java.io.IOException;
Expand Down Expand Up @@ -54,6 +55,7 @@ public class PulsarCommandExecutor<Q extends Request<R>, R extends Response> imp
private ObjectMapper objectMapper;

@Autowired
@Lazy
private RabbitTemplate rabbitTemplate;

private Producer<byte[]> producer;
Expand Down Expand Up @@ -118,9 +120,8 @@ public CompletableFuture<R> executeRabbit(Q request, ExecutionContext executionC
org.springframework.amqp.core.Message rabbitRequest = new org.springframework.amqp.core.Message(json);
rabbitRequest.getMessageProperties().getHeaders().put(Headers.ACCESS_TOKEN, executionContext.jwt());
rabbitRequest.getMessageProperties().getHeaders().put(Headers.USER_ID, executionContext.userId());
rabbitRequest.getMessageProperties().setConsumerQueue(request.getChannel());

org.springframework.amqp.core.Message rabbitResponse = rabbitTemplate.sendAndReceive(rabbitRequest);
rabbitRequest.getMessageProperties().getHeaders().put(Headers.METHOD, request.getChannel());
org.springframework.amqp.core.Message rabbitResponse = rabbitTemplate.sendAndReceive(request.getChannel(), rabbitRequest);

CompletableFuture<R> replyHandler = new CompletableFuture<>();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ private void authorizeAndReplyToRequest(String replyChannel,
subject,
requiredActionId.stream().findFirst().orElse(null));
var executionContext = new ExecutionContext(new UserId(userId), "");
var authResponseFuture = authorizationStatusExecutor.executeRabbit(authRequest, executionContext);
var authResponseFuture = authorizationStatusExecutor.execute(authRequest, executionContext);
authResponseFuture.whenComplete((authResponse, authError) -> {
if (authError != null) {
// The call to the authorization service failed
Expand Down
Original file line number Diff line number Diff line change
@@ -1,29 +1,19 @@
package edu.stanford.protege.webprotege.ipc.pulsar;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.rabbitmq.client.Channel;
import edu.stanford.protege.webprotege.authorization.GetAuthorizationStatusRequest;
import edu.stanford.protege.webprotege.authorization.GetAuthorizationStatusResponse;
import edu.stanford.protege.webprotege.common.Request;
import edu.stanford.protege.webprotege.common.Response;
import edu.stanford.protege.webprotege.ipc.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.*;
import org.springframework.amqp.rabbit.connection.Connection;
import org.springframework.amqp.rabbit.connection.ConnectionFactory;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

import javax.annotation.PostConstruct;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;

/**
* Matthew Horridge
Expand All @@ -40,72 +30,15 @@ public class PulsarCommandHandlersConfiguration {

@Autowired
private PulsarCommandHandlerWrapperFactory wrapperFactory;

@Autowired
private RabbitTemplate rabbitTemplate;
@Autowired
private ObjectMapper objectMapper;

@Autowired
CommandExecutor<GetAuthorizationStatusRequest, GetAuthorizationStatusResponse> authorizationStatusExecutor;

@Autowired
private ConnectionFactory connectionFactory;

public static final String RPC_QUEUE1 = "webprotege-rpc-queue";
public static final String RPC_RESPONSE_QUEUE = "webprotege-backend-response-queue";

public static final String RPC_EXCHANGE = "webprotege-exchange";

@Bean
Queue msgQueue() {
return new Queue(RPC_QUEUE1, true);
}

@Bean
Queue replyQueue() {
return new Queue(RPC_RESPONSE_QUEUE, true);
}

@Bean
DirectExchange exchange() {
return new DirectExchange(RPC_EXCHANGE, true, false);
}

@Bean
public List<Binding> bindings(DirectExchange directExchange, Queue msgQueue){
try (Connection connection = connectionFactory.createConnection();
Channel channel = connection.createChannel(true)) {
channel.exchangeDeclare(RPC_EXCHANGE, "direct", true);
channel.queueDeclare(RPC_QUEUE1,true,false, false,null);

var response = new ArrayList<Binding>();

for(CommandHandler handler: commandHandlers) {
logger.info("Declaring binding {} {} " + handler.getChannelName());
channel.queueBind(RPC_QUEUE1, RPC_EXCHANGE, handler.getChannelName());
response.add(BindingBuilder.bind(msgQueue).to(directExchange).with(handler.getChannelName()));
}
return response;

} catch (Exception e) {
logger.error("Error ", e);
throw new RuntimeException(e);
}


}

@Bean
public SimpleMessageListenerContainer messageListenerContainers(ConnectionFactory connectionFactory){

SimpleMessageListenerContainer container = new SimpleMessageListenerContainer();
container.setQueueNames(RPC_QUEUE1);
container.setConnectionFactory(connectionFactory);
container.setMessageListener(new RabbitMqHandlerWrapper<>(commandHandlers, objectMapper, authorizationStatusExecutor, rabbitTemplate));

return container;
}

@PostConstruct
private void postConstruct() {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
package edu.stanford.protege.webprotege.ipc.pulsar;


import com.fasterxml.jackson.databind.ObjectMapper;
import com.rabbitmq.client.Channel;
import edu.stanford.protege.webprotege.authorization.GetAuthorizationStatusRequest;
import edu.stanford.protege.webprotege.authorization.GetAuthorizationStatusResponse;
import edu.stanford.protege.webprotege.common.Request;
import edu.stanford.protege.webprotege.common.Response;
import edu.stanford.protege.webprotege.ipc.CommandExecutor;
import edu.stanford.protege.webprotege.ipc.CommandHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.Binding;
import org.springframework.amqp.core.BindingBuilder;
import org.springframework.amqp.core.DirectExchange;
import org.springframework.amqp.core.Queue;
import org.springframework.amqp.rabbit.connection.Connection;
import org.springframework.amqp.rabbit.connection.ConnectionFactory;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Lazy;

import java.util.ArrayList;
import java.util.List;

@Configuration
public class RabbitMqConfiguration {

private final static Logger logger = LoggerFactory.getLogger(RabbitMqConfiguration.class);

@Value("${webprotege.rabbitmq.responsequeue}")
public String RPC_RESPONSE_QUEUE;
@Value("${webprotege.rabbitmq.requestqueue}")
public String RPC_QUEUE1;

public static final String RPC_EXCHANGE = "webprotege-exchange";

@Autowired
private ConnectionFactory connectionFactory;

@Autowired(required = false)
private List<CommandHandler<? extends Request, ? extends Response>> commandHandlers = new ArrayList<>();

@Autowired
private PulsarCommandHandlerWrapperFactory wrapperFactory;
@Autowired
private ObjectMapper objectMapper;

@Autowired
@Lazy
CommandExecutor<GetAuthorizationStatusRequest, GetAuthorizationStatusResponse> authorizationStatusExecutor;

@Bean
Queue msgQueue() {
return new Queue(RPC_QUEUE1, true);
}

@Bean
Queue replyQueue() {
return new Queue(RPC_RESPONSE_QUEUE, true);
}

@Bean
DirectExchange exchange() {
return new DirectExchange(RPC_EXCHANGE, true, false);
}


@Bean
public RabbitTemplate rabbitTemplate(ConnectionFactory connectionFactory) {
RabbitTemplate rabbitTemplate = new RabbitTemplate(connectionFactory);
rabbitTemplate.setReplyAddress(RPC_RESPONSE_QUEUE);
rabbitTemplate.setReplyTimeout(60000);
rabbitTemplate.setExchange(RPC_EXCHANGE);
rabbitTemplate.setUseDirectReplyToContainer(false);
return rabbitTemplate;
}

@Bean
public SimpleMessageListenerContainer replyListenerContainer(ConnectionFactory connectionFactory, Queue replyQueue, RabbitTemplate rabbitTemplate) {
SimpleMessageListenerContainer container = new SimpleMessageListenerContainer();
container.setConnectionFactory(connectionFactory);
container.setQueues(replyQueue);
container.setMessageListener(rabbitTemplate);
return container;
}

@Bean
public SimpleMessageListenerContainer messageListenerContainers(ConnectionFactory connectionFactory){

SimpleMessageListenerContainer container = new SimpleMessageListenerContainer();
container.setQueueNames(RPC_QUEUE1);
container.setConnectionFactory(connectionFactory);
container.setMessageListener(new RabbitMqHandlerWrapper<>(commandHandlers, objectMapper, authorizationStatusExecutor));
logger.info("ALEX am construit message listener {}", RPC_QUEUE1);
return container;
}

@Bean
public List<Binding> bindings(DirectExchange directExchange, Queue msgQueue, Queue replyQueue){
try (Connection connection = connectionFactory.createConnection();
Channel channel = connection.createChannel(true)) {
channel.exchangeDeclare(RPC_EXCHANGE, "direct", true);
channel.queueDeclare(RPC_QUEUE1,true,false, false,null);
channel.queueDeclare(RPC_RESPONSE_QUEUE,true,false, false,null);

var response = new ArrayList<Binding>();

for(CommandHandler handler: commandHandlers) {
logger.info("Declaring binding queue {} to exchange {} with key {}",RPC_QUEUE1, RPC_EXCHANGE, handler.getChannelName());
channel.queueBind(RPC_QUEUE1, RPC_EXCHANGE, handler.getChannelName());
response.add(BindingBuilder.bind(msgQueue).to(directExchange).with(handler.getChannelName()));
}
channel.queueBind(RPC_RESPONSE_QUEUE, RPC_EXCHANGE,RPC_RESPONSE_QUEUE);

response.add(BindingBuilder.bind(replyQueue).to(directExchange).with(replyQueue.getName()));
channel.close();
connection.close();
return response;

} catch (Exception e) {
logger.error("Error ", e);
throw new RuntimeException(e);
}
}


}
Loading

0 comments on commit 042e380

Please sign in to comment.