diff --git a/samples/grpc-oauth2/src/test/java/org/springframework/grpc/sample/GrpcServerApplicationTests.java b/samples/grpc-oauth2/src/test/java/org/springframework/grpc/sample/GrpcServerApplicationTests.java
index c81bd67b..4015a189 100644
--- a/samples/grpc-oauth2/src/test/java/org/springframework/grpc/sample/GrpcServerApplicationTests.java
+++ b/samples/grpc-oauth2/src/test/java/org/springframework/grpc/sample/GrpcServerApplicationTests.java
@@ -73,7 +73,7 @@ void unauthenticated() {
 	void anonymous() throws Exception {
 		AtomicReference<ServerReflectionResponse> response = new AtomicReference<>();
 		AtomicBoolean error = new AtomicBoolean();
-		StreamObserver<ServerReflectionResponse> responses = new StreamObserver<ServerReflectionResponse>() {
+		StreamObserver<ServerReflectionResponse> responses = new StreamObserver<>() {
 			@Override
 			public void onNext(ServerReflectionResponse value) {
 				response.set(value);
diff --git a/samples/grpc-secure/src/test/java/org/springframework/grpc/sample/GrpcServerApplicationTests.java b/samples/grpc-secure/src/test/java/org/springframework/grpc/sample/GrpcServerApplicationTests.java
index 701fc01b..306abddc 100644
--- a/samples/grpc-secure/src/test/java/org/springframework/grpc/sample/GrpcServerApplicationTests.java
+++ b/samples/grpc-secure/src/test/java/org/springframework/grpc/sample/GrpcServerApplicationTests.java
@@ -64,7 +64,7 @@ void unauthenticated() {
 	void anonymous() throws Exception {
 		AtomicReference<ServerReflectionResponse> response = new AtomicReference<>();
 		AtomicBoolean error = new AtomicBoolean();
-		StreamObserver<ServerReflectionResponse> responses = new StreamObserver<ServerReflectionResponse>() {
+		StreamObserver<ServerReflectionResponse> responses = new StreamObserver<>() {
 			@Override
 			public void onNext(ServerReflectionResponse value) {
 				response.set(value);
diff --git a/spring-grpc-core/src/main/java/org/springframework/grpc/client/interceptor/security/BasicAuthenticationInterceptor.java b/spring-grpc-core/src/main/java/org/springframework/grpc/client/interceptor/security/BasicAuthenticationInterceptor.java
index 85f7d639..b3b0f9b6 100644
--- a/spring-grpc-core/src/main/java/org/springframework/grpc/client/interceptor/security/BasicAuthenticationInterceptor.java
+++ b/spring-grpc-core/src/main/java/org/springframework/grpc/client/interceptor/security/BasicAuthenticationInterceptor.java
@@ -47,7 +47,7 @@ public BasicAuthenticationInterceptor(String username, String password) {
 	@Override
 	public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(MethodDescriptor<ReqT, RespT> method,
 			CallOptions callOptions, Channel next) {
-		return new SimpleForwardingClientCall<ReqT, RespT>(next.newCall(method, callOptions)) {
+		return new SimpleForwardingClientCall<>(next.newCall(method, callOptions)) {
 			public void start(ClientCall.Listener<RespT> responseListener, io.grpc.Metadata headers) {
 				headers.put(GrpcSecurity.AUTHORIZATION_KEY,
 						"Basic " + Base64.getEncoder()
diff --git a/spring-grpc-core/src/main/java/org/springframework/grpc/client/interceptor/security/BearerTokenAuthenticationInterceptor.java b/spring-grpc-core/src/main/java/org/springframework/grpc/client/interceptor/security/BearerTokenAuthenticationInterceptor.java
index 8d29b29f..3ba7e272 100644
--- a/spring-grpc-core/src/main/java/org/springframework/grpc/client/interceptor/security/BearerTokenAuthenticationInterceptor.java
+++ b/spring-grpc-core/src/main/java/org/springframework/grpc/client/interceptor/security/BearerTokenAuthenticationInterceptor.java
@@ -46,7 +46,7 @@ public BearerTokenAuthenticationInterceptor(Supplier<String> token) {
 	@Override
 	public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(MethodDescriptor<ReqT, RespT> method,
 			CallOptions callOptions, Channel next) {
-		return new SimpleForwardingClientCall<ReqT, RespT>(next.newCall(method, callOptions)) {
+		return new SimpleForwardingClientCall<>(next.newCall(method, callOptions)) {
 			public void start(ClientCall.Listener<RespT> responseListener, io.grpc.Metadata headers) {
 				headers.put(GrpcSecurity.AUTHORIZATION_KEY,
 						"Bearer " + BearerTokenAuthenticationInterceptor.this.token.get());
diff --git a/spring-grpc-core/src/main/java/org/springframework/grpc/server/exception/GrpcExceptionHandlerInterceptor.java b/spring-grpc-core/src/main/java/org/springframework/grpc/server/exception/GrpcExceptionHandlerInterceptor.java
index f274b81b..bf019a6f 100644
--- a/spring-grpc-core/src/main/java/org/springframework/grpc/server/exception/GrpcExceptionHandlerInterceptor.java
+++ b/spring-grpc-core/src/main/java/org/springframework/grpc/server/exception/GrpcExceptionHandlerInterceptor.java
@@ -75,7 +75,7 @@ public <ReqT, RespT> Listener<ReqT> interceptCall(ServerCall<ReqT, RespT> call,
 		}
 		catch (Throwable t) {
 			exceptionHandledServerCall.close(handler.handleException(t).getStatus(), headers(t));
-			listener = new Listener<ReqT>() {
+			listener = new Listener<>() {
 			};
 			return listener;
 		}
diff --git a/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/client/ClientPropertiesChannelBuilderCustomizer.java b/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/client/ClientPropertiesChannelBuilderCustomizer.java
index 286a4190..1a3a2ed3 100644
--- a/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/client/ClientPropertiesChannelBuilderCustomizer.java
+++ b/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/client/ClientPropertiesChannelBuilderCustomizer.java
@@ -61,7 +61,7 @@ public void customize(String authority, T builder) {
 		mapper.from(channel.getKeepAliveTimeout()).to(durationProperty(builder::keepAliveTimeout));
 		mapper.from(channel.getIdleTimeout()).to(durationProperty(builder::idleTimeout));
 		mapper.from(channel.isKeepAliveWithoutCalls()).to(builder::keepAliveWithoutCalls);
-		Map<String, Object> defaultServiceConfig = new HashMap<String, Object>(channel.getServiceConfig());
+		Map<String, Object> defaultServiceConfig = new HashMap<>(channel.getServiceConfig());
 		if (channel.getHealth().isEnabled()) {
 			String serviceNameToCheck = channel.getHealth().getServiceName() != null
 					? channel.getHealth().getServiceName() : "";
diff --git a/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerAutoConfiguration.java b/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerAutoConfiguration.java
index 826358a4..91b129b3 100644
--- a/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerAutoConfiguration.java
+++ b/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerAutoConfiguration.java
@@ -91,7 +91,7 @@ <T extends ServerBuilder<T>> ServerBuilderCustomizer<T> decompressionServerConfi
 	@Bean
 	<T extends ServerBuilder<T>> ServerBuilderCustomizer<T> executorServerConfigurer(
 			GrpcServerExecutorProvider provider) {
-		return new ServerBuilderCustomizerImplementation<T>(provider);
+		return new ServerBuilderCustomizerImplementation<>(provider);
 	}
 
 	private final class ServerBuilderCustomizerImplementation<T extends ServerBuilder<T>>