Fix implementation and add a test

Author: ST-DDT

grpc-client-spring-boot-autoconfigure/build.gradle

@@ -24,6 +24,7 @@ dependencies {
     // api comes from java-library, and allows exposure of the dependency to consumers of the library
     //  this means it can be used implicitly without specifying the dependency (unless you wish to override with a different version, or exclude)
     optionalSupportApi 'io.grpc:grpc-netty'
+    optionalSupportApi 'io.netty:netty-transport-native-epoll'
     api 'io.grpc:grpc-netty-shaded'
     api 'io.grpc:grpc-protobuf'
     api 'io.grpc:grpc-stub'

grpc-client-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/client/channelfactory/NettyChannelFactory.java

@@ -74,15 +74,15 @@ protected NettyChannelBuilder newChannelBuilder(final String name) {
         if (address == null) {
             address = URI.create(name);
         }
-        NettyChannelBuilder builder;
-        if (address.getScheme().equals(GrpcChannelProperties.DOMAIN_SOCKET_ADDRESS_SCHEME)) {
-            builder =  NettyChannelBuilder.forAddress(new DomainSocketAddress(address.getPath()))
+        if (GrpcChannelProperties.DOMAIN_SOCKET_ADDRESS_SCHEME.equals(address.getScheme())) {
+            String path = address.getSchemeSpecificPart();
+            return NettyChannelBuilder.forAddress(new DomainSocketAddress(path))
                     .channelType(EpollDomainSocketChannel.class)
                     .eventLoopGroup(new EpollEventLoopGroup());
         } else {
-            builder = NettyChannelBuilder.forTarget(address.toString());
+            return NettyChannelBuilder.forTarget(address.toString())
+                    .defaultLoadBalancingPolicy(properties.getDefaultLoadBalancingPolicy());
         }
-        return builder.defaultLoadBalancingPolicy(properties.getDefaultLoadBalancingPolicy());
     }
 
     @Override

grpc-client-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/client/channelfactory/ShadedNettyChannelFactory.java

@@ -72,15 +72,15 @@ protected NettyChannelBuilder newChannelBuilder(final String name) {
         if (address == null) {
             address = URI.create(name);
         }
-        NettyChannelBuilder builder;
-        if (address.getScheme().equals(GrpcChannelProperties.DOMAIN_SOCKET_ADDRESS_SCHEME)) {
-            builder =  NettyChannelBuilder.forAddress(new DomainSocketAddress(address.getPath()))
+        if (GrpcChannelProperties.DOMAIN_SOCKET_ADDRESS_SCHEME.equals(address.getScheme())) {
+            final String path = address.getSchemeSpecificPart();
+            return NettyChannelBuilder.forAddress(new DomainSocketAddress(path))
                     .channelType(EpollDomainSocketChannel.class)
                     .eventLoopGroup(new EpollEventLoopGroup());
         } else {
-            builder = NettyChannelBuilder.forTarget(address.toString());
+            return NettyChannelBuilder.forTarget(address.toString())
+                    .defaultLoadBalancingPolicy(properties.getDefaultLoadBalancingPolicy());
         }
-        return builder.defaultLoadBalancingPolicy(properties.getDefaultLoadBalancingPolicy());
     }
 
     @Override

grpc-server-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/server/config/GrpcServerProperties.java

@@ -69,7 +69,7 @@ public class GrpcServerProperties {
     /**
      * A constant that defines, the prefix of a Unix domain socket address.
      */
-    public static final String DOMAIN_SOCKET_ADDRESS_PREFIX = "unix://";
+    public static final String DOMAIN_SOCKET_ADDRESS_PREFIX = "unix:";
 
     /**
      * Bind address for the server. Defaults to {@link #ANY_IP_ADDRESS "*"}. Alternatively you can restrict this to

grpc-server-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/server/serverfactory/NettyGrpcServerFactory.java

@@ -65,8 +65,8 @@ protected NettyServerBuilder newServerBuilder() {
         final String address = getAddress();
         final int port = getPort();
         if (address.startsWith(GrpcServerProperties.DOMAIN_SOCKET_ADDRESS_PREFIX)) {
-            return NettyServerBuilder
-                    .forAddress(new DomainSocketAddress(address.substring(GrpcServerProperties.DOMAIN_SOCKET_ADDRESS_PREFIX.length())))
+            String path = address.substring(GrpcServerProperties.DOMAIN_SOCKET_ADDRESS_PREFIX.length());
+            return NettyServerBuilder.forAddress(new DomainSocketAddress(path))
                     .channelType(EpollServerDomainSocketChannel.class)
                     .bossEventLoopGroup(new EpollEventLoopGroup(1))
                     .workerEventLoopGroup(new EpollEventLoopGroup());

grpc-server-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/server/serverfactory/ShadedNettyGrpcServerFactory.java

@@ -66,8 +66,8 @@ protected NettyServerBuilder newServerBuilder() {
         final String address = getAddress();
         final int port = getPort();
         if (address.startsWith(GrpcServerProperties.DOMAIN_SOCKET_ADDRESS_PREFIX)) {
-            return NettyServerBuilder
-                    .forAddress(new DomainSocketAddress(address.substring(GrpcServerProperties.DOMAIN_SOCKET_ADDRESS_PREFIX.length())))
+            final String path = address.substring(GrpcServerProperties.DOMAIN_SOCKET_ADDRESS_PREFIX.length());
+            return NettyServerBuilder.forAddress(new DomainSocketAddress(path))
                     .channelType(EpollServerDomainSocketChannel.class)
                     .bossEventLoopGroup(new EpollEventLoopGroup(1))
                     .workerEventLoopGroup(new EpollEventLoopGroup());

tests/src/test/java/net/devh/boot/grpc/test/setup/UnixSetupTest.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2016-2021 Michael Zhang <[email protected]>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package net.devh.boot.grpc.test.setup;
+
+import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.OS;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+import lombok.extern.slf4j.Slf4j;
+import net.devh.boot.grpc.test.config.BaseAutoConfiguration;
+import net.devh.boot.grpc.test.config.ServiceConfiguration;
+
+/**
+ * A test checking that the server and client can start and connect to each other with minimal config.
+ *
+ * @author Daniel Theuke ([email protected])
+ */
+@Slf4j
+@SpringBootTest(properties = {
+        "grpc.server.address=unix:unix-test",
+        "grpc.client.GLOBAL.address=unix:unix-test",
+        "grpc.client.GLOBAL.negotiationType=PLAINTEXT",
+})
+@SpringJUnitConfig(classes = {ServiceConfiguration.class, BaseAutoConfiguration.class})
+@DirtiesContext
+@EnabledOnOs(OS.LINUX)
+public class UnixSetupTest extends AbstractSimpleServerClientTest {
+
+    public UnixSetupTest() {
+        log.info("--- UnixSetupTest ---");
+    }
+
+}