From f20865c6584dd8abbfe15010d8caa29b2fccf981 Mon Sep 17 00:00:00 2001 From: Johannes Schnatterer Date: Thu, 2 Aug 2018 11:56:06 +0200 Subject: [PATCH] HgPlugin Config: Minor corrections --- .../java/sonia/scm/api/v2/resources/HgConfigResource.java | 6 +++--- .../sonia/scm/{repository => web}/HgVndMediaType.java | 2 +- .../sonia/scm/api/v2/resources/HgConfigResourceTest.java | 8 ++++---- .../api/v2/resources/HgConfigToHgConfigDtoMapperTest.java | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) rename scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/{repository => web}/HgVndMediaType.java (84%) diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigResource.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigResource.java index e35b380703..36838507ea 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigResource.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigResource.java @@ -6,7 +6,7 @@ import com.webcohesion.enunciate.metadata.rs.TypeHint; import sonia.scm.config.ConfigurationPermissions; import sonia.scm.repository.HgConfig; import sonia.scm.repository.HgRepositoryHandler; -import sonia.scm.repository.HgVndMediaType; +import sonia.scm.web.HgVndMediaType; import javax.inject.Inject; import javax.ws.rs.Consumes; @@ -21,10 +21,10 @@ import javax.ws.rs.core.UriInfo; /** * RESTful Web Service Resource to manage the configuration of the hg plugin. */ -@Path(HgConfigResource.GIT_CONFIG_PATH_V2) +@Path(HgConfigResource.HG_CONFIG_PATH_V2) public class HgConfigResource { - static final String GIT_CONFIG_PATH_V2 = "v2/config/hg"; + static final String HG_CONFIG_PATH_V2 = "v2/config/hg"; private final HgConfigDtoToHgConfigMapper dtoToConfigMapper; private final HgConfigToHgConfigDtoMapper configToDtoMapper; private final HgRepositoryHandler repositoryHandler; diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgVndMediaType.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgVndMediaType.java similarity index 84% rename from scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgVndMediaType.java rename to scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgVndMediaType.java index 003b2744af..b3c5e1f00d 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgVndMediaType.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgVndMediaType.java @@ -1,4 +1,4 @@ -package sonia.scm.repository; +package sonia.scm.web; import sonia.scm.web.VndMediaType; diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigResourceTest.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigResourceTest.java index a0e15c9fee..f260a9f6d1 100644 --- a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigResourceTest.java +++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigResourceTest.java @@ -19,7 +19,7 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import sonia.scm.repository.HgConfig; import sonia.scm.repository.HgRepositoryHandler; -import sonia.scm.repository.HgVndMediaType; +import sonia.scm.web.HgVndMediaType; import javax.servlet.http.HttpServletResponse; import java.io.File; @@ -124,21 +124,21 @@ public class HgConfigResourceTest { @Test @SubjectAware(username = "readOnly") - public void shouldUpdateConfigOnlyWhenAuthorized() throws URISyntaxException, IOException { + public void shouldUpdateConfigOnlyWhenAuthorized() throws URISyntaxException { thrown.expectMessage("Subject does not have permission [configuration:write:hg]"); put(); } private MockHttpResponse get() throws URISyntaxException { - MockHttpRequest request = MockHttpRequest.get("/" + HgConfigResource.GIT_CONFIG_PATH_V2); + MockHttpRequest request = MockHttpRequest.get("/" + HgConfigResource.HG_CONFIG_PATH_V2); MockHttpResponse response = new MockHttpResponse(); dispatcher.invoke(request, response); return response; } private MockHttpResponse put() throws URISyntaxException { - MockHttpRequest request = MockHttpRequest.put("/" + HgConfigResource.GIT_CONFIG_PATH_V2) + MockHttpRequest request = MockHttpRequest.put("/" + HgConfigResource.HG_CONFIG_PATH_V2) .contentType(HgVndMediaType.HG_CONFIG) .content("{\"disabled\":true}".getBytes()); diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigToHgConfigDtoMapperTest.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigToHgConfigDtoMapperTest.java index 7033ce966a..4c61874870 100644 --- a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigToHgConfigDtoMapperTest.java +++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigToHgConfigDtoMapperTest.java @@ -42,7 +42,7 @@ public class HgConfigToHgConfigDtoMapperTest { @Before public void init() { when(uriInfoStore.get().getBaseUri()).thenReturn(baseUri); - expectedBaseUri = baseUri.resolve(HgConfigResource.GIT_CONFIG_PATH_V2); + expectedBaseUri = baseUri.resolve(HgConfigResource.HG_CONFIG_PATH_V2); subjectThreadState.bind(); ThreadContext.bind(subject); }