diff --git a/scm-core/src/main/java/sonia/scm/web/JsonEnricherBase.java b/scm-core/src/main/java/sonia/scm/web/JsonEnricherBase.java index b56e67bb10..71fa962964 100644 --- a/scm-core/src/main/java/sonia/scm/web/JsonEnricherBase.java +++ b/scm-core/src/main/java/sonia/scm/web/JsonEnricherBase.java @@ -18,8 +18,8 @@ public abstract class JsonEnricherBase implements JsonEnricher { return mediaType.equals(context.getResponseMediaType().toString()); } - protected JsonNode value(Object gitConfigUrl) { - return objectMapper.convertValue(gitConfigUrl, JsonNode.class); + protected JsonNode value(Object object) { + return objectMapper.convertValue(object, JsonNode.class); } protected ObjectNode createObject() { diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigInIndexResourceTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigInIndexResourceTest.java index 3151d539bf..665be19788 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigInIndexResourceTest.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigInIndexResourceTest.java @@ -14,6 +14,7 @@ import javax.ws.rs.core.MediaType; import java.net.URI; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; @SubjectAware(configuration = "classpath:sonia/scm/configuration/shiro.ini") public class GitConfigInIndexResourceTest { @@ -39,7 +40,6 @@ public class GitConfigInIndexResourceTest { gitConfigInIndexResource.enrich(context); - System.out.println(root); assertEquals("/v2/config/git", root.get("_links").get("gitConfig").get("href").asText()); } @@ -50,7 +50,7 @@ public class GitConfigInIndexResourceTest { gitConfigInIndexResource.enrich(context); - System.out.println(root); + assertFalse(root.get("_links").iterator().hasNext()); } @Test @@ -59,6 +59,6 @@ public class GitConfigInIndexResourceTest { gitConfigInIndexResource.enrich(context); - System.out.println(root); + assertFalse(root.get("_links").iterator().hasNext()); } } diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigInIndexResource.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigInIndexResource.java index 0507987a26..3de79b2f81 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigInIndexResource.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigInIndexResource.java @@ -27,12 +27,12 @@ public class HgConfigInIndexResource extends JsonEnricherBase { @Override public void enrich(JsonEnricherContext context) { if (resultHasMediaType(INDEX, context) && ConfigurationPermissions.list().isPermitted()) { - String gitConfigUrl = new LinkBuilder(scmPathInfoStore.get().get(), HgConfigResource.class) + String hgConfigUrl = new LinkBuilder(scmPathInfoStore.get().get(), HgConfigResource.class) .method("get") .parameters() .href(); - JsonNode hgConfigRefNode = createObject(singletonMap("href", value(gitConfigUrl))); + JsonNode hgConfigRefNode = createObject(singletonMap("href", value(hgConfigUrl))); addPropertyNode(context.getResponseEntity().get("_links"), "hgConfig", hgConfigRefNode); } diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigInIndexResourceTest.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigInIndexResourceTest.java index a2b500e9f6..27ab74932c 100644 --- a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigInIndexResourceTest.java +++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigInIndexResourceTest.java @@ -14,6 +14,7 @@ import javax.ws.rs.core.MediaType; import java.net.URI; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; @SubjectAware(configuration = "classpath:sonia/scm/configuration/shiro.ini") public class HgConfigInIndexResourceTest { @@ -39,7 +40,6 @@ public class HgConfigInIndexResourceTest { hgConfigInIndexResource.enrich(context); - System.out.println(root); assertEquals("/v2/config/hg", root.get("_links").get("hgConfig").get("href").asText()); } @@ -50,7 +50,7 @@ public class HgConfigInIndexResourceTest { hgConfigInIndexResource.enrich(context); - System.out.println(root); + assertFalse(root.get("_links").iterator().hasNext()); } @Test @@ -59,6 +59,6 @@ public class HgConfigInIndexResourceTest { hgConfigInIndexResource.enrich(context); - System.out.println(root); + assertFalse(root.get("_links").iterator().hasNext()); } } diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/api/v2/resources/SvnConfigInIndexResource.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/api/v2/resources/SvnConfigInIndexResource.java index 5f9e4837b1..5ee1de3169 100644 --- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/api/v2/resources/SvnConfigInIndexResource.java +++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/api/v2/resources/SvnConfigInIndexResource.java @@ -27,14 +27,14 @@ public class SvnConfigInIndexResource extends JsonEnricherBase { @Override public void enrich(JsonEnricherContext context) { if (resultHasMediaType(INDEX, context) && ConfigurationPermissions.list().isPermitted()) { - String gitConfigUrl = new LinkBuilder(scmPathInfoStore.get().get(), SvnConfigResource.class) + String svnConfigUrl = new LinkBuilder(scmPathInfoStore.get().get(), SvnConfigResource.class) .method("get") .parameters() .href(); - JsonNode gitConfigRefNode = createObject(singletonMap("href", value(gitConfigUrl))); + JsonNode svnConfigRefNode = createObject(singletonMap("href", value(svnConfigUrl))); - addPropertyNode(context.getResponseEntity().get("_links"), "svnConfig", gitConfigRefNode); + addPropertyNode(context.getResponseEntity().get("_links"), "svnConfig", svnConfigRefNode); } } } diff --git a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/api/v2/resources/SvnConfigInIndexResourceTest.java b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/api/v2/resources/SvnConfigInIndexResourceTest.java index 762d024125..8b87b57c6c 100644 --- a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/api/v2/resources/SvnConfigInIndexResourceTest.java +++ b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/api/v2/resources/SvnConfigInIndexResourceTest.java @@ -14,6 +14,7 @@ import javax.ws.rs.core.MediaType; import java.net.URI; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; @SubjectAware(configuration = "classpath:sonia/scm/configuration/shiro.ini") public class SvnConfigInIndexResourceTest { @@ -39,7 +40,6 @@ public class SvnConfigInIndexResourceTest { svnConfigInIndexResource.enrich(context); - System.out.println(root); assertEquals("/v2/config/svn", root.get("_links").get("svnConfig").get("href").asText()); } @@ -50,7 +50,7 @@ public class SvnConfigInIndexResourceTest { svnConfigInIndexResource.enrich(context); - System.out.println(root); + assertFalse(root.get("_links").iterator().hasNext()); } @Test @@ -59,6 +59,6 @@ public class SvnConfigInIndexResourceTest { svnConfigInIndexResource.enrich(context); - System.out.println(root); + assertFalse(root.get("_links").iterator().hasNext()); } }