You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2013/02/08 19:29:52 UTC
[23/32] git commit: ISIS-323: back to using javax.ws.rs.core.MediaType
ISIS-323: back to using javax.ws.rs.core.MediaType
... reversed decision to use guava's equivaelent.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/6002a903
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/6002a903
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/6002a903
Branch: refs/heads/master
Commit: 6002a903863541cb813820978233eba701317823
Parents: bb79d33
Author: Dan Haywood <da...@apache.org>
Authored: Thu Feb 7 16:49:44 2013 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Fri Feb 8 18:00:44 2013 +0000
----------------------------------------------------------------------
.../viewer/restfulobjects/applib/MediaTypes.java | 10 ++--
.../restfulobjects/applib/RepresentationType.java | 18 ++------
.../restfulobjects/applib/RestfulResponse.java | 2 +-
...RepresentationTypeTest_getMediaType_lookup.java | 5 +-
.../restfulobjects/applib/util/ParserTest.java | 9 ++--
.../restfulobjects/rendering/LinkBuilder.java | 3 +-
.../rendering/RendererFactoryRegistry.java | 3 +-
.../restfulobjects/server/ResourceContext.java | 33 +++++----------
.../server/resources/ResourceAbstract.java | 3 +-
...ceContextTest_ensureCompatibleAcceptHeader.java | 9 ++--
...eTest_clientAcceptHeader_exceptionHandling.java | 5 +-
.../home/HomePageResourceTest_accept.java | 14 +++----
...ePageResourceTest_representationAndHeaders.java | 18 ++++----
...DomainServiceResourceTest_serviceId_accept.java | 5 +-
...rceTest_serviceId_representationAndHeaders.java | 3 +-
.../DomainServiceResourceTest_services_accept.java | 14 +++----
...urceTest_services_representationAndHeaders.java | 16 +++----
.../resources/user/UserResourceTest_accept.java | 14 +++----
.../UserResourceTest_representationAndHeaders.java | 18 ++++----
.../version/VersionResourceTest_accept.java | 5 +-
...rsionResourceTest_representationAndHeaders.java | 18 ++++----
21 files changed, 94 insertions(+), 131 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/6002a903/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/MediaTypes.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/MediaTypes.java b/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/MediaTypes.java
index a90e187..d34fb45 100644
--- a/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/MediaTypes.java
+++ b/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/MediaTypes.java
@@ -7,11 +7,11 @@ import com.google.common.base.Function;
/**
* Convert between {@link com.google.common.net.MediaType guava MediaType} and {@link javax.ws.rs.core.MediaType jax-rs MediaType}.
*/
-public final class MediaTypes {
+final class MediaTypes {
private MediaTypes(){}
- public static final Function<javax.ws.rs.core.MediaType, ? extends com.google.common.net.MediaType> JAXRS_TO_GUAVA = new Function<javax.ws.rs.core.MediaType, com.google.common.net.MediaType>() {
+ private static final Function<javax.ws.rs.core.MediaType, ? extends com.google.common.net.MediaType> JAXRS_TO_GUAVA = new Function<javax.ws.rs.core.MediaType, com.google.common.net.MediaType>() {
@Override
public com.google.common.net.MediaType apply(javax.ws.rs.core.MediaType input) {
@@ -19,7 +19,7 @@ public final class MediaTypes {
}
};
- public static final Function<com.google.common.net.MediaType, MediaType> GUAVA_TO_JAXRS = new Function<com.google.common.net.MediaType, MediaType>() {
+ private static final Function<com.google.common.net.MediaType, MediaType> GUAVA_TO_JAXRS = new Function<com.google.common.net.MediaType, MediaType>() {
@Override
public MediaType apply(com.google.common.net.MediaType input) {
@@ -28,11 +28,11 @@ public final class MediaTypes {
};
- public static com.google.common.net.MediaType jaxRsToGuava(javax.ws.rs.core.MediaType jaxRsMediaType) {
+ private static com.google.common.net.MediaType jaxRsToGuava(javax.ws.rs.core.MediaType jaxRsMediaType) {
return com.google.common.net.MediaType.parse(jaxRsMediaType.toString());
}
- public static javax.ws.rs.core.MediaType guavaToJaxRs(com.google.common.net.MediaType guavaMediaType) {
+ private static javax.ws.rs.core.MediaType guavaToJaxRs(com.google.common.net.MediaType guavaMediaType) {
return javax.ws.rs.core.MediaType.valueOf(guavaMediaType.toString());
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6002a903/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationType.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationType.java b/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationType.java
index c5c1262..6b04fe3 100644
--- a/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationType.java
+++ b/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationType.java
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.restfulobjects.applib;
+import javax.ws.rs.core.MediaType;
+
import org.apache.isis.applib.util.Enums;
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ActionResultRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainObjectRepresentation;
@@ -41,9 +43,6 @@ import org.apache.isis.viewer.restfulobjects.applib.user.UserRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.util.Parser;
import org.apache.isis.viewer.restfulobjects.applib.version.VersionRepresentation;
-import com.google.common.collect.ImmutableList;
-import com.google.common.net.MediaType;
-
public enum RepresentationType {
HOME_PAGE(RestfulMediaType.APPLICATION_JSON_HOME_PAGE, HomePageRepresentation.class),
@@ -65,14 +64,14 @@ public enum RepresentationType {
ACTION_PARAMETER_DESCRIPTION(RestfulMediaType.APPLICATION_JSON_ACTION_PARAMETER_DESCRIPTION, ActionParameterDescriptionRepresentation.class),
TYPE_ACTION_RESULT(RestfulMediaType.APPLICATION_JSON_TYPE_ACTION_RESULT, TypeActionResultRepresentation.class),
ERROR(RestfulMediaType.APPLICATION_JSON_ERROR, ErrorRepresentation.class),
- GENERIC(MediaType.JSON_UTF_8, JsonRepresentation.class);
+ GENERIC(MediaType.APPLICATION_JSON, JsonRepresentation.class);
private final String name;
private final MediaType mediaType;
private final Class<? extends JsonRepresentation> representationClass;
private RepresentationType(final String mediaTypeStr, final Class<? extends JsonRepresentation> representationClass) {
- this(MediaType.parse(mediaTypeStr), representationClass);
+ this(MediaType.valueOf(mediaTypeStr), representationClass);
}
private RepresentationType(final MediaType mediaType, final Class<? extends JsonRepresentation> representationClass) {
@@ -90,14 +89,7 @@ public enum RepresentationType {
}
public String getMediaTypeProfile() {
- ImmutableList<String> immutableList = getMediaType().parameters().get("profile");
- if (immutableList == null || immutableList.isEmpty()) return null;
- for (String profileValue : immutableList) {
- if(profileValue.startsWith(RestfulMediaType.PROFILE_PARAM_PREFIX)) {
- return profileValue;
- }
- }
- return null;
+ return getMediaType().getParameters().get("profile");
}
public Class<? extends JsonRepresentation> getRepresentationClass() {
http://git-wip-us.apache.org/repos/asf/isis/blob/6002a903/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulResponse.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulResponse.java b/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulResponse.java
index 78af846..e543df7 100644
--- a/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulResponse.java
+++ b/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulResponse.java
@@ -267,7 +267,7 @@ public class RestfulResponse<T> {
@SuppressWarnings({ "rawtypes", "unchecked" })
public static RestfulResponse<JsonRepresentation> of(final Response response) {
final MediaType jaxRsMediaType = getHeader(response, Header.CONTENT_TYPE);
- final RepresentationType representationType = RepresentationType.lookup(MediaTypes.jaxRsToGuava(jaxRsMediaType));
+ final RepresentationType representationType = RepresentationType.lookup(jaxRsMediaType);
final Class<? extends JsonRepresentation> returnType = representationType.getRepresentationClass();
return new RestfulResponse(response, returnType);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6002a903/component/viewer/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_getMediaType_lookup.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_getMediaType_lookup.java b/component/viewer/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_getMediaType_lookup.java
index f917aad..bec0243 100644
--- a/component/viewer/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_getMediaType_lookup.java
+++ b/component/viewer/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_getMediaType_lookup.java
@@ -23,9 +23,10 @@ import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertThat;
+import javax.ws.rs.core.MediaType;
+
import org.junit.Test;
-import com.google.common.net.MediaType;
public class RepresentationTypeTest_getMediaType_lookup {
@@ -40,7 +41,7 @@ public class RepresentationTypeTest_getMediaType_lookup {
@Test
public void whenUnknown() {
- assertThat(RepresentationType.lookup(MediaType.ANY_TEXT_TYPE), is(RepresentationType.GENERIC));
+ assertThat(RepresentationType.lookup(MediaType.APPLICATION_SVG_XML), is(RepresentationType.GENERIC));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/6002a903/component/viewer/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/ParserTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/ParserTest.java b/component/viewer/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/ParserTest.java
index 986a05f..9ae89de 100644
--- a/component/viewer/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/ParserTest.java
+++ b/component/viewer/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/ParserTest.java
@@ -115,7 +115,7 @@ public class ParserTest {
@Test
public void forGuavaMediaTypes() {
final Parser<MediaType> parser = Parser.forGuavaMediaType();
- final MediaType mediaType = RepresentationType.DOMAIN_OBJECT.getMediaType();
+ final MediaType mediaType = MediaType.parse("application/json");
final String asString = parser.asString(mediaType);
final MediaType valueOf = parser.valueOf(asString);
@@ -125,12 +125,11 @@ public class ParserTest {
@Test
public void forListOfMediaTypes() {
final Parser<List<MediaType>> parser = Parser.forListOfGuavaMediaTypes();
- final MediaType mediaType = RepresentationType.DOMAIN_OBJECT.getMediaType();
- final List<MediaType> v = Arrays.asList(mediaType, MediaType.parse("application/json"));
- final String asString = parser.asString(v);
+ final List<MediaType> list = Arrays.asList(MediaType.parse("application/xml"), MediaType.parse("application/json"));
+ final String asString = parser.asString(list);
final List<MediaType> valueOf = parser.valueOf(asString);
- assertThat(v, IsisMatchers.sameContentsAs(valueOf));
+ assertThat(list, IsisMatchers.sameContentsAs(valueOf));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/6002a903/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/LinkBuilder.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/LinkBuilder.java b/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/LinkBuilder.java
index a120f59..acd022d 100644
--- a/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/LinkBuilder.java
+++ b/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/LinkBuilder.java
@@ -17,12 +17,13 @@
package org.apache.isis.viewer.restfulobjects.rendering;
+import javax.ws.rs.core.MediaType;
+
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RoHttpMethod;
import org.apache.isis.viewer.restfulobjects.applib.links.Rel;
-import com.google.common.net.MediaType;
public final class LinkBuilder {
http://git-wip-us.apache.org/repos/asf/isis/blob/6002a903/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererFactoryRegistry.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererFactoryRegistry.java b/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererFactoryRegistry.java
index 7799e52..9a5421e 100644
--- a/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererFactoryRegistry.java
+++ b/component/viewer/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererFactoryRegistry.java
@@ -20,6 +20,8 @@ package org.apache.isis.viewer.restfulobjects.rendering;
import java.util.Map;
+import javax.ws.rs.core.MediaType;
+
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ActionResultReprRenderer;
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.DomainObjectReprRenderer;
@@ -37,7 +39,6 @@ import org.apache.isis.viewer.restfulobjects.rendering.domaintypes.TypeActionRes
import org.apache.isis.viewer.restfulobjects.rendering.domaintypes.TypeListReprRenderer;
import com.google.common.collect.Maps;
-import com.google.common.net.MediaType;
public class RendererFactoryRegistry {
http://git-wip-us.apache.org/repos/asf/isis/blob/6002a903/component/viewer/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java b/component/viewer/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
index ab6f7a3..fd713ad 100644
--- a/component/viewer/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
+++ b/component/viewer/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
@@ -38,7 +38,6 @@ import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
-import org.apache.isis.viewer.restfulobjects.applib.MediaTypes;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulRequest.RequestParameter;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse.HttpStatusCode;
@@ -160,31 +159,21 @@ public class ResourceContext implements RendererContext {
if (representationType == null) {
return;
}
- final com.google.common.net.MediaType producedType = representationType.getMediaType();
+ final MediaType producedType = representationType.getMediaType();
- final List<MediaType> acceptableJaxRsMediaTypes = acceptableMediaTypes();
- final List<com.google.common.net.MediaType> acceptableGuavaMediaTypes = Lists.transform(acceptableJaxRsMediaTypes, MediaTypes.JAXRS_TO_GUAVA);
-
- // reimplemented below using guava
-// for (final MediaType mediaType : acceptableJaxRsMediaTypes) {
-// if (compatible(mediaType, representationType)) {
-// return;
-// }
-// }
-
- if(Iterables.tryFind(acceptableGuavaMediaTypes, accepts(producedType)).isPresent()) {
+ final List<MediaType> acceptedMediaTypes = acceptedMediaTypes();
+
+ if(Iterables.tryFind(acceptedMediaTypes, accepts(producedType)).isPresent()) {
return;
}
- if (!contains(producedType, acceptableJaxRsMediaTypes)) {
- throw RestfulObjectsApplicationException.create(HttpStatusCode.NOT_ACCEPTABLE, "Resource produces %s media type", representationType.getMediaType());
- }
+ throw RestfulObjectsApplicationException.create(HttpStatusCode.NOT_ACCEPTABLE, "Resource produces %s media type", representationType.getMediaType());
}
- private static Predicate<com.google.common.net.MediaType> accepts(final com.google.common.net.MediaType producedType) {
- return new Predicate<com.google.common.net.MediaType>() {
+ private static Predicate<MediaType> accepts(final MediaType producedType) {
+ return new Predicate<MediaType>() {
@Override
- public boolean apply(com.google.common.net.MediaType input) {
- return producedType.is(input);
+ public boolean apply(MediaType accepted) {
+ return producedType.isCompatible(accepted);
}
};
@@ -202,7 +191,7 @@ public class ResourceContext implements RendererContext {
* Otherwise, though, filter out the {@link MediaType#APPLICATION_JSON_TYPE
* generic application/json} media type if it is present.
*/
- private List<MediaType> acceptableMediaTypes() {
+ private List<MediaType> acceptedMediaTypes() {
final List<MediaType> acceptableMediaTypes = getHttpHeaders().getAcceptableMediaTypes();
if (Collections2.filter(acceptableMediaTypes, MEDIA_TYPE_CONTAINS_PROFILE).isEmpty()) {
return acceptableMediaTypes;
@@ -211,7 +200,7 @@ public class ResourceContext implements RendererContext {
}
private boolean compatible(final MediaType acceptedMediaType, final RepresentationType representationType) {
- final MediaType producedJaxRsMediaType = MediaTypes.guavaToJaxRs(representationType.getMediaType());
+ final MediaType producedJaxRsMediaType = representationType.getMediaType();
final String profile = acceptedMediaType.getParameters().get("profile");
return profile == null ? acceptedMediaType.isCompatible(producedJaxRsMediaType) : acceptedMediaType.equals(producedJaxRsMediaType);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6002a903/component/viewer/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java b/component/viewer/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
index aa4397e..c9ec5cf 100644
--- a/component/viewer/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
+++ b/component/viewer/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
@@ -48,7 +48,6 @@ import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.OidGenerator;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.viewer.restfulobjects.applib.MediaTypes;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse.HttpStatusCode;
import org.apache.isis.viewer.restfulobjects.applib.util.JsonMapper;
@@ -194,7 +193,7 @@ public abstract class ResourceAbstract {
public static ResponseBuilder responseOfOk(final ReprRenderer<?, ?> renderer, final Caching caching, final Version version) {
final RepresentationType representationType = renderer.getRepresentationType();
- final ResponseBuilder response = responseOf(HttpStatusCode.OK).type(MediaTypes.guavaToJaxRs(representationType.getMediaType())).cacheControl(caching.getCacheControl()).entity(jsonFor(renderer.render()));
+ final ResponseBuilder response = responseOf(HttpStatusCode.OK).type(representationType.getMediaType()).cacheControl(caching.getCacheControl()).entity(jsonFor(renderer.render()));
return addLastModifiedAndETagIfAvailable(response, version);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6002a903/component/viewer/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_ensureCompatibleAcceptHeader.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_ensureCompatibleAcceptHeader.java b/component/viewer/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_ensureCompatibleAcceptHeader.java
index 4ae4ab5..f5a28b2 100644
--- a/component/viewer/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_ensureCompatibleAcceptHeader.java
+++ b/component/viewer/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_ensureCompatibleAcceptHeader.java
@@ -25,7 +25,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
-import org.apache.isis.viewer.restfulobjects.applib.MediaTypes;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.rendering.ReprRendererException;
import org.jmock.Expectations;
@@ -56,7 +55,7 @@ public class ResourceContextTest_ensureCompatibleAcceptHeader {
@Test
public void noop() throws Exception {
final RepresentationType representationType = RepresentationType.HOME_PAGE;
- givenHttpHeadersGetAcceptableMediaTypesReturns(Arrays.<MediaType> asList(MediaTypes.guavaToJaxRs(representationType.getMediaType())));
+ givenHttpHeadersGetAcceptableMediaTypesReturns(Arrays.<MediaType> asList(representationType.getMediaType()));
instantiateResourceContext(representationType);
}
@@ -64,7 +63,7 @@ public class ResourceContextTest_ensureCompatibleAcceptHeader {
@Test
public void happyCase() throws Exception {
final RepresentationType representationType = RepresentationType.HOME_PAGE;
- givenHttpHeadersGetAcceptableMediaTypesReturns(Arrays.<MediaType> asList(MediaTypes.guavaToJaxRs(representationType.getMediaType())));
+ givenHttpHeadersGetAcceptableMediaTypesReturns(Arrays.<MediaType> asList(representationType.getMediaType()));
instantiateResourceContext(representationType);
}
@@ -96,7 +95,7 @@ public class ResourceContextTest_ensureCompatibleAcceptHeader {
@Test(expected = ReprRendererException.class)
public void nonMatchingProfile() throws Exception {
final RepresentationType representationType = RepresentationType.HOME_PAGE;
- givenHttpHeadersGetAcceptableMediaTypesReturns(Arrays.<MediaType> asList(MediaTypes.guavaToJaxRs(RepresentationType.USER.getMediaType())));
+ givenHttpHeadersGetAcceptableMediaTypesReturns(Arrays.<MediaType> asList(RepresentationType.USER.getMediaType()));
instantiateResourceContext(representationType);
}
@@ -104,7 +103,7 @@ public class ResourceContextTest_ensureCompatibleAcceptHeader {
@Test(expected = ReprRendererException.class)
public void nonMatchingProfile_ignoreGeneric() throws Exception {
final RepresentationType representationType = RepresentationType.HOME_PAGE;
- givenHttpHeadersGetAcceptableMediaTypesReturns(Arrays.<MediaType> asList(MediaTypes.guavaToJaxRs(RepresentationType.USER.getMediaType()), MediaType.APPLICATION_JSON_TYPE));
+ givenHttpHeadersGetAcceptableMediaTypesReturns(Arrays.<MediaType> asList(RepresentationType.USER.getMediaType(), MediaType.APPLICATION_JSON_TYPE));
instantiateResourceContext(representationType);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6002a903/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/AnyResourceTest_clientAcceptHeader_exceptionHandling.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/AnyResourceTest_clientAcceptHeader_exceptionHandling.java b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/AnyResourceTest_clientAcceptHeader_exceptionHandling.java
index 42ff33f..df14f21 100644
--- a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/AnyResourceTest_clientAcceptHeader_exceptionHandling.java
+++ b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/AnyResourceTest_clientAcceptHeader_exceptionHandling.java
@@ -32,7 +32,6 @@ import org.junit.Test;
import org.apache.isis.core.webserver.WebServer;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
-import org.apache.isis.viewer.restfulobjects.applib.MediaTypes;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulClient;
import org.apache.isis.viewer.restfulobjects.applib.RestfulRequest;
@@ -67,7 +66,7 @@ public class AnyResourceTest_clientAcceptHeader_exceptionHandling {
// then
assertThat(restfulResp.getStatus(), is(HttpStatusCode.OK));
- assertThat(restfulResp.getHeader(RestfulResponse.Header.CONTENT_TYPE), is(MediaTypes.guavaToJaxRs(RepresentationType.HOME_PAGE.getMediaType())));
+ assertThat(restfulResp.getHeader(RestfulResponse.Header.CONTENT_TYPE), is(RepresentationType.HOME_PAGE.getMediaType()));
}
@Test
@@ -82,7 +81,7 @@ public class AnyResourceTest_clientAcceptHeader_exceptionHandling {
// then
assertThat(restfulResp.getStatus(), is(HttpStatusCode.OK));
- assertThat(restfulResp.getHeader(RestfulResponse.Header.CONTENT_TYPE), is(MediaTypes.guavaToJaxRs(RepresentationType.HOME_PAGE.getMediaType())));
+ assertThat(restfulResp.getHeader(RestfulResponse.Header.CONTENT_TYPE), is(RepresentationType.HOME_PAGE.getMediaType()));
}
@Ignore("RestEasy seems to reject with a 500, 'No match for accept header', rather than a 405.")
http://git-wip-us.apache.org/repos/asf/isis/blob/6002a903/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/home/HomePageResourceTest_accept.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/home/HomePageResourceTest_accept.java b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/home/HomePageResourceTest_accept.java
index 6af4171..aac4192 100644
--- a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/home/HomePageResourceTest_accept.java
+++ b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/home/HomePageResourceTest_accept.java
@@ -23,20 +23,18 @@ import static org.junit.Assert.assertThat;
import javax.ws.rs.core.MediaType;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
import org.apache.isis.core.webserver.WebServer;
-import org.apache.isis.viewer.restfulobjects.applib.MediaTypes;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulClient;
import org.apache.isis.viewer.restfulobjects.applib.RestfulRequest;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse;
-import org.apache.isis.viewer.restfulobjects.applib.RoHttpMethod;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse.HttpStatusCode;
+import org.apache.isis.viewer.restfulobjects.applib.RoHttpMethod;
import org.apache.isis.viewer.restfulobjects.applib.homepage.HomePageRepresentation;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
public class HomePageResourceTest_accept {
@@ -63,7 +61,7 @@ public class HomePageResourceTest_accept {
@Test
public void applicationJson_profileHomePage() throws Exception {
- final RestfulRequest request = client.createRequest(RoHttpMethod.GET, "/").withHeader(RestfulRequest.Header.ACCEPT, MediaTypes.guavaToJaxRs(RepresentationType.HOME_PAGE.getMediaType()));
+ final RestfulRequest request = client.createRequest(RoHttpMethod.GET, "/").withHeader(RestfulRequest.Header.ACCEPT, RepresentationType.HOME_PAGE.getMediaType());
final RestfulResponse<HomePageRepresentation> restfulResponse = request.executeT();
assertThat(restfulResponse.getStatus(), is(HttpStatusCode.OK));
@@ -72,7 +70,7 @@ public class HomePageResourceTest_accept {
@Test
public void applicationJson_invalid() throws Exception {
- final RestfulRequest request = client.createRequest(RoHttpMethod.GET, "/").withHeader(RestfulRequest.Header.ACCEPT, MediaTypes.guavaToJaxRs(RepresentationType.USER.getMediaType()));
+ final RestfulRequest request = client.createRequest(RoHttpMethod.GET, "/").withHeader(RestfulRequest.Header.ACCEPT, RepresentationType.USER.getMediaType());
final RestfulResponse<HomePageRepresentation> restfulResponse = request.executeT();
assertThat(restfulResponse.getStatus(), is(HttpStatusCode.NOT_ACCEPTABLE));
http://git-wip-us.apache.org/repos/asf/isis/blob/6002a903/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/home/HomePageResourceTest_representationAndHeaders.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/home/HomePageResourceTest_representationAndHeaders.java b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/home/HomePageResourceTest_representationAndHeaders.java
index 1d63cf7..0ee9712 100644
--- a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/home/HomePageResourceTest_representationAndHeaders.java
+++ b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/home/HomePageResourceTest_representationAndHeaders.java
@@ -39,23 +39,21 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status.Family;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
import org.apache.isis.core.webserver.WebServer;
-import org.apache.isis.viewer.restfulobjects.applib.MediaTypes;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulClient;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse;
-import org.apache.isis.viewer.restfulobjects.applib.RoHttpMethod;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse.Header;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse.HttpStatusCode;
+import org.apache.isis.viewer.restfulobjects.applib.RoHttpMethod;
import org.apache.isis.viewer.restfulobjects.applib.homepage.HomePageRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.homepage.HomePageResource;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
+import org.codehaus.jackson.JsonParseException;
+import org.codehaus.jackson.map.JsonMappingException;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
public class HomePageResourceTest_representationAndHeaders {
@@ -111,8 +109,8 @@ public class HomePageResourceTest_representationAndHeaders {
final MediaType contentType = restfulResponse.getHeader(Header.CONTENT_TYPE);
assertThat(contentType, hasType("application"));
assertThat(contentType, hasSubType("json"));
- assertThat(contentType, hasParameter("profile", "urn:org.restfulobjects/homepage"));
- assertThat(contentType, is(MediaTypes.guavaToJaxRs(RepresentationType.HOME_PAGE.getMediaType())));
+ assertThat(contentType, hasParameter("profile", "urn:org.restfulobjects:repr-types/homepage"));
+ assertThat(contentType, is(RepresentationType.HOME_PAGE.getMediaType()));
// then
final CacheControl cacheControl = restfulResponse.getHeader(Header.CACHE_CONTROL);
http://git-wip-us.apache.org/repos/asf/isis/blob/6002a903/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/serviceId/DomainServiceResourceTest_serviceId_accept.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/serviceId/DomainServiceResourceTest_serviceId_accept.java b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/serviceId/DomainServiceResourceTest_serviceId_accept.java
index 116bb61..a33c3c6 100644
--- a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/serviceId/DomainServiceResourceTest_serviceId_accept.java
+++ b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/serviceId/DomainServiceResourceTest_serviceId_accept.java
@@ -33,7 +33,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.core.webserver.WebServer;
-import org.apache.isis.viewer.restfulobjects.applib.MediaTypes;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulClient;
import org.apache.isis.viewer.restfulobjects.applib.RestfulRequest;
@@ -74,7 +73,7 @@ public class DomainServiceResourceTest_serviceId_accept {
final String href = givenLinkToService();
- final RestfulRequest request = client.createRequest(RoHttpMethod.GET, href).withHeader(RestfulRequest.Header.ACCEPT, MediaTypes.guavaToJaxRs(RepresentationType.DOMAIN_OBJECT.getMediaType()));
+ final RestfulRequest request = client.createRequest(RoHttpMethod.GET, href).withHeader(RestfulRequest.Header.ACCEPT, RepresentationType.DOMAIN_OBJECT.getMediaType());
final RestfulResponse<DomainObjectRepresentation> restfulResponse = request.executeT();
assertThat(restfulResponse.getStatus(), is(HttpStatusCode.OK));
@@ -85,7 +84,7 @@ public class DomainServiceResourceTest_serviceId_accept {
final String href = givenLinkToService();
- final RestfulRequest request = client.createRequest(RoHttpMethod.GET, href).withHeader(RestfulRequest.Header.ACCEPT, MediaTypes.guavaToJaxRs(RepresentationType.USER.getMediaType()));
+ final RestfulRequest request = client.createRequest(RoHttpMethod.GET, href).withHeader(RestfulRequest.Header.ACCEPT, RepresentationType.USER.getMediaType());
final RestfulResponse<DomainObjectRepresentation> restfulResponse = request.executeT();
assertThat(restfulResponse.getStatus(), is(HttpStatusCode.NOT_ACCEPTABLE));
http://git-wip-us.apache.org/repos/asf/isis/blob/6002a903/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/serviceId/DomainServiceResourceTest_serviceId_representationAndHeaders.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/serviceId/DomainServiceResourceTest_serviceId_representationAndHeaders.java b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/serviceId/DomainServiceResourceTest_serviceId_representationAndHeaders.java
index e01dfdd..9167317 100644
--- a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/serviceId/DomainServiceResourceTest_serviceId_representationAndHeaders.java
+++ b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/serviceId/DomainServiceResourceTest_serviceId_representationAndHeaders.java
@@ -38,7 +38,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.core.webserver.WebServer;
-import org.apache.isis.viewer.restfulobjects.applib.MediaTypes;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulClient;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse;
@@ -100,7 +99,7 @@ public class DomainServiceResourceTest_serviceId_representationAndHeaders {
// then
assertThat(jsonResp.getStatus(), is(HttpStatusCode.OK));
- assertThat(jsonResp.getHeader(RestfulResponse.Header.CONTENT_TYPE), is(MediaTypes.guavaToJaxRs(RepresentationType.DOMAIN_OBJECT.getMediaType())));
+ assertThat(jsonResp.getHeader(RestfulResponse.Header.CONTENT_TYPE), is(RepresentationType.DOMAIN_OBJECT.getMediaType()));
assertThat(jsonResp.getHeader(RestfulResponse.Header.CACHE_CONTROL).getMaxAge(), is(24 * 60 * 60));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6002a903/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/services/DomainServiceResourceTest_services_accept.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/services/DomainServiceResourceTest_services_accept.java b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/services/DomainServiceResourceTest_services_accept.java
index ed495cb..956dadd 100644
--- a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/services/DomainServiceResourceTest_services_accept.java
+++ b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/services/DomainServiceResourceTest_services_accept.java
@@ -23,20 +23,18 @@ import static org.junit.Assert.assertThat;
import javax.ws.rs.core.MediaType;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
import org.apache.isis.core.webserver.WebServer;
-import org.apache.isis.viewer.restfulobjects.applib.MediaTypes;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulClient;
import org.apache.isis.viewer.restfulobjects.applib.RestfulRequest;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse;
-import org.apache.isis.viewer.restfulobjects.applib.RoHttpMethod;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse.HttpStatusCode;
+import org.apache.isis.viewer.restfulobjects.applib.RoHttpMethod;
import org.apache.isis.viewer.restfulobjects.applib.homepage.HomePageRepresentation;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
public class DomainServiceResourceTest_services_accept {
@@ -63,7 +61,7 @@ public class DomainServiceResourceTest_services_accept {
@Test
public void applicationJson_profileList() throws Exception {
- final RestfulRequest request = client.createRequest(RoHttpMethod.GET, "services").withHeader(RestfulRequest.Header.ACCEPT, MediaTypes.guavaToJaxRs(RepresentationType.LIST.getMediaType()));
+ final RestfulRequest request = client.createRequest(RoHttpMethod.GET, "services").withHeader(RestfulRequest.Header.ACCEPT, RepresentationType.LIST.getMediaType());
final RestfulResponse<HomePageRepresentation> restfulResponse = request.executeT();
assertThat(restfulResponse.getStatus(), is(HttpStatusCode.OK));
@@ -72,7 +70,7 @@ public class DomainServiceResourceTest_services_accept {
@Test
public void applicationJson_invalid() throws Exception {
- final RestfulRequest request = client.createRequest(RoHttpMethod.GET, "services").withHeader(RestfulRequest.Header.ACCEPT, MediaTypes.guavaToJaxRs(RepresentationType.USER.getMediaType()));
+ final RestfulRequest request = client.createRequest(RoHttpMethod.GET, "services").withHeader(RestfulRequest.Header.ACCEPT, RepresentationType.USER.getMediaType());
final RestfulResponse<HomePageRepresentation> restfulResponse = request.executeT();
assertThat(restfulResponse.getStatus(), is(HttpStatusCode.NOT_ACCEPTABLE));
http://git-wip-us.apache.org/repos/asf/isis/blob/6002a903/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/services/DomainServiceResourceTest_services_representationAndHeaders.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/services/DomainServiceResourceTest_services_representationAndHeaders.java b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/services/DomainServiceResourceTest_services_representationAndHeaders.java
index 80bac9b..f692faf 100644
--- a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/services/DomainServiceResourceTest_services_representationAndHeaders.java
+++ b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/services/DomainServiceResourceTest_services_representationAndHeaders.java
@@ -31,24 +31,22 @@ import java.io.IOException;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status.Family;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
import org.apache.isis.core.webserver.WebServer;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
-import org.apache.isis.viewer.restfulobjects.applib.MediaTypes;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulClient;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse;
-import org.apache.isis.viewer.restfulobjects.applib.RoHttpMethod;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse.HttpStatusCode;
+import org.apache.isis.viewer.restfulobjects.applib.RoHttpMethod;
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainServiceResource;
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ListRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.links.LinkRepresentation;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
+import org.codehaus.jackson.JsonParseException;
+import org.codehaus.jackson.map.JsonMappingException;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
public class DomainServiceResourceTest_services_representationAndHeaders {
@@ -75,7 +73,7 @@ public class DomainServiceResourceTest_services_representationAndHeaders {
// then
assertThat(restfulResponse.getStatus(), is(HttpStatusCode.OK));
- assertThat(restfulResponse.getHeader(RestfulResponse.Header.CONTENT_TYPE), is(MediaTypes.guavaToJaxRs(RepresentationType.LIST.getMediaType())));
+ assertThat(restfulResponse.getHeader(RestfulResponse.Header.CONTENT_TYPE), is(RepresentationType.LIST.getMediaType()));
assertThat(restfulResponse.getHeader(RestfulResponse.Header.CACHE_CONTROL).getMaxAge(), is(24 * 60 * 60));
final ListRepresentation repr = restfulResponse.getEntity();
http://git-wip-us.apache.org/repos/asf/isis/blob/6002a903/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/user/UserResourceTest_accept.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/user/UserResourceTest_accept.java b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/user/UserResourceTest_accept.java
index dafa6eb..bfae5be 100644
--- a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/user/UserResourceTest_accept.java
+++ b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/user/UserResourceTest_accept.java
@@ -23,20 +23,18 @@ import static org.junit.Assert.assertThat;
import javax.ws.rs.core.MediaType;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
import org.apache.isis.core.webserver.WebServer;
-import org.apache.isis.viewer.restfulobjects.applib.MediaTypes;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulClient;
import org.apache.isis.viewer.restfulobjects.applib.RestfulRequest;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse;
-import org.apache.isis.viewer.restfulobjects.applib.RoHttpMethod;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse.HttpStatusCode;
+import org.apache.isis.viewer.restfulobjects.applib.RoHttpMethod;
import org.apache.isis.viewer.restfulobjects.applib.homepage.HomePageRepresentation;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
public class UserResourceTest_accept {
@@ -63,7 +61,7 @@ public class UserResourceTest_accept {
@Test
public void applicationJson_profileUser() throws Exception {
- final RestfulRequest request = client.createRequest(RoHttpMethod.GET, "user").withHeader(RestfulRequest.Header.ACCEPT, MediaTypes.guavaToJaxRs(RepresentationType.USER.getMediaType()));
+ final RestfulRequest request = client.createRequest(RoHttpMethod.GET, "user").withHeader(RestfulRequest.Header.ACCEPT, RepresentationType.USER.getMediaType());
final RestfulResponse<HomePageRepresentation> restfulResponse = request.executeT();
assertThat(restfulResponse.getStatus(), is(HttpStatusCode.OK));
@@ -72,7 +70,7 @@ public class UserResourceTest_accept {
@Test
public void applicationJson_invalid() throws Exception {
- final RestfulRequest request = client.createRequest(RoHttpMethod.GET, "user").withHeader(RestfulRequest.Header.ACCEPT, MediaTypes.guavaToJaxRs(RepresentationType.HOME_PAGE.getMediaType()));
+ final RestfulRequest request = client.createRequest(RoHttpMethod.GET, "user").withHeader(RestfulRequest.Header.ACCEPT, RepresentationType.HOME_PAGE.getMediaType());
final RestfulResponse<HomePageRepresentation> restfulResponse = request.executeT();
assertThat(restfulResponse.getStatus(), is(HttpStatusCode.NOT_ACCEPTABLE));
http://git-wip-us.apache.org/repos/asf/isis/blob/6002a903/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/user/UserResourceTest_representationAndHeaders.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/user/UserResourceTest_representationAndHeaders.java b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/user/UserResourceTest_representationAndHeaders.java
index 7a1487e..a11b892 100644
--- a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/user/UserResourceTest_representationAndHeaders.java
+++ b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/user/UserResourceTest_representationAndHeaders.java
@@ -39,23 +39,21 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status.Family;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
import org.apache.isis.core.webserver.WebServer;
-import org.apache.isis.viewer.restfulobjects.applib.MediaTypes;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulClient;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse;
-import org.apache.isis.viewer.restfulobjects.applib.RoHttpMethod;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse.Header;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse.HttpStatusCode;
+import org.apache.isis.viewer.restfulobjects.applib.RoHttpMethod;
import org.apache.isis.viewer.restfulobjects.applib.user.UserRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.user.UserResource;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
+import org.codehaus.jackson.JsonParseException;
+import org.codehaus.jackson.map.JsonMappingException;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
public class UserResourceTest_representationAndHeaders {
@@ -118,8 +116,8 @@ public class UserResourceTest_representationAndHeaders {
final MediaType contentType = restfulResponse.getHeader(Header.CONTENT_TYPE);
assertThat(contentType, hasType("application"));
assertThat(contentType, hasSubType("json"));
- assertThat(contentType, hasParameter("profile", "urn:org.restfulobjects/user"));
- assertThat(contentType, is(MediaTypes.guavaToJaxRs(RepresentationType.USER.getMediaType())));
+ assertThat(contentType, hasParameter("profile", "urn:org.restfulobjects:repr-types/user"));
+ assertThat(contentType, is(RepresentationType.USER.getMediaType()));
// then
final CacheControl cacheControl = restfulResponse.getHeader(Header.CACHE_CONTROL);
http://git-wip-us.apache.org/repos/asf/isis/blob/6002a903/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/version/VersionResourceTest_accept.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/version/VersionResourceTest_accept.java b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/version/VersionResourceTest_accept.java
index 283858d..0f041b0 100644
--- a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/version/VersionResourceTest_accept.java
+++ b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/version/VersionResourceTest_accept.java
@@ -28,7 +28,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.core.webserver.WebServer;
-import org.apache.isis.viewer.restfulobjects.applib.MediaTypes;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulClient;
import org.apache.isis.viewer.restfulobjects.applib.RestfulRequest;
@@ -63,7 +62,7 @@ public class VersionResourceTest_accept {
@Test
public void applicationJson_profileVersion() throws Exception {
- final RestfulRequest request = client.createRequest(RoHttpMethod.GET, "version").withHeader(RestfulRequest.Header.ACCEPT, MediaTypes.guavaToJaxRs(RepresentationType.VERSION.getMediaType()));
+ final RestfulRequest request = client.createRequest(RoHttpMethod.GET, "version").withHeader(RestfulRequest.Header.ACCEPT, RepresentationType.VERSION.getMediaType());
final RestfulResponse<VersionRepresentation> restfulResponse = request.executeT();
assertThat(restfulResponse.getStatus(), is(HttpStatusCode.OK));
@@ -72,7 +71,7 @@ public class VersionResourceTest_accept {
@Test
public void applicationJson_invalid() throws Exception {
- final RestfulRequest request = client.createRequest(RoHttpMethod.GET, "/").withHeader(RestfulRequest.Header.ACCEPT, MediaTypes.guavaToJaxRs(RepresentationType.USER.getMediaType()));
+ final RestfulRequest request = client.createRequest(RoHttpMethod.GET, "/").withHeader(RestfulRequest.Header.ACCEPT, RepresentationType.USER.getMediaType());
final RestfulResponse<VersionRepresentation> restfulResponse = request.executeT();
assertThat(restfulResponse.getStatus(), is(HttpStatusCode.NOT_ACCEPTABLE));
http://git-wip-us.apache.org/repos/asf/isis/blob/6002a903/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/version/VersionResourceTest_representationAndHeaders.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/version/VersionResourceTest_representationAndHeaders.java b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/version/VersionResourceTest_representationAndHeaders.java
index 742040c..93361da 100644
--- a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/version/VersionResourceTest_representationAndHeaders.java
+++ b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/version/VersionResourceTest_representationAndHeaders.java
@@ -39,24 +39,22 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status.Family;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
import org.apache.isis.core.webserver.WebServer;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
-import org.apache.isis.viewer.restfulobjects.applib.MediaTypes;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulClient;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse;
-import org.apache.isis.viewer.restfulobjects.applib.RoHttpMethod;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse.Header;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse.HttpStatusCode;
+import org.apache.isis.viewer.restfulobjects.applib.RoHttpMethod;
import org.apache.isis.viewer.restfulobjects.applib.version.VersionRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.version.VersionResource;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
+import org.codehaus.jackson.JsonParseException;
+import org.codehaus.jackson.map.JsonMappingException;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
public class VersionResourceTest_representationAndHeaders {
@@ -126,8 +124,8 @@ public class VersionResourceTest_representationAndHeaders {
final MediaType contentType = restfulResponse.getHeader(Header.CONTENT_TYPE);
assertThat(contentType, hasType("application"));
assertThat(contentType, hasSubType("json"));
- assertThat(contentType, hasParameter("profile", "urn:org.restfulobjects/version"));
- assertThat(contentType, is(MediaTypes.guavaToJaxRs(RepresentationType.VERSION.getMediaType())));
+ assertThat(contentType, hasParameter("profile", "urn:org.restfulobjects:repr-types/version"));
+ assertThat(contentType, is(RepresentationType.VERSION.getMediaType()));
// then
final CacheControl cacheControl = restfulResponse.getHeader(Header.CACHE_CONTROL);