add tests

Author: Miguel Gonzalez Sanchez

grpc-spring-boot-starter-demo/src/test/java/org/lognet/springboot/grpc/recovery/GRpcRecoveryTest.java

@@ -1,5 +1,20 @@
 package org.lognet.springboot.grpc.recovery;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isA;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
 import io.grpc.Metadata;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
@@ -15,25 +30,11 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isA;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
-
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = {DemoApp.class}, webEnvironment = NONE)
 @ActiveProfiles({"disable-security"})
@@ -43,6 +44,7 @@ public class GRpcRecoveryTest extends GrpcServerTestBase {
     static class CheckedException extends Exception {
 
     }
+
     static class CheckedException1 extends Exception {
 
     }
@@ -59,16 +61,25 @@ static class Exception1 extends RuntimeException {
 
     }
 
+    @GRpcServiceAdvice
+    static class BeanCustomErrorHandler {
+
+        @GRpcExceptionHandler
+        public Status handleA(ExceptionA e, GRpcExceptionScope scope) {
+            return Status.NOT_FOUND;
+        }
+    }
+
     @TestConfiguration
     static class Cfg {
 
+        @Bean
+        public BeanCustomErrorHandler otherErrorHandler() {
+            return new BeanCustomErrorHandler();
+        }
 
         @GRpcServiceAdvice
         static class CustomErrorHandler {
-            @GRpcExceptionHandler
-            public Status handleA(ExceptionA e, GRpcExceptionScope scope) {
-                return Status.NOT_FOUND;
-            }
 
             @GRpcExceptionHandler
             public Status handleB(ExceptionB e, GRpcExceptionScope scope) {
@@ -87,7 +98,6 @@ public Status handle(Exception e, GRpcExceptionScope scope) {
             }
         }
 
-
         @GRpcService
         static class CustomService extends CustomServiceGrpc.CustomServiceImplBase {
 
@@ -150,12 +160,14 @@ public Status handleB(ExceptionB e, GRpcExceptionScope scope) {
     @SpyBean
     private Cfg.CustomErrorHandler handler;
 
+    @SpyBean
+    private BeanCustomErrorHandler beanErrorHandler;
+
 
     @Test
     public void streamingServiceErrorHandlerTest() throws ExecutionException, InterruptedException, TimeoutException {
 
 
-
         final CompletableFuture<Throwable> errorFuture = new CompletableFuture<>();
         final StreamObserver<Custom.CustomReply> reply = new StreamObserver<Custom.CustomReply>() {
 
@@ -180,15 +192,12 @@ public void onCompleted() {
         requests.onCompleted();
 
 
-
-
-
         final Throwable actual = errorFuture.get(20, TimeUnit.SECONDS);
         assertThat(actual, notNullValue());
         assertThat(actual, isA(StatusRuntimeException.class));
-        assertThat(((StatusRuntimeException)actual).getStatus(), is(Status.RESOURCE_EXHAUSTED));
+        assertThat(((StatusRuntimeException) actual).getStatus(), is(Status.RESOURCE_EXHAUSTED));
 
-        Mockito.verify(srv,times(1)).handle(any(CheckedException1.class),any());
+        Mockito.verify(srv, times(1)).handle(any(CheckedException1.class), any());
 
     }
 
@@ -205,9 +214,8 @@ public void checkedExceptionHandlerTest() {
 
         Mockito.verify(srv, never()).handleB(any(), any());
 
-
+        Mockito.verify(beanErrorHandler, never()).handleA(any(), any());
         Mockito.verify(handler, never()).handle(any(), any());
-        Mockito.verify(handler, never()).handleA(any(), any());
         Mockito.verify(handler, times(1)).handleCheckedException(any(CheckedException.class), any());
         Mockito.verify(handler, never()).handleB(any(), any());
 

grpc-spring-boot-starter-gradle-plugin/src/main/resources/grpc-spring-boot.gradle

@@ -40,11 +40,23 @@ sourceSets.configureEach{s->
 
 protobuf {
     protoc {
-        artifact = "com.google.protobuf:protoc:${grpcSpringBoot.protocVersion.get()}"
+
+        // for apple m1, please add protoc_platform=osx-x86_64 in $HOME/.gradle/gradle.properties
+        if (project.hasProperty('protoc_platform')) {
+            artifact = "com.google.protobuf:protoc:${grpcSpringBoot.protocVersion.get()}:${protoc_platform}"
+        } else {
+            artifact = "com.google.protobuf:protoc:${grpcSpringBoot.protocVersion.get()}"
+        }
     }
+
     plugins {
         grpc {
-            artifact = "io.grpc:protoc-gen-grpc-java:${grpcSpringBoot.grpcVersion.get()}"
+            // for apple m1, please add protoc_platform=osx-x86_64 in $HOME/.gradle/gradle.properties
+            if (project.hasProperty('protoc_platform')) {
+                artifact = "io.grpc:protoc-gen-grpc-java:${grpcSpringBoot.grpcVersion.get()}:${protoc_platform}"
+            } else {
+                artifact = "io.grpc:protoc-gen-grpc-java:${grpcSpringBoot.grpcVersion.get()}"
+            }
         }
     }