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/07/19 18:46:22 UTC
[2/4] ISIS-468, ISIS-469, ISIS-470: dynamic layout of members
http://git-wip-us.apache.org/repos/asf/isis/blob/f0f4dc98/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/ActionMethodsFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/ActionMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/ActionMethodsFacetFactoryTest.java
index 5231e0f..e70b1df 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/ActionMethodsFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/ActionMethodsFacetFactoryTest.java
@@ -95,7 +95,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(ActionInvocationFacet.class);
assertNotNull(facet);
@@ -119,7 +119,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
}
final Method method = findMethod(Customer.class, "anActionWithNamedAnnotation");
- facetFactory.process(new ProcessMethodContext(Customer.class, method, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, method, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(NamedFacet.class);
assertNotNull(facet);
@@ -139,7 +139,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
}
}
final Method method = findMethod(Customer.class, "debugAnActionWithDebugPrefix");
- facetFactory.process(new ProcessMethodContext(Customer.class, method, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, method, methodRemover, facetedMethod));
Facet facet = facetedMethod.getFacet(DebugFacet.class);
assertNotNull(facet);
@@ -163,7 +163,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
}
}
final Method method = findMethod(Customer.class, "explorationAnActionWithExplorationPrefix");
- facetFactory.process(new ProcessMethodContext(Customer.class, method, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, method, methodRemover, facetedMethod));
Facet facet = facetedMethod.getFacet(ExplorationFacet.class);
assertNotNull(facet);
@@ -187,7 +187,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
}
}
final Method method = findMethod(Customer.class, "debugExplorationAnActionWithDebugAndExplorationPrefix");
- facetFactory.process(new ProcessMethodContext(Customer.class, method, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, method, methodRemover, facetedMethod));
Facet facet = facetedMethod.getFacet(DebugFacet.class);
assertNotNull(facet);
@@ -208,7 +208,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
}
}
final Method method = findMethod(Customer.class, "explorationDebugAnActionWithExplorationAndDebugPrefix");
- facetFactory.process(new ProcessMethodContext(Customer.class, method, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, method, methodRemover, facetedMethod));
Facet facet = facetedMethod.getFacet(ExplorationFacet.class);
assertNotNull(facet);
@@ -236,7 +236,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final Method actionMethod = findMethod(Customer.class, "someAction");
final Method validateMethod = findMethod(Customer.class, "validateSomeAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(ActionValidationFacet.class);
assertNotNull(facet);
@@ -265,7 +265,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final Method actionMethod = findMethod(Customer.class, "someAction", new Class[] { int.class, int.class });
final Method validateMethod = findMethod(Customer.class, "validateSomeAction", new Class[] { int.class, int.class });
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(ActionValidationFacet.class);
assertNotNull(facet);
@@ -294,7 +294,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final Method actionMethod = findMethod(Customer.class, "someAction", new Class[] { int.class, Long.class });
final Method defaultMethod = findMethod(Customer.class, "defaultSomeAction", new Class[] {});
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(ActionDefaultsFacet.class);
assertNotNull(facet);
@@ -322,7 +322,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
}
final Method actionMethod = findMethod(Customer.class, "someAction", new Class[] { int.class, Long.class });
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(ActionDefaultsFacet.class);
assertNull(facet);
@@ -346,7 +346,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final Method choicesMethod = findMethod(Customer.class, "choicesSomeAction", new Class[] {});
reflector.setLoadSpecificationStringReturn(voidSpec);
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(ActionChoicesFacet.class);
assertNotNull(facet);
@@ -374,7 +374,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
}
final Method actionMethod = findMethod(Customer.class, "someAction", new Class[] { int.class, Long.class });
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(ActionChoicesFacet.class);
assertNull(facet);
@@ -428,7 +428,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final Method actionMethod = findMethod(CustomerStatic.class, "someAction", new Class[] { int.class, Long.class });
final Method nameMethod = findMethod(CustomerStatic.class, "nameSomeAction");
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(NamedFacet.class);
assertNotNull(facet);
@@ -447,7 +447,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final Method actionMethod = findMethod(CustomerStatic.class, "someAction", new Class[] { int.class, Long.class });
final Method descriptionMethod = findMethod(CustomerStatic.class, "descriptionSomeAction");
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(DescribedAsFacet.class);
assertNotNull(facet);
@@ -466,7 +466,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final Method alwaysHideMethod = findMethod(CustomerStatic.class, "alwaysHideSomeAction", new Class[] {});
reflector.setLoadSpecificationStringReturn(voidSpec);
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(HiddenFacet.class);
assertNotNull(facet);
@@ -485,7 +485,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final Method actionMethod = findMethod(CustomerStatic.class, "otherAction", new Class[] { int.class, Long.class });
final Method alwaysHideMethod = findMethod(CustomerStatic.class, "alwaysHideOtherAction", new Class[] {});
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, null, actionMethod, methodRemover, facetedMethod));
assertNull(facetedMethod.getFacet(HiddenFacet.class));
@@ -500,7 +500,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final Method actionMethod = findMethod(CustomerStatic.class, "someAction", new Class[] { int.class, Long.class });
final Method protectMethod = findMethod(CustomerStatic.class, "protectSomeAction", new Class[] {});
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(DisabledFacet.class);
assertNotNull(facet);
@@ -519,7 +519,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final Method actionMethod = findMethod(CustomerStatic.class, "otherAction", new Class[] { int.class, Long.class });
final Method protectMethod = findMethod(CustomerStatic.class, "protectOtherAction", new Class[] {});
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, null, actionMethod, methodRemover, facetedMethod));
assertNull(facetedMethod.getFacet(DisabledFacet.class));
@@ -535,7 +535,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final Method actionMethod = findMethod(CustomerStatic.class, "someAction", new Class[] { int.class, Long.class });
final Method hideMethod = findMethod(CustomerStatic.class, "hideSomeAction", new Class[] { UserMemento.class });
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(HideForSessionFacet.class);
assertNotNull(facet);
@@ -554,7 +554,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final Method actionMethod = findMethod(CustomerStatic.class, "someAction", new Class[] { int.class, Long.class });
final Method disableMethod = findMethod(CustomerStatic.class, "disableSomeAction", new Class[] { UserMemento.class });
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(DisableForSessionFacet.class);
assertNotNull(facet);
@@ -577,7 +577,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(ActionInvocationFacet.class);
final ActionInvocationFacetViaMethod actionInvocationFacetViaMethod = (ActionInvocationFacetViaMethod) facet;
@@ -597,7 +597,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(ActionInvocationFacet.class);
final ActionInvocationFacetViaMethod actionInvocationFacetViaMethod = (ActionInvocationFacetViaMethod) facet;
@@ -617,7 +617,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(ActionInvocationFacet.class);
final ActionInvocationFacetViaMethod actionInvocationFacetViaMethod = (ActionInvocationFacetViaMethod) facet;
@@ -651,7 +651,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final FacetedMethod facetHolderWithParms = FacetedMethod.createForAction(Customer.class, actionMethod);
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetHolderWithParms));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetHolderWithParms));
final Facet facet0 = facetHolderWithParms.getParameters().get(0).getFacet(ActionParameterDefaultsFacet.class);
assertNotNull(facet0);
@@ -698,7 +698,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final FacetedMethod facetHolderWithParms = FacetedMethod.createForAction(Customer.class, actionMethod);
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetHolderWithParms));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetHolderWithParms));
final Facet facet0 = facetHolderWithParms.getParameters().get(0).getFacet(ActionParameterChoicesFacet.class);
assertNotNull(facet0);
@@ -740,7 +740,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final FacetedMethod facetHolderWithParms = FacetedMethod.createForAction(Customer.class, actionMethod);
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetHolderWithParms));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetHolderWithParms));
final Facet facet0 = facetHolderWithParms.getParameters().get(0).getFacet(ActionParameterAutoCompleteFacet.class);
assertNotNull(facet0);
@@ -770,7 +770,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final FacetedMethod facetHolderWithParms = FacetedMethod.createForAction(CustomerEx.class, actionMethod);
- facetFactory.process(new ProcessMethodContext(CustomerEx.class, actionMethod, methodRemover, facetHolderWithParms));
+ facetFactory.process(new ProcessMethodContext(CustomerEx.class, null, null, actionMethod, methodRemover, facetHolderWithParms));
final Facet facet0 = facetHolderWithParms.getFacet(ActionInvocationFacet.class);
assertNotNull(facet0);
@@ -824,7 +824,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final FacetedMethod facetHolderWithParms = FacetedMethod.createForAction(CustomerEx.class, actionMethod);
- final ProcessMethodContext processMethodContext = new ProcessMethodContext(CustomerEx.class, actionMethod, methodRemover, facetHolderWithParms);
+ final ProcessMethodContext processMethodContext = new ProcessMethodContext(CustomerEx.class, null, null, actionMethod, methodRemover, facetHolderWithParms);
facetFactory.process(processMethodContext);
facetFactoryForChoices.process(processMethodContext);
facetFactoryForDisable.process(processMethodContext);
@@ -886,7 +886,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final Method actionMethod = findMethod(Customer.class, "someAction", new Class[] { int.class, long.class });
final FacetedMethod facetHolderWithParms = FacetedMethod.createForAction(Customer.class, actionMethod);
- final ProcessMethodContext processMethodContext = new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetHolderWithParms);
+ final ProcessMethodContext processMethodContext = new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetHolderWithParms);
facetFactory.process(processMethodContext);
try {
facetFactoryForParams.process(processMethodContext);
@@ -929,7 +929,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final Method actionMethod = findMethod(Customer.class, "someAction", new Class[] { int.class, long.class });
final FacetedMethod facetHolderWithParms = FacetedMethod.createForAction(Customer.class, actionMethod);
- final ProcessMethodContext processMethodContext = new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetHolderWithParms);
+ final ProcessMethodContext processMethodContext = new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetHolderWithParms);
facetFactory.process(processMethodContext);
try {
facetFactoryForParams.process(processMethodContext);
http://git-wip-us.apache.org/repos/asf/isis/blob/f0f4dc98/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugAnnotationFacetFactoryTest.java
index 6258f5a..d5e4cac 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugAnnotationFacetFactoryTest.java
@@ -54,7 +54,7 @@ public class DebugAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(DebugFacet.class);
assertNotNull(facet);
http://git-wip-us.apache.org/repos/asf/isis/blob/f0f4dc98/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationAnnotationFacetFactoryTest.java
index ae543b7..1713f6e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationAnnotationFacetFactoryTest.java
@@ -54,7 +54,7 @@ public class ExplorationAnnotationFacetFactoryTest extends AbstractFacetFactoryT
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(ExplorationFacet.class);
assertNotNull(facet);
http://git-wip-us.apache.org/repos/asf/isis/blob/f0f4dc98/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/NotContributedAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/NotContributedAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/NotContributedAnnotationFacetFactoryTest.java
index f28b2d9..ddad96c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/NotContributedAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/NotContributedAnnotationFacetFactoryTest.java
@@ -53,7 +53,7 @@ public class NotContributedAnnotationFacetFactoryTest extends AbstractFacetFacto
}
final Method actionMethod = findMethod(CustomerRepository.class, "someAction");
- facetFactory.process(new ProcessMethodContext(CustomerRepository.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(CustomerRepository.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(NotContributedFacet.class);
assertNotNull(facet);
http://git-wip-us.apache.org/repos/asf/isis/blob/f0f4dc98/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/notinrepositorymenu/NotInRepositoryMenuAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/notinrepositorymenu/NotInRepositoryMenuAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/notinrepositorymenu/NotInRepositoryMenuAnnotationFacetFactoryTest.java
index 4a62150..c616af9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/notinrepositorymenu/NotInRepositoryMenuAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/notinrepositorymenu/NotInRepositoryMenuAnnotationFacetFactoryTest.java
@@ -55,7 +55,7 @@ public class NotInRepositoryMenuAnnotationFacetFactoryTest extends AbstractFacet
}
final Method actionMethod = findMethod(CustomerRepository.class, "someAction");
- facetFactory.process(new ProcessMethodContext(CustomerRepository.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(CustomerRepository.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(NotInServiceMenuFacet.class);
assertNotNull(facet);
http://git-wip-us.apache.org/repos/asf/isis/blob/f0f4dc98/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/notinrepositorymenu/NotInRepositoryMenuMethodFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/notinrepositorymenu/NotInRepositoryMenuMethodFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/notinrepositorymenu/NotInRepositoryMenuMethodFacetFactoryTest.java
index 4745320..855025f 100755
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/notinrepositorymenu/NotInRepositoryMenuMethodFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/notinrepositorymenu/NotInRepositoryMenuMethodFacetFactoryTest.java
@@ -60,7 +60,7 @@ public class NotInRepositoryMenuMethodFacetFactoryTest extends AbstractFacetFact
final Method actionMethod = findMethod(CustomerRepository.class, "someAction");
// when
- facetFactory.process(new ProcessMethodContext(CustomerRepository.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(CustomerRepository.class, null, null, actionMethod, methodRemover, facetedMethod));
// then
final Facet facet = facetedMethod.getFacet(NotInServiceMenuFacet.class);
http://git-wip-us.apache.org/repos/asf/isis/blob/f0f4dc98/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/prototype/PrototypeAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/prototype/PrototypeAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/prototype/PrototypeAnnotationFacetFactoryTest.java
index ae4a402..ce0333c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/prototype/PrototypeAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/prototype/PrototypeAnnotationFacetFactoryTest.java
@@ -54,7 +54,7 @@ public class PrototypeAnnotationFacetFactoryTest extends AbstractFacetFactoryTes
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(PrototypeFacet.class);
assertNotNull(facet);
http://git-wip-us.apache.org/repos/asf/isis/blob/f0f4dc98/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/semantics/ActionSemanticsAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/semantics/ActionSemanticsAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/semantics/ActionSemanticsAnnotationFacetFactoryTest.java
index 9b8949e..5439066 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/semantics/ActionSemanticsAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/semantics/ActionSemanticsAnnotationFacetFactoryTest.java
@@ -53,7 +53,7 @@ public class ActionSemanticsAnnotationFacetFactoryTest extends AbstractFacetFact
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(ActionSemanticsFacet.class);
assertNotNull(facet);
@@ -70,7 +70,7 @@ public class ActionSemanticsAnnotationFacetFactoryTest extends AbstractFacetFact
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(ActionSemanticsFacet.class);
assertNull(facet);
http://git-wip-us.apache.org/repos/asf/isis/blob/f0f4dc98/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/semantics/ActionSemanticsFallbackFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/semantics/ActionSemanticsFallbackFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/semantics/ActionSemanticsFallbackFacetFactoryTest.java
index 44e24e8..d941691 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/semantics/ActionSemanticsFallbackFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/semantics/ActionSemanticsFallbackFacetFactoryTest.java
@@ -58,7 +58,7 @@ public class ActionSemanticsFallbackFacetFactoryTest extends AbstractFacetFactor
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(ActionSemanticsFacet.class);
assertThat(facet, is(existing));
@@ -74,7 +74,7 @@ public class ActionSemanticsFallbackFacetFactoryTest extends AbstractFacetFactor
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(ActionSemanticsFacet.class);
assertNotNull(facet);
http://git-wip-us.apache.org/repos/asf/isis/blob/f0f4dc98/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/semantics/IdempotentAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/semantics/IdempotentAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/semantics/IdempotentAnnotationFacetFactoryTest.java
index 494a5b8..4938e2e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/semantics/IdempotentAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/semantics/IdempotentAnnotationFacetFactoryTest.java
@@ -52,7 +52,7 @@ public class IdempotentAnnotationFacetFactoryTest extends AbstractFacetFactoryTe
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(ActionSemanticsFacet.class);
assertNotNull(facet);
@@ -69,7 +69,7 @@ public class IdempotentAnnotationFacetFactoryTest extends AbstractFacetFactoryTe
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(ActionSemanticsFacet.class);
assertNull(facet);
http://git-wip-us.apache.org/repos/asf/isis/blob/f0f4dc98/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/semantics/QueryOnlyAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/semantics/QueryOnlyAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/semantics/QueryOnlyAnnotationFacetFactoryTest.java
index 72b59c6..05f4090 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/semantics/QueryOnlyAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/semantics/QueryOnlyAnnotationFacetFactoryTest.java
@@ -52,7 +52,7 @@ public class QueryOnlyAnnotationFacetFactoryTest extends AbstractFacetFactoryTes
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(ActionSemanticsFacet.class);
assertNotNull(facet);
@@ -69,7 +69,7 @@ public class QueryOnlyAnnotationFacetFactoryTest extends AbstractFacetFactoryTes
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(ActionSemanticsFacet.class);
assertNull(facet);
http://git-wip-us.apache.org/repos/asf/isis/blob/f0f4dc98/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
index 671754c..9f5bfc2 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
@@ -83,7 +83,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
}
final Method collectionAccessorMethod = findMethod(Customer.class, "getOrders");
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, collectionAccessorMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(PropertyOrCollectionAccessorFacet.class);
assertNotNull(facet);
@@ -106,7 +106,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
}
final Method collectionAccessorMethod = findMethod(Customer.class, "getOrders");
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, collectionAccessorMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(PropertyOrCollectionAccessorFacet.class);
assertNotNull(facet);
@@ -129,7 +129,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
}
final Method collectionAccessorMethod = findMethod(Customer.class, "getOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, collectionAccessorMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(PropertyOrCollectionAccessorFacet.class);
assertNotNull(facet);
@@ -152,7 +152,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
}
final Method collectionAccessorMethod = findMethod(Customer.class, "getOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, collectionAccessorMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(PropertyOrCollectionAccessorFacet.class);
assertNotNull(facet);
@@ -178,7 +178,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
}
final Method collectionAccessorMethod = findMethod(Customer.class, "getOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, collectionAccessorMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(PropertyOrCollectionAccessorFacet.class);
assertNotNull(facet);
@@ -204,7 +204,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
}
final Method collectionAccessorMethod = findMethod(Customer.class, "getOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, collectionAccessorMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(CollectionAddToFacet.class);
assertNotNull(facet);
@@ -228,7 +228,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
}
final Method collectionAccessorMethod = findMethod(Customer.class, "getOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, collectionAccessorMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
assertNull(facetedMethod.getFacet(TypeOfFacet.class));
}
@@ -248,7 +248,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
}
final Method collectionAccessorMethod = findMethod(Customer.class, "getOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, collectionAccessorMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(CollectionRemoveFromFacet.class);
assertNotNull(facet);
@@ -277,7 +277,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final Method collectionAccessorMethod = findMethod(Customer.class, "getOrders");
final Method addToMethod = findMethod(Customer.class, "addToOrders", new Class[] { Order.class });
- facetFactory.process(new ProcessMethodContext(Customer.class, collectionAccessorMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(CollectionAddToFacet.class);
assertNotNull(facet);
@@ -307,7 +307,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
}
final Method collectionAccessorMethod = findMethod(Customer.class, "getOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, collectionAccessorMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(TypeOfFacet.class);
assertNotNull(facet);
@@ -336,7 +336,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final Method collectionAccessorMethod = findMethod(Customer.class, "getOrders");
final Method removeFromMethod = findMethod(Customer.class, "removeFromOrders", new Class[] { Order.class });
- facetFactory.process(new ProcessMethodContext(Customer.class, collectionAccessorMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(CollectionRemoveFromFacet.class);
assertNotNull(facet);
@@ -366,7 +366,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
}
final Method collectionAccessorMethod = findMethod(Customer.class, "getOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, collectionAccessorMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(TypeOfFacet.class);
assertNotNull(facet);
@@ -395,7 +395,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final Method collectionAccessorMethod = findMethod(Customer.class, "getOrders");
final Method clearMethod = findMethod(Customer.class, "clearOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, collectionAccessorMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(CollectionClearFacet.class);
assertNotNull(facet);
@@ -421,7 +421,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
}
final Method collectionAccessorMethod = findMethod(Customer.class, "getOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, collectionAccessorMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(CollectionClearFacet.class);
assertNotNull(facet);
@@ -455,7 +455,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final Method collectionAccessorMethod = findMethod(Customer.class, "getOrders");
final Method validateAddToMethod = findMethod(Customer.class, "validateAddToOrders", new Class[] { Order.class });
- facetFactory.process(new ProcessMethodContext(Customer.class, collectionAccessorMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(CollectionValidateAddToFacet.class);
assertNotNull(facet);
@@ -491,7 +491,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final Method collectionAccessorMethod = findMethod(Customer.class, "getOrders");
final Method validateRemoveFromMethod = findMethod(Customer.class, "validateRemoveFromOrders", new Class[] { Order.class });
- facetFactory.process(new ProcessMethodContext(Customer.class, collectionAccessorMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(CollectionValidateRemoveFromFacet.class);
assertNotNull(facet);
@@ -521,7 +521,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final Method collectionAccessorMethod = findMethod(Customer.class, "getOrders");
- facetFactory.process(new ProcessMethodContext(CustomerEx.class, collectionAccessorMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(CustomerEx.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(PropertyOrCollectionAccessorFacet.class);
assertNotNull(facet);
@@ -561,8 +561,8 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final Method removeFromMethod = findMethod(CustomerEx.class, "removeFromOrders", new Class[] { Order.class });
final Method validateRemoveFromMethod = findMethod(CustomerEx.class, "validateRemoveFromOrders", new Class[] { Order.class });
- facetFactoryForAccessor.process(new ProcessMethodContext(CustomerEx.class, collectionAccessorMethod, methodRemover, facetedMethod));
- facetFactoryForHelpers.process(new ProcessMethodContext(CustomerEx.class, collectionAccessorMethod, methodRemover, facetedMethod));
+ facetFactoryForAccessor.process(new ProcessMethodContext(CustomerEx.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
+ facetFactoryForHelpers.process(new ProcessMethodContext(CustomerEx.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(CollectionRemoveFromFacet.class);
assertNotNull(facet);
@@ -632,7 +632,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method nameMethod = findMethod(CustomerStatic.class, "nameOrders");
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, collectionAccessorMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(NamedFacet.class);
assertNotNull(facet);
@@ -650,7 +650,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method descriptionMethod = findMethod(CustomerStatic.class, "descriptionOrders");
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, collectionAccessorMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(DescribedAsFacet.class);
assertNotNull(facet);
@@ -668,7 +668,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method alwaysHideMethod = findMethod(CustomerStatic.class, "alwaysHideOrders");
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, collectionAccessorMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(HiddenFacet.class);
assertNotNull(facet);
@@ -686,7 +686,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOtherOrders");
final Method alwaysHideMethod = findMethod(CustomerStatic.class, "alwaysHideOtherOrders");
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, collectionAccessorMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
assertNull(facetedMethod.getFacet(HiddenFacet.class));
@@ -700,7 +700,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method protectMethod = findMethod(CustomerStatic.class, "protectOrders");
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, collectionAccessorMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(DisabledFacet.class);
assertNotNull(facet);
@@ -718,7 +718,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOtherOrders");
final Method protectMethod = findMethod(CustomerStatic.class, "protectOtherOrders");
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, collectionAccessorMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
assertNull(facetedMethod.getFacet(DisabledFacet.class));
@@ -732,7 +732,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method hideMethod = findMethod(CustomerStatic.class, "hideOrders", new Class[] { UserMemento.class });
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, collectionAccessorMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(HideForSessionFacet.class);
assertNotNull(facet);
@@ -750,7 +750,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method disableMethod = findMethod(CustomerStatic.class, "disableOrders", new Class[] { UserMemento.class });
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, collectionAccessorMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(DisableForSessionFacet.class);
assertNotNull(facet);
http://git-wip-us.apache.org/repos/asf/isis/blob/f0f4dc98/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/collections/sortedby/SortedByAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/collections/sortedby/SortedByAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/collections/sortedby/SortedByAnnotationFacetFactoryTest.java
index d94c7af..41e0d3c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/collections/sortedby/SortedByAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/collections/sortedby/SortedByAnnotationFacetFactoryTest.java
@@ -71,7 +71,7 @@ public class SortedByAnnotationFacetFactoryTest extends AbstractFacetFactoryTest
}
}
facetedMethod = FacetedMethod.createForCollection(Customer.class, "orders");
- facetFactory.process(new ProcessMethodContext(Customer.class, facetedMethod.getMethod(), methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(SortedByFacet.class);
assertNotNull(facet);
@@ -100,7 +100,7 @@ public class SortedByAnnotationFacetFactoryTest extends AbstractFacetFactoryTest
}
}
facetedMethod = FacetedMethod.createForCollection(Customer.class, "orders");
- facetFactory.process(new ProcessMethodContext(Customer.class, facetedMethod.getMethod(), methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(SortedByFacet.class);
assertNotNull(facet);
http://git-wip-us.apache.org/repos/asf/isis/blob/f0f4dc98/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/disabled/DisabledAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/disabled/DisabledAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/disabled/DisabledAnnotationFacetFactoryTest.java
index ab031b3..7156647 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/disabled/DisabledAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/disabled/DisabledAnnotationFacetFactoryTest.java
@@ -58,7 +58,7 @@ public class DisabledAnnotationFacetFactoryTest extends AbstractFacetFactoryTest
}
final Method actionMethod = findMethod(Customer.class, "getNumberOfOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(DisabledFacet.class);
assertNotNull(facet);
@@ -76,7 +76,7 @@ public class DisabledAnnotationFacetFactoryTest extends AbstractFacetFactoryTest
}
final Method actionMethod = findMethod(Customer.class, "getOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(DisabledFacet.class);
assertNotNull(facet);
@@ -93,7 +93,7 @@ public class DisabledAnnotationFacetFactoryTest extends AbstractFacetFactoryTest
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(DisabledFacet.class);
assertNotNull(facet);
@@ -110,7 +110,7 @@ public class DisabledAnnotationFacetFactoryTest extends AbstractFacetFactoryTest
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(DisabledFacet.class);
final DisabledFacetAbstract disabledFacetAbstract = (DisabledFacetAbstract) facet;
@@ -126,7 +126,7 @@ public class DisabledAnnotationFacetFactoryTest extends AbstractFacetFactoryTest
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(DisabledFacet.class);
final DisabledFacetAbstract disabledFacetAbstract = (DisabledFacetAbstract) facet;
@@ -142,7 +142,7 @@ public class DisabledAnnotationFacetFactoryTest extends AbstractFacetFactoryTest
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(DisabledFacet.class);
final DisabledFacetAbstract disabledFacetAbstract = (DisabledFacetAbstract) facet;
@@ -158,7 +158,7 @@ public class DisabledAnnotationFacetFactoryTest extends AbstractFacetFactoryTest
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(DisabledFacet.class);
final DisabledFacetAbstract disabledFacetAbstract = (DisabledFacetAbstract) facet;
@@ -176,7 +176,7 @@ public class DisabledAnnotationFacetFactoryTest extends AbstractFacetFactoryTest
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(DisabledFacet.class);
final DisabledFacetAbstract disabledFacetAbstract = (DisabledFacetAbstract) facet;
@@ -194,7 +194,7 @@ public class DisabledAnnotationFacetFactoryTest extends AbstractFacetFactoryTest
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(DisabledFacet.class);
final DisabledFacetAbstract disabledFacetAbstract = (DisabledFacetAbstract) facet;
http://git-wip-us.apache.org/repos/asf/isis/blob/f0f4dc98/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/hidden/HiddenAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/hidden/HiddenAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/hidden/HiddenAnnotationFacetFactoryTest.java
index ca3c50c..c3494ff 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/hidden/HiddenAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/hidden/HiddenAnnotationFacetFactoryTest.java
@@ -58,7 +58,7 @@ public class HiddenAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
}
final Method actionMethod = findMethod(Customer.class, "getNumberOfOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(HiddenFacet.class);
assertNotNull(facet);
@@ -76,7 +76,7 @@ public class HiddenAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
}
final Method actionMethod = findMethod(Customer.class, "getOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(HiddenFacet.class);
assertNotNull(facet);
@@ -93,7 +93,7 @@ public class HiddenAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(HiddenFacet.class);
assertNotNull(facet);
@@ -110,7 +110,7 @@ public class HiddenAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(HiddenFacet.class);
final HiddenFacetAbstract hiddenFacetAbstract = (HiddenFacetAbstract) facet;
@@ -126,7 +126,7 @@ public class HiddenAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(HiddenFacet.class);
final HiddenFacetAbstract hiddenFacetAbstract = (HiddenFacetAbstract) facet;
@@ -142,7 +142,7 @@ public class HiddenAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(HiddenFacet.class);
final HiddenFacetAbstract hiddenFacetAbstract = (HiddenFacetAbstract) facet;
@@ -158,7 +158,7 @@ public class HiddenAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(HiddenFacet.class);
final HiddenFacetAbstract hiddenFacetAbstract = (HiddenFacetAbstract) facet;
@@ -175,7 +175,7 @@ public class HiddenAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(HiddenFacet.class);
final HiddenFacetAbstract hiddenFacetAbstract = (HiddenFacetAbstract) facet;
@@ -193,7 +193,7 @@ public class HiddenAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(HiddenFacet.class);
final HiddenFacetAbstract hiddenFacetAbstract = (HiddenFacetAbstract) facet;
http://git-wip-us.apache.org/repos/asf/isis/blob/f0f4dc98/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/members/cssclass/CssClassAnnotationOnMemberFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/members/cssclass/CssClassAnnotationOnMemberFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/members/cssclass/CssClassAnnotationOnMemberFacetFactoryTest.java
index 803bfc3..1250384 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/members/cssclass/CssClassAnnotationOnMemberFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/members/cssclass/CssClassAnnotationOnMemberFacetFactoryTest.java
@@ -34,7 +34,7 @@ public class CssClassAnnotationOnMemberFacetFactoryTest extends AbstractFacetFac
expectNoMethodsRemoved();
facetedMethod = FacetedMethod.createForProperty(Customer.class, "name");
- facetFactory.process(new FacetFactory.ProcessMethodContext(Customer.class, facetedMethod.getMethod(), mockMethodRemover, facetedMethod));
+ facetFactory.process(new FacetFactory.ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), mockMethodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(CssClassFacet.class);
assertThat(facet, is(not(nullValue())));
http://git-wip-us.apache.org/repos/asf/isis/blob/f0f4dc98/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/members/resolve/RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/members/resolve/RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/members/resolve/RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation.java
index 5390d15..ec35e88 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/members/resolve/RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/members/resolve/RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation.java
@@ -60,7 +60,7 @@ public class RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation exte
}
facetedMethod = FacetedMethod.createForProperty(Customer.class, "numberOfOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, facetedMethod.getMethod(), methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(RenderFacet.class);
assertNotNull(facet);
@@ -82,7 +82,7 @@ public class RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation exte
}
facetedMethod = FacetedMethod.createForProperty(Customer.class, "numberOfOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, facetedMethod.getMethod(), methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
final RenderFacet facet = facetedMethod.getFacet(RenderFacet.class);
assertThat(facet.value(), is(Render.Type.EAGERLY));
@@ -99,7 +99,7 @@ public class RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation exte
}
facetedMethod = FacetedMethod.createForProperty(Customer.class, "numberOfOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, facetedMethod.getMethod(), methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
final RenderFacet facet = facetedMethod.getFacet(RenderFacet.class);
assertThat(facet.value(), is(Render.Type.LAZILY));
@@ -114,7 +114,7 @@ public class RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation exte
}
}
facetedMethod = FacetedMethod.createForCollection(Customer.class, "orders");
- facetFactory.process(new ProcessMethodContext(Customer.class, facetedMethod.getMethod(), methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(RenderFacet.class);
assertNotNull(facet);
@@ -134,7 +134,7 @@ public class RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation exte
}
}
facetedMethod = FacetedMethod.createForCollection(Customer.class, "orders");
- facetFactory.process(new ProcessMethodContext(Customer.class, facetedMethod.getMethod(), methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
final RenderFacet facet = facetedMethod.getFacet(RenderFacet.class);
assertThat(facet.value(), is(Render.Type.EAGERLY));
@@ -149,7 +149,7 @@ public class RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation exte
}
}
facetedMethod = FacetedMethod.createForCollection(Customer.class, "orders");
- facetFactory.process(new ProcessMethodContext(Customer.class, facetedMethod.getMethod(), methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
final RenderFacet facet = facetedMethod.getFacet(RenderFacet.class);
assertThat(facet.value(), is(Render.Type.LAZILY));
http://git-wip-us.apache.org/repos/asf/isis/blob/f0f4dc98/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/members/resolve/RenderOrResolveAnnotationFacetFactoryTest_withResolveAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/members/resolve/RenderOrResolveAnnotationFacetFactoryTest_withResolveAnnotation.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/members/resolve/RenderOrResolveAnnotationFacetFactoryTest_withResolveAnnotation.java
index ef99aae..765dfc5 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/members/resolve/RenderOrResolveAnnotationFacetFactoryTest_withResolveAnnotation.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/members/resolve/RenderOrResolveAnnotationFacetFactoryTest_withResolveAnnotation.java
@@ -59,7 +59,7 @@ public class RenderOrResolveAnnotationFacetFactoryTest_withResolveAnnotation ext
}
facetedMethod = FacetedMethod.createForProperty(Customer.class, "numberOfOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, facetedMethod.getMethod(), methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(RenderFacet.class);
assertNotNull(facet);
@@ -81,7 +81,7 @@ public class RenderOrResolveAnnotationFacetFactoryTest_withResolveAnnotation ext
}
facetedMethod = FacetedMethod.createForProperty(Customer.class, "numberOfOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, facetedMethod.getMethod(), methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
final RenderFacet facet = facetedMethod.getFacet(RenderFacet.class);
assertThat(facet.value(), is(Render.Type.EAGERLY));
@@ -98,7 +98,7 @@ public class RenderOrResolveAnnotationFacetFactoryTest_withResolveAnnotation ext
}
facetedMethod = FacetedMethod.createForProperty(Customer.class, "numberOfOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, facetedMethod.getMethod(), methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
final RenderFacet facet = facetedMethod.getFacet(RenderFacet.class);
assertThat(facet.value(), is(Render.Type.LAZILY));
@@ -113,7 +113,7 @@ public class RenderOrResolveAnnotationFacetFactoryTest_withResolveAnnotation ext
}
}
facetedMethod = FacetedMethod.createForCollection(Customer.class, "orders");
- facetFactory.process(new ProcessMethodContext(Customer.class, facetedMethod.getMethod(), methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(RenderFacet.class);
assertNotNull(facet);
@@ -133,7 +133,7 @@ public class RenderOrResolveAnnotationFacetFactoryTest_withResolveAnnotation ext
}
}
facetedMethod = FacetedMethod.createForCollection(Customer.class, "orders");
- facetFactory.process(new ProcessMethodContext(Customer.class, facetedMethod.getMethod(), methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
final RenderFacet facet = facetedMethod.getFacet(RenderFacet.class);
assertThat(facet.value(), is(Render.Type.EAGERLY));
@@ -148,7 +148,7 @@ public class RenderOrResolveAnnotationFacetFactoryTest_withResolveAnnotation ext
}
}
facetedMethod = FacetedMethod.createForCollection(Customer.class, "orders");
- facetFactory.process(new ProcessMethodContext(Customer.class, facetedMethod.getMethod(), methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
final RenderFacet facet = facetedMethod.getFacet(RenderFacet.class);
assertThat(facet.value(), is(Render.Type.LAZILY));
http://git-wip-us.apache.org/repos/asf/isis/blob/f0f4dc98/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/naming/describedas/DescribedAsAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/naming/describedas/DescribedAsAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/naming/describedas/DescribedAsAnnotationFacetFactoryTest.java
index 3c6832c..427425b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/naming/describedas/DescribedAsAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/naming/describedas/DescribedAsAnnotationFacetFactoryTest.java
@@ -43,7 +43,7 @@ public class DescribedAsAnnotationFacetFactoryTest extends AbstractFacetFactoryT
class Customer {
}
- facetFactory.process(new ProcessClassContext(Customer.class, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessClassContext(Customer.class, null, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(DescribedAsFacet.class);
assertNotNull(facet);
@@ -66,7 +66,7 @@ public class DescribedAsAnnotationFacetFactoryTest extends AbstractFacetFactoryT
}
final Method actionMethod = findMethod(Customer.class, "getNumberOfOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(DescribedAsFacet.class);
assertNotNull(facet);
@@ -89,7 +89,7 @@ public class DescribedAsAnnotationFacetFactoryTest extends AbstractFacetFactoryT
}
final Method actionMethod = findMethod(Customer.class, "getOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(DescribedAsFacet.class);
assertNotNull(facet);
@@ -111,7 +111,7 @@ public class DescribedAsAnnotationFacetFactoryTest extends AbstractFacetFactoryT
}
final Method actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(DescribedAsFacet.class);
assertNotNull(facet);
http://git-wip-us.apache.org/repos/asf/isis/blob/f0f4dc98/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java
index a0fd05f..aa0ebee 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java
@@ -56,7 +56,7 @@ public class NamedAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
expectNoMethodsRemoved();
- facetFactory.process(new ProcessClassContext(Customer.class, mockMethodRemover, facetedMethod));
+ facetFactory.process(new ProcessClassContext(Customer.class, null, mockMethodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(NamedFacet.class);
assertThat(facet, is(not(nullValue())));
@@ -82,7 +82,7 @@ public class NamedAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
expectNoMethodsRemoved();
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, mockMethodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, mockMethodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(NamedFacet.class);
assertThat(facet, is(not(nullValue())));
@@ -106,7 +106,7 @@ public class NamedAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
expectNoMethodsRemoved();
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, mockMethodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, mockMethodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(NamedFacet.class);
assertThat(facet, is(not(nullValue())));
@@ -129,7 +129,7 @@ public class NamedAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
expectNoMethodsRemoved();
- facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, mockMethodRemover, facetedMethod));
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, mockMethodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(NamedFacet.class);
assertThat(facet, is(not(nullValue())));
http://git-wip-us.apache.org/repos/asf/isis/blob/f0f4dc98/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/aggregated/AggregatedAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/aggregated/AggregatedAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/aggregated/AggregatedAnnotationFacetFactoryTest.java
index d6df8c2..c190ee6 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/aggregated/AggregatedAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/aggregated/AggregatedAnnotationFacetFactoryTest.java
@@ -49,7 +49,7 @@ public class AggregatedAnnotationFacetFactoryTest extends AbstractFacetFactoryTe
class Customer {
}
- facetFactory.process(new ProcessClassContext(Customer.class, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessClassContext(Customer.class, null, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(ParentedFacet.class);
assertNotNull(facet);
http://git-wip-us.apache.org/repos/asf/isis/blob/f0f4dc98/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/bookmarkable/BookmarkableAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/bookmarkable/BookmarkableAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/bookmarkable/BookmarkableAnnotationFacetFactoryTest.java
index ce57411..7fa5eee 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/bookmarkable/BookmarkableAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/bookmarkable/BookmarkableAnnotationFacetFactoryTest.java
@@ -54,7 +54,7 @@ public class BookmarkableAnnotationFacetFactoryTest extends AbstractFacetFactory
class Customer {
}
- facetFactory.process(new ProcessClassContext(Customer.class, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessClassContext(Customer.class, null, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(BookmarkPolicyFacet.class);
assertNotNull(facet);
@@ -69,7 +69,7 @@ public class BookmarkableAnnotationFacetFactoryTest extends AbstractFacetFactory
class Customer {
}
- facetFactory.process(new ProcessClassContext(Customer.class, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessClassContext(Customer.class, null, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(BookmarkPolicyFacet.class);
assertNotNull(facet);
http://git-wip-us.apache.org/repos/asf/isis/blob/f0f4dc98/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/bounded/BoundedAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/bounded/BoundedAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/bounded/BoundedAnnotationFacetFactoryTest.java
index 951979e..a4d41ea 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/bounded/BoundedAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/bounded/BoundedAnnotationFacetFactoryTest.java
@@ -48,7 +48,7 @@ public class BoundedAnnotationFacetFactoryTest extends AbstractFacetFactoryTest
class Customer {
}
- facetFactory.process(new ProcessClassContext(Customer.class, methodRemover, facetedMethod));
+ facetFactory.process(new ProcessClassContext(Customer.class, null, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(BoundedFacet.class);
assertNotNull(facet);