From 675f417d45cba5ce82e037ba36f14031e772c28c Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 11 Dec 2018 15:14:59 +0100 Subject: [PATCH] fix resultHasMediaType for camel case media types --- .../src/main/java/sonia/scm/web/JsonEnricherBase.java | 2 +- .../src/test/java/sonia/scm/web/JsonEnricherBaseTest.java | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) 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 1baecb62af..6bdd321c86 100644 --- a/scm-core/src/main/java/sonia/scm/web/JsonEnricherBase.java +++ b/scm-core/src/main/java/sonia/scm/web/JsonEnricherBase.java @@ -15,7 +15,7 @@ public abstract class JsonEnricherBase implements JsonEnricher { } protected boolean resultHasMediaType(String mediaType, JsonEnricherContext context) { - return mediaType.equals(context.getResponseMediaType().toString()); + return mediaType.equalsIgnoreCase(context.getResponseMediaType().toString()); } protected JsonNode value(Object object) { diff --git a/scm-core/src/test/java/sonia/scm/web/JsonEnricherBaseTest.java b/scm-core/src/test/java/sonia/scm/web/JsonEnricherBaseTest.java index 43ed4940fa..2f53ae8102 100644 --- a/scm-core/src/test/java/sonia/scm/web/JsonEnricherBaseTest.java +++ b/scm-core/src/test/java/sonia/scm/web/JsonEnricherBaseTest.java @@ -23,6 +23,14 @@ public class JsonEnricherBaseTest { assertThat(enricher.resultHasMediaType(MediaType.APPLICATION_XML, context)).isFalse(); } + @Test + public void testResultHasMediaTypeWithCamelCaseMediaType() { + String mediaType = "application/hitchhikersGuideToTheGalaxy"; + JsonEnricherContext context = new JsonEnricherContext(null, MediaType.valueOf(mediaType), null); + + assertThat(enricher.resultHasMediaType(mediaType, context)).isTrue(); + } + @Test public void testAppendLink() { ObjectNode root = objectMapper.createObjectNode();