Add tests

Author: ST-DDT

tests/src/test/java/net/devh/boot/grpc/test/inject/CustomGrpc.java

@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2016-2020 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.inject;
+
+import io.grpc.CallOptions;
+import io.grpc.Channel;
+
+/**
+ * Fake generated grpc class.
+ */
+public class CustomGrpc {
+
+    public static CustomAccessibleStub custom(final Channel channel) {
+        return new CustomAccessibleStub(channel);
+    }
+
+    public static FactoryMethodAccessibleStub newFactoryMethodAccessibleStubStub(final Channel channel) {
+        return new FactoryMethodAccessibleStub(channel);
+    }
+
+    public static class CustomAccessibleStub extends CustomStub<CustomAccessibleStub> {
+
+        private CustomAccessibleStub(final Channel channel) {
+            super(channel);
+        }
+
+        private CustomAccessibleStub(final Channel channel, final CallOptions callOptions) {
+            super(channel, callOptions);
+        }
+
+        @Override
+        protected CustomAccessibleStub build(final Channel channel, final CallOptions callOptions) {
+            return new CustomAccessibleStub(channel, callOptions);
+        }
+
+    }
+
+    public static class FactoryMethodAccessibleStub extends OtherStub<FactoryMethodAccessibleStub> {
+
+        private FactoryMethodAccessibleStub(final Channel channel) {
+            super(channel);
+        }
+
+        private FactoryMethodAccessibleStub(final Channel channel, final CallOptions callOptions) {
+            super(channel, callOptions);
+        }
+
+        @Override
+        protected FactoryMethodAccessibleStub build(final Channel channel, final CallOptions callOptions) {
+            return new FactoryMethodAccessibleStub(channel, callOptions);
+        }
+
+    }
+
+    public static class ConstructorAccessibleStub extends OtherStub<ConstructorAccessibleStub> {
+
+        public ConstructorAccessibleStub(final Channel channel) {
+            super(channel);
+        }
+
+        public ConstructorAccessibleStub(final Channel channel, final CallOptions callOptions) {
+            super(channel, callOptions);
+        }
+
+        @Override
+        protected ConstructorAccessibleStub build(final Channel channel, final CallOptions callOptions) {
+            return new ConstructorAccessibleStub(channel, callOptions);
+        }
+
+    }
+
+}

tests/src/test/java/net/devh/boot/grpc/test/inject/CustomStub.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2016-2020 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.inject;
+
+import io.grpc.CallOptions;
+import io.grpc.Channel;
+import io.grpc.stub.AbstractStub;
+
+/**
+ * Simulates a custom stub type provided by a third party library, that requires a custom
+ * {@link net.devh.boot.grpc.client.stubfactory.StubFactory StubFactory}.
+ *
+ * @param <S> The type of the stub implementation.
+ */
+public abstract class CustomStub<S extends CustomStub<S>> extends AbstractStub<S> {
+
+    protected CustomStub(final Channel channel) {
+        super(channel);
+    }
+
+    protected CustomStub(final Channel channel, final CallOptions callOptions) {
+        super(channel, callOptions);
+    }
+
+}

tests/src/test/java/net/devh/boot/grpc/test/inject/GrpcClientInjectionTest.java

@@ -23,14 +23,23 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
 import io.grpc.Channel;
+import io.grpc.stub.AbstractStub;
 import net.devh.boot.grpc.client.inject.GrpcClient;
+import net.devh.boot.grpc.client.stubfactory.StandardJavaGrpcStubFactory;
+import net.devh.boot.grpc.client.stubfactory.StubFactory;
 import net.devh.boot.grpc.test.config.BaseAutoConfiguration;
 import net.devh.boot.grpc.test.config.InProcessConfiguration;
 import net.devh.boot.grpc.test.config.ServiceConfiguration;
+import net.devh.boot.grpc.test.inject.CustomGrpc.ConstructorAccessibleStub;
+import net.devh.boot.grpc.test.inject.CustomGrpc.CustomAccessibleStub;
+import net.devh.boot.grpc.test.inject.CustomGrpc.FactoryMethodAccessibleStub;
+import net.devh.boot.grpc.test.inject.GrpcClientInjectionTest.TestConfig;
 import net.devh.boot.grpc.test.proto.TestServiceGrpc.TestServiceBlockingStub;
 import net.devh.boot.grpc.test.proto.TestServiceGrpc.TestServiceFutureStub;
 import net.devh.boot.grpc.test.proto.TestServiceGrpc.TestServiceStub;
@@ -41,24 +50,33 @@
  * @author Daniel Theuke ([email protected])
  */
 @SpringBootTest
-@SpringJUnitConfig(classes = {InProcessConfiguration.class, ServiceConfiguration.class, BaseAutoConfiguration.class})
+@SpringJUnitConfig(classes = {TestConfig.class, InProcessConfiguration.class, ServiceConfiguration.class,
+        BaseAutoConfiguration.class})
 @DirtiesContext
-public class GrpcClientInjectionTest {
+class GrpcClientInjectionTest {
 
     @GrpcClient("test")
-    protected Channel channel;
+    Channel channel;
     @GrpcClient("test")
-    protected TestServiceStub stub;
+    TestServiceStub stub;
     @GrpcClient("test")
-    protected TestServiceBlockingStub blockingStub;
+    TestServiceBlockingStub blockingStub;
     @GrpcClient("test")
-    protected TestServiceFutureStub futureStub;
-
-    protected Channel channelSetted;
-    protected TestServiceStub stubSetted;
-    protected TestServiceBlockingStub blockingStubSetted;
-    protected TestServiceFutureStub futureStubSetted;
+    TestServiceFutureStub futureStub;
+    @GrpcClient("test")
+    ConstructorAccessibleStub constructorStub;
+    @GrpcClient("test")
+    FactoryMethodAccessibleStub factoryMethodStub;
+    @GrpcClient("test")
+    CustomAccessibleStub customStub;
 
+    Channel channelSetted;
+    TestServiceStub stubSetted;
+    TestServiceBlockingStub blockingStubSetted;
+    TestServiceFutureStub futureStubSetted;
+    ConstructorAccessibleStub constructorStubSetted;
+    FactoryMethodAccessibleStub factoryMethodStubSetted;
+    CustomAccessibleStub customStubSetted;
 
     @PostConstruct
     public void init() {
@@ -67,44 +85,93 @@ public void init() {
         assertNotNull(this.stub, "stub");
         assertNotNull(this.blockingStub, "blockingStub");
         assertNotNull(this.futureStub, "futureStub");
+        assertNotNull(this.constructorStub, "constructorStub");
+        assertNotNull(this.factoryMethodStub, "factoryMethodStub");
+        assertNotNull(this.customStub, "customStub");
     }
 
     @GrpcClient("test")
-    public void inject(Channel channel) {
+    void inject(final Channel channel) {
         assertNotNull(channel, "channel");
         this.channelSetted = channel;
     }
 
     @GrpcClient("test")
-    public void inject(TestServiceStub stub) {
+    void inject(final TestServiceStub stub) {
         assertNotNull(stub, "stub");
         this.stubSetted = stub;
     }
 
     @GrpcClient("test")
-    public void inject(TestServiceBlockingStub stub) {
+    void inject(final TestServiceBlockingStub stub) {
         assertNotNull(stub, "stub");
         this.blockingStubSetted = stub;
     }
 
     @GrpcClient("test")
-    public void inject(TestServiceFutureStub stub) {
+    void inject(final TestServiceFutureStub stub) {
         assertNotNull(stub, "stub");
         this.futureStubSetted = stub;
     }
 
+    @GrpcClient("test")
+    void inject(final ConstructorAccessibleStub stub) {
+        assertNotNull(stub, "stub");
+        this.constructorStubSetted = stub;
+    }
+
+    @GrpcClient("test")
+    void inject(final FactoryMethodAccessibleStub stub) {
+        assertNotNull(stub, "stub");
+        this.factoryMethodStubSetted = stub;
+    }
+
+    @GrpcClient("test")
+    void inject(final CustomAccessibleStub stub) {
+        assertNotNull(stub, "stub");
+        this.customStubSetted = stub;
+    }
+
     @Test
-    public void testAllSet() {
+    void testAllSet() {
         // Field injection
         assertNotNull(this.channel, "channel");
         assertNotNull(this.stub, "stub");
         assertNotNull(this.blockingStub, "blockingStub");
         assertNotNull(this.futureStub, "futureStub");
+        assertNotNull(this.constructorStub, "constructorStub");
+        assertNotNull(this.factoryMethodStub, "factoryMethodStub");
+        assertNotNull(this.customStub, "customStub");
         // Setter injection
         assertNotNull(this.channelSetted, "channelSetted");
         assertNotNull(this.stubSetted, "stubSetted");
         assertNotNull(this.blockingStubSetted, "blockingStubSetted");
         assertNotNull(this.futureStubSetted, "futureStubSetted");
+        assertNotNull(this.constructorStubSetted, "constructorStubSetted");
+        assertNotNull(this.factoryMethodStubSetted, "factoryMethodStubSetted");
+        assertNotNull(this.customStubSetted, "customStubSetted");
+    }
+
+    @TestConfiguration
+    public static class TestConfig {
+
+        @Bean
+        StubFactory customStubFactory() {
+            return new StandardJavaGrpcStubFactory() {
+
+                @Override
+                public boolean isApplicable(final Class<? extends AbstractStub<?>> stubType) {
+                    return CustomStub.class.isAssignableFrom(stubType);
+                }
+
+                @Override
+                protected String getFactoryMethodName() {
+                    return "custom";
+                }
+
+            };
+        }
+
     }
 
 }

tests/src/test/java/net/devh/boot/grpc/test/inject/OtherStub.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2016-2020 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.inject;
+
+import io.grpc.CallOptions;
+import io.grpc.Channel;
+import io.grpc.stub.AbstractStub;
+import net.devh.boot.grpc.client.stubfactory.FallbackStubFactory;
+
+/**
+ * Simulates a custom stub type provided by a third party library, that can be created by the
+ * {@link FallbackStubFactory}.
+ *
+ * @param <S> The type of the stub implementation.
+ */
+public abstract class OtherStub<S extends OtherStub<S>> extends AbstractStub<S> {
+
+    protected OtherStub(final Channel channel) {
+        super(channel);
+    }
+
+    protected OtherStub(final Channel channel, final CallOptions callOptions) {
+        super(channel, callOptions);
+    }
+
+}