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/11/13 18:57:16 UTC
[05/11] isis git commit: ISIS-915: minor tidy-up.
ISIS-915: minor tidy-up.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d654fc8e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d654fc8e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d654fc8e
Branch: refs/heads/master
Commit: d654fc8ef3f386f76fa48145fe0881e269a7a41a
Parents: 9163f6d
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Nov 13 10:06:48 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Nov 13 10:06:48 2015 +0000
----------------------------------------------------------------------
.../RecreatableObjectFacetAbstract.java | 3 ++
.../RecreatableObjectFacetFactory.java | 4 ++-
...eObjectFacetForXmlRootElementAnnotation.java | 34 ++++++++------------
3 files changed, 19 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/d654fc8e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetAbstract.java
index 969d007..63de997 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetAbstract.java
@@ -22,6 +22,7 @@ package org.apache.isis.core.metamodel.facets.object.recreatable;
import java.lang.reflect.Method;
import org.apache.isis.applib.ViewModel;
+import org.apache.isis.applib.services.urlencoding.UrlEncodingService;
import org.apache.isis.core.commons.lang.MethodExtensions;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -122,4 +123,6 @@ public abstract class RecreatableObjectFacetAbstract extends MarkerFacetAbstract
}
}
+
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d654fc8e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
index ec03ff4..939e9bf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
@@ -99,7 +99,9 @@ public class RecreatableObjectFacetFactory extends FacetFactoryAbstract
private ViewModelFacet create(final XmlRootElement annotation, final FacetHolder holder) {
final PostConstructMethodCache postConstructMethodCache = this;
- return annotation != null ? new RecreatableObjectFacetForXmlRootElementAnnotation(holder, getSpecificationLoader(), adapterManager, servicesInjector, postConstructMethodCache) : null;
+ return annotation != null
+ ? new RecreatableObjectFacetForXmlRootElementAnnotation(holder, servicesInjector, postConstructMethodCache)
+ : null;
}
// //////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/d654fc8e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForXmlRootElementAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForXmlRootElementAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForXmlRootElementAnnotation.java
index 06581c3..5c167af 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForXmlRootElementAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForXmlRootElementAnnotation.java
@@ -21,53 +21,45 @@ package org.apache.isis.core.metamodel.facets.object.recreatable;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.urlencoding.UrlEncodingService;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.PostConstructMethodCache;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-import org.apache.isis.core.metamodel.spec.SpecificationLoader;
public class RecreatableObjectFacetForXmlRootElementAnnotation extends RecreatableObjectFacetAbstract {
- private final SpecificationLoader specificationLoader;
- private final AdapterManager adapterManager;
- private final ServicesInjector servicesInjector;
public RecreatableObjectFacetForXmlRootElementAnnotation(
final FacetHolder holder,
- final SpecificationLoader specificationLoader,
- final AdapterManager adapterManager,
final ServicesInjector servicesInjector,
final PostConstructMethodCache postConstructMethodCache) {
super(holder, ArchitecturalLayer.APPLICATION, RecreationMechanism.INSTANTIATES,
postConstructMethodCache, servicesInjector);
-
- this.specificationLoader = specificationLoader;
- this.adapterManager = adapterManager;
- this.servicesInjector = servicesInjector;
}
@Override
protected Object doInstantiate(final Class<?> viewModelClass, final String mementoStr) {
- final JaxbService jaxbService = servicesInjector.lookupService(JaxbService.class);
- final UrlEncodingService urlEncodingService =
- servicesInjector.lookupService(UrlEncodingService.class);
+ final String xmlStr = getUrlEncodingService().decode(mementoStr);
+ final Object viewModelPojo = getJaxbService().fromXml(viewModelClass, xmlStr);
- final String xmlStr = urlEncodingService.decode(mementoStr);
- final Object viewModelPojo = jaxbService.fromXml(viewModelClass, xmlStr);
return viewModelPojo;
}
@Override
public String memento(final Object pojo) {
- final JaxbService jaxbService = servicesInjector.lookupService(JaxbService.class);
- final UrlEncodingService urlEncodingService =
- servicesInjector.lookupService(UrlEncodingService.class);
+ final String xml = getJaxbService().toXml(pojo);
+ final String encoded = getUrlEncodingService().encode(xml);
- final String xml = jaxbService.toXml(pojo);
- final String encoded = urlEncodingService.encode(xml);
return encoded;
}
+
+ private JaxbService getJaxbService() {
+ return servicesInjector.lookupService(JaxbService.class);
+ }
+
+ private UrlEncodingService getUrlEncodingService() {
+ return servicesInjector.lookupService(UrlEncodingService.class);
+ }
+
}