From 92444fa73be691b700769d8154c62d714df6dde0 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Wed, 28 Jun 2017 22:02:05 +0200
Subject: [PATCH] json before xml

---
 .../api/rest/resources/GitConfigResource.java    |  4 ++--
 .../scm/api/rest/resources/HgConfigResource.java | 16 ++++++++--------
 .../api/rest/resources/SvnConfigResource.java    |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/rest/resources/GitConfigResource.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/rest/resources/GitConfigResource.java
index 4ecc2f07e7..bace7d0b73 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/rest/resources/GitConfigResource.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/rest/resources/GitConfigResource.java
@@ -57,7 +57,7 @@ import javax.ws.rs.core.UriInfo;
  */
 @Singleton
 @Path("config/repositories/git")
-@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
 public class GitConfigResource
 {
 
@@ -108,7 +108,7 @@ public class GitConfigResource
    * @return
    */
   @POST
-  @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
   public Response setConfig(@Context UriInfo uriInfo, GitConfig config)
   {
     repositoryHandler.setConfig(config);
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/rest/resources/HgConfigResource.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/rest/resources/HgConfigResource.java
index 3ef39c163f..6fc4f4e01a 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/rest/resources/HgConfigResource.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/rest/resources/HgConfigResource.java
@@ -109,7 +109,7 @@ public class HgConfigResource
    */
   @POST
   @Path("auto-configuration")
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
   public HgConfig autoConfiguration(@Context UriInfo uriInfo)
   {
     return autoConfiguration(uriInfo, null);
@@ -126,8 +126,8 @@ public class HgConfigResource
    */
   @POST
   @Path("auto-configuration")
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-  @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+  @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
   public HgConfig autoConfiguration(@Context UriInfo uriInfo, HgConfig config)
   {
     if (config == null)
@@ -185,7 +185,7 @@ public class HgConfigResource
    * @return
    */
   @GET
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
   public HgConfig getConfig()
   {
     HgConfig config = handler.getConfig();
@@ -206,7 +206,7 @@ public class HgConfigResource
    */
   @GET
   @Path("installations/hg")
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
   public InstallationsResponse getHgInstallations()
   {
     List<String> installations =
@@ -223,7 +223,7 @@ public class HgConfigResource
    */
   @GET
   @Path("packages")
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
   public HgPackages getPackages()
   {
     return pkgReader.getPackages();
@@ -237,7 +237,7 @@ public class HgConfigResource
    */
   @GET
   @Path("installations/python")
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
   public InstallationsResponse getPythonInstallations()
   {
     List<String> installations =
@@ -260,7 +260,7 @@ public class HgConfigResource
    * @throws IOException
    */
   @POST
-  @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML  })
   public Response setConfig(@Context UriInfo uriInfo, HgConfig config)
     throws IOException
   {
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/api/rest/resources/SvnConfigResource.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/api/rest/resources/SvnConfigResource.java
index cf824bcb46..a1266ab4a4 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/api/rest/resources/SvnConfigResource.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/api/rest/resources/SvnConfigResource.java
@@ -58,7 +58,7 @@ import javax.ws.rs.core.UriInfo;
  */
 @Singleton
 @Path("config/repositories/svn")
-@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
 public class SvnConfigResource
 {
 
@@ -109,7 +109,7 @@ public class SvnConfigResource
    * @return
    */
   @POST
-  @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
   public Response setConfig(@Context UriInfo uriInfo, SvnConfig config)
   {
     repositoryHandler.setConfig(config);