Excavator: Remove calls to deprecated APIs

client-config/src/main/java/com/palantir/conjure/java/client/config/ClientConfigurations.java

@@ -85,7 +85,6 @@ public static ClientConfiguration of(ServiceConfiguration config) {
      * {@link TrustContextFactory}, filling in empty/absent configuration with the defaults specified as constants
      * in this class.
      */
-    @SuppressWarnings("for-rollout:deprecation")
     public static ClientConfiguration of(ServiceConfiguration config, TrustContextFactory factory) {
         TrustContext trustContext = factory.create(config.security());
         return ClientConfiguration.builder()
@@ -133,7 +132,6 @@ public static ClientConfiguration of(
         return of(uris, sslSocketFactory, trustManager, Optional.of(userAgent));
     }
 
-    @SuppressWarnings("for-rollout:deprecation")
     private static ClientConfiguration of(
             List<String> uris,
             SSLSocketFactory sslSocketFactory,

client-config/src/test/java/com/palantir/conjure/java/client/config/ClientConfigurationsTest.java

@@ -43,7 +43,6 @@ public final class ClientConfigurationsTest {
 
     private static final ImmutableList<String> uris = ImmutableList.of("uri");
 
-    @SuppressWarnings("for-rollout:deprecation")
     @Test
     public void testFromServiceConfig_fillsInDefaults() {
         ServiceConfiguration serviceConfig = ServiceConfiguration.builder()
@@ -112,7 +111,6 @@ public void meshProxy_exactlyOneUri() throws Exception {
                 .hasMessage("If meshProxy is configured then uris must contain exactly 1 URI");
     }
 
-    @SuppressWarnings("for-rollout:deprecation")
     @Test
     public void overriding_tagged_metric_registry_is_convenient() {
         ServiceConfiguration serviceConfig = ServiceConfiguration.builder()
@@ -152,7 +150,6 @@ public void systemEnvUri() {
                 .isNull();
     }
 
-    @SuppressWarnings("for-rollout:deprecation")
     @Test
     public void testProxyAddressIsNotResolved() {
         ProxySelector selector = ClientConfigurations.createProxySelector(ProxyConfiguration.of("localhost:80"));

conjure-java-jackson-serialization/src/main/java/com/palantir/conjure/java/serialization/InstrumentedJsonFactory.java

@@ -236,13 +236,11 @@ public JsonLocation currentTokenLocation() {
             return delegate.currentTokenLocation();
         }
 
-        @SuppressWarnings("for-rollout:deprecation")
         @Override
         public JsonLocation getCurrentLocation() {
             return delegate.getCurrentLocation();
         }
 
-        @SuppressWarnings("for-rollout:deprecation")
         @Override
         public JsonLocation getTokenLocation() {
             return delegate.getTokenLocation();
@@ -258,13 +256,11 @@ public void assignCurrentValue(Object value) {
             delegate.assignCurrentValue(value);
         }
 
-        @SuppressWarnings("for-rollout:deprecation")
         @Override
         public Object getCurrentValue() {
             return delegate.getCurrentValue();
         }
 
-        @SuppressWarnings("for-rollout:deprecation")
         @Override
         public void setCurrentValue(Object value) {
             delegate.setCurrentValue(value);
@@ -313,7 +309,6 @@ public int getFeatureMask() {
             return delegate.getFeatureMask();
         }
 
-        @SuppressWarnings("for-rollout:deprecation")
         @Override
         @Deprecated
         public JsonParser setFeatureMask(int mask) {
@@ -404,7 +399,6 @@ public JsonToken getCurrentToken() {
             return delegate.getCurrentToken();
         }
 
-        @SuppressWarnings("for-rollout:deprecation")
         @Override
         @Deprecated
         public int getCurrentTokenId() {
@@ -461,7 +455,6 @@ public void overrideCurrentName(String name) {
             delegate.overrideCurrentName(name);
         }
 
-        @SuppressWarnings("for-rollout:deprecation")
         @Override
         public String getCurrentName() throws IOException {
             return delegate.getCurrentName();

conjure-java-jackson-serialization/src/main/java/com/palantir/conjure/java/serialization/ObjectMappers.java

@@ -170,7 +170,6 @@ public static ObjectMapper newSmileServerObjectMapper() {
      *   <li>Deserializing a null for a primitive field will throw an exception.
      * </ul>
      */
-    @SuppressWarnings("for-rollout:deprecation")
     public static <M extends ObjectMapper, B extends MapperBuilder<M, B>> B withDefaultModules(B builder) {
         return builder.typeFactory(NonCachingTypeFactory.from(builder.build().getTypeFactory()))
                 .addModule(new GuavaModule())
@@ -206,7 +205,6 @@ public static <M extends ObjectMapper, B extends MapperBuilder<M, B>> B withDefa
      *   <li>Deserializing a null for a primitive field will throw an exception.
      * </ul>
      */
-    @SuppressWarnings("for-rollout:deprecation")
     public static ObjectMapper withDefaultModules(ObjectMapper mapper) {
         return mapper.setTypeFactory(NonCachingTypeFactory.from(mapper.getTypeFactory()))
                 .registerModule(new GuavaModule())

conjure-java-jackson-serialization/src/test/java/com/palantir/conjure/java/serialization/ObjectMappersTest.java

@@ -325,7 +325,6 @@ public void testOptionalIntOverflowDeserialization() {
 
     @Test
     public void testStringMetrics_json() throws IOException {
-        @SuppressWarnings("for-rollout:deprecation")
         TaggedMetricRegistry registry = SharedTaggedMetricRegistries.getSingleton();
         removeJsonParserMetrics(registry);
         Histogram stringLength = JsonParserMetrics.of(registry).stringLength(JsonFactory.FORMAT_NAME_JSON);
@@ -340,7 +339,6 @@ public void testStringMetrics_json() throws IOException {
 
     @Test
     public void testStringMetricsNotRecordedWhenValuesAreSmall_json() throws IOException {
-        @SuppressWarnings("for-rollout:deprecation")
         TaggedMetricRegistry registry = SharedTaggedMetricRegistries.getSingleton();
         removeJsonParserMetrics(registry);
         Histogram stringLength = JsonParserMetrics.of(registry).stringLength(JsonFactory.FORMAT_NAME_JSON);
@@ -353,7 +351,6 @@ public void testStringMetricsNotRecordedWhenValuesAreSmall_json() throws IOExcep
 
     @Test
     public void testStringMetrics_smile() throws IOException {
-        @SuppressWarnings("for-rollout:deprecation")
         TaggedMetricRegistry registry = SharedTaggedMetricRegistries.getSingleton();
         removeJsonParserMetrics(registry);
         Histogram stringLength = JsonParserMetrics.of(registry).stringLength(SmileFactory.FORMAT_NAME_SMILE);
@@ -369,7 +366,6 @@ public void testStringMetrics_smile() throws IOException {
 
     @Test
     public void testStringMetricsNotRecordedWhenValuesAreSmall_smile() throws IOException {
-        @SuppressWarnings("for-rollout:deprecation")
         TaggedMetricRegistry registry = SharedTaggedMetricRegistries.getSingleton();
         removeJsonParserMetrics(registry);
         Histogram stringLength = JsonParserMetrics.of(registry).stringLength(SmileFactory.FORMAT_NAME_SMILE);
@@ -443,7 +439,6 @@ public void testObjectMapperWithDefaultModules() throws IOException {
 
     @Test
     public void testJsonMapperBuilderWithDefaultModules() throws IOException {
-        @SuppressWarnings("for-rollout:deprecation")
         ObjectMapper mapper = ObjectMappers.withDefaultModules(
                         JsonMapper.builder().addModule(new Jdk8Module().configureAbsentsAsNulls(true)))
                 .build();

conjure-java-jaxrs-client/src/main/java/com/palantir/conjure/java/client/jaxrs/AbstractFeignJaxRsClientBuilder.java

@@ -92,7 +92,6 @@ final <T> T build(Class<T> serviceClass, UserAgent userAgent) {
         String name = "JaxRsClient-" + serviceClass.getSimpleName();
         ApacheHttpClientChannels.CloseableClient client =
                 ApacheHttpClientChannels.createCloseableHttpClient(hydratedConfiguration, name);
-        @SuppressWarnings("for-rollout:deprecation")
         Channel channel = DialogueChannel.builder()
                 .channelName(name)
                 .channelFactory(uri -> ApacheHttpClientChannels.createSingleUri(uri, client))

conjure-java-jersey-jakarta-server/src/test/java/com/palantir/conjure/java/server/jersey/TracerTest.java

@@ -39,7 +39,6 @@ public final class TracerTest {
             .jersey(ConjureJerseyFeature.INSTANCE)
             .jersey(new TracerTest.TracingTestResource());
 
-    @SuppressWarnings("for-rollout:deprecation")
     @Test
     public void testTracingFilterIsApplied() {
         undertow.runRequest(

extras/refresh-utils/src/test/java/com/palantir/conjure/java/ext/refresh/RefreshableProxyInvocationHandlerTest.java

@@ -46,7 +46,6 @@ interface Callable {
     @Mock
     private Callable delegate2;
 
-    @SuppressWarnings("for-rollout:deprecation")
     @BeforeEach
     public void before() {
         MockitoAnnotations.initMocks(this);

okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/ConcurrencyLimitingInterceptor.java

@@ -96,7 +96,6 @@ private static Response wrapResponse(Limiter.Listener listener, Response respons
             return response;
         }
         ResponseBody currentBody = response.body();
-        @SuppressWarnings("for-rollout:deprecation")
         ResponseBody newResponseBody = ResponseBody.create(
                 currentBody.contentType(), currentBody.contentLength(), wrapSource(currentBody.source(), listener));
         return response.newBuilder().body(newResponseBody).build();

okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/RemotingOkHttpCall.java

@@ -187,7 +187,6 @@ private static Response buildFrom(Response unbufferedResponse, byte[] bodyBytes)
                 .build();
     }
 
-    @SuppressWarnings("for-rollout:deprecation")
     private static ResponseBody buffer(MediaType mediaType, byte[] bodyBytes) {
         return ResponseBody.create(mediaType, bodyBytes);
     }

okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/ConcurrencyLimitingInterceptorTest.java

@@ -118,7 +118,6 @@ public void ignoresIfIoException() throws IOException {
     @Test
     public void wrapsResponseBody() throws IOException {
         String data = "data";
-        @SuppressWarnings("for-rollout:deprecation")
         ResponseBody body = ResponseBody.create(MediaType.parse("application/json"), data);
         when(chain.proceed(request)).thenReturn(response.newBuilder().body(body).build());
         Response wrappedResponse = interceptor.intercept(chain);
@@ -129,7 +128,6 @@ public void wrapsResponseBody() throws IOException {
 
     @Test
     public void proxyHandlesExceptions() throws IOException {
-        @SuppressWarnings("for-rollout:deprecation")
         ResponseBody body = ResponseBody.create(MediaType.parse("application/json"), -1, mockSource);
         when(chain.proceed(request)).thenReturn(response.newBuilder().body(body).build());
         IOException exception = new IOException();
@@ -149,7 +147,6 @@ public void ignoresIfNoContent() throws IOException {
 
     @Test
     public void marksSuccessIfContentEmpty() throws IOException {
-        @SuppressWarnings("for-rollout:deprecation")
         Response empty = response.newBuilder()
                 .code(204)
                 .body(ResponseBody.create(MediaType.parse("application/json"), new byte[0]))

okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/MeshProxyInterceptorTest.java

@@ -42,7 +42,6 @@ public final class MeshProxyInterceptorTest {
 
     private MeshProxyInterceptor interceptor;
 
-    @SuppressWarnings("for-rollout:deprecation")
     @BeforeEach
     public void before() throws Exception {
         MockitoAnnotations.initMocks(this);

okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/OkHttpClientsTest.java

@@ -233,7 +233,6 @@ public void verifyResponseMetricsAreRegistered() throws IOException {
     @Test
     /** See {@link DispatcherMetricSet}. */
     public void verifyGlobalMetricsAreRegistered() {
-        @SuppressWarnings("for-rollout:deprecation")
         TaggedMetricRegistry registry = DefaultTaggedMetricRegistry.getDefault();
         ClientConfiguration clientConfiguration = ClientConfiguration.builder()
                 .from(createTestConfig(url))

okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/RemoteExceptionResponseHandlerTest.java

@@ -201,7 +201,6 @@ private static Optional<RemoteException> decode(String contentType, int status,
         return handler.handle(response(status, contentType, body));
     }
 
-    @SuppressWarnings("for-rollout:deprecation")
     private static okhttp3.Response response(int code, String mediaType, @CheckForNull String body) {
         okhttp3.Response.Builder response = new okhttp3.Response.Builder()
                 .request(request)

okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/UnknownRemoteExceptionResponseHandlerTest.java

@@ -79,7 +79,6 @@ private static Optional<UnknownRemoteException> decode(String contentType, int s
         return handler.handle(response(status, contentType, body));
     }
 
-    @SuppressWarnings("for-rollout:deprecation")
     private static Response response(int code, String mediaType, @CheckForNull String body) {
         Response.Builder response = new Response.Builder()
                 .request(request)

undertow-jakarta-testing/src/main/java/com/palantir/undertest/UndertowServerExtension.java

@@ -183,7 +183,6 @@ public void afterAll(ExtensionContext _context) throws IOException {
         }
     }
 
-    @SuppressWarnings("for-rollout:deprecation")
     @MustBeClosed
     @CheckReturnValue
     public CloseableHttpResponse makeRequest(ClassicHttpRequest request) throws IOException {