Skip to content

Commit 0c677e6

Browse files
committed
Fix false Sonar null check warnings
- impossible null, but not detectable by Sonar
1 parent 99ccb1b commit 0c677e6

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/CachingConnectionFactory.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ public void setChannelCacheSize(int sessionCacheSize) {
330330
Assert.isTrue(sessionCacheSize >= 1, "Channel cache size must be 1 or higher");
331331
this.channelCacheSize = sessionCacheSize;
332332
if (this.defaultPublisherFactory) {
333-
((CachingConnectionFactory) getPublisherConnectionFactory()).setChannelCacheSize(sessionCacheSize);
333+
((CachingConnectionFactory) getPublisherConnectionFactory()).setChannelCacheSize(sessionCacheSize); // NOSONAR
334334
}
335335
}
336336

@@ -347,7 +347,7 @@ public void setCacheMode(CacheMode cacheMode) {
347347
Assert.notNull(cacheMode, "'cacheMode' must not be null.");
348348
this.cacheMode = cacheMode;
349349
if (this.defaultPublisherFactory) {
350-
((CachingConnectionFactory) getPublisherConnectionFactory()).setCacheMode(cacheMode);
350+
((CachingConnectionFactory) getPublisherConnectionFactory()).setCacheMode(cacheMode); // NOSONAR
351351
}
352352
}
353353

@@ -359,7 +359,7 @@ public void setConnectionCacheSize(int connectionCacheSize) {
359359
Assert.isTrue(connectionCacheSize >= 1, "Connection cache size must be 1 or higher.");
360360
this.connectionCacheSize = connectionCacheSize;
361361
if (this.defaultPublisherFactory) {
362-
((CachingConnectionFactory) getPublisherConnectionFactory()).setConnectionCacheSize(connectionCacheSize);
362+
((CachingConnectionFactory) getPublisherConnectionFactory()).setConnectionCacheSize(connectionCacheSize); // NOSONAR
363363
}
364364
}
365365

@@ -375,7 +375,7 @@ public void setConnectionLimit(int connectionLimit) {
375375
Assert.isTrue(connectionLimit >= 1, "Connection limit must be 1 or higher.");
376376
this.connectionLimit = connectionLimit;
377377
if (this.defaultPublisherFactory) {
378-
((CachingConnectionFactory) getPublisherConnectionFactory()).setConnectionLimit(connectionLimit);
378+
((CachingConnectionFactory) getPublisherConnectionFactory()).setConnectionLimit(connectionLimit); // NOSONAR
379379
}
380380
}
381381

@@ -392,7 +392,7 @@ public boolean isPublisherReturns() {
392392
public void setPublisherReturns(boolean publisherReturns) {
393393
this.publisherReturns = publisherReturns;
394394
if (this.defaultPublisherFactory) {
395-
((CachingConnectionFactory) getPublisherConnectionFactory()).setPublisherReturns(publisherReturns);
395+
((CachingConnectionFactory) getPublisherConnectionFactory()).setPublisherReturns(publisherReturns); // NOSONAR
396396
}
397397
}
398398

@@ -449,7 +449,7 @@ public void setPublisherConfirmType(ConfirmType confirmType) {
449449
Assert.notNull(confirmType, "'confirmType' cannot be null");
450450
this.confirmType = confirmType;
451451
if (this.defaultPublisherFactory) {
452-
((CachingConnectionFactory) getPublisherConnectionFactory()).setPublisherConfirmType(confirmType);
452+
((CachingConnectionFactory) getPublisherConnectionFactory()).setPublisherConfirmType(confirmType); // NOSONAR
453453
}
454454
}
455455

@@ -469,7 +469,7 @@ public void setChannelCheckoutTimeout(long channelCheckoutTimeout) {
469469
this.channelCheckoutTimeout = channelCheckoutTimeout;
470470
if (this.defaultPublisherFactory) {
471471
((CachingConnectionFactory) getPublisherConnectionFactory())
472-
.setChannelCheckoutTimeout(channelCheckoutTimeout);
472+
.setChannelCheckoutTimeout(channelCheckoutTimeout); // NOSONAR
473473
}
474474
}
475475

@@ -492,7 +492,7 @@ public void afterPropertiesSet() {
492492
}
493493
initCacheWaterMarks();
494494
if (this.defaultPublisherFactory) {
495-
((CachingConnectionFactory) getPublisherConnectionFactory()).afterPropertiesSet();
495+
((CachingConnectionFactory) getPublisherConnectionFactory()).afterPropertiesSet(); // NOSONAR
496496
}
497497
}
498498

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/PooledChannelConnectionFactory.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public void setPoolConfigurer(BiConsumer<GenericObjectPool<Channel>, Boolean> po
101101
Assert.notNull(poolConfigurer, "'poolConfigurer' cannot be null");
102102
this.poolConfigurer = poolConfigurer; // NOSONAR - sync inconsistency
103103
if (this.defaultPublisherFactory) {
104-
((PooledChannelConnectionFactory) getPublisherConnectionFactory()).setPoolConfigurer(poolConfigurer);
104+
((PooledChannelConnectionFactory) getPublisherConnectionFactory()).setPoolConfigurer(poolConfigurer); // NOSONAR
105105
}
106106
}
107107

@@ -117,8 +117,8 @@ public boolean isSimplePublisherConfirms() {
117117
public void setSimplePublisherConfirms(boolean simplePublisherConfirms) {
118118
this.simplePublisherConfirms = simplePublisherConfirms;
119119
if (this.defaultPublisherFactory) {
120-
((ThreadChannelConnectionFactory) getPublisherConnectionFactory())
121-
.setSimplePublisherConfirms(simplePublisherConfirms);
120+
((PooledChannelConnectionFactory) getPublisherConnectionFactory())
121+
.setSimplePublisherConfirms(simplePublisherConfirms); // NOSONAR
122122
}
123123
}
124124

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/ThreadChannelConnectionFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public void setSimplePublisherConfirms(boolean simplePublisherConfirms) {
9292
this.simplePublisherConfirms = simplePublisherConfirms;
9393
if (this.defaultPublisherFactory) {
9494
((ThreadChannelConnectionFactory) getPublisherConnectionFactory())
95-
.setSimplePublisherConfirms(simplePublisherConfirms);
95+
.setSimplePublisherConfirms(simplePublisherConfirms); // NOSONAR
9696
}
9797
}
9898

0 commit comments

Comments
 (0)