proofpoint · johngmyers · Feb 22, 2025 · Feb 21, 2025
diff --git a/bootstrap/src/main/java/com/proofpoint/bootstrap/Bootstrap.java b/bootstrap/src/main/java/com/proofpoint/bootstrap/Bootstrap.java
@@ -307,8 +307,7 @@ public Injector initialize()
         Map<String, ConfigurationDefaultingModule> moduleDefaultSource = new HashMap<>();
         List<Message> moduleDefaultErrors = new ArrayList<>();
         for (Module module : modules) {
-            if (module instanceof ConfigurationDefaultingModule) {
-                ConfigurationDefaultingModule configurationDefaultingModule = (ConfigurationDefaultingModule) module;
+            if (module instanceof ConfigurationDefaultingModule configurationDefaultingModule) {
                 Map<String, String> defaults = configurationDefaultingModule.getConfigurationDefaults();
                 for (Entry<String, String> entry : defaults.entrySet()) {
                     ConfigurationDefaultingModule oldModule = moduleDefaultSource.put(entry.getKey(), configurationDefaultingModule);

diff --git a/concurrent/src/main/java/com/proofpoint/concurrent/MoreFutures.java b/concurrent/src/main/java/com/proofpoint/concurrent/MoreFutures.java
@@ -345,8 +345,8 @@ public static <V> CompletableFuture<V> firstCompletedFuture(Iterable<? extends C
             future.exceptionally(throwable -> {
                 if (throwable instanceof CancellationException) {
                     for (CompletionStage<? extends V> sourceFuture : futures) {
-                        if (sourceFuture instanceof Future) {
-                            ((Future<?>) sourceFuture).cancel(true);
+                        if (sourceFuture instanceof Future<?> f) {
+                            f.cancel(true);
                         }
                     }
                 }

diff --git a/...guration/src/main/java/com/proofpoint/configuration/AbstractConfigurationAwareModule.java b/...guration/src/main/java/com/proofpoint/configuration/AbstractConfigurationAwareModule.java
@@ -59,8 +59,8 @@ protected synchronized <T> T buildConfigObject(Class<T> configClass, String pref
 
     protected synchronized void install(Module module)
     {
-        if (module instanceof ConfigurationAwareModule) {
-            ((ConfigurationAwareModule) module).setConfigurationFactory(configurationFactory);
+        if (module instanceof ConfigurationAwareModule configurationAwareModule) {
+            configurationAwareModule.setConfigurationFactory(configurationFactory);
         }
         binder.install(module);
     }

diff --git a/configuration/src/main/java/com/proofpoint/configuration/ConfigurationValidator.java b/configuration/src/main/java/com/proofpoint/configuration/ConfigurationValidator.java
@@ -66,11 +66,9 @@ public List<Message> validate(Iterable<? extends Module> modules)
                 public <T> Void visit(Binding<T> binding)
                 {
                     // look for ConfigurationAwareProviders...
-                    if (binding instanceof ProviderInstanceBinding) {
-                        ProviderInstanceBinding<?> providerInstanceBinding = (ProviderInstanceBinding<?>) binding;
+                    if (binding instanceof ProviderInstanceBinding<?> providerInstanceBinding) {
                         Provider<?> provider = providerInstanceBinding.getUserSuppliedProvider();
-                        if (provider instanceof ConfigurationAwareProvider) {
-                            ConfigurationAwareProvider<?> configurationProvider = (ConfigurationAwareProvider<?>) provider;
+                        if (provider instanceof ConfigurationAwareProvider<?> configurationProvider) {
                             // give the provider the configuration factory
                             configurationProvider.setConfigurationFactory(configurationFactory);
                             try {

diff --git a/configuration/src/main/java/com/proofpoint/configuration/TypeParameterUtils.java b/configuration/src/main/java/com/proofpoint/configuration/TypeParameterUtils.java
@@ -29,9 +29,7 @@ private TypeParameterUtils()
 
     public static Type[] getTypeParameters(Class<?> desiredType, Type type)
     {
-        if (type instanceof Class) {
-            Class<?> rawClass = (Class<?>) type;
-
+        if (type instanceof Class<?> rawClass) {
             // if this is the collection class we're done
             if (desiredType.equals(type)) {
                 return null;
@@ -46,9 +44,7 @@ public static Type[] getTypeParameters(Class<?> desiredType, Type type)
 
             return getTypeParameters(desiredType, rawClass.getGenericSuperclass());
         }
-        if (type instanceof ParameterizedType) {
-            ParameterizedType parameterizedType = (ParameterizedType) type;
-
+        if (type instanceof ParameterizedType parameterizedType) {
             Type rawType = parameterizedType.getRawType();
             if (desiredType.equals(rawType)) {
                 return parameterizedType.getActualTypeArguments();
@@ -57,8 +53,7 @@ public static Type[] getTypeParameters(Class<?> desiredType, Type type)
             Type[] collectionTypes = getTypeParameters(desiredType, rawType);
             if (collectionTypes != null) {
                 for (int i = 0; i < collectionTypes.length; i++) {
-                    if (collectionTypes[i] instanceof TypeVariable) {
-                        TypeVariable<?> typeVariable = (TypeVariable<?>) collectionTypes[i];
+                    if (collectionTypes[i] instanceof TypeVariable<?> typeVariable) {
                         TypeVariable<?>[] rawTypeParams = ((GenericDeclaration) rawType).getTypeParameters();
                         for (int j = 0; j < rawTypeParams.length; j++) {
                             if (typeVariable.getName().equals(rawTypeParams[j].getName())) {

diff --git a/discovery/src/main/java/com/proofpoint/discovery/client/HttpDiscoveryLookupClient.java b/discovery/src/main/java/com/proofpoint/discovery/client/HttpDiscoveryLookupClient.java
@@ -186,8 +186,8 @@ public final T handleException(Request request, Exception exception)
             if (exception instanceof CancellationException) {
                 throw new DiscoveryException(name + " was canceled");
             }
-            if (exception instanceof DiscoveryException) {
-                throw (DiscoveryException) exception;
+            if (exception instanceof DiscoveryException discoveryException) {
+                throw discoveryException;
             }
 
             throw new DiscoveryException(name + " failed", exception);

diff --git a/discovery/src/main/java/com/proofpoint/discovery/client/ServiceTypeImpl.java b/discovery/src/main/java/com/proofpoint/discovery/client/ServiceTypeImpl.java
@@ -48,12 +48,10 @@ public boolean equals(Object o)
         if (this == o) {
             return true;
         }
-        if (!(o instanceof ServiceType)) {
+        if (!(o instanceof ServiceType that)) {
             return false;
         }
 
-        ServiceType that = (ServiceType) o;
-
         if (!value.equals(that.value())) {
             return false;
         }

diff --git a/...c/main/java/com/proofpoint/discovery/client/announce/HttpDiscoveryAnnouncementClient.java b/...c/main/java/com/proofpoint/discovery/client/announce/HttpDiscoveryAnnouncementClient.java
@@ -169,8 +169,8 @@ public final T handleException(Request request, Exception exception)
             if (exception instanceof CancellationException) {
                 throw new DiscoveryException(name + " was canceled");
             }
-            if (exception instanceof DiscoveryException) {
-                throw (DiscoveryException) exception;
+            if (exception instanceof DiscoveryException discoveryException) {
+                throw discoveryException;
             }
 
             throw new DiscoveryException(name + " failed", exception);

diff --git a/event/src/main/java/com/proofpoint/event/client/EventTypeMetadata.java b/event/src/main/java/com/proofpoint/event/client/EventTypeMetadata.java
@@ -237,15 +237,15 @@ private Class<?> extractIterableType(Method method)
             return null;
         }
         Type type = types[0];
-        if (!(type instanceof Class)) {
+        if (!(type instanceof Class<?> clazz)) {
             addMethodError("Iterable type parameter [%s] must be an exact type", method, type);
             return null;
         }
-        if (isIterable((Class<?>) type)) {
+        if (isIterable(clazz)) {
             addMethodError("Iterable of iterable is not supported", method);
             return null;
         }
-        return (Class<?>) type;
+        return clazz;
     }
 
     private Class<?> extractMapType(Method method, Class<?> mapClass)
@@ -258,22 +258,22 @@ private Class<?> extractMapType(Method method, Class<?> mapClass)
         }
         Type keyType = types[0];
         Type valueType = types[1];
-        if (!(keyType instanceof Class)) {
+        if (!(keyType instanceof Class<?> keyClass)) {
             addMethodError("%s key type parameter [%s] must be an exact type", method, className, keyType);
             return null;
         }
-        if (!(valueType instanceof Class)) {
+        if (!(valueType instanceof Class<?> valueClass)) {
             addMethodError("%s value type parameter [%s] must be an exact type", method, className, valueType);
             return null;
         }
-        if (!isString((Class<?>) keyType)) {
+        if (!isString(keyClass)) {
             addMethodError("%s key type parameter [%s] must be a String", method, className, keyType);
         }
-        if (isIterable((Class<?>) valueType)) {
+        if (isIterable(valueClass)) {
             addMethodError("%s value type parameter [%s] cannot be iterable", method, className, valueType);
             return null;
         }
-        return (Class<?>) valueType;
+        return valueClass;
     }
 
     @SuppressWarnings("unchecked")

diff --git a/http-client/src/main/java/com/proofpoint/http/client/Request.java b/http-client/src/main/java/com/proofpoint/http/client/Request.java
@@ -123,10 +123,9 @@ public int hashCode()
     @Override
     public boolean equals(Object obj)
     {
-        if (!(obj instanceof Request)) {
+        if (!(obj instanceof Request r)) {
             return false;
         }
-        final Request r = (Request) obj;
         return Objects.equals(uri, r.uri) &&
                 Objects.equals(method, r.method) &&
                 Objects.equals(headers, r.headers) &&

diff --git a/http-client/src/main/java/com/proofpoint/http/client/ResponseHandlerUtils.java b/http-client/src/main/java/com/proofpoint/http/client/ResponseHandlerUtils.java
@@ -15,11 +15,11 @@ private ResponseHandlerUtils()
     @SuppressWarnings("deprecation")
     public static RuntimeException propagate(Request request, Throwable exception)
     {
-        if (exception instanceof ConnectException) {
-            throw new UncheckedIOException("Server refused connection: " + request.getUri().toASCIIString(), (ConnectException) exception);
+        if (exception instanceof ConnectException connectException) {
+            throw new UncheckedIOException("Server refused connection: " + request.getUri().toASCIIString(), connectException);
         }
-        if (exception instanceof IOException) {
-            throw new UncheckedIOException((IOException) exception);
+        if (exception instanceof IOException ioException) {
+            throw new UncheckedIOException(ioException);
         }
         throwIfUnchecked(exception);
         throw new RuntimeException(exception);

diff --git a/http-client/src/main/java/com/proofpoint/http/client/ServiceTypeImpl.java b/http-client/src/main/java/com/proofpoint/http/client/ServiceTypeImpl.java
@@ -48,12 +48,10 @@ public boolean equals(Object o)
         if (this == o) {
             return true;
         }
-        if (!(o instanceof ServiceType)) {
+        if (!(o instanceof ServiceType that)) {
             return false;
         }
 
-        ServiceType that = (ServiceType) o;
-
         if (!value.equals(that.value())) {
             return false;
         }

diff --git a/http-client/src/main/java/com/proofpoint/http/client/balancing/BalancingHttpClient.java b/http-client/src/main/java/com/proofpoint/http/client/balancing/BalancingHttpClient.java
@@ -228,17 +228,17 @@ RetryBudget getRetryBudget() {
     @Managed
     public String dump()
     {
-        if (httpClient instanceof JettyHttpClient) {
-            return ((JettyHttpClient) httpClient).dump();
+        if (httpClient instanceof JettyHttpClient jettyHttpClient) {
+            return jettyHttpClient.dump();
         }
         return null;
     }
 
     @Managed
     public void dumpStdErr()
     {
-        if (httpClient instanceof JettyHttpClient) {
-            ((JettyHttpClient) httpClient).dumpStdErr();
+        if (httpClient instanceof JettyHttpClient jettyHttpClient) {
+            jettyHttpClient.dumpStdErr();
         }
     }
 
@@ -303,18 +303,17 @@ public void onSuccess(T result)
                 @Override
                 public void onFailure(Throwable t)
                 {
-                    if (t instanceof InnerHandlerException) {
-                        InnerHandlerException innerHandlerException = (InnerHandlerException) t;
+                    if (t instanceof InnerHandlerException innerHandlerException) {
                         attempt.markBad(innerHandlerException.getFailureCategory(), innerHandlerException.getHandlerCategory());
-                        setException(t.getCause());
+                        setException(innerHandlerException.getCause());
                     }
-                    else if (t instanceof FailureStatusException) {
-                        attempt.markBad(((FailureStatusException) t).getFailureCategory());
+                    else if (t instanceof FailureStatusException failureStatusException) {
+                        attempt.markBad(failureStatusException.getFailureCategory());
                         //noinspection unchecked
-                        set((T) ((FailureStatusException) t).result);
+                        set((T) failureStatusException.result);
                     }
-                    else if (t instanceof RetryException) {
-                        attempt.markBad(((RetryException) t).getFailureCategory());
+                    else if (t instanceof RetryException retryException) {
+                        attempt.markBad(retryException.getFailureCategory());
                         TraceToken traceToken = getCurrentTraceToken();
                         synchronized (subFutureLock) {
                             Duration backoff = attemptBackoffPolicy.backoff(previousBackoff);

diff --git a/http-client/src/main/java/com/proofpoint/http/client/balancing/RetryingResponseHandler.java b/http-client/src/main/java/com/proofpoint/http/client/balancing/RetryingResponseHandler.java
@@ -113,6 +113,6 @@ public T handle(Request request, Response response)
     private static boolean bodySourceRetryable(Request request)
     {
         BodySource bodySource = request.getBodySource();
-        return !(bodySource instanceof LimitedRetryable) || ((LimitedRetryable) bodySource).isRetryable();
+        return !(bodySource instanceof LimitedRetryable limitedRetryable) || limitedRetryable.isRetryable();
     }
 }
diff --git a/...ient/src/main/java/com/proofpoint/http/client/jetty/DynamicBodySourceContentProvider.java b/...ient/src/main/java/com/proofpoint/http/client/jetty/DynamicBodySourceContentProvider.java
@@ -110,9 +110,9 @@ private void close()
         try (AutoLock ignored = lock.lock()) {
             closed = true;
         }
-        if (writer instanceof AutoCloseable) {
+        if (writer instanceof AutoCloseable closeableWriter) {
             try (TraceTokenScope ignored = registerTraceToken(traceToken)) {
-                ((AutoCloseable) writer).close();
+                closeableWriter.close();
             }
             catch (Throwable x) {
                 try (AutoLock ignored = lock.lock()) {

diff --git a/http-client/src/main/java/com/proofpoint/http/client/jetty/JettyHttpClient.java b/http-client/src/main/java/com/proofpoint/http/client/jetty/JettyHttpClient.java
@@ -425,8 +425,8 @@ public void onContent(Response response, ByteBuffer content)
             if (cause instanceof RejectedExecutionException || cause instanceof ClosedByInterruptException) {
                 maybeLogJettyState();
             }
-            if (cause instanceof Exception) {
-                return responseHandler.handleException(request, (Exception) cause);
+            if (cause instanceof Exception x) {
+                return responseHandler.handleException(request, x);
             }
             return responseHandler.handleException(request, new RuntimeException(cause));
         }
@@ -517,16 +517,15 @@ private HttpRequest buildJettyRequest(Request finalRequest, AtomicLong bytesWrit
 
         BodySource bodySource = finalRequest.getBodySource();
         if (bodySource != null) {
-            if (bodySource instanceof StaticBodyGenerator) {
-                StaticBodyGenerator staticBodyGenerator = (StaticBodyGenerator) bodySource;
+            if (bodySource instanceof StaticBodyGenerator staticBodyGenerator) {
                 jettyRequest.body(new BytesRequestContent(staticBodyGenerator.getBody()));
                 bytesWritten.addAndGet(staticBodyGenerator.getBody().length);
             }
-            else if (bodySource instanceof InputStreamBodySource) {
-                jettyRequest.body(new InputStreamBodySourceContentProvider((InputStreamBodySource) bodySource, bytesWritten));
+            else if (bodySource instanceof InputStreamBodySource inputStreamBodySource) {
+                jettyRequest.body(new InputStreamBodySourceContentProvider(inputStreamBodySource, bytesWritten));
             }
-            else if (bodySource instanceof DynamicBodySource) {
-                jettyRequest.body(new DynamicBodySourceContentProvider((DynamicBodySource) bodySource, bytesWritten));
+            else if (bodySource instanceof DynamicBodySource dynamicBodySource) {
+                jettyRequest.body(new DynamicBodySourceContentProvider(dynamicBodySource, bytesWritten));
             }
             else {
                 throw new IllegalArgumentException("Request has unsupported BodySource type");

diff --git a/http-client/src/main/java/com/proofpoint/http/client/jetty/JettyResponseFuture.java b/http-client/src/main/java/com/proofpoint/http/client/jetty/JettyResponseFuture.java
@@ -124,12 +124,12 @@ void failed(Throwable throwable)
         }
         try (TraceTokenScope ignored = registerTraceToken(traceToken)) {
             // give handler a chance to rewrite the exception or return a value instead
-            if (throwable instanceof Exception) {
+            if (throwable instanceof Exception x) {
                 try {
-                    if (throwable instanceof RejectedExecutionException) {
+                    if (x instanceof RejectedExecutionException) {
                         jettyHttpClient.maybeLogJettyState();
                     }
-                    T value = responseHandler.handleException(request, (Exception) throwable);
+                    T value = responseHandler.handleException(request, x);
                     // handler returned a value, store it in the future
                     state.set(JettyAsyncHttpState.DONE);
                     set(value);

diff --git a/http-client/src/main/java/com/proofpoint/http/client/testing/BodySourceTester.java b/http-client/src/main/java/com/proofpoint/http/client/testing/BodySourceTester.java
@@ -20,12 +20,12 @@ private BodySourceTester()
     public static void writeBodySourceTo(BodySource bodySource, final OutputStream out)
             throws Exception
     {
-        if (bodySource instanceof StaticBodyGenerator) {
-            out.write(((StaticBodyGenerator) bodySource).getBody());
+        if (bodySource instanceof StaticBodyGenerator staticBodyGenerator) {
+            out.write(staticBodyGenerator.getBody());
         }
-        else if (bodySource instanceof InputStreamBodySource) {
-            InputStream in = ((InputStreamBodySource) bodySource).getInputStream();
-            byte[] buf = new byte[((InputStreamBodySource) bodySource).getBufferSize()];
+        else if (bodySource instanceof InputStreamBodySource inputStreamBodySource) {
+            InputStream in = inputStreamBodySource.getInputStream();
+            byte[] buf = new byte[inputStreamBodySource.getBufferSize()];
             while (true) {
                 int r = in.read(buf);
                 if (r == -1) {
@@ -34,9 +34,9 @@ else if (bodySource instanceof InputStreamBodySource) {
                 out.write(buf, 0, r);
             }
         }
-        else if (bodySource instanceof DynamicBodySource) {
+        else if (bodySource instanceof DynamicBodySource dynamicBodySource) {
             final AtomicBoolean closed = new AtomicBoolean(false);
-            Writer writer = ((DynamicBodySource) bodySource).start(new OutputStream()
+            Writer writer = dynamicBodySource.start(new OutputStream()
             {
                 @Override
                 public void write(int b)
@@ -77,8 +77,8 @@ public void close()
                 writer.write();
             }
 
-            if (writer instanceof AutoCloseable) {
-                ((AutoCloseable) writer).close();
+            if (writer instanceof AutoCloseable closeable) {
+                closeable.close();
             }
         }
         else {

diff --git a/http-client/src/main/java/com/proofpoint/http/client/testing/TestingHttpClient.java b/http-client/src/main/java/com/proofpoint/http/client/testing/TestingHttpClient.java
@@ -91,12 +91,12 @@ private <T, E extends Exception> T execute(Request request, ResponseHandler<T, E
             state.set("FAILED");
             long responseStart = System.nanoTime();
             Duration requestProcessingTime = new Duration(responseStart - requestStart, TimeUnit.NANOSECONDS);
-            if (e instanceof Exception) {
+            if (e instanceof Exception x) {
                 if (e instanceof InterruptedException) {
                     Thread.currentThread().interrupt();
                 }
                 try {
-                    return responseHandler.handleException(request, (Exception) e);
+                    return responseHandler.handleException(request, x);
                 }
                 finally {
                     stats.record(request.getMethod(),

diff --git a/...ient/src/test/java/com/proofpoint/http/client/balancing/TestAsyncBalancingHttpClient.java b/...ient/src/test/java/com/proofpoint/http/client/balancing/TestAsyncBalancingHttpClient.java
@@ -189,9 +189,9 @@ public void write(int b)
 
             Object response = responses.remove(0);
             // TODO: defer availability of return values ?
-            if (response instanceof Exception) {
+            if (response instanceof Exception x) {
                 try {
-                    return new ImmediateAsyncHttpFuture<>(responseHandler.handleException(request, (Exception) response));
+                    return new ImmediateAsyncHttpFuture<>(responseHandler.handleException(request, x));
                 }
                 catch (Exception e) {
                     return new ImmediateFailedAsyncHttpFuture<>((E) e);

diff --git a/http-client/src/test/java/com/proofpoint/http/client/balancing/TestBalancingHttpClient.java b/http-client/src/test/java/com/proofpoint/http/client/balancing/TestBalancingHttpClient.java
@@ -174,8 +174,8 @@ public void write(int b)
             }
 
             Object response = responses.remove(0);
-            if (response instanceof Exception) {
-                return responseHandler.handleException(request, (Exception) response);
+            if (response instanceof Exception x) {
+                return responseHandler.handleException(request, x);
             }
             return responseHandler.handle(request, (Response) response);
         }