From dadfe4a8afca15b78a9bf81c62bc83df288e05f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 4 Mar 2019 08:44:41 +0100
Subject: [PATCH] Fix media type for validation error

---
 .../src/BackendErrorNotification.js           | 33 ++++++++++++-------
 .../v2/ResteasyValidationExceptionMapper.java |  4 +--
 ...cmConstraintValidationExceptionMapper.java |  4 +--
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/scm-ui-components/packages/ui-components/src/BackendErrorNotification.js b/scm-ui-components/packages/ui-components/src/BackendErrorNotification.js
index 0995417e57..4d36495dd3 100644
--- a/scm-ui-components/packages/ui-components/src/BackendErrorNotification.js
+++ b/scm-ui-components/packages/ui-components/src/BackendErrorNotification.js
@@ -46,18 +46,7 @@ class BackendErrorNotification extends React.Component<Props> {
     const { error, t } = this.props;
     return (
       <>
-        <p>
-          <strong>{t("errors.context")}</strong>
-        </p>
-        <ul>
-          {error.context.map((context, index) => {
-            return (
-              <li key={index}>
-                <strong>{context.type}:</strong> {context.id}
-              </li>
-            );
-          })}
-        </ul>
+        {this.renderContext(error)}
         {this.renderMoreInformationLink(error)}
         <div className="level is-size-7">
           <div className="left">
@@ -71,6 +60,26 @@ class BackendErrorNotification extends React.Component<Props> {
     );
   };
 
+  renderContext = (error: BackendError) => {
+    if (error.context) {
+      return <>
+        <p>
+          <strong>{t("errors.context")}</strong>
+        </p>
+        <ul>
+          {error.context.map((context, index) => {
+            return (
+              <li key={index}>
+                <strong>{context.type}:</strong> {context.id}
+              </li>
+            );
+          })}
+        </ul>
+      </>;
+    }
+  };
+
+
   renderMoreInformationLink = (error: BackendError) => {
     const { t } = this.props;
     if (error.url) {
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/ResteasyValidationExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/ResteasyValidationExceptionMapper.java
index 63582e10b8..0b8b44f308 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/ResteasyValidationExceptionMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/ResteasyValidationExceptionMapper.java
@@ -2,9 +2,9 @@ package sonia.scm.api.v2;
 
 import org.jboss.resteasy.api.validation.ResteasyViolationException;
 import sonia.scm.api.v2.resources.ResteasyViolationExceptionToErrorDtoMapper;
+import sonia.scm.web.VndMediaType;
 
 import javax.inject.Inject;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
@@ -23,7 +23,7 @@ public class ResteasyValidationExceptionMapper implements ExceptionMapper<Restea
   public Response toResponse(ResteasyViolationException exception) {
     return Response
       .status(Response.Status.BAD_REQUEST)
-      .type(MediaType.APPLICATION_JSON_TYPE)
+      .type(VndMediaType.ERROR_TYPE)
       .entity(mapper.map(exception))
       .build();
   }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/ScmConstraintValidationExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/ScmConstraintValidationExceptionMapper.java
index 991aeedaeb..17883e41cb 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/ScmConstraintValidationExceptionMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/ScmConstraintValidationExceptionMapper.java
@@ -2,9 +2,9 @@ package sonia.scm.api.v2;
 
 import sonia.scm.ScmConstraintViolationException;
 import sonia.scm.api.v2.resources.ScmViolationExceptionToErrorDtoMapper;
+import sonia.scm.web.VndMediaType;
 
 import javax.inject.Inject;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
@@ -23,7 +23,7 @@ public class ScmConstraintValidationExceptionMapper implements ExceptionMapper<S
   public Response toResponse(ScmConstraintViolationException exception) {
     return Response
       .status(Response.Status.BAD_REQUEST)
-      .type(MediaType.APPLICATION_JSON_TYPE)
+      .type(VndMediaType.ERROR_TYPE)
       .entity(mapper.map(exception))
       .build();
   }