Skip to content

Commit 3b4f4a9

Browse files
committed
Update NullAway
1 parent cb39ec0 commit 3b4f4a9

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

apm-agent-benchmarks/src/main/java/co/elastic/apm/impl/AbstractHttpReporterBenchmark.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.
99
* You may obtain a copy of the License at
10-
*
10+
*
1111
* http://www.apache.org/licenses/LICENSE-2.0
12-
*
12+
*
1313
* Unless required by applicable law or agreed to in writing, software
1414
* distributed under the License is distributed on an "AS IS" BASIS,
1515
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -83,6 +83,7 @@ public void testSerialization() throws IOException {
8383
payloadSerializer.serializePayload(noopBufferedSink, payload);
8484
}
8585

86+
@SuppressWarnings("ConstantConditions")
8687
private static class NoopBufferedSink implements BufferedSink {
8788

8889
private final Blackhole blackhole;

apm-agent-core/src/main/java/co/elastic/apm/matcher/WildcardMatcher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public static boolean anyMatch(Collection<WildcardMatcher> matchers, String s) {
149149
* @return {@code true}, if any of the matchers match the provided partitioned string
150150
* @see #matches(String, String)
151151
*/
152-
public static boolean anyMatch(Collection<WildcardMatcher> matchers, String firstPart, @Nullable String secondPart) {
152+
public static boolean anyMatch(Collection<WildcardMatcher> matchers, String firstPart, String secondPart) {
153153
for (WildcardMatcher matcher : matchers) {
154154
if (matcher.matches(firstPart, secondPart)) {
155155
return true;

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
<path>
139139
<groupId>com.uber.nullaway</groupId>
140140
<artifactId>nullaway</artifactId>
141-
<version>0.3.0</version>
141+
<version>0.4.1</version>
142142
</path>
143143
</annotationProcessorPaths>
144144
<compilerArgs>
@@ -150,7 +150,7 @@
150150
<dependency>
151151
<groupId>org.codehaus.plexus</groupId>
152152
<artifactId>plexus-compiler-javac-errorprone</artifactId>
153-
<version>2.8</version>
153+
<version>2.8.3</version>
154154
</dependency>
155155
<!-- override plexus-compiler-javac-errorprone's dependency on
156156
Error Prone with the latest version -->

0 commit comments

Comments
 (0)