make SonarQube more happy; adjust Test class name to file name

user-manager-server/src/main/java/de/itvsh/kop/user/UserResourceMapper.java

@@ -85,7 +85,7 @@ public abstract class UserResourceMapper {
 				.map(attributes -> attributes.get(properties.ldapIdKey()))
 				.filter(Objects::nonNull)
 				.map(id -> id.get(0))
-				.orElseGet(() -> userRepresentation.getId());
+				.orElseGet(userRepresentation::getId);
 
 	}
 

user-manager-server/src/main/java/de/itvsh/kop/user/common/JwtUtil.java

@@ -39,7 +39,7 @@ public class JwtUtil {
 	public List<String> getOrganisationsEinheitIds() {
 		return Optional.ofNullable(jwt.getClaim(ORGANSIATIONSEINHEIT_IDS_CLAIM))
 				.map(List.class::cast)
-				.orElseGet(() -> Collections.emptyList());
+				.orElseGet(Collections::emptyList);
 	}
 
 	public Optional<String> getUserId() {
@@ -61,8 +61,8 @@ public class JwtUtil {
 				.map(Map.class::cast)
 				.map(clientMap -> clientMap.get(MAP_ROLES_KEY))
 				.map(JsonArray.class::cast)
-				.map(rolesArray -> getAsStringArray(rolesArray))
-				.orElseGet(() -> Collections.<String>emptyList());
+				.map(this::getAsStringArray)
+				.orElseGet(Collections::<String>emptyList);
 	}
 
 	private List<String> getAsStringArray(JsonArray rolesArray) {

user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettingsResourceAssembler.java

 package de.itvsh.kop.user.settings;
 
-import java.util.Optional;
-
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 import javax.ws.rs.core.Link;
@@ -39,11 +37,7 @@ class UserSettingsResourceAssembler {
 	}
 
 	boolean hasValidEmail() {
-		return Optional.ofNullable(getCurrentCallContextUser()).map(user -> user.getEmail()).filter(StringUtils::isNotEmpty).isPresent();
-	}
-
-	private CallContextUser getCurrentCallContextUser() {
-		return currentUserService.getCurrentCallContextUser().orElseGet(null);
+		return currentUserService.getCurrentCallContextUser().map(CallContextUser::getEmail).filter(StringUtils::isNotEmpty).isPresent();
 	}
 
 	boolean hasVerwaltungUserRole() {

user-manager-server/src/test/java/de/itvsh/kop/user/common/JwtUtilTest.java

@@ -60,8 +60,7 @@ class JwtUtilTest {
 
 			var userName = jwtUtil.getUserName();
 
-			assertThat(userName).isPresent();
-			assertThat(userName.get()).isEqualTo(userNameInClaim);
+			assertThat(userName).contains(userNameInClaim);
 		}
 
 		@Test
@@ -129,8 +128,7 @@ class JwtUtilTest {
 
 			var userId = jwtUtil.getUserId();
 
-			assertThat(userId).isPresent();
-			assertThat(userId.get()).isEqualTo(userIdInClaim);
+			assertThat(userId).contains(userIdInClaim);
 		}
 
 		@Test
@@ -161,7 +159,7 @@ class JwtUtilTest {
 
 			var email = jwtUtil.getEmail();
 
-			assertThat(email).isEqualTo(email);
+			assertThat(email).isEqualTo(emailInClaim);
 		}
 
 		@Test
@@ -170,7 +168,7 @@ class JwtUtilTest {
 
 			var email = jwtUtil.getEmail();
 
-			assertThat(email).isEqualTo(null);
+			assertThat(email).isNull();
 		}
 	}
 

user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/GrpcCallContextInterceptorTest.java

@@ -17,7 +17,7 @@ import de.itvsh.kop.user.common.callcontext.GrpcCallContextInterceptor.LogContex
 import io.grpc.Metadata;
 import io.grpc.ServerCall;
 
-class CallContextHandleInterceptorTest {
+class GrpcCallContextInterceptorTest {
 
 	@InjectMocks
 	private GrpcCallContextInterceptor interceptor;
@@ -159,8 +159,7 @@ class CallContextHandleInterceptorTest {
 
 			@Test
 			void shouldClearSecurityContextOnException() {
-				var testException = new RuntimeException() {
-				};
+				var testException = new RuntimeException();
 
 				assertThatThrownBy(() -> listener.doSurroundOn(() -> {
 					throw testException;