Merge pull request #431 from palantir/ds/faster-strings-cr

Stricter null checks
palantir · Sep 18, 2019 · bfe2efd · bfe2efd
2 parents b26ad69 + 31dc183
commit bfe2efd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/tritium-jmh/src/jmh/java/com/palantir/tritium/microbenchmarks/NestedMetricsBenchmark.java b/tritium-jmh/src/jmh/java/com/palantir/tritium/microbenchmarks/NestedMetricsBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2019 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...ium-registry/src/main/java/com/palantir/tritium/metrics/registry/ExtraEntrySortedMap.java b/...ium-registry/src/main/java/com/palantir/tritium/metrics/registry/ExtraEntrySortedMap.java
@@ -121,8 +121,8 @@ public boolean containsValue(Object value) {
         return extraValue.equals(value) || base.containsValue(value);
     }
 
-    @Override
     @Nullable
+    @Override
     public V get(Object key) {
         if (extraKey.equals(key)) {
             return extraValue;

diff --git a/...registry/src/test/java/com/palantir/tritium/metrics/registry/ExtraEntrySortedMapTest.java b/...registry/src/test/java/com/palantir/tritium/metrics/registry/ExtraEntrySortedMapTest.java
@@ -31,6 +31,7 @@
 import net.jqwik.api.constraints.IntRange;
 import net.jqwik.api.constraints.Size;
 
+@SuppressWarnings("JdkObsolete")
 class ExtraEntrySortedMapTest {
 
     @Property(tries = 10_000, seed = "3619154246571270871")

diff --git a/versions.lock b/versions.lock
@@ -35,7 +35,10 @@ com.squareup.okhttp3:okhttp:4.0.0 (1 constraints: 0605ff35)
 com.squareup.okio:okio:2.2.2 (1 constraints: 500c29fd)
 io.undertow:undertow-core:2.0.20.Final (1 constraints: 4e07ff60)
 net.bytebuddy:byte-buddy-agent:1.9.10 (1 constraints: 450b52de)
-org.apiguardian:apiguardian-api:1.1.0 (5 constraints: 0654a8a8)
+net.jqwik:jqwik:1.2.0 (1 constraints: 0505f635)
+net.jqwik:jqwik-api:1.2.0 (2 constraints: ce116f10)
+net.jqwik:jqwik-engine:1.2.0 (1 constraints: 9607e86c)
+org.apiguardian:apiguardian-api:1.1.0 (8 constraints: cc6e0d03)
 org.assertj:assertj-core:3.13.2 (1 constraints: 3b05403b)
 org.awaitility:awaitility:4.0.0 (1 constraints: 0605ff35)
 org.hamcrest:hamcrest:2.1 (1 constraints: 6f0b2cce)
@@ -49,10 +52,10 @@ org.junit.jupiter:junit-jupiter:5.5.1 (1 constraints: 0d051436)
 org.junit.jupiter:junit-jupiter-api:5.5.1 (4 constraints: 2b3e5efe)
 org.junit.jupiter:junit-jupiter-engine:5.5.1 (1 constraints: 080ed53b)
 org.junit.jupiter:junit-jupiter-params:5.5.1 (2 constraints: 1413d83b)
-org.junit.platform:junit-platform-commons:1.5.1 (2 constraints: d520334a)
-org.junit.platform:junit-platform-engine:1.5.1 (1 constraints: a7101db4)
+org.junit.platform:junit-platform-commons:1.5.1 (4 constraints: 11348fab)
+org.junit.platform:junit-platform-engine:1.5.1 (2 constraints: e31ab64d)
 org.mockito:mockito-core:3.0.0 (2 constraints: c2132a64)
 org.mockito:mockito-junit-jupiter:3.0.0 (1 constraints: 0505fa35)
 org.objenesis:objenesis:2.6 (2 constraints: 271650ee)
-org.opentest4j:opentest4j:1.2.0 (2 constraints: cd205b49)
+org.opentest4j:opentest4j:1.2.0 (4 constraints: 01343da7)
 org.slf4j:slf4j-simple:1.7.26 (1 constraints: 4205493b)