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/07/15 20:44:35 UTC
svn commit: r1361751 - in /incubator/isis/trunk/framework: ./
runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/
tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/
Author: danhaywood
Date: Sun Jul 15 18:44:35 2012
New Revision: 1361751
URL: http://svn.apache.org/viewvc?rev=1361751&view=rev
Log:
ISIS-14: adding test for persisting of wrapper-valued entities
Added:
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist_objectAdapters.java
- copied, changed from r1361488, incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist_primitiveValuedEntity.java
- copied, changed from r1361488, incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist_wrapperValuedEntity.java
- copied, changed from r1361488, incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist.java
Removed:
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist.java
Modified:
incubator/isis/trunk/framework/pom.xml
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_namedQuery_all.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_namedQuery_firstOnly.java
incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntity.java
incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntity.java
Modified: incubator/isis/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/pom.xml?rev=1361751&r1=1361750&r2=1361751&view=diff
==============================================================================
--- incubator/isis/trunk/framework/pom.xml (original)
+++ incubator/isis/trunk/framework/pom.xml Sun Jul 15 18:44:35 2012
@@ -145,7 +145,7 @@
<timezone>+0</timezone>
</developer>
<developer>
- <id>kevin-m</id>
+ <id>kevin</id>
<name>Kevin Meyer</name>
<email>kevin@kmz.co.za</email>
<roles>
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_namedQuery_all.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_namedQuery_all.java?rev=1361751&r1=1361750&r2=1361751&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_namedQuery_all.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_namedQuery_all.java Sun Jul 15 18:44:35 2012
@@ -74,7 +74,7 @@ public class Persistence_namedQuery_all
iswf.beginTran();
- List<PrimitiveValuedEntity> entities = repo.findByNamedQueryAll("pve_findByIntProperty", ImmutableMap.of("i", (Object)222));
+ List<PrimitiveValuedEntity> entities = repo.findByNamedQueryAll("prmv_findByIntProperty", ImmutableMap.of("i", (Object)222));
assertThat(entities, is(not(nullValue())));
assertThat(entities.size(), is(1));
@@ -86,7 +86,7 @@ public class Persistence_namedQuery_all
iswf.beginTran();
- List<PrimitiveValuedEntity> entities = repo.findByNamedQueryAll("pve_findByIntProperty", ImmutableMap.of("i", (Object)111));
+ List<PrimitiveValuedEntity> entities = repo.findByNamedQueryAll("prmv_findByIntProperty", ImmutableMap.of("i", (Object)111));
assertThat(entities, is(not(nullValue())));
assertThat(entities.size(), is(2));
@@ -98,7 +98,7 @@ public class Persistence_namedQuery_all
iswf.beginTran();
- List<PrimitiveValuedEntity> entities = repo.findByNamedQueryAll("pve_findByIntProperty", ImmutableMap.of("i", (Object)999));
+ List<PrimitiveValuedEntity> entities = repo.findByNamedQueryAll("prmv_findByIntProperty", ImmutableMap.of("i", (Object)999));
assertThat(entities, is(not(nullValue())));
assertThat(entities.size(), is(0));
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_namedQuery_firstOnly.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_namedQuery_firstOnly.java?rev=1361751&r1=1361750&r2=1361751&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_namedQuery_firstOnly.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_namedQuery_firstOnly.java Sun Jul 15 18:44:35 2012
@@ -75,7 +75,7 @@ public class Persistence_namedQuery_firs
iswf.beginTran();
- entity = repo.findByNamedQueryFirstOnly("pve_findByIntProperty", ImmutableMap.of("i", (Object)222));
+ entity = repo.findByNamedQueryFirstOnly("prmv_findByIntProperty", ImmutableMap.of("i", (Object)222));
assertThat(entity, is(not(nullValue())));
assertThat(entity.getId(), is(2));
@@ -89,7 +89,7 @@ public class Persistence_namedQuery_firs
iswf.beginTran();
- entity = repo.findByNamedQueryFirstOnly("pve_findByIntProperty", ImmutableMap.of("i", (Object)111));
+ entity = repo.findByNamedQueryFirstOnly("prmv_findByIntProperty", ImmutableMap.of("i", (Object)111));
assertThat(entity, is(not(nullValue())));
assertThat(entity.getId(), is(1));
@@ -103,7 +103,7 @@ public class Persistence_namedQuery_firs
iswf.beginTran();
- entity = repo.findByNamedQueryFirstOnly("pve_findByIntProperty", ImmutableMap.of("i", (Object)999));
+ entity = repo.findByNamedQueryFirstOnly("prmv_findByIntProperty", ImmutableMap.of("i", (Object)999));
assertThat(entity, is(nullValue()));
iswf.commitTran();
Copied: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist_objectAdapters.java (from r1361488, incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist_objectAdapters.java?p2=incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist_objectAdapters.java&p1=incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist.java&r1=1361488&r2=1361751&rev=1361751&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist_objectAdapters.java Sun Jul 15 18:44:35 2012
@@ -32,7 +32,7 @@ import org.apache.isis.runtimes.dflt.tes
import org.apache.isis.tck.dom.scalars.PrimitiveValuedEntity;
import org.apache.isis.tck.dom.scalars.PrimitiveValuedEntityRepository;
-public class Persistence_persist {
+public class Persistence_persist_objectAdapters {
private PrimitiveValuedEntityRepository repo = new PrimitiveValuedEntityRepository();
@@ -43,53 +43,6 @@ public class Persistence_persist {
.build();
@Test
- public void persistTwo() throws Exception {
- iswf.beginTran();
- repo.newEntity().setId(1);
- repo.newEntity().setId(2);
- iswf.commitTran();
-
- iswf.bounceSystem();
-
- iswf.beginTran();
- List<PrimitiveValuedEntity> list = repo.list();
- assertThat(list.size(), is(2));
- iswf.commitTran();
- }
-
- @Test
- public void persistAllValues() throws Exception {
- iswf.beginTran();
- PrimitiveValuedEntity entity = repo.newEntity();
- entity.setId(1);
- entity.setBooleanProperty(true);
- entity.setByteProperty((byte)123);
- entity.setDoubleProperty(9876543210987.0);
- entity.setFloatProperty(123456.0f);
- entity.setIntProperty(456);
- entity.setLongProperty(12345678901L);
- entity.setShortProperty((short)4567);
- entity.setCharProperty('X');
-
- iswf.commitTran();
-
- iswf.bounceSystem();
-
- iswf.beginTran();
- PrimitiveValuedEntity entityRetrieved = repo.list().get(0);
- assertThat(entityRetrieved.getBooleanProperty(), is(true));
- assertThat(entityRetrieved.getByteProperty(), is((byte)123));
- assertThat(entityRetrieved.getDoubleProperty(), is(9876543210987.0));
- assertThat(entityRetrieved.getFloatProperty(), is(123456.0f));
- assertThat(entityRetrieved.getIntProperty(), is(456));
- assertThat(entityRetrieved.getLongProperty(), is(12345678901L));
- assertThat(entityRetrieved.getShortProperty(), is((short)4567));
- assertThat(entityRetrieved.getCharProperty(), is('X'));
-
- iswf.commitTran();
- }
-
- @Test
public void adapterResolveState_isResolved() throws Exception {
iswf.beginTran();
Copied: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist_primitiveValuedEntity.java (from r1361488, incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist_primitiveValuedEntity.java?p2=incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist_primitiveValuedEntity.java&p1=incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist.java&r1=1361488&r2=1361751&rev=1361751&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist_primitiveValuedEntity.java Sun Jul 15 18:44:35 2012
@@ -32,7 +32,7 @@ import org.apache.isis.runtimes.dflt.tes
import org.apache.isis.tck.dom.scalars.PrimitiveValuedEntity;
import org.apache.isis.tck.dom.scalars.PrimitiveValuedEntityRepository;
-public class Persistence_persist {
+public class Persistence_persist_primitiveValuedEntity {
private PrimitiveValuedEntityRepository repo = new PrimitiveValuedEntityRepository();
@@ -89,34 +89,4 @@ public class Persistence_persist {
iswf.commitTran();
}
- @Test
- public void adapterResolveState_isResolved() throws Exception {
-
- iswf.beginTran();
- PrimitiveValuedEntity entity = repo.newEntity();
- ObjectAdapter adapter = iswf.adapterFor(entity);
-
- assertThat(adapter.isTransient(), is(true));
- assertThat(adapter.getResolveState(), is(ResolveState.TRANSIENT));
- assertThat(adapter.getOid().isTransient(), is(true));
-
- entity.setId(1);
- iswf.commitTran();
-
- iswf.bounceSystem();
-
- iswf.beginTran();
- final List<PrimitiveValuedEntity> list = repo.list();
- assertThat(list.size(), is(1));
-
- adapter = iswf.adapterFor(list.get(0));
- assertThat(adapter.getResolveState(), is(ResolveState.RESOLVED));
- assertThat(adapter.isTransient(), is(false));
- assertThat(adapter.getOid().enString(), is("PRMV:1"));
-
- iswf.commitTran();
- }
-
-
-
}
Copied: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist_wrapperValuedEntity.java (from r1361488, incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist_wrapperValuedEntity.java?p2=incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist_wrapperValuedEntity.java&p1=incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist.java&r1=1361488&r2=1361751&rev=1361751&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/Persistence_persist_wrapperValuedEntity.java Sun Jul 15 18:44:35 2012
@@ -31,28 +31,30 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.runtimes.dflt.testsupport.IsisSystemWithFixtures;
import org.apache.isis.tck.dom.scalars.PrimitiveValuedEntity;
import org.apache.isis.tck.dom.scalars.PrimitiveValuedEntityRepository;
+import org.apache.isis.tck.dom.scalars.WrapperValuedEntity;
+import org.apache.isis.tck.dom.scalars.WrapperValuedEntityRepository;
-public class Persistence_persist {
+public class Persistence_persist_wrapperValuedEntity {
- private PrimitiveValuedEntityRepository repo = new PrimitiveValuedEntityRepository();
+ private WrapperValuedEntityRepository repo = new WrapperValuedEntityRepository();
@Rule
public IsisSystemWithFixtures iswf = Utils.systemBuilder()
- .with(Utils.listenerToDeleteFrom("PRIMITIVEVALUEDENTITY"))
+ .with(Utils.listenerToDeleteFrom("WRAPPERVALUEDENTITY"))
.withServices(repo)
.build();
@Test
public void persistTwo() throws Exception {
iswf.beginTran();
- repo.newEntity().setId(1);
- repo.newEntity().setId(2);
+ repo.newEntity().setStringProperty("1");
+ repo.newEntity().setStringProperty("2");
iswf.commitTran();
iswf.bounceSystem();
iswf.beginTran();
- List<PrimitiveValuedEntity> list = repo.list();
+ List<WrapperValuedEntity> list = repo.list();
assertThat(list.size(), is(2));
iswf.commitTran();
}
@@ -60,63 +62,34 @@ public class Persistence_persist {
@Test
public void persistAllValues() throws Exception {
iswf.beginTran();
- PrimitiveValuedEntity entity = repo.newEntity();
- entity.setId(1);
+ WrapperValuedEntity entity = repo.newEntity();
+ entity.setStringProperty("1");
entity.setBooleanProperty(true);
entity.setByteProperty((byte)123);
entity.setDoubleProperty(9876543210987.0);
entity.setFloatProperty(123456.0f);
- entity.setIntProperty(456);
+ entity.setIntegerProperty(456);
entity.setLongProperty(12345678901L);
entity.setShortProperty((short)4567);
- entity.setCharProperty('X');
+ entity.setCharacterProperty('X');
iswf.commitTran();
iswf.bounceSystem();
iswf.beginTran();
- PrimitiveValuedEntity entityRetrieved = repo.list().get(0);
+ WrapperValuedEntity entityRetrieved = repo.list().get(0);
+ assertThat(entityRetrieved.getStringProperty(), is("1"));
assertThat(entityRetrieved.getBooleanProperty(), is(true));
assertThat(entityRetrieved.getByteProperty(), is((byte)123));
assertThat(entityRetrieved.getDoubleProperty(), is(9876543210987.0));
assertThat(entityRetrieved.getFloatProperty(), is(123456.0f));
- assertThat(entityRetrieved.getIntProperty(), is(456));
+ assertThat(entityRetrieved.getIntegerProperty(), is(456));
assertThat(entityRetrieved.getLongProperty(), is(12345678901L));
assertThat(entityRetrieved.getShortProperty(), is((short)4567));
- assertThat(entityRetrieved.getCharProperty(), is('X'));
+ assertThat(entityRetrieved.getCharacterProperty(), is('X'));
iswf.commitTran();
}
- @Test
- public void adapterResolveState_isResolved() throws Exception {
-
- iswf.beginTran();
- PrimitiveValuedEntity entity = repo.newEntity();
- ObjectAdapter adapter = iswf.adapterFor(entity);
-
- assertThat(adapter.isTransient(), is(true));
- assertThat(adapter.getResolveState(), is(ResolveState.TRANSIENT));
- assertThat(adapter.getOid().isTransient(), is(true));
-
- entity.setId(1);
- iswf.commitTran();
-
- iswf.bounceSystem();
-
- iswf.beginTran();
- final List<PrimitiveValuedEntity> list = repo.list();
- assertThat(list.size(), is(1));
-
- adapter = iswf.adapterFor(list.get(0));
- assertThat(adapter.getResolveState(), is(ResolveState.RESOLVED));
- assertThat(adapter.isTransient(), is(false));
- assertThat(adapter.getOid().enString(), is("PRMV:1"));
-
- iswf.commitTran();
- }
-
-
-
}
Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntity.java?rev=1361751&r1=1361750&r2=1361751&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntity.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntity.java Sun Jul 15 18:44:35 2012
@@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation
@javax.jdo.annotations.PersistenceCapable
@javax.jdo.annotations.Discriminator("PRMV")
@javax.jdo.annotations.Query(
- name="pve_findByIntProperty", language="JDOQL",
+ name="prmv_findByIntProperty", language="JDOQL",
value="SELECT FROM org.apache.isis.tck.dom.scalars.PrimitiveValuedEntity WHERE intProperty == :i")
@javax.persistence.Entity
@javax.persistence.DiscriminatorValue("PRMV")
Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntity.java?rev=1361751&r1=1361750&r2=1361751&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntity.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntity.java Sun Jul 15 18:44:35 2012
@@ -24,6 +24,13 @@ import org.apache.isis.applib.annotation
import org.apache.isis.applib.annotation.ObjectType;
import org.apache.isis.applib.annotation.Optional;
+@javax.jdo.annotations.PersistenceCapable
+@javax.jdo.annotations.Discriminator("WRPV")
+@javax.jdo.annotations.Query(
+ name="wrpv_findByStringProperty", language="JDOQL",
+ value="SELECT FROM org.apache.isis.tck.dom.scalars.WrapperValuedEntity WHERE stringProperty == :i")
+@javax.persistence.Entity
+@javax.persistence.DiscriminatorValue("WRPV")
@ObjectType("WRPV")
public class WrapperValuedEntity extends AbstractDomainObject {
@@ -49,17 +56,17 @@ public class WrapperValuedEntity extends
// }}
- // {{ BooleanWProperty
- private Boolean booleanWProperty;
+ // {{ BooleanProperty
+ private Boolean booleanProperty;
@Optional
@MemberOrder(sequence = "1")
- public Boolean getBooleanWProperty() {
- return booleanWProperty;
+ public Boolean getBooleanProperty() {
+ return booleanProperty;
}
- public void setBooleanWProperty(final Boolean booleanWProperty) {
- this.booleanWProperty = booleanWProperty;
+ public void setBooleanProperty(final Boolean booleanProperty) {
+ this.booleanProperty = booleanProperty;
}
// }}
@@ -153,4 +160,19 @@ public class WrapperValuedEntity extends
}
// }}
+ // {{ CharacterProperty (property)
+ private Character characterProperty;
+
+ @Optional
+ @MemberOrder(sequence = "1")
+ public Character getCharacterProperty() {
+ return characterProperty;
+ }
+
+ public void setCharacterProperty(final Character charProperty) {
+ this.characterProperty = charProperty;
+ }
+ // }}
+
+
}