This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch CAUSEWAY-2485 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 79aa4bbc8ab5bb301aa8cad5919493d319a58299 Author: danhaywood <[email protected]> AuthorDate: Tue May 23 07:48:30 2023 +0100 CAUSEWAY-2485: jdo demo app now starts --- .../src/main/java/demoapp/dom/DemoModuleJpa.java | 4 +-- .../hidden/PropertyLayoutHiddenRepository.java | 2 +- ...ropertyLayoutHiddenEntityImpl-description.adoc} | 0 .../PropertyLayoutHiddenEntityImpl.java} | 34 +++++++++------------- .../PropertyLayoutHiddenEntityImplRepository.java} | 31 +++++--------------- ...ropertyLayoutHiddenEntityImpl-description.adoc} | 0 ...pa.java => PropertyLayoutHiddenEntityImpl.java} | 8 ++--- ... PropertyLayoutHiddenEntityImplRepository.java} | 27 ++++------------- 8 files changed, 34 insertions(+), 72 deletions(-) diff --git a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java index cf7315ff8c..ff22f6dcdc 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java @@ -57,7 +57,7 @@ import demoapp.dom.domain.properties.Property.editing.jpa.PropertyEditingEntityI import demoapp.dom.domain.properties.Property.executionPublishing.jpa.PropertyExecutionPublishingEntityImpl; import demoapp.dom.domain.properties.Property.projecting.jpa.PropertyProjectingChildEntityImpl; import demoapp.dom.domain.properties.Property.snapshot.jpa.PropertySnapshotEntityImpl; -import demoapp.dom.domain.properties.PropertyLayout.hidden.jpa.PropertyLayoutHiddenJpa; +import demoapp.dom.domain.properties.PropertyLayout.hidden.jpa.PropertyLayoutHiddenEntityImpl; import demoapp.dom.services.core.eventbusservice.EventLogEntryJpa; import demoapp.dom.services.core.wrapperFactory.jpa.PrimeNumberJpa; import demoapp.dom.services.extensions.secman.apptenancy.jpa.TenantedJpa; @@ -151,7 +151,7 @@ import demoapp.dom.types.primitive.shorts.jpa.PrimitiveShortJpa; PropertyProjectingChildEntityImpl.class, PropertySnapshotEntityImpl.class, - PropertyLayoutHiddenJpa.class, + PropertyLayoutHiddenEntityImpl.class, CausewayBlobJpa.class, CausewayClobJpa.class, diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenRepository.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenRepository.java index e5259aaa40..1cbf054ea1 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenRepository.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenRepository.java @@ -22,5 +22,5 @@ import java.util.List; public interface PropertyLayoutHiddenRepository { - List<? extends PropertyLayoutHidden> allInstances(); + List<? extends PropertyLayoutHidden> all(); } diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jdo/PropertyLayoutHiddenEntityImpl-description.adoc similarity index 100% copy from examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenJpa-description.adoc copy to examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jdo/PropertyLayoutHiddenEntityImpl-description.adoc diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jdo/PropertyLayoutHiddenEntityImpl.java similarity index 74% copy from examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenJpa.java copy to examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jdo/PropertyLayoutHiddenEntityImpl.java index a8b96bbd25..b32ed3193a 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenJpa.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jdo/PropertyLayoutHiddenEntityImpl.java @@ -16,14 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.properties.PropertyLayout.hidden.jpa; +package demoapp.dom.domain.properties.PropertyLayout.hidden.jdo; import javax.inject.Named; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.jdo.annotations.DatastoreIdentity; +import javax.jdo.annotations.IdGeneratorStrategy; +import javax.jdo.annotations.IdentityType; +import javax.jdo.annotations.PersistenceCapable; import org.springframework.context.annotation.Profile; @@ -32,41 +31,34 @@ import org.apache.causeway.applib.annotation.Nature; import org.apache.causeway.applib.annotation.Property; import org.apache.causeway.applib.annotation.PropertyLayout; import org.apache.causeway.applib.annotation.Where; -import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener; import lombok.Getter; -import lombok.NoArgsConstructor; import lombok.Setter; import demoapp.dom.domain.properties.PropertyLayout.hidden.PropertyLayoutHidden; -@Profile("demo-jpa") -@Entity -@Table( +@Profile("demo-jdo") +@PersistenceCapable( + identityType = IdentityType.DATASTORE, schema = "demo", - name = "PropertyLayoutHiddenJpa" + table = "PropertyLayoutHiddenEntity" ) -@EntityListeners(CausewayEntityListener.class) -@Named("demo.PropertyLayoutHiddenJpa") -@NoArgsConstructor +@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id") +@Named("demo.PropertyLayoutHiddenEntity") //tag::class[] // ... @DomainObject(nature = Nature.ENTITY) -public class PropertyLayoutHiddenJpa extends PropertyLayoutHidden { +public class PropertyLayoutHiddenEntityImpl extends PropertyLayoutHidden { // ... //end::class[] - public PropertyLayoutHiddenJpa(final String value) { + public PropertyLayoutHiddenEntityImpl(final String value) { setName(value); setNameHiddenAllTables(value); setNameHiddenEverywhere(value); setNameHiddenObjectForms(value); } - @Id - @GeneratedValue - private Long id; - @Property() @Getter @Setter private String name; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenJpaEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jdo/PropertyLayoutHiddenEntityImplRepository.java similarity index 56% copy from examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenJpaEntities.java copy to examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jdo/PropertyLayoutHiddenEntityImplRepository.java index 69508328cb..4fcef0f2d3 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenJpaEntities.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jdo/PropertyLayoutHiddenEntityImplRepository.java @@ -16,40 +16,25 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.properties.PropertyLayout.hidden.jpa; - -import java.util.List; +package demoapp.dom.domain.properties.PropertyLayout.hidden.jdo; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; import demoapp.dom._infra.values.ValueHolderRepository; -import demoapp.dom.domain.properties.PropertyLayout.hidden.PropertyLayoutHidden; import demoapp.dom.domain.properties.PropertyLayout.hidden.PropertyLayoutHiddenRepository; -@Profile("demo-jpa") +@Profile("demo-jdo") @Service -public class PropertyLayoutHiddenJpaEntities -extends ValueHolderRepository<String, PropertyLayoutHiddenJpa> implements PropertyLayoutHiddenRepository { - - protected PropertyLayoutHiddenJpaEntities() { - super(PropertyLayoutHiddenJpa.class); - } +public class PropertyLayoutHiddenEntityImplRepository +extends ValueHolderRepository<String, PropertyLayoutHiddenEntityImpl> implements PropertyLayoutHiddenRepository { - @Override - protected PropertyLayoutHiddenJpa newDetachedEntity(String value) { - return new PropertyLayoutHiddenJpa(value); + protected PropertyLayoutHiddenEntityImplRepository() { + super(PropertyLayoutHiddenEntityImpl.class); } @Override - public List<? extends PropertyLayoutHidden> allInstances() { - return all(); - } - - public List<? extends PropertyLayoutHidden> allMatches(final String s) { - return all(); - } - public List<? extends PropertyLayoutHidden> allMatches() { - return all(); + protected PropertyLayoutHiddenEntityImpl newDetachedEntity(String value) { + return new PropertyLayoutHiddenEntityImpl(value); } } diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenEntityImpl-description.adoc similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenJpa-description.adoc rename to examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenEntityImpl-description.adoc diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenEntityImpl.java similarity index 92% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenJpa.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenEntityImpl.java index a8b96bbd25..e7db54ffb2 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenJpa.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenEntityImpl.java @@ -44,19 +44,19 @@ import demoapp.dom.domain.properties.PropertyLayout.hidden.PropertyLayoutHidden; @Entity @Table( schema = "demo", - name = "PropertyLayoutHiddenJpa" + name = "PropertyLayoutHiddenEntity" ) @EntityListeners(CausewayEntityListener.class) -@Named("demo.PropertyLayoutHiddenJpa") +@Named("demo.PropertyLayoutHiddenEntity") @NoArgsConstructor //tag::class[] // ... @DomainObject(nature = Nature.ENTITY) -public class PropertyLayoutHiddenJpa extends PropertyLayoutHidden { +public class PropertyLayoutHiddenEntityImpl extends PropertyLayoutHidden { // ... //end::class[] - public PropertyLayoutHiddenJpa(final String value) { + public PropertyLayoutHiddenEntityImpl(final String value) { setName(value); setNameHiddenAllTables(value); setNameHiddenEverywhere(value); diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenJpaEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenEntityImplRepository.java similarity index 60% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenJpaEntities.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenEntityImplRepository.java index 69508328cb..67ba446101 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenJpaEntities.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenEntityImplRepository.java @@ -18,38 +18,23 @@ */ package demoapp.dom.domain.properties.PropertyLayout.hidden.jpa; -import java.util.List; - import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; import demoapp.dom._infra.values.ValueHolderRepository; -import demoapp.dom.domain.properties.PropertyLayout.hidden.PropertyLayoutHidden; import demoapp.dom.domain.properties.PropertyLayout.hidden.PropertyLayoutHiddenRepository; @Profile("demo-jpa") @Service -public class PropertyLayoutHiddenJpaEntities -extends ValueHolderRepository<String, PropertyLayoutHiddenJpa> implements PropertyLayoutHiddenRepository { - - protected PropertyLayoutHiddenJpaEntities() { - super(PropertyLayoutHiddenJpa.class); - } +public class PropertyLayoutHiddenEntityImplRepository +extends ValueHolderRepository<String, PropertyLayoutHiddenEntityImpl> implements PropertyLayoutHiddenRepository { - @Override - protected PropertyLayoutHiddenJpa newDetachedEntity(String value) { - return new PropertyLayoutHiddenJpa(value); + protected PropertyLayoutHiddenEntityImplRepository() { + super(PropertyLayoutHiddenEntityImpl.class); } @Override - public List<? extends PropertyLayoutHidden> allInstances() { - return all(); - } - - public List<? extends PropertyLayoutHidden> allMatches(final String s) { - return all(); - } - public List<? extends PropertyLayoutHidden> allMatches() { - return all(); + protected PropertyLayoutHiddenEntityImpl newDetachedEntity(String value) { + return new PropertyLayoutHiddenEntityImpl(value); } }
