Skip to content

Commit fc956d9

Browse files
JaidenAshmoreJaidenAshmore
authored
closes #367: Upgrade some dependencies (#368)
1 parent 1b9c0ee commit fc956d9

File tree

9 files changed

+38
-32
lines changed

9 files changed

+38
-32
lines changed

‎build.gradle.kts‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,14 @@ val spotbugsVersion: String by project
3636

3737
subprojects {
3838
val isKotlinProject = project.name.contains("kotlin") || project.name.contains("ktor")
39+
val isExampleProject = project.name.contains("example")
3940
apply(plugin = "java-library")
4041
apply(plugin = "jacoco")
4142
apply(plugin = "org.unbroken-dome.test-sets")
4243
if (!isKotlinProject) {
43-
apply(plugin = "com.github.spotbugs")
44+
if (!isExampleProject) {
45+
apply(plugin = "com.github.spotbugs")
46+
}
4447
} else {
4548
apply(plugin = "org.jlleitschuh.gradle.ktlint")
4649
apply(plugin = "io.gitlab.arturbosch.detekt")
@@ -63,7 +66,7 @@ subprojects {
6366
testImplementation("ch.qos.logback:logback-core:$logbackVersion")
6467
testImplementation("ch.qos.logback:logback-classic:$logbackVersion")
6568

66-
if (!isKotlinProject) {
69+
if (!isKotlinProject && !isExampleProject) {
6770
// SpotBugs
6871
spotbugs("com.github.spotbugs:spotbugs:$spotbugsVersion")
6972
}
@@ -78,8 +81,10 @@ subprojects {
7881
}
7982

8083
if (!isKotlinProject) {
81-
spotbugs {
82-
excludeFilter.set(file("${project.rootDir}/configuration/spotbugs/bugsExcludeFilter.xml"))
84+
if (!isExampleProject) {
85+
spotbugs {
86+
excludeFilter.set(file("${project.rootDir}/configuration/spotbugs/bugsExcludeFilter.xml"))
87+
}
8388
}
8489
} else {
8590
detekt {

‎gradle.properties‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
# Versions
2-
assertJVersion=3.17.2
3-
avroVersion=1.10.0
2+
assertJVersion=3.20.1
3+
avroVersion=1.10.1
44
awsV1Version=1.0.8
5-
awsVersion=2.15.9
5+
awsVersion=2.16.87
66
awsXrayVersion=2.7.1
7-
braveVersion=5.12.7
7+
braveVersion=5.13.3
88
cglibVersion=3.3.0
9-
elasticMqVersion=0.15.6
9+
elasticMqVersion=0.15.8
1010
guavaVersion=29.0-jre
1111
immutablesVersion=2.8.8
12-
jacksonVersion=2.11.3
13-
junitJupiterVersion=5.7.0
14-
ktorVersion=1.4.1
12+
jacksonVersion=2.12.3
13+
junitJupiterVersion=5.7.2
14+
ktorVersion=1.6.0
1515
logbackVersion=1.2.3
16-
lombokVersion=1.18.16
17-
mockitoVersion=3.5.13
16+
lombokVersion=1.18.20
17+
mockitoVersion=3.11.1
1818
mockitoKotlinVersion=2.2.0
1919
slf4jVersion=1.7.30
20-
spotbugsVersion=4.1.2
21-
springBootVersion=2.3.4.RELEASE
20+
spotbugsVersion=4.2.3
21+
springBootVersion=2.5.1
2222
springCloudVersion=2.2.3.RELEASE
2323
springCloudMessagingVersion=2.2.2.RELEASE
24-
springCloudSchemaRegistryVersion=1.0.8.RELEASE
24+
springCloudSchemaRegistryVersion=1.1.3
2525
springJmsVersion=5.2.7.RELEASE

‎ktor/core/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ dependencies {
1919
testImplementation(project(":expected-test-exception"))
2020
testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:$mockitoKotlinVersion")
2121
testImplementation("io.ktor:ktor-server-test-host:$ktorVersion")
22+
testImplementation("io.ktor:ktor-server-netty:$ktorVersion")
2223
}
2324

2425
tasks.withType<KotlinCompile>().configureEach {

‎spring/spring-core/src/main/java/com/jashmore/sqs/spring/container/AbstractCoreMessageListenerContainerFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ protected MessageListenerContainer wrapMethodContainingAnnotation(final Object b
117117
private SqsAsyncClient getSqsAsyncClient(A annotation) {
118118
final String sqsClient = getSqsClientIdentifier(annotation);
119119

120-
if (StringUtils.isEmpty(sqsClient)) {
120+
if (!StringUtils.hasText(sqsClient)) {
121121
return sqsAsyncClientProvider
122122
.getDefaultClient()
123123
.orElseThrow(

‎spring/spring-core/src/main/java/com/jashmore/sqs/spring/container/basic/QueueListenerParser.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public boolean interruptThreadsProcessingMessagesOnShutdown() {
100100
*/
101101
protected Supplier<Integer> concurrencySupplier(final QueueListener annotation) {
102102
final int concurrencyLevel;
103-
if (StringUtils.isEmpty(annotation.concurrencyLevelString())) {
103+
if (!StringUtils.hasText(annotation.concurrencyLevelString())) {
104104
concurrencyLevel = annotation.concurrencyLevel();
105105
} else {
106106
concurrencyLevel = Integer.parseInt(environment.resolvePlaceholders(annotation.concurrencyLevelString()));
@@ -132,7 +132,7 @@ protected Supplier<Duration> concurrencyPollingRateSupplier(final QueueListener
132132
*/
133133
protected Supplier<Integer> batchSizeSupplier(final QueueListener annotation) {
134134
final int batchSize;
135-
if (StringUtils.isEmpty(annotation.batchSizeString())) {
135+
if (!StringUtils.hasText(annotation.batchSizeString())) {
136136
batchSize = annotation.batchSize();
137137
} else {
138138
batchSize = Integer.parseInt(environment.resolvePlaceholders(annotation.batchSizeString()));
@@ -152,7 +152,7 @@ protected Supplier<Integer> batchSizeSupplier(final QueueListener annotation) {
152152
*/
153153
protected Supplier<Duration> batchingPeriodSupplier(final QueueListener annotation) {
154154
final Duration batchingPeriod;
155-
if (StringUtils.isEmpty(annotation.batchingPeriodInMsString())) {
155+
if (!StringUtils.hasText(annotation.batchingPeriodInMsString())) {
156156
batchingPeriod = Duration.ofMillis(annotation.batchingPeriodInMs());
157157
} else {
158158
batchingPeriod = Duration.ofMillis(Integer.parseInt(environment.resolvePlaceholders(annotation.batchingPeriodInMsString())));
@@ -185,7 +185,7 @@ protected Supplier<Duration> errorBackoffTimeSupplier(final QueueListener annota
185185
*/
186186
protected Supplier<Duration> messageVisibilityTimeoutSupplier(final QueueListener annotation) {
187187
final Duration messageVisibilityTimeout;
188-
if (StringUtils.isEmpty(annotation.messageVisibilityTimeoutInSecondsString())) {
188+
if (!StringUtils.hasText(annotation.messageVisibilityTimeoutInSecondsString())) {
189189
final int visibilityTimeout = annotation.messageVisibilityTimeoutInSeconds();
190190
if (visibilityTimeout < 0) {
191191
messageVisibilityTimeout = null;

‎spring/spring-core/src/main/java/com/jashmore/sqs/spring/container/fifo/FifoQueueListenerParser.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public boolean interruptThreadsProcessingMessagesOnShutdown() {
8787
*/
8888
protected Supplier<Integer> concurrencySupplier(final FifoQueueListener annotation) {
8989
final int concurrencyLevel;
90-
if (StringUtils.isEmpty(annotation.concurrencyLevelString())) {
90+
if (!StringUtils.hasText(annotation.concurrencyLevelString())) {
9191
concurrencyLevel = annotation.concurrencyLevel();
9292
} else {
9393
concurrencyLevel = Integer.parseInt(environment.resolvePlaceholders(annotation.concurrencyLevelString()));
@@ -119,7 +119,7 @@ protected Supplier<Duration> concurrencyPollingRateSupplier(final FifoQueueListe
119119
*/
120120
protected Supplier<Integer> maximumMessagesInGroupSupplier(final FifoQueueListener annotation) {
121121
final int batchSize;
122-
if (StringUtils.isEmpty(annotation.maximumMessagesInMessageGroupString())) {
122+
if (!StringUtils.hasText(annotation.maximumMessagesInMessageGroupString())) {
123123
batchSize = annotation.maximumMessagesInMessageGroup();
124124
} else {
125125
batchSize = Integer.parseInt(environment.resolvePlaceholders(annotation.maximumMessagesInMessageGroupString()));
@@ -139,7 +139,7 @@ protected Supplier<Integer> maximumMessagesInGroupSupplier(final FifoQueueListen
139139
*/
140140
protected Supplier<Integer> maximumCachedMessageGroupsSupplier(final FifoQueueListener annotation) {
141141
final int maximumCachedMessageGroups;
142-
if (StringUtils.isEmpty(annotation.maximumCachedMessageGroupsString())) {
142+
if (!StringUtils.hasText(annotation.maximumCachedMessageGroupsString())) {
143143
maximumCachedMessageGroups = annotation.maximumCachedMessageGroups();
144144
} else {
145145
maximumCachedMessageGroups = Integer.parseInt(environment.resolvePlaceholders(annotation.maximumCachedMessageGroupsString()));
@@ -172,7 +172,7 @@ protected Supplier<Duration> errorBackoffTimeSupplier(final FifoQueueListener an
172172
*/
173173
protected Supplier<Duration> messageVisibilityTimeoutSupplier(final FifoQueueListener annotation) {
174174
final Duration messageVisibilityTimeout;
175-
if (StringUtils.isEmpty(annotation.messageVisibilityTimeoutInSecondsString())) {
175+
if (!StringUtils.hasText(annotation.messageVisibilityTimeoutInSecondsString())) {
176176
if (annotation.messageVisibilityTimeoutInSeconds() <= 0) {
177177
messageVisibilityTimeout = null;
178178
} else {

‎spring/spring-core/src/main/java/com/jashmore/sqs/spring/container/prefetch/PrefetchingQueueListenerParser.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public boolean interruptThreadsProcessingMessagesOnShutdown() {
9898
*/
9999
protected Supplier<Integer> concurrencySupplier(final PrefetchingQueueListener annotation) {
100100
final int concurrencyLevel;
101-
if (StringUtils.isEmpty(annotation.concurrencyLevelString())) {
101+
if (!StringUtils.hasText(annotation.concurrencyLevelString())) {
102102
concurrencyLevel = annotation.concurrencyLevel();
103103
} else {
104104
concurrencyLevel = Integer.parseInt(environment.resolvePlaceholders(annotation.concurrencyLevelString()));
@@ -130,7 +130,7 @@ protected Supplier<Duration> concurrencyPollingRateSupplier(final PrefetchingQue
130130
*/
131131
protected Supplier<Integer> desiredMinPrefetchedMessagesSupplier(final PrefetchingQueueListener annotation) {
132132
final int desiredMinPrefetchedMessages;
133-
if (StringUtils.isEmpty(annotation.desiredMinPrefetchedMessagesString())) {
133+
if (!StringUtils.hasText(annotation.desiredMinPrefetchedMessagesString())) {
134134
desiredMinPrefetchedMessages = annotation.desiredMinPrefetchedMessages();
135135
} else {
136136
desiredMinPrefetchedMessages =
@@ -150,7 +150,7 @@ protected Supplier<Integer> desiredMinPrefetchedMessagesSupplier(final Prefetchi
150150
*/
151151
protected Supplier<Integer> maxPrefetchedMessagesSupplier(final PrefetchingQueueListener annotation) {
152152
final int maxPrefetchedMessages;
153-
if (StringUtils.isEmpty(annotation.maxPrefetchedMessagesString())) {
153+
if (!StringUtils.hasText(annotation.maxPrefetchedMessagesString())) {
154154
maxPrefetchedMessages = annotation.maxPrefetchedMessages();
155155
} else {
156156
maxPrefetchedMessages = Integer.parseInt(environment.resolvePlaceholders(annotation.maxPrefetchedMessagesString()));
@@ -183,7 +183,7 @@ protected Supplier<Duration> errorBackoffTimeSupplier(final PrefetchingQueueList
183183
*/
184184
protected Supplier<Duration> messageVisibilityTimeoutSupplier(final PrefetchingQueueListener annotation) {
185185
final Duration messageVisibilityTimeout;
186-
if (StringUtils.isEmpty(annotation.messageVisibilityTimeoutInSecondsString())) {
186+
if (!StringUtils.hasText(annotation.messageVisibilityTimeoutInSecondsString())) {
187187
final int visibilityTimeout = annotation.messageVisibilityTimeoutInSeconds();
188188
if (visibilityTimeout < 0) {
189189
messageVisibilityTimeout = null;

‎spring/spring-core/src/main/java/com/jashmore/sqs/spring/decorator/visibilityextender/AutoVisibilityExtenderMessageProcessingDecoratorFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ private Duration getDurationFromSeconds(
107107
final Supplier<Integer> integerSupplier
108108
) {
109109
final String stringPropertyValue = stringProperty.get();
110-
if (!StringUtils.isEmpty(stringPropertyValue)) {
110+
if (StringUtils.hasText(stringPropertyValue)) {
111111
return Duration.ofSeconds(Integer.parseInt(environment.resolvePlaceholders(stringPropertyValue)));
112112
}
113113

‎spring/spring-core/src/main/java/com/jashmore/sqs/spring/util/IdentifierUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class IdentifierUtils {
1818
* @return an identifier for this class' method
1919
*/
2020
public String buildIdentifierForMethod(final String identifier, final Class<?> clazz, final Method method) {
21-
if (StringUtils.isEmpty(identifier.trim())) {
21+
if (!StringUtils.hasText(identifier.trim())) {
2222
return toLowerHyphenCase(clazz.getSimpleName() + "-" + method.getName());
2323
} else {
2424
return identifier.trim();

0 commit comments

Comments
 (0)