Skip to content

Commit 2c08781

Browse files
Workaround NullAway bug on AssertJ null-check
It seems assertThat(obj).isNotNull(); does not qualify as a null-check for NullAway if obj is a collection. See uber/NullAway#1219
1 parent 53299aa commit 2c08781

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

micrometer-core/src/test/java/io/micrometer/core/instrument/push/PushMeterRegistryTest.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,9 @@ void doNotPublishAgainOnClose_whenScheduledPublishInProgress() throws Interrupte
127127
onClosePublishThread.join();
128128

129129
assertThat(overlappingStepMeterRegistry.publishes).as("only one publish happened").hasSize(1);
130-
Deque<Double> firstPublishValues = overlappingStepMeterRegistry.publishes.get(0);
130+
// TODO: remove requireNonNull: https://github.com/uber/NullAway/issues/1219
131+
Deque<Double> firstPublishValues = Objects.requireNonNull(overlappingStepMeterRegistry.publishes.get(0));
132+
assertThat(firstPublishValues).isNotNull();
131133
assertThat(firstPublishValues.pop()).isEqualTo(1);
132134
assertThat(firstPublishValues.pop()).isEqualTo(2.5);
133135
}
@@ -189,7 +191,9 @@ void waitForScheduledPublishToFinish_whenClosedWhilePublishIsInProgress()
189191
closeThread.join();
190192

191193
assertThat(registry.publishes).as("only one publish happened").hasSize(1);
192-
Deque<Double> firstPublishValues = registry.publishes.get(0);
194+
// TODO: remove requireNonNull: https://github.com/uber/NullAway/issues/1219
195+
Deque<Double> firstPublishValues = Objects.requireNonNull(registry.publishes.get(0));
196+
assertThat(firstPublishValues).isNotNull();
193197
assertThat(firstPublishValues.pop()).isEqualTo(1); // c1 counter count
194198
assertThat(firstPublishValues.pop()).isEqualTo(2.5); // c2 counter count
195199
}

0 commit comments

Comments
 (0)