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 2010/12/18 13:42:24 UTC

svn commit: r1050630 [2/2] - in /incubator/isis/trunk: alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/auto/ core/commons/src/main/java/org/apache/isis/core/commons/debug/ core/metamodel/src/main/java/o...

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/specloader/internal/introspector/JavaIntrospector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/specloader/internal/introspector/JavaIntrospector.java?rev=1050630&r1=1050629&r2=1050630&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/specloader/internal/introspector/JavaIntrospector.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/specloader/internal/introspector/JavaIntrospector.java Sat Dec 18 12:42:22 2010
@@ -20,7 +20,6 @@
 
 package org.apache.isis.core.progmodel.specloader.internal.introspector;
 
-import java.beans.Introspector;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -34,7 +33,6 @@ import org.apache.log4j.Logger;
 
 import com.google.common.collect.Lists;
 
-import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.lang.JavaClassUtils;
 import org.apache.isis.core.commons.lang.ToString;
@@ -45,6 +43,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.spec.identifier.Util;
 import org.apache.isis.core.metamodel.specloader.ObjectReflectorAbstract;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
@@ -52,10 +51,9 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.specloader.internal.introspector.MethodFinderUtils;
 import org.apache.isis.core.metamodel.specloader.internal.peer.JavaObjectActionParamPeer;
 import org.apache.isis.core.metamodel.specloader.internal.peer.JavaObjectActionPeer;
-import org.apache.isis.core.metamodel.specloader.internal.peer.JavaOneToManyAssociationPeer;
-import org.apache.isis.core.metamodel.specloader.internal.peer.JavaOneToOneAssociationPeer;
+import org.apache.isis.core.metamodel.specloader.internal.peer.JavaObjectAssociationPeer;
+import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectActionParamPeer;
 import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectActionPeer;
-import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectAssociationPeer;
 import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectMemberPeer;
 import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverser;
 import org.apache.isis.core.metamodel.util.NameUtils;
@@ -129,7 +127,6 @@ public class JavaIntrospector {
     private static final String GET_PREFIX = "get";
     private static final String IS_PREFIX = "is";
 
-    private final String className;
     private final Class<?> type;
     private final List<Method> methods;
 
@@ -164,7 +161,6 @@ public class JavaIntrospector {
         // has been removed.
 
         methods = Arrays.asList(type.getMethods());
-        className = type.getName();
     }
 
     // ////////////////////////////////////////////////////////////////////////////
@@ -191,13 +187,6 @@ public class JavaIntrospector {
         return type;
     }
 
-    /**
-     * As per {@link Class#getName()}.
-     */
-    String className() {
-        return className;
-    }
-
     public String getFullName() {
         return type.getName();
     }
@@ -217,9 +206,13 @@ public class JavaIntrospector {
     public boolean isFinal() {
         return JavaClassUtils.isFinal(type);
     }
+
+    private String getClassName() {
+        return type.getName();
+    }
 
     public String shortName() {
-        final String name = type.getName();
+        final String name = getClassName();
         return name.substring(name.lastIndexOf('.') + 1);
     }
 
@@ -227,11 +220,11 @@ public class JavaIntrospector {
     // ////////////////////////////////////////////////////////////////////////////
     // introspect
     // ////////////////////////////////////////////////////////////////////////////
-
+
     public void introspectClass() {
-        LOG.info("introspecting " + className());
+        LOG.info("introspecting " + getClassName());
         if (LOG.isDebugEnabled()) {
-        	LOG.debug("introspecting " + className() + ": class-level details");
+        	LOG.debug("introspecting " + getClassName() + ": class-level details");
         }
 
         // process facets at object level
@@ -259,7 +252,7 @@ public class JavaIntrospector {
     }
 
     public void introspectPropertiesAndCollections() {
-        LOG.debug("introspecting " + className() + ": properties and collections");
+        LOG.debug("introspecting " + getClassName() + ": properties and collections");
 
         // find the properties and collections (fields) ...
         final List<ObjectMemberPeer> fieldPeers = findAndCreateFieldPeers();
@@ -281,7 +274,7 @@ public class JavaIntrospector {
     }
 
     public void introspectActions() {
-        LOG.debug("introspecting " + className() + ": actions");
+        LOG.debug("introspecting " + getClassName() + ": actions");
 
         // find the actions ...
         MethodScope methodScope = MethodScope.OBJECT;
@@ -364,15 +357,13 @@ public class JavaIntrospector {
     }
 
     private void createCollectionPeersFromAccessors(final List<Method> collectionAccessors, final List<ObjectMemberPeer> associationPeerListToAppendto) {
-        for (final Method getMethod : collectionAccessors) {
-            LOG.debug("  identified one-many association method " + getMethod);
-            final String capitalizedName = NameUtils.javaBaseName(getMethod.getName());
-            final String collectionNameName = Introspector.decapitalize(capitalizedName);
-
-            final Identifier identifier = Identifier.propertyOrCollectionIdentifier(className(), collectionNameName);
+        for (final Method getMethod : collectionAccessors) {
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("  identified one-many association method " + getMethod);
+            }
 
-            // create property and add facets
-            final JavaOneToManyAssociationPeer collection = new JavaOneToManyAssociationPeer(identifier, getSpecificationLoader());
+            // create property and add facets
+            final JavaObjectAssociationPeer collection = JavaObjectAssociationPeer.createCollectionPeer(type, getMethod, getSpecificationLoader());
             getFacetProcessor().process(type, getMethod, new JavaIntrospectorMethodRemover(), collection,
                     ObjectFeatureType.COLLECTION);
 
@@ -382,9 +373,9 @@ public class JavaIntrospector {
             if (typeOfFacet != null) {
                 elementType = typeOfFacet.value();
             }
-            collection.setElementType(elementType);
+            collection.setType(elementType);
 
-            // skip if class substituor says so.
+            // skip if class substitutor says so.
             if (getClassSubstitutor().getClass(elementType) == null) {
                 continue;
             }
@@ -396,28 +387,21 @@ public class JavaIntrospector {
     private void createPropertyPeersFromAccessors(final List<Method> propertyAccessors, final List<ObjectMemberPeer> associationPeerListToAppendto)
             throws ReflectionException {
 
-        for (final Method accessorMethod : propertyAccessors) {
-            LOG.debug("  identified 1-1 association method " + accessorMethod);
+        for (final Method getMethod : propertyAccessors) {
+            LOG.debug("  identified 1-1 association method " + getMethod);
 
-            final String capitalizedName = NameUtils.javaBaseName(accessorMethod.getName());
-            final String beanName = Introspector.decapitalize(capitalizedName);
-            final Class<?> returnType = accessorMethod.getReturnType();
+            final Class<?> returnType = getMethod.getReturnType();
 
             // skip if class strategy says so.
             if (getClassSubstitutor().getClass(returnType) == null) {
                 continue;
             }
 
-            if (LOG.isDebugEnabled()) {
-            	LOG.debug("one-to-one association " + capitalizedName + " ->" + accessorMethod);
-            }
-            final Identifier identifier = Identifier.propertyOrCollectionIdentifier(className, beanName);
-
             // create a 1:1 association peer
-            final JavaOneToOneAssociationPeer associationPeer = new JavaOneToOneAssociationPeer(identifier, returnType, getSpecificationLoader());
+            final JavaObjectAssociationPeer associationPeer = JavaObjectAssociationPeer.createPropertyPeer(type, getMethod, returnType, getSpecificationLoader());
 
             // process facets for the 1:1 association
-            getFacetProcessor().process(type, accessorMethod, new JavaIntrospectorMethodRemover(), associationPeer,
+            getFacetProcessor().process(type, getMethod, new JavaIntrospectorMethodRemover(), associationPeer,
                     ObjectFeatureType.PROPERTY);
 
             associationPeerListToAppendto.add(associationPeer);
@@ -478,34 +462,35 @@ public class JavaIntrospector {
         return createAction(actionMethod);
     }
 
-	private ObjectActionPeer createAction(final Method actionMethod) {
-		final Class<?>[] parameterTypes = getParameterTypesFor(actionMethod);
-        final int numParameters = parameterTypes.length;
-
-        final JavaObjectActionParamPeer[] actionParams = new JavaObjectActionParamPeer[numParameters];
-        for (int j = 0; j < numParameters; j++) {
-            ObjectSpecification paramSpec = getSpecificationLoader().loadSpecification(parameterTypes[j]);
-            if (paramSpec == null) {
-            	return null;
-            }
-            actionParams[j] = new JavaObjectActionParamPeer(paramSpec);
-        }
-
-
-        final String fullMethodName = actionMethod.getName();
-        final Identifier identifier = Identifier.actionIdentifier(className, fullMethodName, parameterTypes);
-        final JavaObjectActionPeer action = new JavaObjectActionPeer(identifier, actionParams);
+	private ObjectActionPeer createAction(final Method actionMethod) {
+	    
+		if (!isAllParamTypesValid(actionMethod)) {
+		    return null;
+		}
+        
+        Class<?> returnType = actionMethod.getReturnType();
+        final JavaObjectActionPeer action = new JavaObjectActionPeer(type, actionMethod, returnType, reflector);
 
         // process facets on the action & parameters
         getFacetProcessor()
-                .process(type, actionMethod, new JavaIntrospectorMethodRemover(), action, ObjectFeatureType.ACTION);
+                .process(type, actionMethod, new JavaIntrospectorMethodRemover(), action, ObjectFeatureType.ACTION);
+
+        ObjectActionParamPeer[] actionParams = action.getParameters();
         for (int j = 0; j < actionParams.length; j++) {
             getFacetProcessor().processParams(actionMethod, j, actionParams[j]);
         }
 
         return action;
-	}
-
+	}
+
+    public boolean isAllParamTypesValid(final Method actionMethod) {
+        return Util.isAllParamTypesValid(actionMethod, getSpecificationLoader());
+    }
+
+    private JavaObjectActionParamPeer[] getParamPeersFor(final Method actionMethod) {
+        return Util.getParamPeers(actionMethod, getSpecificationLoader());
+    }
+
     private boolean representsAction(final MethodScope methodScope, RecognisedHelpersStrategy skipRecognisedHelpers, final Method actionMethod) {
 
         if (!MethodFinderUtils.inScope(methodScope, actionMethod)) {
@@ -542,25 +527,10 @@ public class JavaIntrospector {
     }
 
 	private boolean loadParamSpecs(final Method actionMethod) {
-		final Class<?>[] parameterTypes = getParameterTypesFor(actionMethod);
+		final Class<?>[] parameterTypes = actionMethod.getParameterTypes();
         return loadParamSpecs(parameterTypes);
 	}
 
-	private Class<?>[] getParameterTypesFor(final Method actionMethod) {
-
-		// build/validate action parameters
-        // as for return type, if the reflector's class strategy says to skip any of the
-        // action's parameter types, then just ignore this action altogether.
-        final Class<?>[] parameterTypes = actionMethod.getParameterTypes();
-
-
-        // previously we wrapped primitives.  However, this prevents the lookup of
-        // actions during remote authorization calls (using Identifier class).
-        // ... should we remove ... ?
-        // final Class<?>[] parameterClasses = WrapperUtils.wrapAsNecessary(parameterTypes);
-		return parameterTypes;
-	}
-
 	private boolean loadParamSpecs(final Class<?>[] parameterTypes) {
         final int numParameters = parameterTypes.length;
         for (int j = 0; j < numParameters; j++) {
@@ -645,7 +615,7 @@ public class JavaIntrospector {
         if (method == null) {
             return null;
         } else if (!JavaClassUtils.isStatic(method)) {
-            LOG.warn("method " + className + "." + type + "Order() must be declared as static");
+            LOG.warn("method " + getClassName() + "." + type + "Order() must be declared as static");
             return null;
         } else {
             String s;
@@ -661,7 +631,7 @@ public class JavaIntrospector {
         try {
             return method.invoke(null, parameters);
         } catch (final IllegalAccessException ignore) {
-            LOG.warn("method " + className + "." + method.getName() + "() must be declared as public");
+            LOG.warn("method " + getClassName() + "." + method.getName() + "() must be declared as public");
             return null;
         } catch (final InvocationTargetException e) {
             throw new ReflectionException(e);
@@ -712,7 +682,7 @@ public class JavaIntrospector {
      * <p>
      * Have therefore made private.
      */
-    private static List<ObjectAssociationPeer> orderArray(final List<ObjectAssociationPeer> original, final String[] order) {
+    private static List<ObjectMemberPeer> orderArray(final List<ObjectMemberPeer> original, final String[] order) {
         if (order == null) {
             return original;
 
@@ -721,14 +691,14 @@ public class JavaIntrospector {
                 order[i] = NameUtils.simpleName(order[i]);
             }
 
-            final List<ObjectAssociationPeer> ordered = Lists.newArrayListWithCapacity(original.size());
+            final List<ObjectMemberPeer> ordered = Lists.newArrayListWithCapacity(original.size());
 
             // work through each order element and find, if there is one, a
             // matching member.
             int orderedIndex = 0;
             ordering: for (int orderIndex = 0; orderIndex < order.length; orderIndex++) {
                 for (int memberIndex = 0; memberIndex < original.size(); memberIndex++) {
-                    final ObjectAssociationPeer member = original.get(memberIndex);
+                    final ObjectMemberPeer member = original.get(memberIndex);
                     if (member == null) {
                         continue;
                     }
@@ -745,7 +715,7 @@ public class JavaIntrospector {
                 }
             }
 
-            final List<ObjectAssociationPeer> results = Lists.newArrayListWithCapacity(original.size());
+            final List<ObjectMemberPeer> results = Lists.newArrayListWithCapacity(original.size());
             int index = append(0, results, ordered);
             index = append(index, results, original);
 
@@ -753,9 +723,9 @@ public class JavaIntrospector {
         }
     }
 
-    protected static int append(int index, final List<ObjectAssociationPeer> to, List<ObjectAssociationPeer> from) {
+    protected static int append(int index, final List<ObjectMemberPeer> to, List<ObjectMemberPeer> from) {
         for (int i = 0; i < from.size(); i++) {
-            final ObjectAssociationPeer member = from.get(i);
+            final ObjectMemberPeer member = from.get(i);
             if (member != null) {
                 to.set(index++, member);
             }
@@ -776,7 +746,7 @@ public class JavaIntrospector {
     @Override
     public String toString() {
         ToString str = new ToString(this);
-        str.append("class", className);
+        str.append("class", getClassName());
         return str.toString();
     }
 

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/ActionMethodsFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/ActionMethodsFacetFactoryTest.java?rev=1050630&r1=1050629&r2=1050630&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/ActionMethodsFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/ActionMethodsFacetFactoryTest.java Sat Dec 18 12:42:22 2010
@@ -24,7 +24,6 @@ import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.annotation.Named;
 import org.apache.isis.applib.security.UserMemento;
 import org.apache.isis.core.metamodel.facets.Facet;
@@ -42,7 +41,6 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
-import org.apache.isis.core.metamodel.specloader.internal.peer.JavaObjectActionParamPeer;
 import org.apache.isis.core.metamodel.specloader.internal.peer.JavaObjectActionPeer;
 import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectActionPeer;
 import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
@@ -628,15 +626,6 @@ public class ActionMethodsFacetFactoryTe
         assertEquals(customerNoSpec, actionInvocationFacetViaMethod.getOnType());
     }
 
-    private static ObjectActionPeer createHolderWithParms() {
-        JavaObjectActionParamPeer param1 = new JavaObjectActionParamPeer(
-                new TestProxySpecification("java.lang.Integer"));
-        JavaObjectActionParamPeer param2 = new JavaObjectActionParamPeer(new TestProxySpecification("java.lang.Long"));
-        JavaObjectActionParamPeer[] parms = new JavaObjectActionParamPeer[] { param1, param2 };
-        Identifier id = Identifier.classIdentifier("action");
-        return new JavaObjectActionPeer(id, parms);
-    }
-
     public void testInstallsParameterDefaultsMethodAndRemovesMethod() {
         class Customer {
             @SuppressWarnings("unused")
@@ -660,7 +649,7 @@ public class ActionMethodsFacetFactoryTe
         Method default0Method = findMethod(Customer.class, "default0SomeAction", new Class[] {});
         Method default1Method = findMethod(Customer.class, "default1SomeAction", new Class[] {});
 
-        ObjectActionPeer facetHolderWithParms = createHolderWithParms();
+        ObjectActionPeer facetHolderWithParms = new JavaObjectActionPeer(Customer.class, actionMethod, void.class, reflector);
 
         reflector.setLoadSpecificationStringReturn(voidNoSpec);
 
@@ -707,7 +696,7 @@ public class ActionMethodsFacetFactoryTe
         Method choices0Method = findMethod(Customer.class, "choices0SomeAction", new Class[] {});
         Method choices1Method = findMethod(Customer.class, "choices1SomeAction", new Class[] {});
 
-        ObjectActionPeer facetHolderWithParms = createHolderWithParms();
+        ObjectActionPeer facetHolderWithParms = new JavaObjectActionPeer(Customer.class, actionMethod, void.class, reflector);
 
         reflector.setLoadSpecificationStringReturn(voidNoSpec);
 
@@ -745,7 +734,7 @@ public class ActionMethodsFacetFactoryTe
         Method actionMethod = findMethod(CustomerEx.class, "someAction", new Class[] { int.class, long.class });
 
 
-        ObjectActionPeer facetHolderWithParms = createHolderWithParms();
+        ObjectActionPeer facetHolderWithParms = new JavaObjectActionPeer(CustomerEx.class, actionMethod, void.class, reflector);
 
         reflector.setLoadSpecificationStringReturn(voidNoSpec);
 
@@ -793,7 +782,7 @@ public class ActionMethodsFacetFactoryTe
         Method disableMethod = findMethod(CustomerEx.class, "disableSomeAction", new Class[] {});
 
 
-        ObjectActionPeer facetHolderWithParms = createHolderWithParms();
+        ObjectActionPeer facetHolderWithParms = new JavaObjectActionPeer(CustomerEx.class, actionMethod, void.class, reflector);
 
         reflector.setLoadSpecificationStringReturn(voidNoSpec);
 
@@ -848,7 +837,7 @@ public class ActionMethodsFacetFactoryTe
         }
 
         Method actionMethod = findMethod(Customer.class, "someAction", new Class[] { int.class, long.class });
-        ObjectActionPeer facetHolderWithParms = createHolderWithParms();
+        ObjectActionPeer facetHolderWithParms = new JavaObjectActionPeer(Customer.class, actionMethod, void.class, reflector);
         reflector.setLoadSpecificationStringReturn(voidNoSpec);
 
         try {
@@ -862,23 +851,27 @@ public class ActionMethodsFacetFactoryTe
     public void testBothDefaultMethodCausesException() {
         @edu.umd.cs.findbugs.annotations.SuppressWarnings("UMAC_UNCALLABLE_METHOD_OF_ANONYMOUS_CLASS")
         class Customer {
+            @SuppressWarnings("unused")
             public void someAction(final int x, final long y) {}
 
+            @SuppressWarnings("unused")
             public int default0SomeAction() {
                 return 0;
             }
 
+            @SuppressWarnings("unused")
             public long default1SomeAction() {
                 return 0;
             }
 
+            @SuppressWarnings("unused")
             public Object[] defaultSomeAction(final int x, final long y) {
                 return null;
             }
         }
 
         Method actionMethod = findMethod(Customer.class, "someAction", new Class[] { int.class, long.class });
-        ObjectActionPeer facetHolderWithParms = createHolderWithParms();
+        ObjectActionPeer facetHolderWithParms = new JavaObjectActionPeer(Customer.class, actionMethod, void.class, reflector);
         reflector.setLoadSpecificationStringReturn(voidNoSpec);
 
         try {
@@ -892,23 +885,27 @@ public class ActionMethodsFacetFactoryTe
     public void testBothDefaultChoicesMethodCausesException() {
         @edu.umd.cs.findbugs.annotations.SuppressWarnings("UMAC_UNCALLABLE_METHOD_OF_ANONYMOUS_CLASS")
         class Customer {
+            @SuppressWarnings("unused")
             public void someAction(final int x, final long y) {}
 
+            @SuppressWarnings("unused")
             public int default0SomeAction() {
                 return 0;
             }
 
+            @SuppressWarnings("unused")
             public long default1SomeAction() {
                 return 0;
             }
 
+            @SuppressWarnings("unused")
             public Object[] choicesSomeAction(final int x, final long y) {
                 return null;
             }
         }
 
         Method actionMethod = findMethod(Customer.class, "someAction", new Class[] { int.class, long.class });
-        ObjectActionPeer facetHolderWithParms = createHolderWithParms();
+        ObjectActionPeer facetHolderWithParms = new JavaObjectActionPeer(Customer.class, actionMethod, void.class, reflector);
         reflector.setLoadSpecificationStringReturn(voidNoSpec);
 
         try {
@@ -922,23 +919,27 @@ public class ActionMethodsFacetFactoryTe
     public void testBothChoicesDefaultMethodCausesException() {
         @edu.umd.cs.findbugs.annotations.SuppressWarnings("UMAC_UNCALLABLE_METHOD_OF_ANONYMOUS_CLASS")
         class Customer {
+            @SuppressWarnings("unused")
             public void someAction(final int x, final long y) {}
 
+            @SuppressWarnings("unused")
             public int[] choices0SomeAction() {
                 return new int[0];
             }
 
+            @SuppressWarnings("unused")
             public long[] choices1SomeAction() {
                 return new long[0];
             }
 
+            @SuppressWarnings("unused")
             public Object[] defaultSomeAction(final int x, final long y) {
                 return null;
             }
         }
 
         Method actionMethod = findMethod(Customer.class, "someAction", new Class[] { int.class, long.class });
-        ObjectActionPeer facetHolderWithParms = createHolderWithParms();
+        ObjectActionPeer facetHolderWithParms = new JavaObjectActionPeer(Customer.class, actionMethod, void.class, reflector);
         reflector.setLoadSpecificationStringReturn(voidNoSpec);
 
         try {

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/DeweyOrderSetTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/DeweyOrderSetTest.java?rev=1050630&r1=1050629&r2=1050630&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/DeweyOrderSetTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/DeweyOrderSetTest.java Sat Dec 18 12:42:22 2010
@@ -40,11 +40,11 @@ public class DeweyOrderSetTest extends T
         junit.textui.TestRunner.run(new TestSuite(DeweyOrderSetTest.class));
     }
 
-    private final ObjectMemberPeer lastNameMember = new MemberPeerStub("LastName");
-    private final ObjectMemberPeer firstNameMember = new MemberPeerStub("FirstName");
-    private final ObjectMemberPeer houseNumberMember = new MemberPeerStub("HouseNumber");
-    private final ObjectMemberPeer streetNameMember = new MemberPeerStub("StreetName");
-    private final ObjectMemberPeer postalTownMember = new MemberPeerStub("PostalTown");
+    private final ObjectMemberPeer lastNameMember = MemberPeerStub.createProperty("LastName");
+    private final ObjectMemberPeer firstNameMember = MemberPeerStub.createProperty("FirstName");
+    private final ObjectMemberPeer houseNumberMember = MemberPeerStub.createProperty("HouseNumber");
+    private final ObjectMemberPeer streetNameMember = MemberPeerStub.createProperty("StreetName");
+    private final ObjectMemberPeer postalTownMember = MemberPeerStub.createProperty("PostalTown");
     private final List<ObjectMemberPeer> lastNameAndFirstName = ImmutableList.of( lastNameMember, firstNameMember );
     private final List<ObjectMemberPeer> nameAndAddressMembers = ImmutableList.of( lastNameMember, firstNameMember,
             houseNumberMember, streetNameMember, postalTownMember );

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderComparatorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderComparatorTest.java?rev=1050630&r1=1050629&r2=1050630&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderComparatorTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderComparatorTest.java Sat Dec 18 12:42:22 2010
@@ -23,8 +23,6 @@ package org.apache.isis.core.progmodel.f
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.isis.core.progmodel.facets.ordering.memberorder.MemberOrderComparator;
-import org.apache.isis.core.progmodel.facets.ordering.memberorder.MemberOrderFacetAnnotation;
 import org.apache.log4j.Level;
 import org.apache.log4j.LogManager;
 
@@ -37,8 +35,8 @@ public class MemberOrderComparatorTest e
 
     private MemberOrderComparator comparator, laxComparator;
 
-    private final MemberPeerStub m1 = new MemberPeerStub("abc");
-    private final MemberPeerStub m2 = new MemberPeerStub("abc");
+    private final MemberPeerStub m1 = MemberPeerStub.createProperty("abc");
+    private final MemberPeerStub m2 = MemberPeerStub.createProperty("abc");
 
     @Override
     protected void setUp() {

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberPeerStub.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberPeerStub.java?rev=1050630&r1=1050629&r2=1050630&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberPeerStub.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberPeerStub.java Sat Dec 18 12:42:22 2010
@@ -20,28 +20,49 @@
 
 package org.apache.isis.core.progmodel.facets.ordering.memberorder;
 
-import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.consent.Allow;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.facets.NamedAndDescribedFacetHolderImpl;
+import org.apache.isis.core.metamodel.runtimecontext.spec.feature.MemberType;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectMemberPeer;
 
 
 final class MemberPeerStub extends NamedAndDescribedFacetHolderImpl implements ObjectMemberPeer {
 
-    public MemberPeerStub(final String name) {
-        super(name);
+    public static MemberPeerStub createProperty(final String name) {
+        return new MemberPeerStub(MemberType.PROPERTY, name);
+    }
+
+    public static MemberPeerStub createCollection(final String name) {
+        return new MemberPeerStub(MemberType.COLLECTION, name);
+    }
+
+    public static MemberPeerStub createAction(final String name) {
+        return new MemberPeerStub(MemberType.ACTION, name);
+    }
+
+    private final MemberType memberType;
+
+    private MemberPeerStub(final MemberType collection, final String name) {
+        super(name);
+        this.memberType = collection;
     }
+
 
+    @Override
     public void debugData(final DebugString debugString) {}
 
     public String getHelp() {
         return null;
     }
 
+    @Override
     public Identifier getIdentifier() {
         return Identifier.classIdentifier(MemberPeerStub.this.getName());
     }
@@ -69,10 +90,34 @@ final class MemberPeerStub extends Named
     public boolean isVisible(final ObjectAdapter target) {
         return false;
     }
+
+    @Override
+    public ObjectSpecification getSpecification(final SpecificationLoader specificationLoader) {
+        return null;
+    }
 
     @Override
     public String toString() {
         return getName();
-    }
-
+    }
+
+    protected MemberType getMemberType() {
+        return memberType;
+    }
+    
+    @Override
+    public boolean isProperty() {
+        return getMemberType().isProperty();
+    }
+
+    @Override
+    public boolean isCollection() {
+        return getMemberType().isCollection();
+    }
+
+    @Override
+    public boolean isAction() {
+        return getMemberType().isAction();
+    }
+
 }

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java?rev=1050630&r1=1050629&r2=1050630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java Sat Dec 18 12:42:22 2010
@@ -41,6 +41,7 @@ import org.apache.isis.core.metamodel.in
 import org.apache.isis.core.metamodel.interactions.VisibilityContext;
 import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
+import org.apache.isis.core.metamodel.runtimecontext.spec.feature.MemberType;
 import org.apache.isis.core.metamodel.runtimecontext.spec.feature.ObjectMemberAbstract;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.identifier.IdentifiedImpl;
@@ -190,11 +191,11 @@ public class ObjectMemberAbstractTest {
 class ObjectMemberAbstractImpl extends ObjectMemberAbstract {
 
     protected ObjectMemberAbstractImpl(final String id) {
-        super(id, new IdentifiedImpl(), MemberType.ONE_TO_ONE_ASSOCIATION, new RuntimeContextNoRuntime());
+        super(id, new IdentifiedImpl(), MemberType.PROPERTY, new RuntimeContextNoRuntime());
     }
 
     protected ObjectMemberAbstractImpl(final String id, final RuntimeContext runtimeContext) {
-        super(id, new IdentifiedImpl(), MemberType.ONE_TO_ONE_ASSOCIATION, runtimeContext);
+        super(id, new IdentifiedImpl(), MemberType.PROPERTY, runtimeContext);
     }
 
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/specpeer/DummyActionPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/specpeer/DummyActionPeer.java?rev=1050630&r1=1050629&r2=1050630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/specpeer/DummyActionPeer.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/specpeer/DummyActionPeer.java Sat Dec 18 12:42:22 2010
@@ -27,9 +27,11 @@ import org.apache.isis.core.metamodel.au
 import org.apache.isis.core.metamodel.consent.Allow;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.runtimecontext.spec.feature.MemberType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.Target;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectActionParamPeer;
 import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectActionPeer;
 import org.apache.isis.core.runtime.testsystem.TestSpecification;
@@ -44,6 +46,7 @@ public final class DummyActionPeer exten
     private ObjectAdapter returnObject;
     private ObjectSpecification returnType;
 
+    @Override
     public void debugData(final DebugString debugString) {}
 
     public ObjectAdapter execute(final ObjectAdapter object, final ObjectAdapter[] parameters) {
@@ -63,6 +66,7 @@ public final class DummyActionPeer exten
         return null;
     }
 
+    @Override
     public Identifier getIdentifier() {
         return Identifier.classIdentifier(name);
     }
@@ -184,9 +188,33 @@ public final class DummyActionPeer exten
         return new int[3];
     }
 
+    @Override
     public ObjectActionParamPeer[] getParameters() {
         return new ObjectActionParamPeer[] { new DummyActionParamPeer(), new DummyActionParamPeer(),
                 new DummyActionParamPeer(), };
     }
 
+    @Override
+    public ObjectSpecification getSpecification(final SpecificationLoader specificationLoader) {
+        return null;
+    }
+
+    protected MemberType getMemberType() {
+        return MemberType.ACTION;
+    }
+
+    @Override
+    public boolean isProperty() {
+        return getMemberType().isProperty();
+    }
+
+    @Override
+    public boolean isCollection() {
+        return getMemberType().isCollection();
+    }
+
+    @Override
+    public boolean isAction() {
+        return getMemberType().isAction();
+    }
 }

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/specpeer/DummyOneToManyPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/specpeer/DummyOneToManyPeer.java?rev=1050630&r1=1050629&r2=1050630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/specpeer/DummyOneToManyPeer.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/specpeer/DummyOneToManyPeer.java Sat Dec 18 12:42:22 2010
@@ -27,16 +27,15 @@ import junit.framework.Assert;
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.consent.Allow;
-import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.runtimecontext.spec.feature.MemberType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectAssociationPeer;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectMemberPeer;
 import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
 
 
-public class DummyOneToManyPeer extends FacetHolderImpl implements ObjectAssociationPeer {
+public class DummyOneToManyPeer extends FacetHolderImpl implements ObjectMemberPeer {
 
     Vector<String> actions = new Vector<String>();
     private final ExpectedSet expectedActions = new ExpectedSet();
@@ -65,6 +64,7 @@ public class DummyOneToManyPeer extends 
         }
     }
 
+    @Override
     public void debugData(final DebugString debugString) {}
 
     public void expect(final String string) {
@@ -76,87 +76,21 @@ public class DummyOneToManyPeer extends 
         return getCollection;
     }
 
-    public String getBusinessKeyName() {
-        return null;
-    }
-
-    public ObjectAdapter getDefault(final ObjectAdapter target) {
-        return null;
-    }
-
-    public String getDescription() {
-        return null;
-    }
-
-    public String getHelp() {
-        return null;
-    }
-
+    @Override
     public Identifier getIdentifier() {
         return Identifier.classIdentifier("SomeClassName");
     }
 
-    public String getName() {
-        return null;
-    }
-
-    public Object[] getOptions(final ObjectAdapter target) {
-        return null;
-    }
-
-    public ObjectSpecification getSpecification() {
+    @Override
+    public ObjectSpecification getSpecification(final SpecificationLoader specificationLoader) {
         return specification;
     }
 
-    public void initAssociation(final ObjectAdapter inObject, final ObjectAdapter associate) {}
-
-    public void initOneToManyAssociation(final ObjectAdapter inObject, final ObjectAdapter[] instances) {}
-
-    public Consent isAddValid(final ObjectAdapter container, final ObjectAdapter element) {
-        return null;
-    }
-
-    public boolean isPersisted() {
-        return true;
-    }
-
     public boolean isEmpty(final ObjectAdapter inObject) {
         actions.addElement("empty " + inObject);
         return isEmpty;
     }
 
-    public boolean isMandatory() {
-        return false;
-    }
-
-    public Consent isRemoveValid(final ObjectAdapter container, final ObjectAdapter element) {
-        return null;
-    }
-
-    public Consent isUsableDeclaratively() {
-        return Allow.DEFAULT;
-    }
-
-    public Consent isUsableForSession(final AuthenticationSession session) {
-        return Allow.DEFAULT;
-    }
-
-    public Consent isUsable(final ObjectAdapter target) {
-        return null;
-    }
-
-    public boolean isVisibleDeclaratively() {
-        return false;
-    }
-
-    public boolean isVisibleForSession(final AuthenticationSession session) {
-        return false;
-    }
-
-    public boolean isVisible(final ObjectAdapter target) {
-        return true;
-    }
-
     public void removeAllAssociations(final ObjectAdapter inObject) {
         actions.addElement("removeall " + inObject);
     }
@@ -170,12 +104,23 @@ public class DummyOneToManyPeer extends 
         expectedActions.verify();
     }
 
-    public boolean isOneToMany() {
-        return true;
+    protected MemberType getMemberType() {
+        return MemberType.COLLECTION;
+    }
+
+    @Override
+    public boolean isProperty() {
+        return getMemberType().isProperty();
+    }
+
+    @Override
+    public boolean isCollection() {
+        return getMemberType().isCollection();
     }
 
-    public boolean isOneToOne() {
-        return false;
+    @Override
+    public boolean isAction() {
+        return getMemberType().isAction();
     }
 
 }

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/specpeer/DummyOneToOnePeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/specpeer/DummyOneToOnePeer.java?rev=1050630&r1=1050629&r2=1050630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/specpeer/DummyOneToOnePeer.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/specpeer/DummyOneToOnePeer.java Sat Dec 18 12:42:22 2010
@@ -22,21 +22,18 @@ package org.apache.isis.core.runtime.sys
 
 import java.util.Vector;
 
-import junit.framework.Assert;
-
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.consent.Allow;
-import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.runtimecontext.spec.feature.MemberType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectAssociationPeer;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectMemberPeer;
 
 
 @SuppressWarnings("unchecked")
-public class DummyOneToOnePeer extends FacetHolderImpl implements ObjectAssociationPeer {
+public class DummyOneToOnePeer extends FacetHolderImpl implements ObjectMemberPeer {
 	
     private final ExpectedSet expectedActions = new ExpectedSet();
     Vector actions = new Vector();
@@ -58,37 +55,23 @@ public class DummyOneToOnePeer extends F
         return getObject;
     }
 
-    public ObjectAdapter getDefault(final ObjectAdapter target) {
-        return null;
-    }
-
-    public Object[] getOptions(final ObjectAdapter target) {
-        return null;
-    }
-
+    @Override
     public Identifier getIdentifier() {
         return null;
     }
 
-    public ObjectSpecification getSpecification() {
+    @Override
+    public ObjectSpecification getSpecification(final SpecificationLoader specificationLoader) {
         return null;
     }
 
     public void initAssociation(final ObjectAdapter inObject, final ObjectAdapter associate) {}
 
-    public boolean isPersisted() {
-        return true;
-    }
-
     public boolean isEmpty(final ObjectAdapter inObject) {
         actions.addElement("empty " + inObject);
         return isEmpty;
     }
 
-    public boolean isMandatory() {
-        return false;
-    }
-
     public void setAssociation(final ObjectAdapter inObject, final ObjectAdapter associate) {
         actions.addElement("associate " + inObject);
         actions.addElement("associate " + associate);
@@ -98,70 +81,26 @@ public class DummyOneToOnePeer extends F
         expectedActions.verify();
     }
 
-    public void assertAction(final int index, final String expected) {
-        Assert.assertEquals(expected, actions.elementAt(index));
-    }
-
-    public Consent isAssociationValid(final ObjectAdapter inObject, final ObjectAdapter value) {
-        return null;
-    }
-
-    public String getDescription() {
-        return null;
-    }
-
-    public String getName() {
-        return null;
-    }
-
-    public boolean isVisibleDeclaratively() {
-        return true;
-    }
-
-    public boolean isVisibleForSession(final AuthenticationSession session) {
-        return true;
-    }
-
-    public boolean isVisible(final ObjectAdapter target) {
-        return isVisible;
-    }
-
-    public void setupVisible(final boolean isVisible) {
-        this.isVisible = isVisible;
-    }
-
-    public Consent isUsableDeclaratively() {
-        return Allow.DEFAULT;
-    }
-
-    public Consent isUsableForSession(final AuthenticationSession session) {
-        return Allow.DEFAULT;
-    }
-
-    public Consent isUsable(final ObjectAdapter target) {
-        return null;
-    }
-
-    public boolean isOptionEnabled() {
-        return false;
-    }
+    @Override
+    public void debugData(final DebugString debugString) {}
 
-    public String getHelp() {
-        return null;
+    protected MemberType getMemberType() {
+        return MemberType.PROPERTY;
     }
 
-    public void debugData(final DebugString debugString) {}
-
-    public String getBusinessKeyName() {
-        return null;
+    @Override
+    public boolean isProperty() {
+        return getMemberType().isProperty();
     }
 
-    public boolean isOneToMany() {
-        return false;
+    @Override
+    public boolean isCollection() {
+        return getMemberType().isCollection();
     }
 
-    public boolean isOneToOne() {
-        return true;
+    @Override
+    public boolean isAction() {
+        return getMemberType().isAction();
     }
 
 }

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/ObjectAssociationNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/ObjectAssociationNoop.java?rev=1050630&r1=1050629&r2=1050630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/ObjectAssociationNoop.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/ObjectAssociationNoop.java Sat Dec 18 12:42:22 2010
@@ -28,6 +28,7 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.metamodel.interactions.UsabilityContext;
 import org.apache.isis.core.metamodel.interactions.VisibilityContext;
 import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.runtimecontext.spec.feature.MemberType;
 import org.apache.isis.core.metamodel.runtimecontext.spec.feature.ObjectAssociationAbstract;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.identifier.IdentifiedImpl;
@@ -39,7 +40,7 @@ public class ObjectAssociationNoop exten
     		final String name, 
     		final ObjectSpecification spec, 
     		final RuntimeContext runtimeContext) {
-        super(name, spec, MemberType.ONE_TO_ONE_ASSOCIATION, new IdentifiedImpl(), runtimeContext);
+        super(name, spec, MemberType.PROPERTY, new IdentifiedImpl(), runtimeContext);
     }
 
     public String debugData() {