You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2011/07/24 17:16:29 UTC
svn commit: r1150399 - in
/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5:
internal/transform/PersistWorker.java services/TapestryModule.java
Author: hlship
Date: Sun Jul 24 15:16:14 2011
New Revision: 1150399
URL: http://svn.apache.org/viewvc?rev=1150399&view=rev
Log:
TAP5-1508: Convert PersistWorker to CCTW2, and make it more lazy
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/PersistWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/PersistWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/PersistWorker.java?rev=1150399&r1=1150398&r2=1150399&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/PersistWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/PersistWorker.java Sun Jul 24 15:16:14 2011
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007, 2008, 2009, 2010 The Apache Software Foundation
+// Copyright 2006, 2007, 2008, 2009, 2010, 2011 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,72 +14,57 @@
package org.apache.tapestry5.internal.transform;
-import java.util.List;
-
-import org.apache.tapestry5.ComponentResources;
import org.apache.tapestry5.annotations.Persist;
import org.apache.tapestry5.internal.InternalComponentResources;
import org.apache.tapestry5.internal.services.ComponentClassCache;
-import org.apache.tapestry5.ioc.services.FieldValueConduit;
import org.apache.tapestry5.ioc.services.PerThreadValue;
import org.apache.tapestry5.ioc.services.PerthreadManager;
import org.apache.tapestry5.model.MutableComponentModel;
-import org.apache.tapestry5.runtime.PageLifecycleAdapter;
-import org.apache.tapestry5.services.ClassTransformation;
-import org.apache.tapestry5.services.ComponentClassTransformWorker;
-import org.apache.tapestry5.services.ComponentValueProvider;
-import org.apache.tapestry5.services.TransformField;
+import org.apache.tapestry5.plastic.*;
+import org.apache.tapestry5.services.transform.ComponentClassTransformWorker2;
+import org.apache.tapestry5.services.transform.TransformationSupport;
/**
* Converts fields with the {@link org.apache.tapestry5.annotations.Persist} annotation into persistent fields.
*/
-public class PersistWorker implements ComponentClassTransformWorker
+public class PersistWorker implements ComponentClassTransformWorker2
{
- class PersistentFieldConduit implements FieldValueConduit
+ class PersistentFieldConduit implements FieldConduit<Object>
{
private final InternalComponentResources resources;
private final String name;
- private final PerThreadValue<Object> fieldValue;
+ private final PerThreadValue<Object> fieldValue = perThreadManager.createValue();
private final Object defaultValue;
public PersistentFieldConduit(InternalComponentResources resources, String name,
- PerThreadValue<Object> fieldValue, Object defaultValue)
+ Object defaultValue)
{
this.resources = resources;
this.name = name;
- this.fieldValue = fieldValue;
this.defaultValue = defaultValue;
-
- resources.addPageLifecycleListener(new PageLifecycleAdapter()
- {
- @Override
- public void restoreStateBeforePageAttach()
- {
- restoreStateAtPageAttach();
- }
- });
}
- public Object get()
+ public Object get(Object instance, InstanceContext context)
{
- return fieldValue.get(defaultValue);
+ if (!fieldValue.exists())
+ {
+ Object persistedValue = resources.hasFieldChange(name) ? resources.getFieldChange(name) : defaultValue;
+
+ fieldValue.set(persistedValue);
+ }
+
+ return fieldValue.get();
}
- public void set(Object newValue)
+ public void set(Object instance, InstanceContext context, Object newValue)
{
resources.persistFieldChange(name, newValue);
fieldValue.set(newValue);
}
-
- private void restoreStateAtPageAttach()
- {
- if (resources.hasFieldChange(name))
- fieldValue.set(resources.getFieldChange(name));
- }
}
private final ComponentClassCache classCache;
@@ -92,17 +77,15 @@ public class PersistWorker implements Co
this.perThreadManager = perThreadManager;
}
- public void transform(ClassTransformation transformation, MutableComponentModel model)
+ public void transform(PlasticClass plasticClass, TransformationSupport support, MutableComponentModel model)
{
- List<TransformField> fieldsWithAnnotation = transformation.matchFieldsWithAnnotation(Persist.class);
-
- for (TransformField field : fieldsWithAnnotation)
+ for (PlasticField field : plasticClass.getFieldsWithAnnotation(Persist.class))
{
makeFieldPersistent(field, model);
}
}
- private void makeFieldPersistent(TransformField field, MutableComponentModel model)
+ private void makeFieldPersistent(PlasticField field, MutableComponentModel model)
{
Persist annotation = field.getAnnotation(Persist.class);
@@ -112,20 +95,20 @@ public class PersistWorker implements Co
final Object defaultValue = determineDefaultValueFromFieldType(field);
- ComponentValueProvider<FieldValueConduit> provider = new ComponentValueProvider<FieldValueConduit>()
+ ComputedValue<FieldConduit<Object>> computed = new ComputedValue<FieldConduit<Object>>()
{
- public FieldValueConduit get(ComponentResources resources)
+ public FieldConduit<Object> get(InstanceContext context)
{
- return new PersistentFieldConduit((InternalComponentResources) resources, logicalFieldName,
- perThreadManager.createValue(), defaultValue);
+ InternalComponentResources resources = context.get(InternalComponentResources.class);
+ return new PersistentFieldConduit(resources, logicalFieldName, defaultValue);
}
};
- field.replaceAccess(provider);
+ field.setComputedConduit(computed);
}
- private Object determineDefaultValueFromFieldType(TransformField field)
+ private Object determineDefaultValueFromFieldType(PlasticField field)
{
- return classCache.defaultValueForType(field.getType());
+ return classCache.defaultValueForType(field.getTypeName());
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java?rev=1150399&r1=1150398&r2=1150399&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java Sun Jul 24 15:16:14 2011
@@ -537,7 +537,9 @@ public final class TapestryModule
* <dt>Environment</dt>
* <dd>Allows fields to contain values extracted from the {@link org.apache.tapestry5.services.Environment} service</dd>
* <dt>ApplicationState</dt>
- * <dd>Converts fields that reference application state objects
+ * <dd>Converts fields that reference application state objects</dd>
+ * <dt>Persist</dt>
+ * <dd>Allows fields to store their their value persistently between requests via {@link Persist}</dd>
* </dl>
*/
@Contribute(ComponentClassTransformWorker2.class)
@@ -603,6 +605,8 @@ public final class TapestryModule
configuration.addInstance("InjectService", InjectServiceWorker.class);
configuration.addInstance("InjectNamed", InjectNamedWorker.class);
+ configuration.addInstance("Persist", PersistWorker.class);
+
// This one is always last. Any additional private fields that aren't
// annotated will
@@ -614,8 +618,6 @@ public final class TapestryModule
/**
* Adds a number of standard component class transform workers:
* <dl>
- * <dt>Persist</dt>
- * <dd>Allows fields to store their their value persistently between requests</dd>
* <dt>Inject</dt>
* <dd>Used with the {@link org.apache.tapestry5.ioc.annotations.Inject} annotation, when a value is supplied</dd>
* <dt>Log</dt>
@@ -631,8 +633,6 @@ public final class TapestryModule
{
configuration.addInstance("Inject", InjectWorker.class);
- configuration.addInstance("Persist", PersistWorker.class);
-
configuration.addInstance("Log", LogWorker.class);
configuration.addInstance("SessionAttribute", SessionAttributeWorker.class);