From 09409bae33f569d9451b9554f6623ba9944c5f79 Mon Sep 17 00:00:00 2001 From: Eduard Heimbuch Date: Mon, 14 Oct 2019 11:34:32 +0200 Subject: [PATCH] cleanup --- .../sonia/scm/api/v2/resources/ConfigResource.java | 5 +---- .../scm/api/v2/resources/ConfigResourceTest.java | 11 +---------- .../RepositoryPermissionRootResourceTest.java | 3 --- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ConfigResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ConfigResource.java index 6c568609ee..e5e754afea 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ConfigResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ConfigResource.java @@ -6,7 +6,6 @@ import com.webcohesion.enunciate.metadata.rs.TypeHint; import sonia.scm.config.ConfigurationPermissions; import sonia.scm.config.ScmConfiguration; import sonia.scm.repository.NamespaceStrategyValidator; -import sonia.scm.user.UserManager; import sonia.scm.util.ScmConfigurationUtil; import sonia.scm.web.VndMediaType; @@ -30,17 +29,15 @@ public class ConfigResource { private final ScmConfigurationToConfigDtoMapper configToDtoMapper; private final ScmConfiguration configuration; private final NamespaceStrategyValidator namespaceStrategyValidator; - private final UserManager userManager; @Inject public ConfigResource(ConfigDtoToScmConfigurationMapper dtoToConfigMapper, ScmConfigurationToConfigDtoMapper configToDtoMapper, - ScmConfiguration configuration, NamespaceStrategyValidator namespaceStrategyValidator, UserManager userManager) { + ScmConfiguration configuration, NamespaceStrategyValidator namespaceStrategyValidator) { this.dtoToConfigMapper = dtoToConfigMapper; this.configToDtoMapper = configToDtoMapper; this.configuration = configuration; this.namespaceStrategyValidator = namespaceStrategyValidator; - this.userManager = userManager; } /** diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ConfigResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ConfigResourceTest.java index 6b48360523..d274d7b6d7 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ConfigResourceTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ConfigResourceTest.java @@ -14,10 +14,8 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.InjectMocks; import org.mockito.Mock; -import sonia.scm.SCMContext; import sonia.scm.config.ScmConfiguration; import sonia.scm.repository.NamespaceStrategyValidator; -import sonia.scm.user.UserManager; import sonia.scm.web.VndMediaType; import javax.servlet.http.HttpServletResponse; @@ -31,9 +29,7 @@ import java.nio.charset.StandardCharsets; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; @SubjectAware( @@ -54,9 +50,6 @@ public class ConfigResourceTest { @SuppressWarnings("unused") // Is injected private ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri); - @Mock - private UserManager userManager; - @Mock private NamespaceStrategyValidator namespaceStrategyValidator; @@ -76,7 +69,7 @@ public class ConfigResourceTest { public void prepareEnvironment() { initMocks(this); - ConfigResource configResource = new ConfigResource(dtoToConfigMapper, configToDtoMapper, createConfiguration(), namespaceStrategyValidator, userManager); + ConfigResource configResource = new ConfigResource(dtoToConfigMapper, configToDtoMapper, createConfiguration(), namespaceStrategyValidator); dispatcher.getRegistry().addSingletonResource(configResource); } @@ -142,7 +135,6 @@ public class ConfigResourceTest { @Test @SubjectAware(username = "readWrite") public void shouldUpdateConfigAndNotCreateAnonymousUserIfAlreadyExists() throws URISyntaxException, IOException { - when(userManager.contains(SCMContext.USER_ANONYMOUS)).thenReturn(true); MockHttpRequest request = post("sonia/scm/api/v2/config-test-update-with-anonymous-access.json"); MockHttpResponse response = new MockHttpResponse(); @@ -156,7 +148,6 @@ public class ConfigResourceTest { assertTrue(response.getContentAsString().contains("\"proxyPassword\":\"newPassword\"")); assertTrue(response.getContentAsString().contains("\"self\":{\"href\":\"/v2/config")); assertTrue("link not found", response.getContentAsString().contains("\"update\":{\"href\":\"/v2/config")); - verify(userManager, never()).create(SCMContext.ANONYMOUS); } @Test diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryPermissionRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryPermissionRootResourceTest.java index a1b6bd9e36..dcaf72dd56 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryPermissionRootResourceTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryPermissionRootResourceTest.java @@ -2,7 +2,6 @@ package sonia.scm.api.v2.resources; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.github.sdorra.shiro.SubjectAware; import com.google.common.collect.ImmutableList; import com.google.inject.util.Providers; import de.otto.edison.hal.HalRepresentation; @@ -170,7 +169,6 @@ public class RepositoryPermissionRootResourceTest extends RepositoryTestBase { @TestFactory @DisplayName("test endpoints on missing permissions and user is not Admin") - @SubjectAware(username = "trillian") Stream missedPermissionUserForbiddenTestFactory() { when(subject.getPrincipal()).thenReturn("user"); doThrow(AuthorizationException.class).when(repositoryManager).get(any(NamespaceAndName.class)); @@ -184,7 +182,6 @@ public class RepositoryPermissionRootResourceTest extends RepositoryTestBase { @TestFactory @DisplayName("test endpoints on missing permissions and user is not Admin") - @SubjectAware(username = "trillian") Stream missedPermissionAnonymousUnauthorizedTestFactory() { when(subject.getPrincipal()).thenReturn("_anonymous"); doThrow(AuthorizationException.class).when(repositoryManager).get(any(NamespaceAndName.class));