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 2015/09/17 11:46:54 UTC
[05/10] isis git commit: ISIS-1194: extending ResourceContext so that
DomainResourceHelper can interact with ServicesInjector directly (rather than
by way of PersistenceSession)
ISIS-1194: extending ResourceContext so that DomainResourceHelper can interact with ServicesInjector directly (rather than by way of PersistenceSession)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/6352f06a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/6352f06a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/6352f06a
Branch: refs/heads/master
Commit: 6352f06a8dc981773c4b83a83d2f97b75327baf2
Parents: fe2b2ba
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Sep 16 16:56:32 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Sep 16 16:56:32 2015 +0100
----------------------------------------------------------------------
.../system/persistence/PersistenceSession.java | 7 ----
.../system/session/IsisSessionFactory.java | 42 +++++++++++---------
.../rendering/RendererContext.java | 4 ++
.../rendering/RendererContext5.java | 2 +
.../service/RepresentationService.java | 7 ++++
.../restfulobjects/server/ResourceContext.java | 34 +++++++++++-----
.../server/resources/DomainResourceHelper.java | 34 +++++++++++-----
.../server/resources/ResourceAbstract.java | 13 ++++--
...ontextTest_ensureCompatibleAcceptHeader.java | 3 +-
.../server/ResourceContextTest_getArg.java | 6 +--
10 files changed, 96 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/6352f06a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
index 4327cf4..476d76d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
@@ -301,13 +301,6 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
}
}
- /**
- * @return - the service, or <tt>null</tt> if no service registered of specified type.
- */
- public <T> T getServiceOrNull(final Class<T> serviceType) {
- return servicesInjector.lookupService(serviceType);
- }
-
//endregion
//region > close
http://git-wip-us.apache.org/repos/asf/isis/blob/6352f06a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
index 0e3b9a9..9b4d08a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
@@ -24,21 +24,20 @@ import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.isis.applib.clock.Clock;
-import org.apache.isis.applib.fixtures.FixtureClock;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.installerregistry.InstallerLookup;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory;
import static org.apache.isis.core.commons.ensure.Ensure.ensureThatArg;
import static org.hamcrest.CoreMatchers.is;
@@ -104,18 +103,12 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
}
-
- // ///////////////////////////////////////////
- // init, shutdown
- // ///////////////////////////////////////////
-
public void shutdown() {
persistenceSessionFactory.shutdown();
authenticationManager.shutdown();
specificationLoaderSpi.shutdown();
}
- // //////////////////////////////////////
/**
@@ -138,6 +131,14 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
/**
* The {@link ApplicationScopedComponent application-scoped}
+ * {@link DeploymentType}.
+ */
+ public DeploymentType getDeploymentType() {
+ return deploymentType;
+ }
+
+ /**
+ * The {@link ApplicationScopedComponent application-scoped}
* {@link IsisConfiguration}.
*/
public IsisConfiguration getConfiguration() {
@@ -145,13 +146,23 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
}
/**
- * The {@link ApplicationScopedComponent application-scoped}
- * {@link DeploymentType}.
+ * The {@link ApplicationScopedComponent application-scoped} {@link ServicesInjector}.
*/
- public DeploymentType getDeploymentType() {
- return deploymentType;
+ public ServicesInjector getServicesInjector() {
+ return servicesInjector;
+ }
+
+ /**
+ * Derived from {@link #getServicesInjector()}.
+ *
+ * @deprecated - use {@link #getServicesInjector()} instead.
+ */
+ @Deprecated
+ public List<Object> getServices() {
+ return servicesInjector.getRegisteredServices();
}
+
/**
* The {@link ApplicationScopedComponent application-scoped}
* {@link SpecificationLoaderSpi}.
@@ -187,10 +198,6 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
return persistenceSessionFactory;
}
- public List<Object> getServices() {
- return servicesInjector.getRegisteredServices();
- }
-
/**
* The {@link OidMarshaller} to use for marshalling and unmarshalling {@link Oid}s
* into strings.
@@ -199,5 +206,4 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
return oidMarshaller;
}
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6352f06a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java
index a1b0821..3ee6991 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java
@@ -40,6 +40,10 @@ public interface RendererContext {
public PersistenceSession getPersistenceSession();
+ /**
+ * @deprecated - replaced by {@link #getPersistenceSession()}.
+ */
+ @Deprecated
public AdapterManager getAdapterManager();
public Where getWhere();
http://git-wip-us.apache.org/repos/asf/isis/blob/6352f06a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext5.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext5.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext5.java
index f91d9d2..76b8b95 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext5.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext5.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.viewer.restfulobjects.rendering;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
/**
@@ -26,5 +27,6 @@ import org.apache.isis.core.metamodel.spec.SpecificationLoader;
public interface RendererContext5 extends RendererContext4 {
public SpecificationLoader getSpecificationLoader();
+ public ServicesInjector getServicesInjector();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6352f06a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationService.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationService.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationService.java
index 4028fe5..b49fcf4 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationService.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationService.java
@@ -21,11 +21,14 @@ import javax.ws.rs.core.Response;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.viewer.restfulobjects.rendering.RendererContext;
import org.apache.isis.viewer.restfulobjects.rendering.RendererContext2;
import org.apache.isis.viewer.restfulobjects.rendering.RendererContext3;
import org.apache.isis.viewer.restfulobjects.rendering.RendererContext4;
+import org.apache.isis.viewer.restfulobjects.rendering.RendererContext5;
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ActionResultReprRenderer;
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.MemberReprMode;
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ObjectAdapterLinkTo;
@@ -84,4 +87,8 @@ public interface RepresentationService {
public static interface Context4 extends Context3, RendererContext4 {
InteractionInitiatedBy getInteractionInitiatedBy();
}
+ public static interface Context5 extends Context3, RendererContext5 {
+ public SpecificationLoader getSpecificationLoader();
+ public ServicesInjector getServicesInjector();
+ }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6352f06a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
index 999959a..ae59797 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
@@ -43,6 +43,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
@@ -65,17 +66,17 @@ public class ResourceContext implements RendererContext5 {
private final HttpServletResponse httpServletResponse;
private final SecurityContext securityContext;
- private final Localization localization;
+ private final DeploymentType deploymentType;
private final IsisConfiguration configuration;
+ private final ServicesInjector servicesInjector;
+ private final SpecificationLoader specificationLoader;
private final AuthenticationSession authenticationSession;
+ private final Localization localization;
private final PersistenceSession persistenceSession;
- private final AdapterManager adapterManager;
- private final SpecificationLoader specificationLoader;
private List<List<String>> followLinks;
private final Where where;
- private final DeploymentType deploymentType;
private final InteractionInitiatedBy interactionInitiatedBy;
private final String urlUnencodedQueryString;
@@ -94,13 +95,13 @@ public class ResourceContext implements RendererContext5 {
final HttpServletRequest httpServletRequest,
final HttpServletResponse httpServletResponse,
final SecurityContext securityContext,
- final Localization localization,
+ final DeploymentType deploymentType,
+ final IsisConfiguration configuration,
+ final ServicesInjector servicesInjector,
+ final SpecificationLoader specificationLoader,
final AuthenticationSession authenticationSession,
+ final Localization localization,
final PersistenceSession persistenceSession,
- final AdapterManager objectAdapterLookup,
- final SpecificationLoader specificationLoader,
- final IsisConfiguration configuration,
- final DeploymentType deploymentType,
final InteractionInitiatedBy interactionInitiatedBy) {
this.httpHeaders = httpHeaders;
@@ -111,11 +112,11 @@ public class ResourceContext implements RendererContext5 {
this.httpServletRequest = httpServletRequest;
this.httpServletResponse = httpServletResponse;
this.securityContext = securityContext;
+ this.servicesInjector = servicesInjector;
this.localization = localization;
this.configuration = configuration;
this.authenticationSession = authenticationSession;
this.persistenceSession = persistenceSession;
- this.adapterManager = objectAdapterLookup;
this.specificationLoader = specificationLoader;
this.where = where;
this.deploymentType = deploymentType;
@@ -264,6 +265,7 @@ public class ResourceContext implements RendererContext5 {
return securityContext;
}
+ @Override
public DeploymentType getDeploymentType() {
return deploymentType;
}
@@ -288,9 +290,18 @@ public class ResourceContext implements RendererContext5 {
return authenticationSession;
}
+ /**
+ * @deprecated - use {@link #getPersistenceSession()}.
+ */
+ @Deprecated
@Override
public AdapterManager getAdapterManager() {
- return adapterManager;
+ return persistenceSession;
+ }
+
+ @Override
+ public ServicesInjector getServicesInjector() {
+ return servicesInjector;
}
@Override
@@ -302,6 +313,7 @@ public class ResourceContext implements RendererContext5 {
return persistenceSession.getServices();
}
+ @Override
public SpecificationLoader getSpecificationLoader() {
return specificationLoader;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6352f06a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
index ebef262..1f652d9 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
@@ -29,15 +29,16 @@ import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
-import org.apache.isis.viewer.restfulobjects.rendering.RendererContext4;
+import org.apache.isis.viewer.restfulobjects.rendering.RendererContext5;
import org.apache.isis.viewer.restfulobjects.rendering.RestfulObjectsApplicationException;
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ActionResultReprRenderer;
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.DomainObjectLinkTo;
@@ -52,13 +53,13 @@ import org.apache.isis.viewer.restfulobjects.server.ResourceContext;
public class DomainResourceHelper {
- static class RepresentationServiceContextAdapter implements RepresentationService.Context4 {
+ static class RepresentationServiceContextAdapter implements RepresentationService.Context5 {
- private final RendererContext4 rendererContext;
+ private final RendererContext5 rendererContext;
private final ObjectAdapterLinkTo adapterLinkTo;
RepresentationServiceContextAdapter(
- final RendererContext4 rendererContext,
+ final RendererContext5 rendererContext,
final ObjectAdapterLinkTo adapterLinkTo) {
this.rendererContext = rendererContext;
this.adapterLinkTo = adapterLinkTo;
@@ -91,7 +92,7 @@ public class DomainResourceHelper {
@Override
public AdapterManager getAdapterManager() {
- return rendererContext.getAdapterManager();
+ return rendererContext.getPersistenceSession();
}
@Override
@@ -168,6 +169,16 @@ public class DomainResourceHelper {
public InteractionInitiatedBy getInteractionInitiatedBy() {
return rendererContext.getInteractionInitiatedBy();
}
+
+ @Override
+ public SpecificationLoader getSpecificationLoader() {
+ return rendererContext.getSpecificationLoader();
+ }
+
+ @Override
+ public ServicesInjector getServicesInjector() {
+ return rendererContext.getServicesInjector();
+ }
}
private final RepresentationService representationService;
@@ -347,14 +358,15 @@ public class DomainResourceHelper {
// //////////////////////////////////////
private PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return resourceContext.getPersistenceSession();
+ }
+
+ private ServicesInjector getServicesInjector() {
+ return resourceContext.getServicesInjector();
}
- /**
- * Service locator
- */
private <T> T lookupService(Class<T> serviceType) {
- return getPersistenceSession().getServiceOrNull(serviceType);
+ return getServicesInjector().lookupService(serviceType);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6352f06a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
index 9d725d3..46c3e58 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
@@ -38,6 +38,7 @@ import org.apache.isis.core.commons.url.UrlEncodingUtils;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.services.ServiceUtil;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
@@ -112,9 +113,11 @@ public abstract class ResourceAbstract {
this.resourceContext = new ResourceContext(
representationType, httpHeaders, providers, uriInfo, request, where, urlUnencodedQueryString, httpServletRequest, httpServletResponse,
- securityContext, getLocalization(), getAuthenticationSession(), getPersistenceSession(),
- getPersistenceSession(), getSpecificationLoader(), getConfiguration(),
- getDeploymentType(), InteractionInitiatedBy.USER);
+ securityContext,
+ getDeploymentType(), getConfiguration(),
+ getServicesInjector(), getSpecificationLoader(),
+ getAuthenticationSession(), getLocalization(),
+ getPersistenceSession(), InteractionInitiatedBy.USER);
}
protected ResourceContext getResourceContext() {
@@ -164,6 +167,10 @@ public abstract class ResourceAbstract {
return IsisContext.getConfiguration();
}
+ protected ServicesInjector getServicesInjector () {
+ return IsisContext.getSessionFactory().getServicesInjector();
+ }
+
protected AuthenticationSession getAuthenticationSession() {
return IsisContext.getAuthenticationSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6352f06a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_ensureCompatibleAcceptHeader.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_ensureCompatibleAcceptHeader.java b/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_ensureCompatibleAcceptHeader.java
index 8f65ede..9c60ec0 100644
--- a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_ensureCompatibleAcceptHeader.java
+++ b/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_ensureCompatibleAcceptHeader.java
@@ -161,8 +161,7 @@ public class ResourceContextTest_ensureCompatibleAcceptHeader {
private ResourceContext instantiateResourceContext(
final RepresentationType representationType) {
- return new ResourceContext(representationType, httpHeaders, null, null, null, null, null, httpServletRequest, null, null, null, null, null, null, null, null, null,
- null);
+ return new ResourceContext(representationType, httpHeaders, null, null, null, null, null, httpServletRequest, null, null, null, null, null, null, null, null, null, null);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6352f06a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java b/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
index 184f28f..7a3ced3 100644
--- a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
+++ b/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
@@ -56,8 +56,7 @@ public class ResourceContextTest_getArg {
givenServletRequestQueryString(queryString);
givenServletRequestParameterMapEmpty();
- resourceContext = new ResourceContext(null, null, null, null, null, null, (String)null, httpServletRequest, null, null, null, null, null, null, null, null, null,
- null) {
+ resourceContext = new ResourceContext(null, null, null, null, null, null, (String)null, httpServletRequest, null, null, null, null, null, null, null, null, null, null) {
@Override
void init(final RepresentationType representationType) {
//
@@ -73,8 +72,7 @@ public class ResourceContextTest_getArg {
givenServletRequestQueryString(queryString);
givenServletRequestParameterMapEmpty();
- resourceContext = new ResourceContext(null, null, null, null, null, null, (String)null, httpServletRequest, null, null, null, null, null, null, null, null, null,
- null) {
+ resourceContext = new ResourceContext(null, null, null, null, null, null, (String)null, httpServletRequest, null, null, null, null, null, null, null, null, null, null) {
@Override
void init(final RepresentationType representationType) {
//