SONAR-6947 Move and rename MimeTypes to sonar-ws package

33 files changed, 100 insertions, 225 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java
index 13c7022dc3e..c44f5ba1952 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java
@@ -33,7 +33,7 @@ import org.sonar.db.metric.MetricDto;
 import org.sonar.db.property.PropertiesDao;
 import org.sonar.db.property.PropertyDto;
 import org.sonar.server.exceptions.ForbiddenException;
-import org.sonar.server.plugins.MimeTypes;
+import org.sonarqube.ws.MediaTypes;
 import org.sonar.server.user.UserSession;
 
 public class GlobalAction implements BatchWsAction {
@@ -72,7 +72,7 @@ public class GlobalAction implements BatchWsAction {
       addMetrics(ref, session);
       addSettings(ref, hasScanPerm, hasPreviewPerm, session);
 
-      response.stream().setMediaType(MimeTypes.JSON);
+      response.stream().setMediaType(MediaTypes.JSON);
       IOUtils.write(ref.toJson(), response.stream().output());
     } finally {
       MyBatis.closeQuietly(session);
diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java
index f829c62a033..e580c50406c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java
@@ -38,7 +38,7 @@ import org.sonar.db.component.ComponentDto;
 import org.sonar.server.component.ComponentFinder;
 import org.sonar.server.issue.index.IssueDoc;
 import org.sonar.server.issue.index.IssueIndex;
-import org.sonar.server.plugins.MimeTypes;
+import org.sonarqube.ws.MediaTypes;
 import org.sonar.server.user.UserSession;
 
 import static com.google.common.collect.Maps.newHashMap;
@@ -80,7 +80,7 @@ public class IssuesAction implements BatchWsAction {
     userSession.checkGlobalPermission(GlobalPermissions.PREVIEW_EXECUTION);
     final String moduleKey = request.mandatoryParam(PARAM_KEY);
 
-    response.stream().setMediaType(MimeTypes.PROTOBUF);
+    response.stream().setMediaType(MediaTypes.PROTOBUF);
     DbSession session = dbClient.openSession(false);
     try {
       ComponentDto component = componentFinder.getByKey(session, moduleKey);
diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/UsersAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/UsersAction.java
index ad3e1c53114..52bd0be4111 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/batch/UsersAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/batch/UsersAction.java
@@ -29,7 +29,7 @@ import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.batch.protocol.input.BatchInput;
 import org.sonar.core.permission.GlobalPermissions;
-import org.sonar.server.plugins.MimeTypes;
+import org.sonarqube.ws.MediaTypes;
 import org.sonar.server.user.UserSession;
 import org.sonar.server.user.index.UserDoc;
 import org.sonar.server.user.index.UserIndex;
@@ -67,7 +67,7 @@ public class UsersAction implements BatchWsAction {
     userSession.checkGlobalPermission(GlobalPermissions.PREVIEW_EXECUTION);
     List<String> logins = request.mandatoryParamAsStrings(PARAM_LOGINS);
 
-    response.stream().setMediaType(MimeTypes.PROTOBUF);
+    response.stream().setMediaType(MediaTypes.PROTOBUF);
     BatchInput.User.Builder userBuilder = BatchInput.User.newBuilder();
     OutputStream output = response.stream().output();
     try {
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/LogsWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/computation/ws/LogsWsAction.java
index 7c9b2bd4d72..36d1c29782e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/LogsWsAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/ws/LogsWsAction.java
@@ -35,7 +35,7 @@ import org.sonar.db.ce.CeQueueDto;
 import org.sonar.server.computation.log.CeLogging;
 import org.sonar.server.computation.log.LogFileRef;
 import org.sonar.server.exceptions.NotFoundException;
-import org.sonar.server.plugins.MimeTypes;
+import org.sonarqube.ws.MediaTypes;
 import org.sonar.server.user.UserSession;
 
 import static java.lang.String.format;
@@ -107,7 +107,7 @@ public class LogsWsAction implements CeWsAction {
   private static void writeFile(File file, Response wsResponse) {
     try {
       Response.Stream stream = wsResponse.stream();
-      stream.setMediaType(MimeTypes.TXT);
+      stream.setMediaType(MediaTypes.TXT);
       FileUtils.copyFile(file, stream.output());
     } catch (IOException e) {
       throw new IllegalStateException("Fail to copy compute engine log file to HTTP response: " + file.getAbsolutePath(), e);
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/LogsAction.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/LogsAction.java
index 6539c0870c2..50245406122 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/LogsAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/LogsAction.java
@@ -26,7 +26,7 @@ import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.api.web.UserRole;
 import org.sonar.server.platform.ServerLogging;
-import org.sonar.server.plugins.MimeTypes;
+import org.sonarqube.ws.MediaTypes;
 import org.sonar.server.user.UserSession;
 
 public class LogsAction implements SystemWsAction {
@@ -51,7 +51,7 @@ public class LogsAction implements SystemWsAction {
   @Override
   public void handle(Request wsRequest, Response wsResponse) throws Exception {
     userSession.checkGlobalPermission(UserRole.ADMIN);
-    wsResponse.stream().setMediaType(MimeTypes.TXT);
+    wsResponse.stream().setMediaType(MediaTypes.TXT);
     File file = serverLogging.getCurrentLogFile();
     if (file.exists()) {
       FileUtils.copyFile(file, wsResponse.stream().output());
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/MimeTypes.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/MimeTypes.java
deleted file mode 100644
index 782a589bfcb..00000000000
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/MimeTypes.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * SonarQube is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * SonarQube is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.sonar.server.plugins;
-
-import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableMap;
-import org.apache.commons.io.FilenameUtils;
-
-import java.util.Locale;
-import java.util.Map;
-
-/**
- * @since 3.1
- */
-public final class MimeTypes {
-
-  public static final String JSON = "application/json";
-  public static final String XML = "application/xml";
-  public static final String TXT = "text/plain";
-  public static final String PROTOBUF = "application/x-protobuf";
-  public static final String DEFAULT = "application/octet-stream";
-
-  private static final Map<String, String> MAP = new ImmutableMap.Builder<String, String>()
-    .put("json", JSON)
-    .put("zip", "application/zip")
-    .put("tgz", "application/tgz")
-    .put("ps", "application/postscript")
-    .put("jnlp", "application/jnlp")
-    .put("jar", "application/java-archive")
-    .put("xls", "application/vnd.ms-excel")
-    .put("ppt", "application/vnd.ms-powerpoint")
-    .put("tar", "application/x-tar")
-    .put("xml", XML)
-    .put("dtd", "application/xml-dtd")
-    .put("xslt", "application/xslt+xml")
-    .put("bmp", "image/bmp")
-    .put("gif", "image/gif")
-    .put("jpg", "image/jpeg")
-    .put("jpeg", "image/jpeg")
-    .put("tiff", "image/tiff")
-    .put("png", "image/png")
-    .put("svg", "image/svg+xml")
-    .put("ico", "image/x-icon")
-    .put("txt", TXT)
-    .put("csv", "text/csv")
-    .put("properties", "text/plain")
-    .put("rtf", "text/rtf")
-    .put("html", "text/html")
-    .put("css", "text/css")
-    .put("tsv", "text/tab-separated-values")
-    .build();
-
-  private MimeTypes() {
-    // only static methods
-  }
-
-  public static String getByFilename(String filename) {
-    String extension = FilenameUtils.getExtension(filename);
-    String mime = null;
-    if (!Strings.isNullOrEmpty(extension)) {
-      mime = MAP.get(extension.toLowerCase(Locale.ENGLISH));
-    }
-    return mime != null ? mime : DEFAULT;
-  }
-}
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/StaticResourcesServlet.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/StaticResourcesServlet.java
index 3208faf78d6..0413d602828 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/StaticResourcesServlet.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/plugins/StaticResourcesServlet.java
@@ -35,6 +35,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import org.sonarqube.ws.MediaTypes;
 
 public class StaticResourcesServlet extends HttpServlet {
 
@@ -92,6 +93,6 @@ public class StaticResourcesServlet extends HttpServlet {
 
   @VisibleForTesting
   void completeContentType(HttpServletResponse response, String filename) {
-    response.setContentType(MimeTypes.getByFilename(filename));
+    response.setContentType(MediaTypes.getByFilename(filename));
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BackupAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BackupAction.java
index 40720fac50e..3614d3a3be6 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BackupAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BackupAction.java
@@ -30,7 +30,7 @@ import org.sonar.api.server.ws.WebService;
 import org.sonar.api.server.ws.WebService.NewAction;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
-import org.sonar.server.plugins.MimeTypes;
+import org.sonarqube.ws.MediaTypes;
 import org.sonar.server.qualityprofile.QProfileBackuper;
 import org.sonar.server.qualityprofile.QProfileFactory;
 
@@ -65,7 +65,7 @@ public class BackupAction implements QProfileWsAction {
   @Override
   public void handle(Request request, Response response) throws Exception {
     Stream stream = response.stream();
-    stream.setMediaType(MimeTypes.XML);
+    stream.setMediaType(MediaTypes.XML);
     OutputStreamWriter writer = new OutputStreamWriter(stream.output(), StandardCharsets.UTF_8);
     DbSession dbSession = dbClient.openSession(false);
     try {
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java
index 0a40d32a3fd..28f096e8d3a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java
@@ -32,7 +32,7 @@ import org.sonar.core.permission.GlobalPermissions;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.qualityprofile.QualityProfileDto;
-import org.sonar.server.plugins.MimeTypes;
+import org.sonarqube.ws.MediaTypes;
 import org.sonar.server.qualityprofile.QProfileExporters;
 import org.sonar.server.qualityprofile.QProfileFactory;
 import org.sonar.server.qualityprofile.QProfileName;
@@ -134,7 +134,7 @@ public class CreateAction implements QProfileWsAction {
       // This will be fixed in 5.3 when support of IE9/10 will be dropped in order to use
       // more recent JS libs.
       // We detect that caller is IE because it asks for application/html or text/html
-      return MimeTypes.TXT;
+      return MediaTypes.TXT;
     }
     return request.getMediaType();
   }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java
index 9c232d39295..da8f1393c55 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java
@@ -38,7 +38,7 @@ import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.qualityprofile.QualityProfileDto;
 import org.sonar.server.exceptions.NotFoundException;
-import org.sonar.server.plugins.MimeTypes;
+import org.sonarqube.ws.MediaTypes;
 import org.sonar.server.qualityprofile.QProfileBackuper;
 import org.sonar.server.qualityprofile.QProfileExporters;
 import org.sonar.server.qualityprofile.QProfileFactory;
@@ -126,7 +126,7 @@ public class ExportAction implements QProfileWsAction {
 
       String profileKey = profile.getKey();
       if (format == null) {
-        stream.setMediaType(MimeTypes.XML);
+        stream.setMediaType(MediaTypes.XML);
         backuper.backup(profileKey, writer);
       } else {
         stream.setMediaType(exporters.mimeType(format));
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ListAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ListAction.java
index bca5b6fa86b..bcc681c8000 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ListAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ListAction.java
@@ -27,7 +27,7 @@ import org.sonar.api.server.ws.WebService;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.rule.RuleDto;
-import org.sonar.server.plugins.MimeTypes;
+import org.sonarqube.ws.MediaTypes;
 import org.sonarqube.ws.Rules.ListResponse;
 
 import static com.google.common.base.Strings.nullToEmpty;
@@ -75,7 +75,7 @@ public class ListAction implements RulesWsAction {
     }
 
     // JSON response is voluntarily not supported. This WS is for internal use.
-    wsResponse.stream().setMediaType(MimeTypes.PROTOBUF);
+    wsResponse.stream().setMediaType(MediaTypes.PROTOBUF);
     listResponseBuilder.build().writeTo(wsResponse.stream().output());
   }
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/ServletRequest.java b/server/sonar-server/src/main/java/org/sonar/server/ws/ServletRequest.java
index 4ae04e47905..679d3ec0856 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ws/ServletRequest.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ws/ServletRequest.java
@@ -27,7 +27,7 @@ import javax.annotation.CheckForNull;
 import javax.servlet.http.HttpServletRequest;
 import org.jruby.RubyFile;
 import org.sonar.api.server.ws.internal.ValidatingRequest;
-import org.sonar.server.plugins.MimeTypes;
+import org.sonarqube.ws.MediaTypes;
 
 import static com.google.common.base.Objects.firstNonNull;
 
@@ -36,9 +36,9 @@ public class ServletRequest extends ValidatingRequest {
   private final HttpServletRequest source;
   private final Map<String, Object> params;
   private static final Map<String, String> SUPPORTED_FORMATS = ImmutableMap.of(
-    "JSON", MimeTypes.JSON,
-    "PROTOBUF", MimeTypes.PROTOBUF,
-    "TEXT", MimeTypes.TXT);
+    "JSON", MediaTypes.JSON,
+    "PROTOBUF", MediaTypes.PROTOBUF,
+    "TEXT", MediaTypes.TXT);
 
   public ServletRequest(HttpServletRequest source, Map<String, Object> params) {
     this.source = source;
@@ -56,7 +56,7 @@ public class ServletRequest extends ValidatingRequest {
       mediaTypeFromUrl(source.getRequestURI()),
       firstNonNull(
         acceptedContentTypeInResponse(),
-        MimeTypes.DEFAULT));
+        MediaTypes.DEFAULT));
   }
 
   @Override
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/ServletResponse.java b/server/sonar-server/src/main/java/org/sonar/server/ws/ServletResponse.java
index b08c0a6dd85..c5c456630b3 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ws/ServletResponse.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ws/ServletResponse.java
@@ -30,7 +30,7 @@ import javax.annotation.CheckForNull;
 import org.sonar.api.server.ws.Response;
 import org.sonar.api.utils.text.JsonWriter;
 import org.sonar.api.utils.text.XmlWriter;
-import org.sonar.server.plugins.MimeTypes;
+import org.sonarqube.ws.MediaTypes;
 
 public class ServletResponse implements Response {
 
@@ -81,13 +81,13 @@ public class ServletResponse implements Response {
 
   @Override
   public JsonWriter newJsonWriter() {
-    stream.setMediaType(MimeTypes.JSON);
+    stream.setMediaType(MediaTypes.JSON);
     return JsonWriter.of(new OutputStreamWriter(stream.output(), StandardCharsets.UTF_8));
   }
 
   @Override
   public XmlWriter newXmlWriter() {
-    stream.setMediaType(MimeTypes.XML);
+    stream.setMediaType(MediaTypes.XML);
     return XmlWriter.of(new OutputStreamWriter(stream.output(), StandardCharsets.UTF_8));
   }
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java b/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java
index 038de3a04dd..d5615926d51 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java
@@ -33,8 +33,8 @@ import org.sonar.server.exceptions.BadRequestException;
 import org.sonar.server.exceptions.Errors;
 import org.sonar.server.exceptions.Message;
 import org.sonar.server.exceptions.ServerException;
-import org.sonar.server.plugins.MimeTypes;
 import org.sonar.server.user.UserSession;
+import org.sonarqube.ws.MediaTypes;
 
 import static java.lang.String.format;
 import static org.sonar.server.ws.RequestVerifier.verifyRequest;
@@ -116,7 +116,7 @@ public class WebServiceEngine implements Startable {
     ServletResponse.ServletStream stream = response.stream();
     stream.reset();
     stream.setStatus(status);
-    stream.setMediaType(MimeTypes.JSON);
+    stream.setMediaType(MediaTypes.JSON);
     JsonWriter json = JsonWriter.of(new OutputStreamWriter(stream.output(), StandardCharsets.UTF_8));
 
     try {
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/WsUtils.java b/server/sonar-server/src/main/java/org/sonar/server/ws/WsUtils.java
index 0e0c9c1e515..b0a275f92bc 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ws/WsUtils.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ws/WsUtils.java
@@ -31,7 +31,7 @@ import org.sonar.api.utils.text.JsonWriter;
 import org.sonar.core.util.ProtobufJsonFormat;
 import org.sonar.server.exceptions.BadRequestException;
 import org.sonar.server.exceptions.NotFoundException;
-import org.sonar.server.plugins.MimeTypes;
+import org.sonarqube.ws.MediaTypes;
 
 import static java.lang.String.format;
 
@@ -44,11 +44,11 @@ public class WsUtils {
   public static void writeProtobuf(Message msg, Request request, Response response) throws Exception {
     OutputStream output = response.stream().output();
     try {
-      if (request.getMediaType().equals(MimeTypes.PROTOBUF)) {
-        response.stream().setMediaType(MimeTypes.PROTOBUF);
+      if (request.getMediaType().equals(MediaTypes.PROTOBUF)) {
+        response.stream().setMediaType(MediaTypes.PROTOBUF);
         msg.writeTo(output);
       } else {
-        response.stream().setMediaType(MimeTypes.JSON);
+        response.stream().setMediaType(MediaTypes.JSON);
         try (OutputStreamWriter writer = new OutputStreamWriter(output)) {
           ProtobufJsonFormat.write(msg, JsonWriter.of(writer));
         }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java
index 00a02a1f176..d72da18b211 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java
@@ -41,7 +41,7 @@ import org.sonar.server.exceptions.BadRequestException;
 import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.exceptions.UnauthorizedException;
 import org.sonar.server.i18n.I18nRule;
-import org.sonar.server.plugins.MimeTypes;
+import org.sonarqube.ws.MediaTypes;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.TestRequest;
 import org.sonar.server.ws.WsActionTester;
@@ -109,7 +109,7 @@ public class SearchActionTest {
     db.commit();
 
     String response = newRequest(Qualifiers.PROJECT, Qualifiers.MODULE, Qualifiers.DIRECTORY, Qualifiers.FILE)
-      .setMediaType(MimeTypes.JSON)
+      .setMediaType(MediaTypes.JSON)
       .execute()
       .getInput();
 
@@ -177,7 +177,7 @@ public class SearchActionTest {
 
   private TestRequest newRequest(String... qualifiers) {
     return ws.newRequest()
-      .setMediaType(MimeTypes.PROTOBUF)
+      .setMediaType(MediaTypes.PROTOBUF)
       .setParam(PARAM_QUALIFIERS, Joiner.on(",").join(qualifiers));
   }
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/ActivityWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/ActivityWsActionTest.java
index 18f0f550ca1..8f981cb856e 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/ActivityWsActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/ActivityWsActionTest.java
@@ -40,7 +40,7 @@ import org.sonar.db.component.ComponentDbTester;
 import org.sonar.server.computation.log.CeLogging;
 import org.sonar.server.computation.log.LogFileRef;
 import org.sonar.server.exceptions.BadRequestException;
-import org.sonar.server.plugins.MimeTypes;
+import org.sonarqube.ws.MediaTypes;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.TestResponse;
 import org.sonar.server.ws.WsActionTester;
@@ -84,7 +84,7 @@ public class ActivityWsActionTest {
     insert("T2", "PROJECT_2", CeActivityDto.Status.FAILED);
 
     TestResponse wsResponse = tester.newRequest()
-      .setMediaType(MimeTypes.PROTOBUF)
+      .setMediaType(MediaTypes.PROTOBUF)
       .execute();
 
     // verify the protobuf response
@@ -111,7 +111,7 @@ public class ActivityWsActionTest {
 
     TestResponse wsResponse = tester.newRequest()
       .setParam("status", "FAILED")
-      .setMediaType(MimeTypes.PROTOBUF)
+      .setMediaType(MediaTypes.PROTOBUF)
       .execute();
 
     WsCe.ActivityResponse activityResponse = Protobuf.read(wsResponse.getInputStream(), WsCe.ActivityResponse.PARSER);
@@ -128,7 +128,7 @@ public class ActivityWsActionTest {
 
     TestResponse wsResponse = tester.newRequest()
       .setParam("onlyCurrents", "true")
-      .setMediaType(MimeTypes.PROTOBUF)
+      .setMediaType(MediaTypes.PROTOBUF)
       .execute();
 
     WsCe.ActivityResponse activityResponse = Protobuf.read(wsResponse.getInputStream(), WsCe.ActivityResponse.PARSER);
@@ -150,7 +150,7 @@ public class ActivityWsActionTest {
 
   private void assertPage(int pageIndex, int pageSize, int expectedTotal, List<String> expectedOrderedTaskIds) {
     TestResponse wsResponse = tester.newRequest()
-      .setMediaType(MimeTypes.PROTOBUF)
+      .setMediaType(MediaTypes.PROTOBUF)
       .setParam(WebService.Param.PAGE, Integer.toString(pageIndex))
       .setParam(WebService.Param.PAGE_SIZE, Integer.toString(pageSize))
       .execute();
@@ -176,7 +176,7 @@ public class ActivityWsActionTest {
 
     TestResponse wsResponse = tester.newRequest()
       .setParam("componentId", "PROJECT_1")
-      .setMediaType(MimeTypes.PROTOBUF)
+      .setMediaType(MediaTypes.PROTOBUF)
       .execute();
 
     WsCe.ActivityResponse activityResponse = Protobuf.read(wsResponse.getInputStream(), WsCe.ActivityResponse.PARSER);
@@ -200,7 +200,7 @@ public class ActivityWsActionTest {
 
     TestResponse wsResponse = tester.newRequest()
       .setParam("componentQuery", "apac")
-      .setMediaType(MimeTypes.PROTOBUF)
+      .setMediaType(MediaTypes.PROTOBUF)
       .execute();
 
     WsCe.ActivityResponse activityResponse = WsCe.ActivityResponse.parseFrom(wsResponse.getInputStream());
@@ -215,7 +215,7 @@ public class ActivityWsActionTest {
     tester.newRequest()
       .setParam("componentId", "ID1")
       .setParam("componentQuery", "apache")
-      .setMediaType(MimeTypes.PROTOBUF)
+      .setMediaType(MediaTypes.PROTOBUF)
       .execute();
   }
 
@@ -223,7 +223,7 @@ public class ActivityWsActionTest {
   public void support_json_response() {
     userSession.setGlobalPermissions(UserRole.ADMIN);
     TestResponse wsResponse = tester.newRequest()
-      .setMediaType(MimeTypes.JSON)
+      .setMediaType(MediaTypes.JSON)
       .execute();
 
     JsonAssert.assertJson(wsResponse.getInput()).isSimilarTo("{\"tasks\":[]}");
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/ComponentWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/ComponentWsActionTest.java
index 025c03ba1a8..8d2908d1460 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/ComponentWsActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/ComponentWsActionTest.java
@@ -33,7 +33,7 @@ import org.sonar.db.ce.CeQueueDto;
 import org.sonar.db.ce.CeTaskTypes;
 import org.sonar.server.computation.log.CeLogging;
 import org.sonar.server.computation.log.LogFileRef;
-import org.sonar.server.plugins.MimeTypes;
+import org.sonarqube.ws.MediaTypes;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.TestResponse;
 import org.sonar.server.ws.WsActionTester;
@@ -68,7 +68,7 @@ public class ComponentWsActionTest {
 
     TestResponse wsResponse = tester.newRequest()
       .setParam("componentId", "PROJECT_1")
-      .setMediaType(MimeTypes.PROTOBUF)
+      .setMediaType(MediaTypes.PROTOBUF)
       .execute();
 
     WsCe.ProjectResponse response = Protobuf.read(wsResponse.getInputStream(), WsCe.ProjectResponse.PARSER);
@@ -87,7 +87,7 @@ public class ComponentWsActionTest {
 
     TestResponse wsResponse = tester.newRequest()
       .setParam("componentId", "PROJECT_1")
-      .setMediaType(MimeTypes.PROTOBUF)
+      .setMediaType(MediaTypes.PROTOBUF)
       .execute();
 
     WsCe.ProjectResponse response = Protobuf.read(wsResponse.getInputStream(), WsCe.ProjectResponse.PARSER);
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/LogsWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/LogsWsActionTest.java
index 68148743387..44f0a0853a6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/LogsWsActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/LogsWsActionTest.java
@@ -36,7 +36,7 @@ import org.sonar.server.computation.log.CeLogging;
 import org.sonar.server.computation.log.LogFileRef;
 import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.exceptions.NotFoundException;
-import org.sonar.server.plugins.MimeTypes;
+import org.sonarqube.ws.MediaTypes;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.TestResponse;
 import org.sonar.server.ws.WsActionTester;
@@ -74,7 +74,7 @@ public class LogsWsActionTest {
       .setParam("taskId", "TASK_1")
       .execute();
 
-    assertThat(response.getMediaType()).isEqualTo(MimeTypes.TXT);
+    assertThat(response.getMediaType()).isEqualTo(MediaTypes.TXT);
     assertThat(response.getInput()).isEqualTo("{logs}");
   }
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/QueueWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/QueueWsActionTest.java
index 888d9d9937e..5709e7acda0 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/QueueWsActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/QueueWsActionTest.java
@@ -33,7 +33,7 @@ import org.sonar.db.ce.CeTaskTypes;
 import org.sonar.server.computation.log.CeLogging;
 import org.sonar.server.computation.log.LogFileRef;
 import org.sonar.server.exceptions.ForbiddenException;
-import org.sonar.server.plugins.MimeTypes;
+import org.sonarqube.ws.MediaTypes;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.TestResponse;
 import org.sonar.server.ws.WsActionTester;
@@ -69,7 +69,7 @@ public class QueueWsActionTest {
     insert("T2", "PROJECT_2", CeQueueDto.Status.IN_PROGRESS);
 
     TestResponse wsResponse = tester.newRequest()
-      .setMediaType(MimeTypes.PROTOBUF)
+      .setMediaType(MediaTypes.PROTOBUF)
       .execute();
 
     // verify the protobuf response
@@ -92,7 +92,7 @@ public class QueueWsActionTest {
 
     TestResponse wsResponse = tester.newRequest()
       .setParam("componentId", "PROJECT_1")
-      .setMediaType(MimeTypes.PROTOBUF)
+      .setMediaType(MediaTypes.PROTOBUF)
       .execute();
 
     // verify the protobuf response
@@ -104,7 +104,7 @@ public class QueueWsActionTest {
   @Test(expected = ForbiddenException.class)
   public void requires_admin_permission() {
     tester.newRequest()
-      .setMediaType(MimeTypes.PROTOBUF)
+      .setMediaType(MediaTypes.PROTOBUF)
       .execute();
   }
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/SubmitWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/SubmitWsActionTest.java
index bd1d9cfc9f5..4a076a5f124 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/SubmitWsActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/SubmitWsActionTest.java
@@ -26,7 +26,7 @@ import org.sonar.core.util.Protobuf;
 import org.sonar.db.ce.CeTaskTypes;
 import org.sonar.server.computation.queue.CeTask;
 import org.sonar.server.computation.queue.report.ReportSubmitter;
-import org.sonar.server.plugins.MimeTypes;
+import org.sonarqube.ws.MediaTypes;
 import org.sonar.server.ws.TestResponse;
 import org.sonar.server.ws.WsActionTester;
 import org.sonar.test.JsonAssert;
@@ -54,7 +54,7 @@ public class SubmitWsActionTest {
       .setParam("projectKey", "my_project")
       .setParam("projectName", "My Project")
       .setParam("report", "{binary}")
-      .setMediaType(MimeTypes.PROTOBUF)
+      .setMediaType(MediaTypes.PROTOBUF)
       .setMethod("POST")
       .execute();
 
@@ -74,7 +74,7 @@ public class SubmitWsActionTest {
       .setParam("projectKey", "my_project")
       .setParam("projectName", "My Project")
       .setParam("report", "{binary}")
-      .setMediaType(MimeTypes.JSON)
+      .setMediaType(MediaTypes.JSON)
       .setMethod("POST")
       .execute();
 
@@ -92,7 +92,7 @@ public class SubmitWsActionTest {
     tester.newRequest()
       .setParam("projectKey", "my_project")
       .setParam("report", "{binary}")
-      .setMediaType(MimeTypes.PROTOBUF)
+      .setMediaType(MediaTypes.PROTOBUF)
       .setMethod("POST")
       .execute();
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/TaskWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/TaskWsActionTest.java
index d23fc4cd697..c43a24096ee 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/TaskWsActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/TaskWsActionTest.java
@@ -36,7 +36,7 @@ import org.sonar.db.component.ComponentTesting;
 import org.sonar.server.computation.log.CeLogging;
 import org.sonar.server.computation.log.LogFileRef;
 import org.sonar.server.exceptions.NotFoundException;
-import org.sonar.server.plugins.MimeTypes;
+import org.sonarqube.ws.MediaTypes;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.TestResponse;
 import org.sonar.server.ws.WsActionTester;
@@ -83,7 +83,7 @@ public class TaskWsActionTest {
     dbTester.commit();
 
     TestResponse wsResponse = tester.newRequest()
-      .setMediaType(MimeTypes.PROTOBUF)
+      .setMediaType(MediaTypes.PROTOBUF)
       .setParam("id", "TASK_1")
       .execute();
 
@@ -116,7 +116,7 @@ public class TaskWsActionTest {
     dbTester.commit();
 
     TestResponse wsResponse = tester.newRequest()
-      .setMediaType(MimeTypes.PROTOBUF)
+      .setMediaType(MediaTypes.PROTOBUF)
       .setParam("id", "TASK_1")
       .execute();
 
@@ -150,7 +150,7 @@ public class TaskWsActionTest {
 
     userSession.setGlobalPermissions(UserRole.ADMIN);
     TestResponse wsResponse = tester.newRequest()
-      .setMediaType(MimeTypes.JSON)
+      .setMediaType(MediaTypes.JSON)
       .setParam("id", "TASK_1")
       .execute();
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java
index 57ad3a5a90c..de9f5cd61d7 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java
@@ -46,7 +46,7 @@ import org.sonar.server.issue.filter.IssueFilterParameters;
 import org.sonar.server.issue.index.IssueIndexer;
 import org.sonar.server.permission.PermissionChange;
 import org.sonar.server.permission.PermissionUpdater;
-import org.sonar.server.plugins.MimeTypes;
+import org.sonarqube.ws.MediaTypes;
 import org.sonar.server.rule.db.RuleDao;
 import org.sonar.server.tester.ServerTester;
 import org.sonar.server.tester.UserSessionRule;
@@ -132,7 +132,7 @@ public class SearchActionComponentsMediumTest {
 
     WsActionTester actionTester = new WsActionTester(tester.get(SearchAction.class));
     TestResponse response = actionTester.newRequest()
-      .setMediaType(MimeTypes.PROTOBUF)
+      .setMediaType(MediaTypes.PROTOBUF)
       .execute();
     Issues.Search searchResponse = Issues.Search.parseFrom(response.getInputStream());
     assertThat(searchResponse.getIssuesCount()).isEqualTo(2);
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/TemplateGroupsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/TemplateGroupsActionTest.java
index 29e886af50f..4c59eac6fb0 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/TemplateGroupsActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/TemplateGroupsActionTest.java
@@ -46,7 +46,7 @@ import org.sonar.server.exceptions.BadRequestException;
 import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.exceptions.UnauthorizedException;
-import org.sonar.server.plugins.MimeTypes;
+import org.sonarqube.ws.MediaTypes;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.usergroups.ws.UserGroupFinder;
 import org.sonar.server.ws.WsActionTester;
@@ -141,7 +141,7 @@ public class TemplateGroupsActionTest {
   @Test
   public void search_by_template_name() throws IOException {
     InputStream responseStream = ws.newRequest()
-      .setMediaType(MimeTypes.PROTOBUF)
+      .setMediaType(MediaTypes.PROTOBUF)
       .setParam(PARAM_PERMISSION, UserRole.USER)
       .setParam(PARAM_TEMPLATE_NAME, template1.getName())
       .execute()
@@ -154,7 +154,7 @@ public class TemplateGroupsActionTest {
   @Test
   public void search_with_admin_permission_does_not_return_anyone() throws IOException {
     InputStream responseStream = ws.newRequest()
-      .setMediaType(MimeTypes.PROTOBUF)
+      .setMediaType(MediaTypes.PROTOBUF)
       .setParam(PARAM_PERMISSION, UserRole.ADMIN)
       .setParam(PARAM_TEMPLATE_UUID, template1.getUuid())
       .setParam(Param.SELECTED, SelectionMode.ALL.value())
@@ -168,7 +168,7 @@ public class TemplateGroupsActionTest {
   @Test
   public void search_with_pagination() throws IOException {
     InputStream responseStream = ws.newRequest()
-      .setMediaType(MimeTypes.PROTOBUF)
+      .setMediaType(MediaTypes.PROTOBUF)
       .setParam(PARAM_PERMISSION, UserRole.USER)
       .setParam(PARAM_TEMPLATE_NAME, template1.getName())
       .setParam(PAGE, "2")
@@ -183,7 +183,7 @@ public class TemplateGroupsActionTest {
   @Test
   public void search_with_selected() throws IOException {
     InputStream responseStream = ws.newRequest()
-      .setMediaType(MimeTypes.PROTOBUF)
+      .setMediaType(MediaTypes.PROTOBUF)
       .setParam(PARAM_PERMISSION, UserRole.USER)
       .setParam(PARAM_TEMPLATE_NAME, template1.getName())
       .setParam(SELECTED, SelectionMode.ALL.value())
@@ -197,7 +197,7 @@ public class TemplateGroupsActionTest {
   @Test
   public void search_with_text_query() throws IOException {
     InputStream responseStream = ws.newRequest()
-      .setMediaType(MimeTypes.PROTOBUF)
+      .setMediaType(MediaTypes.PROTOBUF)
       .setParam(PARAM_PERMISSION, UserRole.USER)
       .setParam(PARAM_TEMPLATE_NAME, template1.getName())
       .setParam(TEXT_QUERY, "-name")
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/TemplateUsersActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/TemplateUsersActionTest.java
index a4d63b2b97f..a9902e044dd 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/TemplateUsersActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/TemplateUsersActionTest.java
@@ -56,7 +56,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.api.web.UserRole.ADMIN;
 import static org.sonar.db.permission.PermissionTemplateTesting.newPermissionTemplateDto;
 import static org.sonar.db.permission.PermissionTemplateTesting.newPermissionTemplateUserDto;
-import static org.sonar.server.plugins.MimeTypes.PROTOBUF;
+import static org.sonarqube.ws.MediaTypes.PROTOBUF;
 import static org.sonar.test.JsonAssert.assertJson;
 import static org.sonarqube.ws.WsPermissions.WsUsersResponse.parseFrom;
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/LogsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/LogsActionTest.java
index 168d0a584b3..5891fb6becd 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/LogsActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/LogsActionTest.java
@@ -29,7 +29,7 @@ import org.junit.rules.TemporaryFolder;
 import org.sonar.api.web.UserRole;
 import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.platform.ServerLogging;
-import org.sonar.server.plugins.MimeTypes;
+import org.sonarqube.ws.MediaTypes;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.TestResponse;
 import org.sonar.server.ws.WsActionTester;
@@ -62,7 +62,7 @@ public class LogsActionTest {
     when(serverLogging.getCurrentLogFile()).thenReturn(file);
 
     TestResponse response = actionTester.newRequest().execute();
-    assertThat(response.getMediaType()).isEqualTo(MimeTypes.TXT);
+    assertThat(response.getMediaType()).isEqualTo(MediaTypes.TXT);
     assertThat(response.getInput()).isEqualTo("{logs}");
   }
 
@@ -75,7 +75,7 @@ public class LogsActionTest {
     when(serverLogging.getCurrentLogFile()).thenReturn(file);
 
     TestResponse response = actionTester.newRequest().execute();
-    assertThat(response.getMediaType()).isEqualTo(MimeTypes.TXT);
+    assertThat(response.getMediaType()).isEqualTo(MediaTypes.TXT);
     assertThat(response.getInput()).isEqualTo("");
   }
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/MimeTypesTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/MimeTypesTest.java
deleted file mode 100644
index 235831cd6fe..00000000000
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/MimeTypesTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * SonarQube is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * SonarQube is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.sonar.server.plugins;
-
-import org.junit.Test;
-import org.sonar.test.TestUtils;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class MimeTypesTest {
-  @Test
-  public void getByFilename_default_mime_type() {
-    assertThat(MimeTypes.getByFilename("")).isEqualTo(MimeTypes.DEFAULT);
-    assertThat(MimeTypes.getByFilename("unknown.extension")).isEqualTo(MimeTypes.DEFAULT);
-  }
-
-  @Test
-  public void getByFilename() {
-    assertThat(MimeTypes.getByFilename("static/sqale/sqale.css")).isEqualTo("text/css");
-    assertThat(MimeTypes.getByFilename("sqale.css")).isEqualTo("text/css");
-  }
-
-  @Test
-  public void only_statics() {
-    assertThat(TestUtils.hasOnlyPrivateConstructors(MimeTypes.class)).isTrue();
-  }
-}
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java
index eaa807efb7d..1da7ffa0890 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java
@@ -27,7 +27,7 @@ import org.sonar.db.DbTester;
 import org.sonar.db.qualityprofile.QualityProfileDao;
 import org.sonar.server.db.DbClient;
 import org.sonar.server.language.LanguageTesting;
-import org.sonar.server.plugins.MimeTypes;
+import org.sonarqube.ws.MediaTypes;
 import org.sonar.server.qualityprofile.QProfileFactory;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.TestResponse;
@@ -57,12 +57,12 @@ public class CreateActionTest {
 
     TestResponse response = wsTester.newRequest()
       .setMethod("POST")
-      .setMediaType(MimeTypes.JSON)
+      .setMediaType(MediaTypes.JSON)
       .setParam("language", "xoo")
       .setParam("name", "Yeehaw!")
       .execute();
     JsonAssert.assertJson(response.getInput()).isSimilarTo(getClass().getResource("CreateActionTest/create-no-importer.json"));
-    assertThat(response.getMediaType()).isEqualTo(MimeTypes.JSON);
+    assertThat(response.getMediaType()).isEqualTo(MediaTypes.JSON);
   }
 
   /**
@@ -81,7 +81,7 @@ public class CreateActionTest {
       .setParam("language", "xoo")
       .setParam("name", "Yeehaw!")
       .execute();
-    assertThat(response.getMediaType()).isEqualTo(MimeTypes.TXT);
+    assertThat(response.getMediaType()).isEqualTo(MediaTypes.TXT);
 
   }
 }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ListActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ListActionTest.java
index e11b6aada87..e39aa38fc03 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ListActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ListActionTest.java
@@ -26,7 +26,7 @@ import org.sonar.api.server.ws.WebService;
 import org.sonar.api.utils.System2;
 import org.sonar.db.DbTester;
 import org.sonar.db.rule.RuleTesting;
-import org.sonar.server.plugins.MimeTypes;
+import org.sonarqube.ws.MediaTypes;
 import org.sonar.server.ws.TestResponse;
 import org.sonar.server.ws.WsActionTester;
 import org.sonarqube.ws.Rules;
@@ -55,10 +55,10 @@ public class ListActionTest {
     dbTester.getSession().commit();
 
     TestResponse response = tester.newRequest()
-      .setMediaType(MimeTypes.PROTOBUF)
+      .setMediaType(MediaTypes.PROTOBUF)
       .execute();
 
-    assertThat(response.getMediaType()).isEqualTo(MimeTypes.PROTOBUF);
+    assertThat(response.getMediaType()).isEqualTo(MediaTypes.PROTOBUF);
     Rules.ListResponse listResponse = Rules.ListResponse.parseFrom(response.getInputStream());
     assertThat(listResponse.getRulesCount()).isEqualTo(2);
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ws/ServletRequestTest.java b/server/sonar-server/src/test/java/org/sonar/server/ws/ServletRequestTest.java
index a49fce8a92e..8205df3474c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ws/ServletRequestTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/ws/ServletRequestTest.java
@@ -26,7 +26,7 @@ import java.util.Collections;
 import javax.servlet.http.HttpServletRequest;
 import org.jruby.RubyFile;
 import org.junit.Test;
-import org.sonar.server.plugins.MimeTypes;
+import org.sonarqube.ws.MediaTypes;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -46,25 +46,25 @@ public class ServletRequestTest {
 
   @Test
   public void getMediaType() throws Exception {
-    when(source.getHeader(HttpHeaders.ACCEPT)).thenReturn(MimeTypes.JSON);
+    when(source.getHeader(HttpHeaders.ACCEPT)).thenReturn(MediaTypes.JSON);
     when(source.getRequestURI()).thenReturn("/path/to/resource/search");
     ServletRequest request = new ServletRequest(source, Collections.<String, Object>emptyMap());
-    assertThat(request.getMediaType()).isEqualTo(MimeTypes.JSON);
+    assertThat(request.getMediaType()).isEqualTo(MediaTypes.JSON);
   }
 
   @Test
   public void default_media_type_is_octet_stream() throws Exception {
     ServletRequest request = new ServletRequest(source, Collections.<String, Object>emptyMap());
     when(source.getRequestURI()).thenReturn("/path/to/resource/search");
-    assertThat(request.getMediaType()).isEqualTo(MimeTypes.DEFAULT);
+    assertThat(request.getMediaType()).isEqualTo(MediaTypes.DEFAULT);
   }
 
   @Test
   public void media_type_taken_in_url_first() throws Exception {
     ServletRequest request = new ServletRequest(source, Collections.<String, Object>emptyMap());
-    when(source.getHeader(HttpHeaders.ACCEPT)).thenReturn(MimeTypes.JSON);
+    when(source.getHeader(HttpHeaders.ACCEPT)).thenReturn(MediaTypes.JSON);
     when(source.getRequestURI()).thenReturn("/path/to/resource/search.protobuf");
-    assertThat(request.getMediaType()).isEqualTo(MimeTypes.PROTOBUF);
+    assertThat(request.getMediaType()).isEqualTo(MediaTypes.PROTOBUF);
   }
 
   @Test
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceEngineTest.java b/server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceEngineTest.java
index 44c5e4f5e6f..368a27976cd 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceEngineTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceEngineTest.java
@@ -39,8 +39,8 @@ import org.sonar.api.server.ws.internal.ValidatingRequest;
 import org.sonar.server.exceptions.BadRequestException;
 import org.sonar.server.exceptions.Errors;
 import org.sonar.server.exceptions.Message;
-import org.sonar.server.plugins.MimeTypes;
 import org.sonar.server.tester.UserSessionRule;
+import org.sonarqube.ws.MediaTypes;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -200,7 +200,7 @@ public class WebServiceEngineTest {
 
     assertThat(response.stream().outputAsString()).isEqualTo("{\"errors\":[{\"msg\":\"Unexpected\"}]}");
     assertThat(response.stream().httpStatus()).isEqualTo(500);
-    assertThat(response.stream().mediaType()).isEqualTo(MimeTypes.JSON);
+    assertThat(response.stream().mediaType()).isEqualTo(MediaTypes.JSON);
   }
 
   @Test
@@ -216,7 +216,7 @@ public class WebServiceEngineTest {
       "{\"errors\":[{\"msg\":\"reason #0\"}]}"
       );
     assertThat(response.stream().httpStatus()).isEqualTo(400);
-    assertThat(response.stream().mediaType()).isEqualTo(MimeTypes.JSON);
+    assertThat(response.stream().mediaType()).isEqualTo(MediaTypes.JSON);
   }
 
   @Test
@@ -232,7 +232,7 @@ public class WebServiceEngineTest {
       + "{\"msg\":\"Bad request reason #2\"}"
       + "]}");
     assertThat(response.stream().httpStatus()).isEqualTo(400);
-    assertThat(response.stream().mediaType()).isEqualTo(MimeTypes.JSON);
+    assertThat(response.stream().mediaType()).isEqualTo(MediaTypes.JSON);
   }
 
   @Test
@@ -252,7 +252,7 @@ public class WebServiceEngineTest {
       "{\"msg\":\"reason #1\"}," +
       "{\"msg\":\"reason #2\"}]}");
     assertThat(response.stream().httpStatus()).isEqualTo(400);
-    assertThat(response.stream().mediaType()).isEqualTo(MimeTypes.JSON);
+    assertThat(response.stream().mediaType()).isEqualTo(MediaTypes.JSON);
   }
 
   @Test
@@ -280,7 +280,7 @@ public class WebServiceEngineTest {
 
     @Override
     public String getMediaType() {
-      return MimeTypes.JSON;
+      return MediaTypes.JSON;
     }
 
     @Override
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ws/WsTester.java b/server/sonar-server/src/test/java/org/sonar/server/ws/WsTester.java
index 6369daeb01d..d9b0d084030 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ws/WsTester.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/ws/WsTester.java
@@ -37,9 +37,9 @@ import org.sonar.api.server.ws.WebService;
 import org.sonar.api.server.ws.internal.ValidatingRequest;
 import org.sonar.api.utils.text.JsonWriter;
 import org.sonar.api.utils.text.XmlWriter;
-import org.sonar.server.plugins.MimeTypes;
 import org.sonar.server.ws.WsTester.TestResponse.TestStream;
 import org.sonar.test.JsonAssert;
+import org.sonarqube.ws.MediaTypes;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.server.ws.RequestVerifier.verifyRequest;
@@ -66,7 +66,7 @@ public class WsTester {
 
     @Override
     public String getMediaType() {
-      return MimeTypes.JSON;
+      return MediaTypes.JSON;
     }
 
     @Override
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ws/WsUtilsTest.java b/server/sonar-server/src/test/java/org/sonar/server/ws/WsUtilsTest.java
index 7693a82f8e0..2bf1c7edfb6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ws/WsUtilsTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/ws/WsUtilsTest.java
@@ -23,8 +23,8 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.sonar.server.exceptions.BadRequestException;
-import org.sonar.server.plugins.MimeTypes;
 import org.sonarqube.ws.Issues;
+import org.sonarqube.ws.MediaTypes;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -41,7 +41,7 @@ public class WsUtilsTest {
     Issues.Issue msg = Issues.Issue.newBuilder().setKey("I1").build();
     WsUtils.writeProtobuf(msg, request, response);
 
-    assertThat(response.stream().mediaType()).isEqualTo(MimeTypes.JSON);
+    assertThat(response.stream().mediaType()).isEqualTo(MediaTypes.JSON);
     assertThat(response.outputAsString())
       .startsWith("{")
       .contains("\"key\":\"I1\"")
@@ -51,13 +51,13 @@ public class WsUtilsTest {
   @Test
   public void write_protobuf() throws Exception {
     TestRequest request = new TestRequest();
-    request.setMediaType(MimeTypes.PROTOBUF);
+    request.setMediaType(MediaTypes.PROTOBUF);
     DumbResponse response = new DumbResponse();
 
     Issues.Issue msg = Issues.Issue.newBuilder().setKey("I1").build();
     WsUtils.writeProtobuf(msg, request, response);
 
-    assertThat(response.stream().mediaType()).isEqualTo(MimeTypes.PROTOBUF);
+    assertThat(response.stream().mediaType()).isEqualTo(MediaTypes.PROTOBUF);
     assertThat(Issues.Issue.parseFrom(response.getFlushedOutput()).getKey()).isEqualTo("I1");
   }