From b21f15ac3f1ae394ce7f39b5f5b6ac047c828c7f Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 26 Oct 2022 10:09:12 +0200
Subject: [PATCH] OZG-2737 do not inject RestTemplate
---
.../common/migration/M012_MigrationUserId.java | 5 ++---
.../migration/M012_MigrationUserIdITCase.java | 13 +++++++++----
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/pluto-server/src/main/java/de/itvsh/ozg/pluto/common/migration/M012_MigrationUserId.java b/pluto-server/src/main/java/de/itvsh/ozg/pluto/common/migration/M012_MigrationUserId.java
index 755dff430..5928feea1 100644
--- a/pluto-server/src/main/java/de/itvsh/ozg/pluto/common/migration/M012_MigrationUserId.java
+++ b/pluto-server/src/main/java/de/itvsh/ozg/pluto/common/migration/M012_MigrationUserId.java
@@ -39,17 +39,16 @@ public class M012_MigrationUserId {// NOSONAR
private MongoTemplate template;
- private RestTemplate restTemplate;
+ private RestTemplate restTemplate = new RestTemplate();
private String userManagerUrlTemplate;
@Execution
- public void doMigration(MongoTemplate template, RestTemplate restTemplate, Environment environment) {
+ public void doMigration(MongoTemplate template, Environment environment) {
var userManagerUrl = environment.getProperty(KOP_USERMANAGER_URL_KEY);
if (Objects.nonNull(userManagerUrl)) {
this.template = template;
- this.restTemplate = restTemplate;
this.userManagerUrlTemplate = userManagerUrl + "/%s";
migrate();
diff --git a/pluto-server/src/test/java/de/itvsh/ozg/pluto/common/migration/M012_MigrationUserIdITCase.java b/pluto-server/src/test/java/de/itvsh/ozg/pluto/common/migration/M012_MigrationUserIdITCase.java
index 263b0e072..bf2623fc2 100644
--- a/pluto-server/src/test/java/de/itvsh/ozg/pluto/common/migration/M012_MigrationUserIdITCase.java
+++ b/pluto-server/src/test/java/de/itvsh/ozg/pluto/common/migration/M012_MigrationUserIdITCase.java
@@ -15,12 +15,12 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.boot.test.mock.mockito.SpyBean;
import org.springframework.core.env.Environment;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
+import org.springframework.test.util.ReflectionTestUtils;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.RestTemplate;
@@ -40,7 +40,7 @@ class M012_MigrationUserIdITCase {
@Autowired
private MongoTemplate template;
- @MockBean
+ @Mock
private RestTemplate restTemplate;
@DisplayName("Migrate")
@@ -50,18 +50,23 @@ class M012_MigrationUserIdITCase {
@Mock
private Environment env;
+ @BeforeEach
+ void init() {
+ ReflectionTestUtils.setField(migration, "restTemplate", restTemplate);
+ }
+
@Test
void shouldInitMigration() {
when(env.getProperty(anyString())).thenReturn(USER_MANAGER_URL);
- migration.doMigration(template, restTemplate, env);
+ migration.doMigration(template, env);
verify(migration, never()).logUrlIsNotConfigured();
}
@Test
void shouldNotInitMigration() {
- migration.doMigration(template, restTemplate, env);
+ migration.doMigration(template, env);
verify(migration).logUrlIsNotConfigured();
}
--
GitLab