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 2012/03/15 17:07:34 UTC
svn commit: r1301066 - in /incubator/isis/trunk/framework:
applib/src/docbkx/guide/
applib/src/main/java/org/apache/isis/applib/annotation/
core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/
core/progmodel/src/main...
Author: danhaywood
Date: Thu Mar 15 16:07:33 2012
New Revision: 1301066
URL: http://svn.apache.org/viewvc?rev=1301066&view=rev
Log:
ISIS-216: introduced @ObjectType and corresponding facet and facet factories
Added:
incubator/isis/trunk/framework/applib/src/main/java/org/apache/isis/applib/annotation/ObjectType.java (with props)
incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeAnnotationFacetFactory.java (with props)
incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeDerivedFromClassNameFacetFactory.java (with props)
incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeFacetAnnotation.java (with props)
incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeFacetDerivedFromClassName.java (with props)
incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/
incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeAnnotationFacetFactoryTest.java (with props)
incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeDerivedFromClassNameFacetFactoryTest.java (with props)
Modified:
incubator/isis/trunk/framework/applib/src/docbkx/guide/isis-applib.xml
incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorAbstract.java
incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorAware.java
incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorComposite.java
incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/AbstractFacetFactoryJUnit4TestCase.java
incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java
incubator/isis/trunk/framework/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/object/namedquery/GivenJpaNamedQueryAnnotationFacetFactoryWhenHasAnnotationsTest.java
Modified: incubator/isis/trunk/framework/applib/src/docbkx/guide/isis-applib.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/applib/src/docbkx/guide/isis-applib.xml?rev=1301066&r1=1301065&r2=1301066&view=diff
==============================================================================
--- incubator/isis/trunk/framework/applib/src/docbkx/guide/isis-applib.xml (original)
+++ incubator/isis/trunk/framework/applib/src/docbkx/guide/isis-applib.xml Thu Mar 15 16:07:33 2012
@@ -6958,6 +6958,29 @@ public class InputForm {
</sect1>
<sect1>
+ <title>@ObjectType</title>
+
+ <para>The <classname>@ObjectType</classname> annotation is used to
+ provide a unique abbreviation for the object's class name. This is
+ used internally to generate a string representation of an objects
+ identity (the Oid).</para>
+
+ <para>For example:</para>
+
+ <programlisting format="linespecific">@ObjectType("ORD")
+public class Order {
+
+ ...
+}</programlisting>
+
+ <para>If no <code>@ObjectType</code> annotation is present, then the
+ framework uses the fully-qualified class name.</para>
+
+ <para>If an <code>@ObjectType</code> is not unique, then the framework
+ will fail to boot.</para>
+ </sect1>
+
+ <sect1>
<title>@Optional</title>
<para>By default, the system assumes that all properties of an object
Added: incubator/isis/trunk/framework/applib/src/main/java/org/apache/isis/applib/annotation/ObjectType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/applib/src/main/java/org/apache/isis/applib/annotation/ObjectType.java?rev=1301066&view=auto
==============================================================================
--- incubator/isis/trunk/framework/applib/src/main/java/org/apache/isis/applib/annotation/ObjectType.java (added)
+++ incubator/isis/trunk/framework/applib/src/main/java/org/apache/isis/applib/annotation/ObjectType.java Thu Mar 15 16:07:33 2012
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.applib.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Provides a unique abbreviation for the object type, eg "CUS" for Customer.
+ *
+ * <p>
+ * This value, if specified, is used in the serialized form of the object's OID. An OID is
+ * used by the framework to unique identify an object over time (same concept as a URN).
+ */
+@Inherited
+@Target({ ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ObjectType {
+ String value();
+}
Propchange: incubator/isis/trunk/framework/applib/src/main/java/org/apache/isis/applib/annotation/ObjectType.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorAbstract.java?rev=1301066&r1=1301065&r2=1301066&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorAbstract.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorAbstract.java Thu Mar 15 16:07:33 2012
@@ -105,7 +105,7 @@ public abstract class ClassSubstitutorAb
public void injectInto(final Object candidate) {
if (ClassSubstitutorAware.class.isAssignableFrom(candidate.getClass())) {
final ClassSubstitutorAware cast = ClassSubstitutorAware.class.cast(candidate);
- cast.setClassInstrumentor(this);
+ cast.setClassSubstitutor(this);
}
}
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorAware.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorAware.java?rev=1301066&r1=1301065&r2=1301066&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorAware.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorAware.java Thu Mar 15 16:07:33 2012
@@ -21,5 +21,5 @@ package org.apache.isis.core.metamodel.s
public interface ClassSubstitutorAware {
- public void setClassInstrumentor(ClassSubstitutor classStrategy);
+ public void setClassSubstitutor(ClassSubstitutor classSubstitutor);
}
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorComposite.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorComposite.java?rev=1301066&r1=1301065&r2=1301066&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorComposite.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorComposite.java Thu Mar 15 16:07:33 2012
@@ -69,7 +69,7 @@ public class ClassSubstitutorComposite i
public void injectInto(final Object candidate) {
if (ClassSubstitutorAware.class.isAssignableFrom(candidate.getClass())) {
final ClassSubstitutorAware cast = ClassSubstitutorAware.class.cast(candidate);
- cast.setClassInstrumentor(this);
+ cast.setClassSubstitutor(this);
}
}
Added: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeAnnotationFacetFactory.java?rev=1301066&view=auto
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeAnnotationFacetFactory.java (added)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeAnnotationFacetFactory.java Thu Mar 15 16:07:33 2012
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.core.progmodel.facets.object.objecttype;
+
+import org.apache.isis.applib.annotation.ObjectType;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
+
+public class ObjectTypeAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+
+ public ObjectTypeAnnotationFacetFactory() {
+ super(FeatureType.OBJECTS_ONLY);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContaxt) {
+ final ObjectType annotation = getAnnotation(processClassContaxt.getCls(), ObjectType.class);
+ FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
+ }
+
+ private ObjectTypeFacet create(final ObjectType annotation, final FacetHolder holder) {
+ return annotation != null ? new ObjectTypeFacetAnnotation(annotation.value(), holder) : null;
+ }
+
+}
Propchange: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeAnnotationFacetFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeDerivedFromClassNameFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeDerivedFromClassNameFacetFactory.java?rev=1301066&view=auto
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeDerivedFromClassNameFacetFactory.java (added)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeDerivedFromClassNameFacetFactory.java Thu Mar 15 16:07:33 2012
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.core.progmodel.facets.object.objecttype;
+
+import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
+import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutorAware;
+
+public class ObjectTypeDerivedFromClassNameFacetFactory extends AnnotationBasedFacetFactoryAbstract implements ClassSubstitutorAware {
+
+ private ClassSubstitutor classSubstitutor;
+
+ public ObjectTypeDerivedFromClassNameFacetFactory() {
+ super(FeatureType.OBJECTS_ONLY);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContaxt) {
+ final Class<?> originalClass = processClassContaxt.getCls();
+ final Class<?> substitutedClass = classSubstitutor.getClass(originalClass);
+ FacetUtil.addFacet(new ObjectTypeFacetDerivedFromClassName(substitutedClass.getCanonicalName(), processClassContaxt.getFacetHolder()));
+ }
+
+ @Override
+ public void setClassSubstitutor(ClassSubstitutor classSubstitutor) {
+ this.classSubstitutor = classSubstitutor;
+ }
+
+}
Propchange: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeDerivedFromClassNameFacetFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeFacetAnnotation.java?rev=1301066&view=auto
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeFacetAnnotation.java (added)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeFacetAnnotation.java Thu Mar 15 16:07:33 2012
@@ -0,0 +1,11 @@
+package org.apache.isis.core.progmodel.facets.object.objecttype;
+
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+public class ObjectTypeFacetAnnotation extends
+ ObjectTypeFacetAbstract {
+
+ public ObjectTypeFacetAnnotation(final String value,
+ final FacetHolder holder) {
+ super(value, holder);
+ }
+}
Propchange: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeFacetAnnotation.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeFacetDerivedFromClassName.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeFacetDerivedFromClassName.java?rev=1301066&view=auto
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeFacetDerivedFromClassName.java (added)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeFacetDerivedFromClassName.java Thu Mar 15 16:07:33 2012
@@ -0,0 +1,11 @@
+package org.apache.isis.core.progmodel.facets.object.objecttype;
+
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+public class ObjectTypeFacetDerivedFromClassName extends
+ ObjectTypeFacetAbstract {
+
+ public ObjectTypeFacetDerivedFromClassName(final String value,
+ final FacetHolder holder) {
+ super(value, holder);
+ }
+}
Propchange: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeFacetDerivedFromClassName.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/AbstractFacetFactoryJUnit4TestCase.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/AbstractFacetFactoryJUnit4TestCase.java?rev=1301066&r1=1301065&r2=1301066&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/AbstractFacetFactoryJUnit4TestCase.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/AbstractFacetFactoryJUnit4TestCase.java Thu Mar 15 16:07:33 2012
@@ -19,20 +19,30 @@
package org.apache.isis.core.progmodel.facets;
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.assertThat;
+
import java.lang.reflect.Method;
import java.util.List;
+import org.jmock.Expectations;
import org.jmock.auto.Mock;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Rule;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MethodRemover;
+import org.apache.isis.core.metamodel.facets.FacetedMethod;
+import org.apache.isis.core.metamodel.facets.FacetedMethodParameter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneActionParameter;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.ObjectReflector;
+import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest.Customer;
import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2;
import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
@@ -48,8 +58,10 @@ public abstract class AbstractFacetFacto
@Mock
protected FacetHolder facetHolder;
+ protected FacetHolder facetHolderImpl;
+
@Mock
- protected ObjectSpecification mockObjSpec;
+ protected ObjectSpecification objSpec;
@Mock
protected OneToOneAssociation oneToOneAssociation;
@Mock
@@ -57,6 +69,23 @@ public abstract class AbstractFacetFacto
@Mock
protected OneToOneActionParameter actionParameter;
+ protected FacetedMethod facetedMethod;
+ protected FacetedMethodParameter facetedMethodParameter;
+
+ @Before
+ public void setUpFacetedMethodAndParameter() throws Exception {
+ facetHolderImpl = new FacetHolderImpl();
+ facetedMethod = FacetedMethod.createProperty(Customer.class, "firstName");
+ facetedMethodParameter = new FacetedMethodParameter(String.class);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ facetHolderImpl = null;
+ facetedMethod = null;
+ facetedMethodParameter = null;
+ }
+
protected boolean contains(final Class<?>[] types, final Class<?> type) {
return Utils.contains(types, type);
}
@@ -77,4 +106,8 @@ public abstract class AbstractFacetFacto
return Utils.findMethod(type, methodName);
}
+ protected void expectNoMethodsRemoved() {
+ context.never(methodRemover);
+ }
+
}
Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java?rev=1301066&r1=1301065&r2=1301066&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java Thu Mar 15 16:07:33 2012
@@ -19,23 +19,31 @@
package org.apache.isis.core.progmodel.facets.naming.named;
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.assertThat;
+
import java.lang.reflect.Method;
import java.util.Collection;
+import org.junit.Test;
+
import org.apache.isis.applib.annotation.Named;
+import org.apache.isis.core.commons.matchers.IsisMatchers;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessParameterContext;
import org.apache.isis.core.metamodel.facets.named.NamedFacet;
import org.apache.isis.core.metamodel.facets.named.NamedFacetAbstract;
+import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.progmodel.facets.members.named.annotation.NamedAnnotationOnMemberFacetFactory;
import org.apache.isis.core.progmodel.facets.object.named.annotation.NamedAnnotationOnTypeFacetFactory;
import org.apache.isis.core.progmodel.facets.param.named.annotation.NamedAnnotationOnParameterFacetFactory;
-public class NamedAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
+public class NamedAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
+ @Test
public void testNamedAnnotationPickedUpOnClass() {
final NamedAnnotationOnTypeFacetFactory facetFactory = new NamedAnnotationOnTypeFacetFactory();
@@ -44,17 +52,19 @@ public class NamedAnnotationFacetFactory
@Named("some name")
class Customer {
}
+
+ expectNoMethodsRemoved();
+
facetFactory.process(new ProcessClassContext(Customer.class, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(NamedFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof NamedFacetAbstract);
+ assertThat(facet, is(not(nullValue())));
+ assertThat(facet instanceof NamedFacetAbstract, is(true));
final NamedFacetAbstract namedFacetAbstract = (NamedFacetAbstract) facet;
- assertEquals("some name", namedFacetAbstract.value());
-
- assertNoMethodsRemoved();
+ assertThat(namedFacetAbstract.value(), equalTo("some name"));
}
+ @Test
public void testNamedAnnotationPickedUpOnProperty() {
final NamedAnnotationOnMemberFacetFactory facetFactory = new NamedAnnotationOnMemberFacetFactory();
@@ -69,15 +79,15 @@ public class NamedAnnotationFacetFactory
}
final Method actionMethod = findMethod(Customer.class, "getNumberOfOrders");
+ expectNoMethodsRemoved();
+
facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(NamedFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof NamedFacetAbstract);
+ assertThat(facet, is(not(nullValue())));
+ assertThat(facet instanceof NamedFacetAbstract, is(true));
final NamedFacetAbstract namedFacetAbstract = (NamedFacetAbstract) facet;
- assertEquals("some name", namedFacetAbstract.value());
-
- assertNoMethodsRemoved();
+ assertThat(namedFacetAbstract.value(), equalTo("some name"));
}
public void testNamedAnnotationPickedUpOnCollection() {
@@ -93,15 +103,15 @@ public class NamedAnnotationFacetFactory
}
final Method actionMethod = findMethod(Customer.class, "getOrders");
+ expectNoMethodsRemoved();
+
facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(NamedFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof NamedFacetAbstract);
+ assertThat(facet, is(not(nullValue())));
+ assertThat(facet instanceof NamedFacetAbstract, is(true));
final NamedFacetAbstract namedFacetAbstract = (NamedFacetAbstract) facet;
- assertEquals("some name", namedFacetAbstract.value());
-
- assertNoMethodsRemoved();
+ assertThat(namedFacetAbstract.value(), equalTo("some name"));
}
public void testNamedAnnotationPickedUpOnAction() {
@@ -116,15 +126,15 @@ public class NamedAnnotationFacetFactory
}
final Method actionMethod = findMethod(Customer.class, "someAction");
+ expectNoMethodsRemoved();
+
facetFactory.process(new ProcessMethodContext(Customer.class, actionMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(NamedFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof NamedFacetAbstract);
+ assertThat(facet, is(not(nullValue())));
+ assertThat(facet instanceof NamedFacetAbstract, is(true));
final NamedFacetAbstract namedFacetAbstract = (NamedFacetAbstract) facet;
- assertEquals("some name", namedFacetAbstract.value());
-
- assertNoMethodsRemoved();
+ assertThat(namedFacetAbstract.value(), equalTo("some name"));
}
public void testNamedAnnotationPickedUpOnActionParameter() {
@@ -139,13 +149,15 @@ public class NamedAnnotationFacetFactory
}
final Method actionMethod = findMethod(Customer.class, "someAction", new Class[] { int.class });
+ expectNoMethodsRemoved();
+
facetFactory.processParams(new ProcessParameterContext(actionMethod, 0, facetedMethodParameter));
final Facet facet = facetedMethodParameter.getFacet(NamedFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof NamedFacetAbstract);
+ assertThat(facet, is(not(nullValue())));
+ assertThat(facet instanceof NamedFacetAbstract, is(true));
final NamedFacetAbstract namedFacetAbstract = (NamedFacetAbstract) facet;
- assertEquals("some name", namedFacetAbstract.value());
+ assertThat(namedFacetAbstract.value(), equalTo("some name"));
}
}
Added: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeAnnotationFacetFactoryTest.java?rev=1301066&view=auto
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeAnnotationFacetFactoryTest.java (added)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeAnnotationFacetFactoryTest.java Thu Mar 15 16:07:33 2012
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.core.progmodel.facets.object.objecttype;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.apache.isis.applib.annotation.ObjectType;
+import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
+import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryJUnit4TestCase;
+
+public class ObjectTypeAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
+
+ private ObjectTypeAnnotationFacetFactory facetFactory;
+
+ @Before
+ public void setUp() throws Exception {
+ facetFactory = new ObjectTypeAnnotationFacetFactory();
+ }
+
+ @Test
+ public void objectTypeAnnotationPickedUpOnClass() {
+
+ @ObjectType("CUS")
+ class Customer {
+ }
+
+ expectNoMethodsRemoved();
+
+ facetFactory.process(new ProcessClassContext(Customer.class, methodRemover, facetHolderImpl));
+
+ final ObjectTypeFacet facet = facetHolderImpl.getFacet(ObjectTypeFacet.class);
+
+ assertThat(facet, is(not(nullValue())));
+ assertThat(facet instanceof ObjectTypeFacetAnnotation, is(true));
+ assertThat(facet.value(), is("CUS"));
+
+ }
+
+}
Propchange: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeAnnotationFacetFactoryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeDerivedFromClassNameFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeDerivedFromClassNameFacetFactoryTest.java?rev=1301066&view=auto
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeDerivedFromClassNameFacetFactoryTest.java (added)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeDerivedFromClassNameFacetFactoryTest.java Thu Mar 15 16:07:33 2012
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.core.progmodel.facets.object.objecttype;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
+import org.jmock.Expectations;
+import org.jmock.auto.Mock;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
+import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
+import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryJUnit4TestCase;
+
+public class ObjectTypeDerivedFromClassNameFacetFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
+
+ @Mock
+ private ClassSubstitutor classSubstitutor;
+
+ private ObjectTypeDerivedFromClassNameFacetFactory facetFactory;
+
+ @Before
+ public void setUp() throws Exception {
+ facetFactory = new ObjectTypeDerivedFromClassNameFacetFactory();
+ facetFactory.setSpecificationLookup(reflector);
+ facetFactory.setClassSubstitutor(classSubstitutor);
+ }
+
+ @Test
+ public void installsFacet_andDelegatesToClassSubstitutor() {
+
+ class CustomerAsManufacturedByCglibByteCodeEnhancer {
+ }
+
+ class Customer {
+ }
+
+ expectNoMethodsRemoved();
+ context.checking(new Expectations() {
+ {
+ one(classSubstitutor).getClass(CustomerAsManufacturedByCglibByteCodeEnhancer.class);
+ will(returnValue(Customer.class));
+ }
+ });
+
+ facetFactory.process(new ProcessClassContext(CustomerAsManufacturedByCglibByteCodeEnhancer.class, methodRemover, facetHolderImpl));
+
+ final ObjectTypeFacet facet = facetHolderImpl.getFacet(ObjectTypeFacet.class);
+
+ assertThat(facet, is(not(nullValue())));
+ assertThat(facet instanceof ObjectTypeFacetDerivedFromClassName, is(true));
+ assertThat(facet.value(), is(Customer.class.getCanonicalName()));
+ }
+
+}
+
Propchange: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeDerivedFromClassNameFacetFactoryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/isis/trunk/framework/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java?rev=1301066&r1=1301065&r2=1301066&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java (original)
+++ incubator/isis/trunk/framework/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java Thu Mar 15 16:07:33 2012
@@ -94,6 +94,8 @@ import org.apache.isis.core.progmodel.fa
import org.apache.isis.core.progmodel.facets.object.named.staticmethod.NamedFacetViaSingularNameStaticMethodFacetFactory;
import org.apache.isis.core.progmodel.facets.object.notpersistable.NotPersistableAnnotationFacetFactory;
import org.apache.isis.core.progmodel.facets.object.notpersistable.NotPersistableMarkerInterfacesFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.objecttype.ObjectTypeAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.objecttype.ObjectTypeDerivedFromClassNameFacetFactory;
import org.apache.isis.core.progmodel.facets.object.orderactions.ActionOrderAnnotationFacetFactory;
import org.apache.isis.core.progmodel.facets.object.orderfields.FieldOrderAnnotationFacetFactory;
import org.apache.isis.core.progmodel.facets.object.parseable.ParseableFacetFactory;
@@ -186,7 +188,8 @@ public class ProgrammingModelFacetsJava5
// must be first, so any Facets created can be replaced by other
// FacetFactorys later.
addFactory(FallbackFacetFactory.class);
-
+ addFactory(ObjectTypeDerivedFromClassNameFacetFactory.class);
+
addFactory(IteratorFilteringFacetFactory.class);
addFactory(SyntheticMethodFilteringFacetFactory.class);
addFactory(RemoveSuperclassMethodsFacetFactory.class);
@@ -210,6 +213,7 @@ public class ProgrammingModelFacetsJava5
addFactory(ParameterChoicesFacetDerivedFromChoicesFacetFacetFactory.class);
addFactory(PropertyChoicesFacetDerivedFromChoicesFacetFacetFactory.class);
+
// properties
addFactory(PropertyAccessorFacetFactory.class);
addFactory(PropertySetAndClearFacetFactory.class);
@@ -245,6 +249,8 @@ public class ProgrammingModelFacetsJava5
addFactory(HiddenFacetViaAlwaysHideMethodFacetFactory.class);
addFactory(HiddenFacetViaHideMethodFacetFactory.class);
+ // objects
+ addFactory(ObjectTypeAnnotationFacetFactory.class);
addFactory(IconMethodFacetFactory.class);
addFactory(CreatedCallbackFacetFactory.class);
@@ -290,7 +296,6 @@ public class ProgrammingModelFacetsJava5
addFactory(HiddenAnnotationForTypeFacetFactory.class);
addFactory(HiddenAnnotationForMemberFacetFactory.class);
- // KAM
addFactory(HiddenObjectViaHiddenMethodFacetFactory.class);
addFactory(DisabledObjectViaDisabledMethodFacetFactory.class);
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/object/namedquery/GivenJpaNamedQueryAnnotationFacetFactoryWhenHasAnnotationsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/object/namedquery/GivenJpaNamedQueryAnnotationFacetFactoryWhenHasAnnotationsTest.java?rev=1301066&r1=1301065&r2=1301066&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/object/namedquery/GivenJpaNamedQueryAnnotationFacetFactoryWhenHasAnnotationsTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/object/namedquery/GivenJpaNamedQueryAnnotationFacetFactoryWhenHasAnnotationsTest.java Thu Mar 15 16:07:33 2012
@@ -44,21 +44,21 @@ public class GivenJpaNamedQueryAnnotatio
public void testNamedQueryAnnotationPickedUpOnClass() {
expectJpaNamedQueryFacet();
- facetFactory.process(new FacetFactory.ProcessClassContext(SimpleObjectWithNamedQuery.class, methodRemover, mockObjSpec));
+ facetFactory.process(new FacetFactory.ProcessClassContext(SimpleObjectWithNamedQuery.class, methodRemover, objSpec));
}
@Test
public void testNamedQueriesAnnotationPickedUpOnClass() {
expectJpaNamedQueriesFacet();
- facetFactory.process(new FacetFactory.ProcessClassContext(SimpleObjectWithNamedQueries.class, methodRemover, mockObjSpec));
+ facetFactory.process(new FacetFactory.ProcessClassContext(SimpleObjectWithNamedQueries.class, methodRemover, objSpec));
}
@Test
public void testNamedQueryAnnotationValueType() {
expectJpaNamedQueryFacet();
- facetFactory.process(new FacetFactory.ProcessClassContext(SimpleObjectWithNamedQuery.class, methodRemover, mockObjSpec));
+ facetFactory.process(new FacetFactory.ProcessClassContext(SimpleObjectWithNamedQuery.class, methodRemover, objSpec));
final List<NamedQuery> namedQueries = facet.getNamedQueries();
assertEquals(1, namedQueries.size());
@@ -72,7 +72,7 @@ public class GivenJpaNamedQueryAnnotatio
public void testNamedQueriesAnnotationValueType() {
expectJpaNamedQueriesFacet();
- facetFactory.process(new FacetFactory.ProcessClassContext(SimpleObjectWithNamedQueries.class, methodRemover, mockObjSpec));
+ facetFactory.process(new FacetFactory.ProcessClassContext(SimpleObjectWithNamedQueries.class, methodRemover, objSpec));
final List<NamedQuery> namedQueries = facet.getNamedQueries();
assertEquals(2, namedQueries.size());
@@ -90,7 +90,7 @@ public class GivenJpaNamedQueryAnnotatio
public void testWhenAnnotatedWithBothNamedQueriesAndNamedQueryWillIgnoreTheNamedQuery() {
expectJpaNamedQueriesFacet();
- facetFactory.process(new FacetFactory.ProcessClassContext(SimpleObjectWithNamedQueriesAndNamedQuery.class, methodRemover, mockObjSpec));
+ facetFactory.process(new FacetFactory.ProcessClassContext(SimpleObjectWithNamedQueriesAndNamedQuery.class, methodRemover, objSpec));
final List<NamedQuery> namedQueries = facet.getNamedQueries();
assertEquals(2, namedQueries.size());
@@ -109,7 +109,7 @@ public class GivenJpaNamedQueryAnnotatio
expectJpaNamedQueryFacet();
expectMethodRemoverNeverCalled();
- facetFactory.process(new FacetFactory.ProcessClassContext(SimpleObjectWithNamedQuery.class, methodRemover, mockObjSpec));
+ facetFactory.process(new FacetFactory.ProcessClassContext(SimpleObjectWithNamedQuery.class, methodRemover, objSpec));
}
@Test
@@ -117,7 +117,7 @@ public class GivenJpaNamedQueryAnnotatio
expectJpaNamedQueriesFacet();
expectMethodRemoverNeverCalled();
- facetFactory.process(new FacetFactory.ProcessClassContext(SimpleObjectWithNamedQueries.class, methodRemover, mockObjSpec));
+ facetFactory.process(new FacetFactory.ProcessClassContext(SimpleObjectWithNamedQueries.class, methodRemover, objSpec));
}
@@ -135,7 +135,7 @@ public class GivenJpaNamedQueryAnnotatio
private void expectJpaNamedQueryFacet() {
context.checking(new Expectations() {
{
- one(mockObjSpec)
+ one(objSpec)
.addFacet(
with(IsisMatchers
.anInstanceOf(JpaNamedQueryFacetAnnotation.class)));
@@ -147,7 +147,7 @@ public class GivenJpaNamedQueryAnnotatio
private void expectJpaNamedQueriesFacet() {
context.checking(new Expectations() {
{
- one(mockObjSpec)
+ one(objSpec)
.addFacet(
with(IsisMatchers
.anInstanceOf(JpaNamedQueriesFacetAnnotation.class)));