release 4.2.2

LogNet · Nov 2, 2020 · d783ca8 · d783ca8
1 parent 4bf2678
commit d783ca8
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/README.adoc b/README.adoc
@@ -31,7 +31,7 @@ repositories {
 
 }
 dependencies {
-    compile 'io.github.lognet:grpc-spring-boot-starter:4.2.1'
+    compile 'io.github.lognet:grpc-spring-boot-starter:4.2.2'
 }
 
 

diff --git a/ReleaseNotes.adoc b/ReleaseNotes.adoc
@@ -1,3 +1,6 @@
+== Version 4.2.2
+* Fixes https://github.com/LogNet/grpc-spring-boot-starter/issues/162[162]
+
 == Version 4.2.1
 
 * Configure bind address and other netty settings (fixes https://github.com/LogNet/grpc-spring-boot-starter/issues/82[82])

diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ grpcVersion=1.33.0
 springBootVersion=2.3.4.RELEASE
 springCloudVersion=Hoxton.SR6
 
-version=4.2.2-SNAPSHOT
+version=4.2.2
 group=io.github.lognet
 description=Spring Boot starter for Google RPC.
 gitHubUrl=https\://github.com/LogNet/grpc-spring-boot-starter

diff --git a/...oot-starter-demo/src/test/java/org/lognet/springboot/grpc/auth/DefaultAuthConfigTest.java b/...oot-starter-demo/src/test/java/org/lognet/springboot/grpc/auth/DefaultAuthConfigTest.java
@@ -2,6 +2,7 @@
 
 
 import com.google.protobuf.Empty;
+import io.grpc.examples.GreeterGrpc;
 import io.grpc.examples.SecuredGreeterGrpc;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -44,4 +45,14 @@ public void securedServiceTest() {
         assertTrue(String.format("Reply should contain name '%s'",USER_NAME),reply.contains(USER_NAME));
 
     }
+    @Test
+    public void securedServiceMethodTest() {
+
+        final GreeterGrpc.GreeterBlockingStub   securedFutureStub = GreeterGrpc.newBlockingStub(getChannel(true));
+
+        final String reply = securedFutureStub.sayAuthHello(Empty.getDefaultInstance()).getMessage();
+        assertNotNull("Reply should not be null",reply);
+        assertTrue(String.format("Reply should contain name '%s'",USER_NAME),reply.contains(USER_NAME));
+
+    }
 }
diff --git a/...src/main/java/org/lognet/springboot/grpc/security/GrpcServiceAuthorizationConfigurer.java b/...src/main/java/org/lognet/springboot/grpc/security/GrpcServiceAuthorizationConfigurer.java
@@ -18,9 +18,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -139,7 +137,7 @@ private void processSecuredAnnotation() {
                     // method level security
                     for (ServerMethodDefinition<?, ?> methodDefinition : serverServiceDefinition.getMethods()) {
                         Stream.of(service.getClass().getMethods()) // get method from methodDefinition
-                                .filter(m -> 0 == Objects.compare(methodDefinition.getMethodDescriptor().getBareMethodName(), m.getName(), Comparator.naturalOrder()))
+                                .filter(m ->   m.getName().equalsIgnoreCase(methodDefinition.getMethodDescriptor().getBareMethodName()))
                                 .findFirst()
                                 .flatMap(m -> Optional.ofNullable(AnnotationUtils.findAnnotation(m, Secured.class)))
                                 .ifPresent(secured -> new AuthorizedMethod(methodDefinition.getMethodDescriptor()).hasAnyAuthority(secured.value()));