From 05a9cd115eaabcfb3f41aa5bef290109dd8fdcfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Mon, 4 Jun 2018 15:55:18 +0200 Subject: [PATCH] Use versioned media type --- .../java/sonia/scm/api/v2/resources/ScmMediaType.java | 9 +++++++++ .../scm/api/v2/resources/UserCollectionResource.java | 4 +++- .../java/sonia/scm/api/v2/resources/UserSubResource.java | 4 +++- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 scm-webapp/src/main/java/sonia/scm/api/v2/resources/ScmMediaType.java diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ScmMediaType.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ScmMediaType.java new file mode 100644 index 0000000000..81310dd4df --- /dev/null +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ScmMediaType.java @@ -0,0 +1,9 @@ +package sonia.scm.api.v2.resources; + +public class ScmMediaType { + private static final String VERSION = "2"; + private static final String PREFIX = "application/vnd.scmm-"; + private static final String SUFFIX = "+json;v=" + VERSION; + + public static final String USER = PREFIX + "user" + SUFFIX; +} diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java index ca15f6169b..5ec6236b8e 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java @@ -18,8 +18,10 @@ import java.util.Collection; import java.util.List; import java.util.stream.Collectors; +import static sonia.scm.api.v2.resources.ScmMediaType.USER; + @Singleton -@Produces("application/vnd.scmm-user+json") +@Produces(USER) public class UserCollectionResource extends AbstractManagerResource { private final UserDto2UserMapper dtoToUserMapper; private final User2UserDtoMapper userToDtoMapper; diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserSubResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserSubResource.java index f2d97568a6..46789b2deb 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserSubResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserSubResource.java @@ -16,8 +16,10 @@ import javax.ws.rs.*; import javax.ws.rs.core.*; import java.util.Collection; +import static sonia.scm.api.v2.resources.ScmMediaType.USER; + @Singleton -@Produces("application/vnd.scmm-user+json") +@Produces(USER) public class UserSubResource extends AbstractManagerResource { private final UserDto2UserMapper dtoToUserMapper; private final User2UserDtoMapper userToDtoMapper;