OZG-4460 OZG-4495 fix issue with logging

build-native-local-docker-image.sh

 #!/usr/bin/env bash
 
 cd user-manager-server
-./mvnw clean verify \
+./mvnw clean install -D skipTests \
       -Pnative \
       -Dquarkus.container-image.registry=docker.ozg-sh.de \
       -Dquarkus.container-image.push=false \

user-manager-server/pom.xml

@@ -94,6 +94,10 @@
 					<groupId>org.apache.logging.log4j</groupId>
 					<artifactId>log4j-slf4j-impl</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-context</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 

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

@@ -41,8 +41,6 @@ import org.mockito.Mock;
 
 import com.thedeanda.lorem.LoremIpsum;
 
-import de.itvsh.kop.user.common.reflection.SaferReflection;
-
 class UserProfileResourceTest {
 
 	private static final String USER_MANAGER_URL = LoremIpsum.getInstance().getUrl();
@@ -52,16 +50,13 @@ class UserProfileResourceTest {
 
 	@Mock
 	private UserService userService;
+
 	@Mock
 	private UserProfileResourceAssembler resourceAssembler;
 
 	@BeforeEach
 	void init() {
-		mockUserManagerUrl();
-	}
-
-	private void mockUserManagerUrl() {
-		SaferReflection.setField("userManagerUrl", resource, USER_MANAGER_URL);
+		resource.userManagerUrl = USER_MANAGER_URL;
 	}
 
 	@Nested

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

@@ -30,7 +30,6 @@ import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.mockito.Spy;
-import org.springframework.util.ReflectionUtils;
 
 class CurrentCallContextUserServiceTest {
 
@@ -43,14 +42,6 @@ class CurrentCallContextUserServiceTest {
 	@Nested
 	class TestClearCallContextUser {
 
-		@BeforeEach
-		void init() {
-			var userField = ReflectionUtils.findField(CurrentCallContextUserService.class, "user");
-			userField.setAccessible(true);
-			ReflectionUtils.setField(userField, userService, callContextUser);
-			assertThat(userService.getCurrentCallContextUser()).isPresent();
-		}
-
 		@Test
 		void shouldSetUserToNull() {
 			userService.clearCallContextUser();
@@ -60,7 +51,7 @@ class CurrentCallContextUserServiceTest {
 	}
 
 	@Nested
-	class TestService {
+	class TestGetCurrentCallContextUser {
 
 		@BeforeEach
 		void init() {

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

@@ -37,11 +37,10 @@ import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
-import org.springframework.util.ReflectionUtils;
 
 import de.itvsh.kop.user.User;
 import de.itvsh.kop.user.UserTestFactory;
-import de.itvsh.kop.user.common.callcontext.GrpcCallContextInterceptor.LogContextSettingListener;
+import de.itvsh.kop.user.common.callcontext.GrpcCallContextInterceptor.*;
 import de.itvsh.kop.user.common.errorhandling.ResourceNotFoundException;
 import io.grpc.Metadata;
 import io.grpc.ServerCall;
@@ -289,11 +288,6 @@ class GrpcCallContextInterceptorTest {
 				@Nested
 				class TestWithExistingClientName {
 
-					@BeforeEach
-					void initListener() {
-						setClientName(Optional.of("ClientNameDummy"));
-					}
-
 					@Test
 					void shouldCallDoSurroundOn() {
 						listener.onReady();
@@ -306,18 +300,26 @@ class GrpcCallContextInterceptorTest {
 				@Nested
 				class TestWithMissingClientName {
 
+					private LogContextSettingListener<?, ?, ?> listener;
+					private Metadata headers = CallContextMetadataTestFactory.createMetadata();
+
 					@BeforeEach
 					void initListener() {
-						setClientName(Optional.empty());
+						headers.discardAll(GrpcUtil.createKeyOf(GrpcCallContextInterceptor.KEY_CLIENT_NAME));
+						listener = spy(interceptor.new LogContextSettingListener<>(delegate, originCall, headers));
 					}
 
 					@Test
 					void shouldHandleMissingClientName() {
+						try (var mock = mockStatic(GrpcUtil.class)) {
+							mock.when(() -> GrpcUtil.getFromHeaders(KEY_CLIENT_NAME, headers)).thenReturn(Optional.empty());
+
 							listener.onReady();
 
 							verify(listener).handleMissingClientName();
 							verify(originCall).close(any(), eq(headers));
 						}
+					}
 
 					@Test
 					void shouldNotCallDoSurroundOn() {
@@ -326,12 +328,6 @@ class GrpcCallContextInterceptorTest {
 						verify(listener, never()).doSurroundOn(any());
 					}
 				}
-
-				private void setClientName(Optional<String> clientName) {
-					var field = ReflectionUtils.findField(LogContextSettingListener.class, "clientName");
-					field.setAccessible(true);
-					ReflectionUtils.setField(field, listener, clientName);
-				}
 			}
 		}
 

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

-package de.itvsh.kop.user.common.reflection;
-
-import static java.lang.String.*;
-import static org.junit.jupiter.api.Assertions.*;
-
-import org.springframework.util.ReflectionUtils;
-
-/**
- * Safer in this case means "with error handling".
- */
-public class SaferReflection {
-
-	private SaferReflection() {
-		// noop
-	}
-
-	public static <T, V> void setField(String fieldName, T target, V value) {
-		var field = ReflectionUtils.findField(target.getClass(), fieldName);
-		if (field == null) {
-			fail(format(
-					"Can't mock because of reflection error. Unknown field: %s. Check in code if the field name in class fits to the  string passed"
-							+ " to reflection call.",
-					fieldName));
-		}
-		field.setAccessible(true);
-		ReflectionUtils.setField(field, target, value);
-	}
-}

user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsResourceTest.java

@@ -41,7 +41,6 @@ import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
-import org.springframework.util.ReflectionUtils;
 
 import com.thedeanda.lorem.LoremIpsum;
 
@@ -76,6 +75,11 @@ class UserSettingsResourceTest {
 	private final String USER_MANAGER_URL = LoremIpsum.getInstance().getUrl();
 	private final String USER_ID = UUID.randomUUID().toString();
 
+	@BeforeEach
+	void setUp() {
+		resource.userManagerUrl = USER_MANAGER_URL;
+	}
+
 	@DisplayName("Get Usersettings")
 	@Nested
 	class TestGetUserSettings {
@@ -86,8 +90,6 @@ class UserSettingsResourceTest {
 		void mockAccess() {
 			doNothing().when(resource).checkUserAccess(anyString());
 			when(userSettingsService.getByUserId(anyString())).thenReturn(userSettings);
-
-			mockUserManagerUrl();
 		}
 
 		@Test
@@ -167,8 +169,6 @@ class UserSettingsResourceTest {
 			void mockAccess() {
 				doNothing().when(resource).checkUserAccess(anyString());
 				when(userSettingsService.updateByUserId(any(UserSettings.class), anyString())).thenReturn(Optional.of(updatedUserSettings));
-
-				mockUserManagerUrl();
 			}
 
 			@Test
@@ -198,12 +198,6 @@ class UserSettingsResourceTest {
 		}
 	}
 
-	private void mockUserManagerUrl() {
-		var field = ReflectionUtils.findField(UserSettingsResource.class, "userManagerUrl");
-		field.setAccessible(true);
-		ReflectionUtils.setField(field, resource, USER_MANAGER_URL);
-	}
-
 	@DisplayName("Check User access")
 	@Nested
 	class TestCheckUserAccess {