#8: Codec support

Author: andreilisa

spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/client/GrpcChannelFactoryConfigurations.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.grpc.autoconfigure.client;
 
-import java.net.URI;
 import java.util.List;
 
 import javax.net.ssl.SSLException;
@@ -78,16 +77,11 @@ public GrpcChannelConfigurer secureChannelConfigurer(GrpcClientProperties channe
 		}
 
 		private static io.grpc.netty.shaded.io.grpc.netty.NegotiationType of(final NegotiationType negotiationType) {
-			switch (negotiationType) {
-				case PLAINTEXT:
-					return io.grpc.netty.shaded.io.grpc.netty.NegotiationType.PLAINTEXT;
-				case PLAINTEXT_UPGRADE:
-					return io.grpc.netty.shaded.io.grpc.netty.NegotiationType.PLAINTEXT_UPGRADE;
-				case TLS:
-					return io.grpc.netty.shaded.io.grpc.netty.NegotiationType.TLS;
-				default:
-					throw new IllegalArgumentException("Unsupported NegotiationType: " + negotiationType);
-			}
+			return switch (negotiationType) {
+				case PLAINTEXT -> io.grpc.netty.shaded.io.grpc.netty.NegotiationType.PLAINTEXT;
+				case PLAINTEXT_UPGRADE -> io.grpc.netty.shaded.io.grpc.netty.NegotiationType.PLAINTEXT_UPGRADE;
+				case TLS -> io.grpc.netty.shaded.io.grpc.netty.NegotiationType.TLS;
+			};
 		}
 
 	}
@@ -128,16 +122,11 @@ public GrpcChannelConfigurer secureChannelConfigurer(GrpcClientProperties channe
 		}
 
 		private static io.grpc.netty.NegotiationType of(final NegotiationType negotiationType) {
-			switch (negotiationType) {
-				case PLAINTEXT:
-					return io.grpc.netty.NegotiationType.PLAINTEXT;
-				case PLAINTEXT_UPGRADE:
-					return io.grpc.netty.NegotiationType.PLAINTEXT_UPGRADE;
-				case TLS:
-					return io.grpc.netty.NegotiationType.TLS;
-				default:
-					throw new IllegalArgumentException("Unsupported NegotiationType: " + negotiationType);
-			}
+			return switch (negotiationType) {
+				case PLAINTEXT -> io.grpc.netty.NegotiationType.PLAINTEXT;
+				case PLAINTEXT_UPGRADE -> io.grpc.netty.NegotiationType.PLAINTEXT_UPGRADE;
+				case TLS -> io.grpc.netty.NegotiationType.TLS;
+			};
 		}
 
 	}
@@ -168,8 +157,7 @@ static class NamedChannelVirtualTargets implements VirtualTargets {
 		@Override
 		public String getTarget(String authority) {
 			NamedChannel channel = this.channels.getChannel(authority);
-			String address = channels.getTarget(channel.getAddress());
-			return address;
+			return channels.getTarget(channel.getAddress());
 		}
 
 	}

spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/client/GrpcClientAutoConfiguration.java

@@ -17,6 +17,9 @@
 
 import java.util.concurrent.TimeUnit;
 
+import io.grpc.CompressorRegistry;
+import io.grpc.DecompressorRegistry;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.ssl.SslBundle;
 import org.springframework.boot.ssl.SslBundles;
@@ -81,4 +84,16 @@ else if (ShadedNettyChannelFactoryHelper.isAvailable()) {
 		};
 	}
 
+	@ConditionalOnBean(CompressorRegistry.class)
+	@Bean
+	public GrpcChannelConfigurer compressionServerConfigurer(final CompressorRegistry registry) {
+		return (name, builder) -> builder.compressorRegistry(registry);
+	}
+
+	@ConditionalOnBean(DecompressorRegistry.class)
+	@Bean
+	public GrpcChannelConfigurer decompressionServerConfigurer(final DecompressorRegistry registry) {
+		return (name, builder) -> builder.decompressorRegistry(registry);
+	}
+
 }

spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/common/codec/GrpcCodecAutoConfiguration.java

@@ -0,0 +1,42 @@
+package org.springframework.grpc.autoconfigure.common.codec;
+
+import io.grpc.Codec;
+import io.grpc.CompressorRegistry;
+import io.grpc.DecompressorRegistry;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * The autoconfiguration that contains all codec related beans for clients/servers.
+ *
+ * @author Andrei Lisa
+ */
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnClass(Codec.class)
+public class GrpcCodecAutoConfiguration {
+
+	@ConditionalOnMissingBean
+	@Bean
+	public Codec gzipCompressor() {
+		return new Codec.Gzip();
+	}
+
+	@ConditionalOnMissingBean
+	@Bean
+	public CompressorRegistry defaultCompressorRegistry(Codec codec) {
+		final CompressorRegistry registry = CompressorRegistry.getDefaultInstance();
+		registry.register(codec);
+		return registry;
+	}
+
+	@ConditionalOnMissingBean
+	@Bean
+	public DecompressorRegistry defaultDecompressorRegistry(Codec codec) {
+		DecompressorRegistry registry = DecompressorRegistry.getDefaultInstance();
+		registry = registry.with(codec, false);
+		return registry;
+	}
+
+}

spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerAutoConfiguration.java

@@ -17,6 +17,9 @@
 
 import io.grpc.BindableService;
 
+import io.grpc.CompressorRegistry;
+import io.grpc.DecompressorRegistry;
+import io.grpc.netty.NettyServerBuilder;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
@@ -70,4 +73,17 @@ ServerBuilderCustomizers serverBuilderCustomizers(ObjectProvider<ServerBuilderCu
 		return new ServerBuilderCustomizers(customizers.orderedStream().toList());
 	}
 
+	@ConditionalOnBean(CompressorRegistry.class)
+	@Bean
+	public ServerBuilderCustomizer<NettyServerBuilder> compressionServerConfigurer(final CompressorRegistry registry) {
+		return builder -> builder.compressorRegistry(registry);
+	}
+
+	@ConditionalOnBean(DecompressorRegistry.class)
+	@Bean
+	public ServerBuilderCustomizer<NettyServerBuilder> decompressionServerConfigurer(
+			final DecompressorRegistry registry) {
+		return builder -> builder.decompressorRegistry(registry);
+	}
+
 }