Skip to content

Commit 0c8befe

Browse files
Bump com.uber.nullaway:nullaway from 0.12.9 to 0.12.10 (#6732)
* Bump com.uber.nullaway:nullaway from 0.12.9 to 0.12.10 Bumps [com.uber.nullaway:nullaway](https://github.com/uber/NullAway) from 0.12.9 to 0.12.10. - [Release notes](https://github.com/uber/NullAway/releases) - [Changelog](https://github.com/uber/NullAway/blob/master/CHANGELOG.md) - [Commits](uber/NullAway@v0.12.9...v0.12.10) --- updated-dependencies: - dependency-name: com.uber.nullaway:nullaway dependency-version: 0.12.10 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Fix NullAway issues --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tommy Ludwig <[email protected]>
1 parent 7adc818 commit 0c8befe

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ mockitoCore5 = { module = "org.mockito:mockito-core", version.ref = "mockito5" }
178178
mongoSync = { module = "org.mongodb:mongodb-driver-sync", version.ref = "mongo" }
179179
nettyBom = { module = "io.netty:netty-bom", version.ref = "netty" }
180180
newrelicApi = { module = "com.newrelic.agent.java:newrelic-api", version.ref = "newrelic-api" }
181-
nullAway = { module = "com.uber.nullaway:nullaway", version = "0.12.9" }
181+
nullAway = { module = "com.uber.nullaway:nullaway", version = "0.12.10" }
182182
okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
183183
# some proto are marked alpha, hence the alpha version. metrics proto is what we use and it is marked stable
184184
openTelemetry-proto = { module = "io.opentelemetry.proto:opentelemetry-proto", version = "1.8.0-alpha" }

micrometer-core/src/main/java/io/micrometer/core/instrument/DistributionSummary.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ public Builder publishPercentileHistogram(@Nullable Boolean enabled) {
244244
* then.
245245
*/
246246
@Deprecated
247-
public Builder sla(@Nullable long... sla) {
247+
public Builder sla(long @Nullable ... sla) {
248248
return sla == null ? this : serviceLevelObjectives(Arrays.stream(sla).asDoubleStream().toArray());
249249
}
250250

@@ -266,7 +266,7 @@ public Builder sla(@Nullable long... sla) {
266266
* then.
267267
*/
268268
@Deprecated
269-
public Builder sla(@Nullable double... sla) {
269+
public Builder sla(double @Nullable ... sla) {
270270
this.distributionConfigBuilder.serviceLevelObjectives(sla);
271271
return this;
272272
}

micrometer-core/src/main/java/io/micrometer/core/instrument/Tags.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ public static Tags concat(@Nullable Iterable<? extends Tag> tags, @Nullable Iter
322322
* @param keyValues the additional key/value pairs to add, elements mustn't be null
323323
* @return the merged tags
324324
*/
325-
public static Tags concat(@Nullable Iterable<? extends Tag> tags, @Nullable String... keyValues) {
325+
public static Tags concat(@Nullable Iterable<? extends Tag> tags, String @Nullable ... keyValues) {
326326
return Tags.of(tags).and(keyValues);
327327
}
328328

micrometer-core/src/test/java/io/micrometer/core/instrument/TagsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ void concatOnTwoTagsWithSameKeyAreMergedIntoOneTag() {
147147
@Test
148148
void concatWhenKeyValuesAreNullShouldReturnCurrentInstance() {
149149
Tags source = Tags.of("k", "v1");
150-
Tags concatenated = Tags.concat(source, (String) null);
150+
Tags concatenated = Tags.concat(source, (String[]) null);
151151
assertThat(source).isSameAs(concatenated);
152152
}
153153

0 commit comments

Comments
 (0)