Skip to content

Commit 3b4e97b

Browse files
juancgalvisjuancgalvis
committed
build(sonar): Fix some sonar issues
1 parent a80a695 commit 3b4e97b

File tree

18 files changed

+97
-80
lines changed

18 files changed

+97
-80
lines changed

‎async/async-kafka/src/main/java/org/reactivecommons/async/kafka/KafkaDirectAsyncGateway.java

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,68 +8,71 @@
88
import reactor.core.publisher.Mono;
99

1010
public class KafkaDirectAsyncGateway implements DirectAsyncGateway {
11+
12+
public static final String NOT_IMPLEMENTED_YET = "Not implemented yet";
13+
1114
@Override
1215
public <T> Mono<Void> sendCommand(Command<T> command, String targetName) {
13-
throw new UnsupportedOperationException("Not implemented yet");
16+
throw new UnsupportedOperationException(NOT_IMPLEMENTED_YET);
1417
}
1518

1619
@Override
1720
public <T> Mono<Void> sendCommand(Command<T> command, String targetName, long delayMillis) {
18-
throw new UnsupportedOperationException("Not implemented yet");
21+
throw new UnsupportedOperationException(NOT_IMPLEMENTED_YET);
1922
}
2023

2124
@Override
2225
public <T> Mono<Void> sendCommand(Command<T> command, String targetName, String domain) {
23-
throw new UnsupportedOperationException("Not implemented yet");
26+
throw new UnsupportedOperationException(NOT_IMPLEMENTED_YET);
2427
}
2528

2629
@Override
2730
public <T> Mono<Void> sendCommand(Command<T> command, String targetName, long delayMillis, String domain) {
28-
throw new UnsupportedOperationException("Not implemented yet");
31+
throw new UnsupportedOperationException(NOT_IMPLEMENTED_YET);
2932
}
3033

3134
@Override
3235
public Mono<Void> sendCommand(CloudEvent command, String targetName) {
33-
throw new UnsupportedOperationException("Not implemented yet");
36+
throw new UnsupportedOperationException(NOT_IMPLEMENTED_YET);
3437
}
3538

3639
@Override
3740
public Mono<Void> sendCommand(CloudEvent command, String targetName, long delayMillis) {
38-
throw new UnsupportedOperationException("Not implemented yet");
41+
throw new UnsupportedOperationException(NOT_IMPLEMENTED_YET);
3942
}
4043

4144
@Override
4245
public Mono<Void> sendCommand(CloudEvent command, String targetName, String domain) {
43-
throw new UnsupportedOperationException("Not implemented yet");
46+
throw new UnsupportedOperationException(NOT_IMPLEMENTED_YET);
4447
}
4548

4649
@Override
4750
public Mono<Void> sendCommand(CloudEvent command, String targetName, long delayMillis, String domain) {
48-
throw new UnsupportedOperationException("Not implemented yet");
51+
throw new UnsupportedOperationException(NOT_IMPLEMENTED_YET);
4952
}
5053

5154
@Override
5255
public <T, R> Mono<R> requestReply(AsyncQuery<T> query, String targetName, Class<R> type) {
53-
throw new UnsupportedOperationException("Not implemented yet");
56+
throw new UnsupportedOperationException(NOT_IMPLEMENTED_YET);
5457
}
5558

5659
@Override
5760
public <T, R> Mono<R> requestReply(AsyncQuery<T> query, String targetName, Class<R> type, String domain) {
58-
throw new UnsupportedOperationException("Not implemented yet");
61+
throw new UnsupportedOperationException(NOT_IMPLEMENTED_YET);
5962
}
6063

6164
@Override
6265
public <R extends CloudEvent> Mono<R> requestReply(CloudEvent query, String targetName, Class<R> type) {
63-
throw new UnsupportedOperationException("Not implemented yet");
66+
throw new UnsupportedOperationException(NOT_IMPLEMENTED_YET);
6467
}
6568

6669
@Override
6770
public <R extends CloudEvent> Mono<R> requestReply(CloudEvent query, String targetName, Class<R> type, String domain) {
68-
throw new UnsupportedOperationException("Not implemented yet");
71+
throw new UnsupportedOperationException(NOT_IMPLEMENTED_YET);
6972
}
7073

7174
@Override
7275
public <T> Mono<Void> reply(T response, From from) {
73-
throw new UnsupportedOperationException("Not implemented yet");
76+
throw new UnsupportedOperationException(NOT_IMPLEMENTED_YET);
7477
}
7578
}

‎async/async-kafka/src/main/java/org/reactivecommons/async/kafka/KafkaDomainEventBus.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
@AllArgsConstructor
1111
public class KafkaDomainEventBus implements DomainEventBus {
12+
public static final String NOT_IMPLEMENTED_YET = "Not implemented yet";
1213
private final ReactiveMessageSender sender;
1314

1415
@Override
@@ -18,7 +19,7 @@ public <T> Publisher<Void> emit(DomainEvent<T> event) {
1819

1920
@Override
2021
public <T> Publisher<Void> emit(String domain, DomainEvent<T> event) {
21-
throw new UnsupportedOperationException("Not implemented yet");
22+
throw new UnsupportedOperationException(NOT_IMPLEMENTED_YET);
2223
}
2324

2425
@Override
@@ -28,6 +29,6 @@ public Publisher<Void> emit(CloudEvent event) {
2829

2930
@Override
3031
public Publisher<Void> emit(String domain, CloudEvent event) {
31-
throw new UnsupportedOperationException("Not implemented yet");
32+
throw new UnsupportedOperationException(NOT_IMPLEMENTED_YET);
3233
}
3334
}

‎main.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ allprojects {
1111
maven { url 'https://repo.spring.io/milestone' }
1212
}
1313

14-
if (toPublish.split(',').contains(project.name) || project.name == 'ReactiveArchitectureCommons') {
14+
if (toPublish.split(',').contains(project.name) || project.name == rootProject.name) {
1515

1616
sonar {
1717
properties {

‎starters/async-commons-starter/src/main/java/org/reactivecommons/async/impl/config/annotations/EnableDirectAsyncGateway.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.reactivecommons.async.impl.config.annotations;
22

3-
import org.reactivecommons.async.starter.config.ReactiveCommonsConfig;
43
import org.reactivecommons.async.starter.senders.DirectAsyncGatewayConfig;
54
import org.springframework.context.annotation.Configuration;
65
import org.springframework.context.annotation.Import;

‎starters/async-commons-starter/src/main/java/org/reactivecommons/async/starter/config/ConnectionManager.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,6 @@ public ConnectionManager addDomain(String domain, BrokerProvider domainConn) {
1919
return this;
2020
}
2121

22-
private BrokerProvider getChecked(String domain) {
23-
BrokerProvider domainProvider = connections.get(domain);
24-
if (domainProvider == null) {
25-
throw new RuntimeException("You are trying to use the domain " + domain
26-
+ " but this connection is not defined");
27-
}
28-
return domainProvider;
29-
}
30-
3122
public Map<String, BrokerProvider> getProviders() {
3223
return connections;
3324
}

‎starters/async-commons-starter/src/main/java/org/reactivecommons/async/starter/config/DomainHandlers.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.reactivecommons.async.starter.config;
22

33
import org.reactivecommons.async.commons.HandlerResolver;
4+
import org.reactivecommons.async.starter.exceptions.InvalidConfigurationException;
45

56
import java.util.Map;
67
import java.util.TreeMap;
@@ -15,7 +16,7 @@ public void add(String domain, HandlerResolver resolver) {
1516
public HandlerResolver get(String domain) {
1617
HandlerResolver handlerResolver = handlers.get(domain);
1718
if (handlerResolver == null) {
18-
throw new RuntimeException("You are trying to use the domain " + domain
19+
throw new InvalidConfigurationException("You are trying to use the domain " + domain
1920
+ " but this connection is not defined");
2021
}
2122
return handlerResolver;

‎starters/async-commons-starter/src/main/java/org/reactivecommons/async/starter/listeners/AbstractListenerConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package org.reactivecommons.async.starter.listeners;
22

33
import org.reactivecommons.async.commons.HandlerResolver;
4-
import org.reactivecommons.async.starter.config.ConnectionManager;
54
import org.reactivecommons.async.starter.broker.BrokerProvider;
5+
import org.reactivecommons.async.starter.config.ConnectionManager;
66
import org.reactivecommons.async.starter.config.DomainHandlers;
77

88
public abstract class AbstractListenerConfig {
99

10-
public AbstractListenerConfig(ConnectionManager manager, DomainHandlers handlers) {
10+
protected AbstractListenerConfig(ConnectionManager manager, DomainHandlers handlers) {
1111
manager.forDomain((domain, provider) -> listen(domain, provider, handlers.get(domain)));
1212
}
1313

‎starters/async-commons-starter/src/main/java/org/reactivecommons/async/starter/props/GenericAsyncProps.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ public abstract class GenericAsyncProps<P> {
1515
private String appName;
1616
private String secret;
1717

18-
abstract public void setConnectionProperties(P properties);
18+
public abstract void setConnectionProperties(P properties);
1919

20-
abstract public P getConnectionProperties();
20+
public abstract P getConnectionProperties();
2121

22-
abstract public String getBrokerType();
22+
public abstract String getBrokerType();
2323

24-
abstract public boolean isEnabled();
24+
public abstract boolean isEnabled();
2525

26-
abstract public void setUseDiscardNotifierPerDomain(boolean enabled);
26+
public abstract void setUseDiscardNotifierPerDomain(boolean enabled);
2727
}

‎starters/async-commons-starter/src/main/java/org/reactivecommons/async/starter/props/GenericAsyncPropsDomain.java

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.fasterxml.jackson.databind.ObjectMapper;
44
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
5+
import lombok.EqualsAndHashCode;
56
import lombok.Getter;
67
import lombok.Setter;
78
import lombok.SneakyThrows;
@@ -10,6 +11,7 @@
1011
import java.lang.reflect.Constructor;
1112
import java.util.HashMap;
1213
import java.util.Map;
14+
import java.util.Objects;
1315

1416
import static org.reactivecommons.async.api.HandlerRegistry.DEFAULT_DOMAIN;
1517

@@ -61,7 +63,7 @@ public GenericAsyncPropsDomain(String defaultAppName,
6163
}
6264

6365
protected void fillCustoms(T asyncProps) {
64-
66+
// To be overridden called after the default properties are set
6567
}
6668

6769
public T getProps(String domain) {
@@ -153,4 +155,17 @@ public interface SecretFiller<P> {
153155
void fillWithSecret(String domain, GenericAsyncProps<P> props);
154156
}
155157

158+
@Override
159+
public boolean equals(Object o) {
160+
if (this == o) return true;
161+
if (o == null || getClass() != o.getClass()) return false;
162+
if (!super.equals(o)) return false;
163+
GenericAsyncPropsDomain<?, ?> that = (GenericAsyncPropsDomain<?, ?>) o;
164+
return Objects.equals(asyncPropsClass, that.asyncPropsClass) && Objects.equals(propsClass, that.propsClass);
165+
}
166+
167+
@Override
168+
public int hashCode() {
169+
return Objects.hash(super.hashCode(), asyncPropsClass, propsClass);
170+
}
156171
}

‎starters/async-commons-starter/src/main/java/org/reactivecommons/async/starter/props/GenericAsyncPropsDomainProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
@Setter
1111
public class GenericAsyncPropsDomainProperties<T extends GenericAsyncProps<P>, P> extends HashMap<String, T> {
1212

13-
public GenericAsyncPropsDomainProperties(Map<? extends String, ? extends T> m) {
13+
public GenericAsyncPropsDomainProperties(Map<String, ? extends T> m) {
1414
super(m);
1515
}
1616

‎starters/async-kafka-starter/src/main/java/org/reactivecommons/async/kafka/KafkaBrokerProvider.java

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,18 @@ public DirectAsyncGateway getDirectAsyncGateway(HandlerResolver resolver) {
5252

5353
@Override
5454
public void listenDomainEvents(HandlerResolver resolver) {
55-
if (!props.getDomain().isIgnoreThisListener()) {
56-
if (!resolver.getEventListeners().isEmpty()) {
57-
ApplicationEventListener eventListener = new ApplicationEventListener(receiver,
58-
resolver,
59-
converter,
60-
props.getWithDLQRetry(),
61-
props.getCreateTopology(),
62-
props.getMaxRetries(),
63-
props.getRetryDelay(),
64-
discardNotifier,
65-
errorReporter,
66-
props.getAppName());
67-
eventListener.startListener(topologyCreator);
68-
}
55+
if (!props.getDomain().isIgnoreThisListener() && !resolver.getEventListeners().isEmpty()) {
56+
ApplicationEventListener eventListener = new ApplicationEventListener(receiver,
57+
resolver,
58+
converter,
59+
props.getWithDLQRetry(),
60+
props.getCreateTopology(),
61+
props.getMaxRetries(),
62+
props.getRetryDelay(),
63+
discardNotifier,
64+
errorReporter,
65+
props.getAppName());
66+
eventListener.startListener(topologyCreator);
6967
}
7068
}
7169

@@ -88,17 +86,17 @@ public void listenNotificationEvents(HandlerResolver resolver) {
8886

8987
@Override
9088
public void listenCommands(HandlerResolver resolver) {
91-
89+
// Implemented in the future
9290
}
9391

9492
@Override
9593
public void listenQueries(HandlerResolver resolver) {
96-
94+
// May be implemented in the future
9795
}
9896

9997
@Override
10098
public void listenReplies(HandlerResolver resolver) {
101-
99+
// May be implemented in the future
102100
}
103101

104102
@Override

‎starters/async-kafka-starter/src/main/java/org/reactivecommons/async/kafka/KafkaSetupUtils.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ public static ReactiveMessageSender createMessageSender(AsyncKafkaProps config,
3838
TopologyCreator topologyCreator,
3939
SslBundles sslBundles) {
4040
KafkaProperties props = config.getConnectionProperties();
41-
props.setClientId(config.getAppName()); // CLIENT_ID_CONFIG
42-
props.getProducer().setKeySerializer(StringSerializer.class); // KEY_SERIALIZER_CLASS_CONFIG;
43-
props.getProducer().setValueSerializer(ByteArraySerializer.class); // VALUE_SERIALIZER_CLASS_CONFIG
41+
props.setClientId(config.getAppName());
42+
props.getProducer().setKeySerializer(StringSerializer.class);
43+
props.getProducer().setValueSerializer(ByteArraySerializer.class);
4444
SenderOptions<String, byte[]> senderOptions = SenderOptions.create(props.buildProducerProperties(sslBundles));
4545
KafkaSender<String, byte[]> kafkaSender = KafkaSender.create(senderOptions);
4646
return new ReactiveMessageSender(kafkaSender, converter, topologyCreator);
@@ -50,8 +50,8 @@ public static ReactiveMessageSender createMessageSender(AsyncKafkaProps config,
5050

5151
public static ReactiveMessageListener createMessageListener(AsyncKafkaProps config, SslBundles sslBundles) {
5252
KafkaProperties props = config.getConnectionProperties();
53-
props.getConsumer().setKeyDeserializer(StringDeserializer.class); // KEY_DESERIALIZER_CLASS_CONFIG
54-
props.getConsumer().setValueDeserializer(ByteArrayDeserializer.class); // VALUE_DESERIALIZER_CLASS_CONFIG
53+
props.getConsumer().setKeyDeserializer(StringDeserializer.class);
54+
props.getConsumer().setValueDeserializer(ByteArrayDeserializer.class);
5555
ReceiverOptions<String, byte[]> receiverOptions = ReceiverOptions.create(props.buildConsumerProperties(sslBundles));
5656
return new ReactiveMessageListener(receiverOptions);
5757
}

‎starters/async-rabbit-standalone/src/main/java/org/reactivecommons/async/rabbit/standalone/config/DirectAsyncGatewayConfig.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,17 @@ public class DirectAsyncGatewayConfig {
2222
private String appName;
2323

2424

25-
public RabbitDirectAsyncGateway rabbitDirectAsyncGateway(BrokerConfig config, ReactiveReplyRouter router, ReactiveMessageSender rSender, MessageConverter converter,
26-
MeterRegistry meterRegistry) throws Exception {
27-
return new RabbitDirectAsyncGateway(config, router, rSender, directMessagesExchangeName, converter, meterRegistry);
25+
public RabbitDirectAsyncGateway rabbitDirectAsyncGateway(BrokerConfig config, ReactiveReplyRouter router,
26+
ReactiveMessageSender rSender, MessageConverter converter,
27+
MeterRegistry meterRegistry) {
28+
return new RabbitDirectAsyncGateway(config, router, rSender, directMessagesExchangeName, converter,
29+
meterRegistry);
2830
}
2931

30-
public ApplicationReplyListener msgListener(ReactiveReplyRouter router, BrokerConfig config, ReactiveMessageListener listener, boolean createTopology) {
31-
final ApplicationReplyListener replyListener = new ApplicationReplyListener(router, listener, generateName(), globalReplyExchangeName, createTopology);
32+
public ApplicationReplyListener msgListener(ReactiveReplyRouter router, BrokerConfig config,
33+
ReactiveMessageListener listener, boolean createTopology) {
34+
final ApplicationReplyListener replyListener = new ApplicationReplyListener(router, listener, generateName(),
35+
globalReplyExchangeName, createTopology);
3236
replyListener.startListening(config.getRoutingKey());
3337
return replyListener;
3438
}
@@ -50,7 +54,7 @@ public String generateName() {
5054
.putLong(uuid.getLeastSignificantBits());
5155
// Convert to base64 and remove trailing =
5256
return this.appName + encodeToUrlSafeString(bb.array())
53-
.replaceAll("=", "");
57+
.replace("=", "");
5458
}
5559

5660
public static String encodeToUrlSafeString(byte[] src) {

‎starters/async-rabbit-standalone/src/main/java/org/reactivecommons/async/rabbit/standalone/config/RabbitMqConfig.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,21 @@
33
import com.rabbitmq.client.Connection;
44
import com.rabbitmq.client.ConnectionFactory;
55
import lombok.extern.java.Log;
6-
import org.reactivecommons.async.rabbit.communications.ReactiveMessageSender;
7-
import org.reactivecommons.async.rabbit.communications.TopologyCreator;
86
import org.reactivecommons.async.commons.converters.MessageConverter;
97
import org.reactivecommons.async.commons.converters.json.ObjectMapperSupplier;
8+
import org.reactivecommons.async.rabbit.communications.ReactiveMessageSender;
9+
import org.reactivecommons.async.rabbit.communications.TopologyCreator;
1010
import org.reactivecommons.async.rabbit.config.ConnectionFactoryProvider;
1111
import org.reactivecommons.async.rabbit.converters.json.RabbitJacksonMessageConverter;
1212
import reactor.core.publisher.Mono;
13-
import reactor.rabbitmq.*;
13+
import reactor.rabbitmq.ChannelPool;
14+
import reactor.rabbitmq.ChannelPoolFactory;
15+
import reactor.rabbitmq.ChannelPoolOptions;
16+
import reactor.rabbitmq.RabbitFlux;
17+
import reactor.rabbitmq.Sender;
18+
import reactor.rabbitmq.SenderOptions;
1419
import reactor.util.retry.Retry;
1520

16-
import java.io.File;
1721
import java.time.Duration;
1822
import java.util.logging.Level;
1923

@@ -40,12 +44,6 @@ public ReactiveMessageSender messageSender(ConnectionFactoryProvider provider, M
4044
return new ReactiveMessageSender(sender, appName, converter, new TopologyCreator(sender));
4145
}
4246

43-
/*public ReactiveMessageListener messageListener(ConnectionFactoryProvider provider) {
44-
final Mono<Connection> connection = createSenderConnectionMono(provider.getConnectionFactory(), "listener");
45-
Receiver receiver = RabbitFlux.createReceiver(new ReceiverOptions().connectionMono(connection));
46-
return new ReactiveMessageListener(receiver, new TopologyCreator(connection));
47-
}*/
48-
4947
public ConnectionFactoryProvider connectionFactory(RabbitProperties properties) {
5048
final ConnectionFactory factory = new ConnectionFactory();
5149
factory.setHost(properties.getHost());

0 commit comments

Comments
 (0)