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 755dff4308d168f64d370703827f6eea4a02e7c8..5928feea1b0044f7d59ba5366cfd3b140907791b 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 263b0e0720caffeb9150ecf93416eb8253041b06..bf2623fc255ce4f65121b8da97777a0e8ee8a8b5 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(); }