Small changes

Author: artem-v

services-api/src/main/java/io/scalecube/services/auth/ServicePrincipal.java

@@ -15,7 +15,7 @@ public class ServicePrincipal implements Principal {
    * @param role service role
    * @param permissions service permissions
    */
-  public ServicePrincipal(String role, Set<String> permissions) {
+  public ServicePrincipal(String role, Collection<String> permissions) {
     this.role = role;
     this.permissions = Set.copyOf(permissions);
   }

services-api/src/main/java/io/scalecube/services/methods/ServiceRoleDefinition.java

@@ -1,7 +1,6 @@
 package io.scalecube.services.methods;
 
 import java.util.Collection;
-import java.util.Objects;
 import java.util.Set;
 import java.util.StringJoiner;
 
@@ -29,25 +28,6 @@ public Collection<String> permissions() {
     return permissions;
   }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    final var that = (ServiceRoleDefinition) o;
-    return Objects.equals(role, that.role) && Objects.equals(permissions, that.permissions);
-  }
-
-  @Override
-  public int hashCode() {
-    int result = Objects.hashCode(role);
-    result = 31 * result + Objects.hashCode(permissions);
-    return result;
-  }
-
   @Override
   public String toString() {
     return new StringJoiner(", ", ServiceRoleDefinition.class.getSimpleName() + "[", "]")

services-api/src/test/java/io/scalecube/services/methods/ReflectTest.java

@@ -3,10 +3,9 @@
 import static io.scalecube.services.CommunicationMode.REQUEST_CHANNEL;
 import static io.scalecube.services.CommunicationMode.REQUEST_RESPONSE;
 import static io.scalecube.services.CommunicationMode.REQUEST_STREAM;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasItem;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import io.scalecube.services.CommunicationMode;
 import io.scalecube.services.Reflect;
@@ -17,6 +16,7 @@
 import io.scalecube.services.auth.AllowedRoles;
 import java.lang.reflect.Method;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Stream;
@@ -107,11 +107,21 @@ public void testServiceRoles(String test, SuccessArgs args) throws Exception {
     final var serviceRoles = Reflect.serviceRoles(method);
     assertNotNull(serviceRoles, "serviceRoles");
     assertEquals(args.list.size(), serviceRoles.size(), "serviceRoles.size");
-    for (var expectedServiceRole : args.list) {
-      assertThat(serviceRoles, hasItem(expectedServiceRole));
+    for (var role : args.list) {
+      assertContains(serviceRoles, role);
     }
   }
 
+  private static void assertContains(
+      Collection<ServiceRoleDefinition> serviceRoles, ServiceRoleDefinition item) {
+    final var hasItem =
+        serviceRoles.stream()
+            .filter(role -> role.role().equals(item.role()))
+            .filter(role -> role.permissions().equals(item.permissions()))
+            .findFirst();
+    assertTrue(hasItem.isPresent(), "serviceRoles: " + serviceRoles + ", item: " + item);
+  }
+
   private record SuccessArgs(Object serviceInstance, List<ServiceRoleDefinition> list) {}
 
   private static Stream<Arguments> testServiceRolesMethodSource() {

services/src/test/java/io/scalecube/services/auth/ServiceRolesProcessorTest.java

@@ -1,9 +1,9 @@
 package io.scalecube.services.auth;
 
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasItem;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
@@ -12,6 +12,7 @@
 import io.scalecube.services.annotations.Service;
 import io.scalecube.services.annotations.ServiceMethod;
 import io.scalecube.services.methods.ServiceRoleDefinition;
+import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import org.junit.jupiter.api.Test;
@@ -44,13 +45,23 @@ void processSuccessfully() {
                     assertEquals(
                         expectedServiceRoles.size(), serviceRoles.size(), "serviceRoles.size");
                     for (var role : expectedServiceRoles) {
-                      assertThat(serviceRoles, hasItem(role));
+                      assertContains(serviceRoles, role);
                     }
                     return true;
                   }));
     }
   }
 
+  private static void assertContains(
+      Collection<ServiceRoleDefinition> serviceRoles, ServiceRoleDefinition item) {
+    final var hasItem =
+        serviceRoles.stream()
+            .filter(role -> role.role().equals(item.role()))
+            .filter(role -> role.permissions().equals(item.permissions()))
+            .findFirst();
+    assertTrue(hasItem.isPresent(), "serviceRoles: " + serviceRoles + ", item: " + item);
+  }
+
   @Service
   private interface Service1 {