You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/09/01 13:46:25 UTC
[isis] branch master updated (ae111b0b0d -> ba0310342c)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
from ae111b0b0d Merge remote-tracking branch 'origin/master'
new 0bdbcafaed ISIS-3167: update site index
new ba0310342c ISIS-3167: revert a tiny refactoring step done too early
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../index/services/repository/EntityState.adoc | 27 +++
.../index/metamodel/object/ManagedObject.adoc | 36 ++-
core/adoc/modules/_overview/pages/about.adoc | 260 ++++++++++++++++++++-
.../graphql/viewer/source/ObjectTypeFactory.java | 2 +-
.../graphql/viewer/source/QueryFieldFactory.java | 2 +-
.../viewer/vaadin/ui/binding/BindingsVaa.java | 2 +-
...JpaNonGeneratedStringIdEntityLifecycleTest.java | 2 -
7 files changed, 308 insertions(+), 23 deletions(-)
[isis] 01/02: ISIS-3167: update site index
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0bdbcafaed83075dcdaf876d2fb1c2f42e8d28c5
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Sep 1 15:39:48 2022 +0200
ISIS-3167: update site index
---
.../index/services/repository/EntityState.adoc | 27 +++
.../index/metamodel/object/ManagedObject.adoc | 36 ++-
core/adoc/modules/_overview/pages/about.adoc | 260 ++++++++++++++++++++-
...JpaNonGeneratedStringIdEntityLifecycleTest.java | 2 -
4 files changed, 305 insertions(+), 20 deletions(-)
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/repository/EntityState.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/repository/EntityState.adoc
index c920f71ff5..87eb830ca3 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/repository/EntityState.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/repository/EntityState.adoc
@@ -11,14 +11,17 @@ Enumerates the state of an entity.
enum EntityState {
NOT_PERSISTABLE // <.>
PERSISTABLE_ATTACHED // <.>
+ PERSISTABLE_NEW // <.>
PERSISTABLE_DETACHED // <.>
PERSISTABLE_REMOVED // <.>
boolean isPersistable() // <.>
boolean isAttached() // <.>
+ boolean isNew() // <.>
boolean isDetached() // <.>
boolean isRemoved() // <.>
boolean isDetachedOrRemoved() // <.>
boolean isAttachedOrRemoved() // <.>
+ boolean isAttachedOrNew() // <.>
}
----
@@ -32,6 +35,11 @@ Object with this state is not an entity (for example it might be a view model, v
--
Object with this state is an entity that is attached to a persistence session, in other words changes to the entity will be flushed back to the database.
--
+<.> xref:#PERSISTABLE_NEW[PERSISTABLE_NEW]
++
+--
+DN/JDO specific on pre-store. Is attached, has no OID yet.
+--
<.> xref:#PERSISTABLE_DETACHED[PERSISTABLE_DETACHED]
+
--
@@ -52,6 +60,11 @@ Object is an entity so is _potentially_ persistable ot the database.
--
Object with this state is an entity that is attached to a persistence session, in other words changes to the entity will be flushed back to the database.
--
+<.> xref:#isNew_[isNew()]
++
+--
+DN/JDO specific on pre-store. Is attached, has no OID yet.
+--
<.> xref:#isDetached_[isDetached()]
+
--
@@ -64,6 +77,7 @@ Object with this state is an entity that has been removed from the database. Obj
--
<.> xref:#isDetachedOrRemoved_[isDetachedOrRemoved()]
<.> xref:#isAttachedOrRemoved_[isAttachedOrRemoved()]
+<.> xref:#isAttachedOrNew_[isAttachedOrNew()]
== Members
@@ -77,6 +91,11 @@ Object with this state is not an entity (for example it might be a view model, v
Object with this state is an entity that is attached to a persistence session, in other words changes to the entity will be flushed back to the database.
+[#PERSISTABLE_NEW]
+=== PERSISTABLE_NEW
+
+DN/JDO specific on pre-store. Is attached, has no OID yet.
+
[#PERSISTABLE_DETACHED]
=== PERSISTABLE_DETACHED
@@ -97,6 +116,11 @@ Object is an entity so is _potentially_ persistable ot the database.
Object with this state is an entity that is attached to a persistence session, in other words changes to the entity will be flushed back to the database.
+[#isNew_]
+=== isNew()
+
+DN/JDO specific on pre-store. Is attached, has no OID yet.
+
[#isDetached_]
=== isDetached()
@@ -114,3 +138,6 @@ Only supported by JDO. Will always return false with JPA.
[#isAttachedOrRemoved_]
=== isAttachedOrRemoved()
+
+[#isAttachedOrNew_]
+=== isAttachedOrNew()
diff --git a/antora/components/refguide-index/modules/core/pages/index/metamodel/object/ManagedObject.adoc b/antora/components/refguide-index/modules/core/pages/index/metamodel/object/ManagedObject.adoc
index 675441deb9..24a4dd830a 100644
--- a/antora/components/refguide-index/modules/core/pages/index/metamodel/object/ManagedObject.adoc
+++ b/antora/components/refguide-index/modules/core/pages/index/metamodel/object/ManagedObject.adoc
@@ -1,7 +1,7 @@
= ManagedObject
:Notice: 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 ag [...]
-Represents an instance of some element of the meta-model managed by the framework, that is _Spring_ managed beans, persistence-stack provided entities, view-models or instances of value types.
+Represents an instance of some element of the meta-model recognized by the framework, that is _Spring_ managed beans, persistence-stack provided entities, view-models, mixins or instances of value types.
== API
@@ -13,6 +13,7 @@ interface ManagedObject {
BookmarkPolicy getBookmarkPolicy()
ObjectSpecification getSpecification() // <.>
Object getPojo() // <.>
+ EntityState getEntityState()
void refreshViewmodel(Supplier<Bookmark> bookmarkSupplier) // <.>
Supplier<ManagedObject> asSupplier()
T assertCompliance(T pojo) // <.>
@@ -25,13 +26,16 @@ interface ManagedObject {
ManagedObject value(ObjectSpecification spec, Object pojo) // <.>
ManagedObject service(ObjectSpecification spec, Object pojo) // <.>
ManagedObject viewmodel(ObjectSpecification spec, Object pojo, Optional<Bookmark> bookmarkIfKnown) // <.>
- ManagedObject entity(ObjectSpecification spec, Object pojo) // <.>
+ ManagedObject entity(ObjectSpecification spec, Object pojo, Optional<Bookmark> bookmarkIfKnown) // <.>
+ ManagedObject entityAttached(ObjectSpecification spec, Object pojo, Optional<Bookmark> bookmarkIfKnown)
+ ManagedObject entityDetached(ObjectSpecification spec, Object pojo)
ManagedObject mixin(ObjectSpecification spec, Object pojo) // <.>
ManagedObject other(ObjectSpecification spec, Object pojo) // <.>
PackedManagedObject packed(ObjectSpecification elementSpec, Can<ManagedObject> nonScalar) // <.>
- ManagedObject wrapScalar(SpecificationLoader specLoader, Object pojo) // <.>
- ManagedObject wrapScalarInternal(ObjectSpecification spec, Object pojo, Optional<Bookmark> bookmarkIfAny)
- ManagedObject notBookmarked(ObjectSpecification spec, Object pojo)
+ ManagedObject adaptScalar(SpecificationLoader specLoader, Object pojo) // <.>
+ ManagedObject adaptScalar(ObjectSpecification guess, Object pojo)
+ ManagedObject identified(ObjectSpecification spec, Object pojo, Bookmark bookmark)
+ ManagedObject adaptScalarInternal(ObjectSpecification guess, Object pojo, Optional<Bookmark> bookmarkIfAny) // <.>
ManagedObject of(ObjectSpecification spec, Object pojo) // <.>
ManagedObject bookmarked(ObjectSpecification spec, Object pojo, Bookmark bookmark) // <.>
}
@@ -102,7 +106,7 @@ SERVICE
--
VIEWMODEL
--
-<.> xref:#entity_ObjectSpecification_Object[entity(ObjectSpecification, Object)]
+<.> xref:#entity_ObjectSpecification_Object_Optional[entity(ObjectSpecification, Object, Optional)]
+
--
ENTITY
@@ -122,11 +126,16 @@ OTHER
--
PACKED
--
-<.> xref:#wrapScalar_SpecificationLoader_Object[wrapScalar(SpecificationLoader, Object)]
+<.> xref:#adaptScalar_SpecificationLoader_Object[adaptScalar(SpecificationLoader, Object)]
+
--
For cases, when the pojo's specification is not available and needs to be looked up.
--
+<.> xref:#adaptScalarInternal_ObjectSpecification_Object_Optional[adaptScalarInternal(ObjectSpecification, Object, Optional)]
++
+--
+spec and pojo don't need to be strictly in sync, we adapt if required
+--
<.> xref:#of_ObjectSpecification_Object[of(ObjectSpecification, Object)]
+
--
@@ -207,8 +216,8 @@ SERVICE
VIEWMODEL
-[#entity_ObjectSpecification_Object]
-=== entity(ObjectSpecification, Object)
+[#entity_ObjectSpecification_Object_Optional]
+=== entity(ObjectSpecification, Object, Optional)
ENTITY
@@ -227,13 +236,18 @@ OTHER
PACKED
-[#wrapScalar_SpecificationLoader_Object]
-=== wrapScalar(SpecificationLoader, Object)
+[#adaptScalar_SpecificationLoader_Object]
+=== adaptScalar(SpecificationLoader, Object)
For cases, when the pojo's specification is not available and needs to be looked up.
Fails if the pojo is non-scalar.
+[#adaptScalarInternal_ObjectSpecification_Object_Optional]
+=== adaptScalarInternal(ObjectSpecification, Object, Optional)
+
+spec and pojo don't need to be strictly in sync, we adapt if required
+
[#of_ObjectSpecification_Object]
=== of(ObjectSpecification, Object)
diff --git a/core/adoc/modules/_overview/pages/about.adoc b/core/adoc/modules/_overview/pages/about.adoc
index 90158dff28..c18c89b94e 100644
--- a/core/adoc/modules/_overview/pages/about.adoc
+++ b/core/adoc/modules/_overview/pages/about.adoc
@@ -728,7 +728,243 @@ Artifact: demo-domain
Type: jar
Directory: /examples/demo/domain
----
-|.Dependencies
+|.Components
+****
+demoapp.dom.AppConfiguration +
+demoapp.dom._infra.LibraryPreloadingService +
+demoapp.dom._infra.resources.AsciiDocConverterService +
+demoapp.dom._infra.resources.AsciiDocReaderService +
+demoapp.dom._infra.resources.AsciiDocValueSemanticsWithPreprocessing +
+demoapp.dom._infra.resources.MarkdownReaderService +
+demoapp.dom._infra.resources.MarkupReaderService +
+demoapp.dom._infra.resources.MarkupVariableResolverService +
+demoapp.dom._infra.resources.ResourceReaderService +
+demoapp.dom._infra.samples.NameSamples +
+demoapp.dom._infra.urlencoding.UrlEncodingServiceNaiveInMemory +
+demoapp.dom.domain._changes.EntityChangesSubscriberToCaptureChangesInMemory +
+demoapp.dom.domain._commands.ExposePersistedCommands$TableColumnOrderDefault +
+demoapp.dom.domain._interactions.ExecutionListenerToCaptureInteractionsInMemory +
+demoapp.dom.domain.actions.Action.commandPublishing.ActionCommandPublishingSeeding +
+demoapp.dom.domain.actions.Action.commandPublishing.jdo.ActionCommandPublishingJdoEntities +
+demoapp.dom.domain.actions.Action.commandPublishing.jpa.ActionCommandPublishingJpaEntities +
+demoapp.dom.domain.actions.Action.domainEvent.subscribers.ActionDomainEventControlService +
+demoapp.dom.domain.actions.Action.executionPublishing.ActionExecutionPublishingSeeding +
+demoapp.dom.domain.actions.Action.executionPublishing.jdo.ActionExecutionPublishingJdoEntities +
+demoapp.dom.domain.actions.Action.executionPublishing.jpa.ActionExecutionPublishingJpaEntities +
+demoapp.dom.domain.collections.Collection.domainEvent.subscribers.CollectionDomainEventControlService +
+demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.disabled.DomainObjectEntityChangePublishingDisabledSeeding +
+demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.disabled.jdo.DomainObjectEntityChangePublishingDisabledJdoEntities +
+demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.disabled.jpa.DomainObjectEntityChangePublishingDisabledJpaEntities +
+demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.enabled.DomainObjectEntityChangePublishingEnabledSeeding +
+demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.enabled.jdo.DomainObjectEntityChangePublishingEnabledJdoEntities +
+demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.enabled.jpa.DomainObjectEntityChangePublishingEnabledJpaEntities +
+demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnot.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotatedSeeding +
+demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnot.enabled.jdo.DomainObjectEntityChangePublishingEnabledMetaAnnotatedJdoEntities +
+demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnot.enabled.jpa.DomainObjectEntityChangePublishingEnabledMetaAnnotatedJpaEntities +
+demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnotOverridden.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenSeeding +
+demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnotOverridden.enabled.jdo.DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJdoEntities +
+demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnotOverridden.enabled.jpa.DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJpaEntities +
+demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.JaxbRefSeeding +
+demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.jdo.JaxbRefJdoEntities +
+demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.jpa.JaxbRefJpaEntities +
+demoapp.dom.domain.objects.other.embedded.jdo.ComplexNumberJdoValueSemantics +
+demoapp.dom.domain.objects.other.embedded.jdo.NumberConstantJdoRepository +
+demoapp.dom.domain.objects.other.embedded.jpa.ComplexNumberJpaValueSemantics +
+demoapp.dom.domain.objects.other.embedded.jpa.NumberConstantJpaRepository +
+demoapp.dom.domain.objects.other.embedded.persistence.NumberConstantSeeding +
+demoapp.dom.domain.objects.other.embedded.samples.ComplexNumberSamples +
+demoapp.dom.domain.properties.Property.commandPublishing.PropertyCommandPublishingSeeding +
+demoapp.dom.domain.properties.Property.commandPublishing.jdo.PropertyCommandPublishingJdoEntities +
+demoapp.dom.domain.properties.Property.commandPublishing.jpa.PropertyCommandPublishingJpaEntities +
+demoapp.dom.domain.properties.Property.domainEvent.subscribers.PropertyDomainEventControlService +
+demoapp.dom.domain.properties.Property.executionPublishing.PropertyExecutionPublishingSeeding +
+demoapp.dom.domain.properties.Property.executionPublishing.jdo.PropertyExecutionPublishingJdoEntities +
+demoapp.dom.domain.properties.Property.executionPublishing.jpa.PropertyExecutionPublishingJpaEntities +
+demoapp.dom.domain.properties.Property.projecting.jdo.PropertyProjectingChildJdoEntities +
+demoapp.dom.domain.properties.Property.projecting.jpa.PropertyProjectingChildJpaEntities +
+demoapp.dom.domain.properties.Property.projecting.persistence.PropertyProjectingChildSeeding +
+demoapp.dom.domain.properties.PropertyLayout.navigable.FileTreeNodeService +
+demoapp.dom.domain.properties.PropertyLayout.repainting.PdfJsViewerAdvisorFallback +
+demoapp.dom.featured.customui.geocoding.GeoapifyClient +
+demoapp.dom.services.core.errorreportingservice.ErrorReportingServiceDemoImplementation +
+demoapp.dom.services.core.eventbusservice.EventLogEntryJdoRepository +
+demoapp.dom.services.core.eventbusservice.EventLogEntryJpaRepository +
+demoapp.dom.services.core.eventbusservice.EventSubscriberDemoImplementation +
+demoapp.dom.services.core.wrapperFactory.WrapperFactorySeeding +
+demoapp.dom.services.core.wrapperFactory.jdo.WrapperFactoryJdoEntities +
+demoapp.dom.services.core.wrapperFactory.jpa.WrapperFactoryJpaEntities +
+demoapp.dom.services.extensions.secman.apptenancy.ApplicationTenancyEvaluatorForDemo +
+demoapp.dom.services.extensions.secman.apptenancy.jdo.TenantedJdoEntities +
+demoapp.dom.services.extensions.secman.apptenancy.jpa.TenantedJpaEntities +
+demoapp.dom.services.extensions.secman.apptenancy.persistence.TenantedSeeding +
+demoapp.dom.services.extensions.secman.appuser.seed.AppUserSeeding +
+demoapp.dom.types.isis.blobs.jdo.IsisBlobJdoEntities +
+demoapp.dom.types.isis.blobs.jpa.IsisBlobJpaEntities +
+demoapp.dom.types.isis.blobs.persistence.IsisBlobSeeding +
+demoapp.dom.types.isis.blobs.samples.IsisBlobsSamples +
+demoapp.dom.types.isis.clobs.jdo.IsisClobJdoEntities +
+demoapp.dom.types.isis.clobs.jpa.IsisClobJpaEntities +
+demoapp.dom.types.isis.clobs.persistence.IsisClobSeeding +
+demoapp.dom.types.isis.clobs.samples.IsisClobsSamples +
+demoapp.dom.types.isis.localresourcepaths.jdo.IsisLocalResourcePathJdoEntities +
+demoapp.dom.types.isis.localresourcepaths.jpa.IsisLocalResourcePathJpaEntities +
+demoapp.dom.types.isis.localresourcepaths.persistence.IsisLocalResourcePathSeeding +
+demoapp.dom.types.isis.localresourcepaths.samples.IsisLocalResourcePathsSamples +
+demoapp.dom.types.isis.markups.jdo.IsisMarkupJdoEntities +
+demoapp.dom.types.isis.markups.jpa.IsisMarkupJpaEntities +
+demoapp.dom.types.isis.markups.persistence.IsisMarkupSeeding +
+demoapp.dom.types.isis.markups.samples.IsisMarkupSamples +
+demoapp.dom.types.isis.passwords.jdo.IsisPasswordJdoEntities +
+demoapp.dom.types.isis.passwords.jpa.IsisPasswordJpaEntities +
+demoapp.dom.types.isis.passwords.persistence.IsisPasswordSeeding +
+demoapp.dom.types.isis.passwords.samples.IsisPasswordsSamples +
+demoapp.dom.types.isisext.asciidocs.jdo.IsisAsciiDocJdoEntities +
+demoapp.dom.types.isisext.asciidocs.jpa.IsisAsciiDocJpaEntities +
+demoapp.dom.types.isisext.asciidocs.persistence.IsisAsciiDocSeeding +
+demoapp.dom.types.isisext.asciidocs.samples.IsisAsciiDocSamples +
+demoapp.dom.types.isisext.cal.jdo.IsisCalendarEventEntities +
+demoapp.dom.types.isisext.cal.jpa.IsisCalendarEventEntities +
+demoapp.dom.types.isisext.cal.persistence.IsisCalendarEventSeeding +
+demoapp.dom.types.isisext.cal.samples.IsisCalendarEventSamples +
+demoapp.dom.types.isisext.markdowns.jdo.IsisMarkdownJdoEntities +
+demoapp.dom.types.isisext.markdowns.jpa.IsisMarkdownJpaEntities +
+demoapp.dom.types.isisext.markdowns.persistence.IsisMarkdownSeeding +
+demoapp.dom.types.isisext.markdowns.samples.IsisMarkdownSamples +
+demoapp.dom.types.javaawt.images.jdo.JavaAwtBufferedImageJdoEntities +
+demoapp.dom.types.javaawt.images.jpa.JavaAwtBufferedImageJpaEntities +
+demoapp.dom.types.javaawt.images.persistence.JavaAwtBufferedImageSeeding +
+demoapp.dom.types.javaawt.images.samples.JavaAwtBufferedImageService +
+demoapp.dom.types.javaawt.images.samples.JavaAwtBufferedImagesSamples +
+demoapp.dom.types.javalang.booleans.jdo.WrapperBooleanJdoEntities +
+demoapp.dom.types.javalang.booleans.jpa.WrapperBooleanJpaEntities +
+demoapp.dom.types.javalang.booleans.persistence.WrapperBooleanSeeding +
+demoapp.dom.types.javalang.booleans.samples.WrapperBooleanSamples +
+demoapp.dom.types.javalang.bytes.jdo.WrapperByteJdoEntities +
+demoapp.dom.types.javalang.bytes.jpa.WrapperByteJpaEntities +
+demoapp.dom.types.javalang.bytes.persistence.WrapperByteSeeding +
+demoapp.dom.types.javalang.bytes.samples.WrapperByteSamples +
+demoapp.dom.types.javalang.characters.jdo.WrapperCharacterJdoEntities +
+demoapp.dom.types.javalang.characters.jpa.WrapperCharacterJpaEntities +
+demoapp.dom.types.javalang.characters.persistence.WrapperCharacterSeeding +
+demoapp.dom.types.javalang.characters.samples.WrapperCharacterSamples +
+demoapp.dom.types.javalang.doubles.jdo.WrapperDoubleJdoEntities +
+demoapp.dom.types.javalang.doubles.jpa.WrapperDoubleJpaEntities +
+demoapp.dom.types.javalang.doubles.persistence.WrapperDoubleSeeding +
+demoapp.dom.types.javalang.doubles.samples.WrapperDoubleSamples +
+demoapp.dom.types.javalang.enums.jdo.JavaLangEnumJdoEntities +
+demoapp.dom.types.javalang.enums.jpa.JavaLangEnumJpaEntities +
+demoapp.dom.types.javalang.enums.persistence.JavaLangEnumSeeding +
+demoapp.dom.types.javalang.enums.samples.JavaLangEnumSamples +
+demoapp.dom.types.javalang.floats.jdo.WrapperFloatJdoEntities +
+demoapp.dom.types.javalang.floats.jpa.WrapperFloatJpaEntities +
+demoapp.dom.types.javalang.floats.persistence.WrapperFloatSeeding +
+demoapp.dom.types.javalang.floats.samples.WrapperFloatSamples +
+demoapp.dom.types.javalang.integers.jdo.WrapperIntegerJdoEntities +
+demoapp.dom.types.javalang.integers.jpa.WrapperIntegerJpaEntities +
+demoapp.dom.types.javalang.integers.persistence.WrapperIntegerSeeding +
+demoapp.dom.types.javalang.integers.samples.WrapperIntegerSamples +
+demoapp.dom.types.javalang.longs.jdo.WrapperLongJdoEntities +
+demoapp.dom.types.javalang.longs.jpa.WrapperLongJpaEntities +
+demoapp.dom.types.javalang.longs.persistence.WrapperLongSeeding +
+demoapp.dom.types.javalang.longs.samples.WrapperLongSamples +
+demoapp.dom.types.javalang.shorts.jdo.WrapperShortJdoEntities +
+demoapp.dom.types.javalang.shorts.jpa.WrapperShortJpaEntities +
+demoapp.dom.types.javalang.shorts.persistence.WrapperShortSeeding +
+demoapp.dom.types.javalang.shorts.samples.WrapperShortSamples +
+demoapp.dom.types.javalang.strings.jdo.JavaLangStringJdoEntities +
+demoapp.dom.types.javalang.strings.jpa.JavaLangStringJpaEntities +
+demoapp.dom.types.javalang.strings.persistence.JavaLangStringSeeding +
+demoapp.dom.types.javamath.bigdecimals.jdo.JavaMathBigDecimalJdoEntities +
+demoapp.dom.types.javamath.bigdecimals.jpa.JavaMathBigDecimalJpaEntities +
+demoapp.dom.types.javamath.bigdecimals.persistence.JavaMathBigDecimalSeeding +
+demoapp.dom.types.javamath.bigdecimals.samples.JavaMathBigDecimalSamples +
+demoapp.dom.types.javamath.bigintegers.jdo.JavaMathBigIntegerJdoEntities +
+demoapp.dom.types.javamath.bigintegers.jpa.JavaMathBigIntegerJpaEntities +
+demoapp.dom.types.javamath.bigintegers.persistence.JavaMathBigIntegerSeeding +
+demoapp.dom.types.javamath.bigintegers.samples.JavaMathBigIntegerSamples +
+demoapp.dom.types.javanet.urls.jdo.JavaNetUrlJdoEntities +
+demoapp.dom.types.javanet.urls.jpa.JavaNetUrlJpaEntities +
+demoapp.dom.types.javanet.urls.persistence.JavaNetUrlSeeding +
+demoapp.dom.types.javanet.urls.samples.JavaNetUrlSamples +
+demoapp.dom.types.javasql.javasqldate.jdo.JavaSqlDateJdoEntities +
+demoapp.dom.types.javasql.javasqldate.jpa.JavaSqlDateJpaEntities +
+demoapp.dom.types.javasql.javasqldate.persistence.JavaSqlDateSeeding +
+demoapp.dom.types.javasql.javasqldate.samples.JavaSqlDateSamples +
+demoapp.dom.types.javasql.javasqltimestamp.jdo.JavaSqlTimestampJdoEntities +
+demoapp.dom.types.javasql.javasqltimestamp.jpa.JavaSqlTimestampJpaEntities +
+demoapp.dom.types.javasql.javasqltimestamp.persistence.JavaSqlTimestampSeeding +
+demoapp.dom.types.javasql.javasqltimestamp.samples.JavaSqlTimestampSamples +
+demoapp.dom.types.javatime.javatimelocaldate.jdo.JavaTimeLocalDateJdoEntities +
+demoapp.dom.types.javatime.javatimelocaldate.jpa.JavaTimeLocalDateJpaEntities +
+demoapp.dom.types.javatime.javatimelocaldate.persistence.JavaTimeLocalDateSeeding +
+demoapp.dom.types.javatime.javatimelocaldate.samples.JavaTimeLocalDateSamples +
+demoapp.dom.types.javatime.javatimelocaldatetime.jdo.JavaTimeLocalDateTimeJdoEntities +
+demoapp.dom.types.javatime.javatimelocaldatetime.jpa.JavaTimeLocalDateTimeJpaEntities +
+demoapp.dom.types.javatime.javatimelocaldatetime.persistence.JavaTimeLocalDateTimeSeeding +
+demoapp.dom.types.javatime.javatimelocaldatetime.samples.JavaTimeLocalDateTimeSamples +
+demoapp.dom.types.javatime.javatimelocaltime.jdo.JavaTimeLocalTimeJdoEntities +
+demoapp.dom.types.javatime.javatimelocaltime.jpa.JavaTimeLocalTimeJpaEntities +
+demoapp.dom.types.javatime.javatimelocaltime.persistence.JavaTimeLocalTimeSeeding +
+demoapp.dom.types.javatime.javatimelocaltime.samples.JavaTimeLocalTimeSamples +
+demoapp.dom.types.javatime.javatimeoffsetdatetime.jdo.JavaTimeOffsetDateTimeJdoEntities +
+demoapp.dom.types.javatime.javatimeoffsetdatetime.jpa.JavaTimeOffsetDateTimeJpaEntities +
+demoapp.dom.types.javatime.javatimeoffsetdatetime.persistence.JavaTimeOffsetDateTimeSeeding +
+demoapp.dom.types.javatime.javatimeoffsetdatetime.samples.JavaTimeOffsetDateTimeSamples +
+demoapp.dom.types.javatime.javatimeoffsettime.jdo.JavaTimeOffsetTimeJdoEntities +
+demoapp.dom.types.javatime.javatimeoffsettime.jpa.JavaTimeOffsetTimeJpaEntities +
+demoapp.dom.types.javatime.javatimeoffsettime.persistence.JavaTimeOffsetTimeSeeding +
+demoapp.dom.types.javatime.javatimeoffsettime.samples.JavaTimeOffsetTimeSamples +
+demoapp.dom.types.javatime.javatimezoneddatetime.jdo.JavaTimeZonedDateTimeJdoEntities +
+demoapp.dom.types.javatime.javatimezoneddatetime.jpa.JavaTimeZonedDateTimeJpaEntities +
+demoapp.dom.types.javatime.javatimezoneddatetime.persistence.JavaTimeZonedDateTimeSeeding +
+demoapp.dom.types.javatime.javatimezoneddatetime.samples.JavaTimeZonedDateTimeSamples +
+demoapp.dom.types.javautil.javautildate.jdo.JavaUtilDateJdoEntities +
+demoapp.dom.types.javautil.javautildate.jpa.JavaUtilDateJpaEntities +
+demoapp.dom.types.javautil.javautildate.persistence.JavaUtilDateSeeding +
+demoapp.dom.types.javautil.javautildate.samples.JavaUtilDateSamples +
+demoapp.dom.types.javautil.uuids.jdo.JavaUtilUuidJdoEntities +
+demoapp.dom.types.javautil.uuids.jpa.JavaUtilUuidJpaEntities +
+demoapp.dom.types.javautil.uuids.persistence.JavaUtilUuidSeeding +
+demoapp.dom.types.javautil.uuids.samples.JavaUtilUuidSamples +
+demoapp.dom.types.jodatime.jodadatetime.jdo.JodaDateTimeJdoEntities +
+demoapp.dom.types.jodatime.jodadatetime.persistence.JodaDateTimeJdoSeeding +
+demoapp.dom.types.jodatime.jodadatetime.samples.JodaDateTimeSamples +
+demoapp.dom.types.jodatime.jodalocaldate.jdo.JodaLocalDateJdoEntities +
+demoapp.dom.types.jodatime.jodalocaldate.persistence.JodaLocalDateJdoSeeding +
+demoapp.dom.types.jodatime.jodalocaldate.samples.JodaLocalDateSamples +
+demoapp.dom.types.jodatime.jodalocaldatetime.jdo.JodaLocalDateTimeJdoEntities +
+demoapp.dom.types.jodatime.jodalocaldatetime.persistence.JodaLocalDateTimeSeeding +
+demoapp.dom.types.jodatime.jodalocaldatetime.samples.JodaLocalDateTimeSamples +
+demoapp.dom.types.jodatime.jodalocaltime.jdo.JodaLocalTimeJdoEntities +
+demoapp.dom.types.jodatime.jodalocaltime.persistence.JodaLocalTimeSeeding +
+demoapp.dom.types.jodatime.jodalocaltime.samples.JodaLocalTimeSamples +
+demoapp.dom.types.primitive.booleans.jdo.PrimitiveBooleanJdoEntities +
+demoapp.dom.types.primitive.booleans.jpa.PrimitiveBooleanJpaEntities +
+demoapp.dom.types.primitive.booleans.persistence.PrimitiveBooleanSeeding +
+demoapp.dom.types.primitive.bytes.jdo.PrimitiveByteJdoEntities +
+demoapp.dom.types.primitive.bytes.jpa.PrimitiveByteJpaEntities +
+demoapp.dom.types.primitive.bytes.persistence.PrimitiveByteSeeding +
+demoapp.dom.types.primitive.chars.jdo.PrimitiveCharJdoEntities +
+demoapp.dom.types.primitive.chars.jpa.PrimitiveCharJpaEntities +
+demoapp.dom.types.primitive.chars.persistence.PrimitiveCharSeeding +
+demoapp.dom.types.primitive.doubles.jdo.PrimitiveDoubleJdoEntities +
+demoapp.dom.types.primitive.doubles.jpa.PrimitiveDoubleJpaEntities +
+demoapp.dom.types.primitive.doubles.persistence.PrimitiveDoubleSeeding +
+demoapp.dom.types.primitive.floats.jdo.PrimitiveFloatJdoEntities +
+demoapp.dom.types.primitive.floats.jpa.PrimitiveFloatJpaEntities +
+demoapp.dom.types.primitive.floats.persistence.PrimitiveFloatSeeding +
+demoapp.dom.types.primitive.ints.jdo.PrimitiveIntJdoEntities +
+demoapp.dom.types.primitive.ints.jpa.PrimitiveIntJpaEntities +
+demoapp.dom.types.primitive.ints.persistence.PrimitiveIntSeeding +
+demoapp.dom.types.primitive.longs.jdo.PrimitiveLongJdoEntities +
+demoapp.dom.types.primitive.longs.jpa.PrimitiveLongJpaEntities +
+demoapp.dom.types.primitive.longs.persistence.PrimitiveLongSeeding +
+demoapp.dom.types.primitive.shorts.jdo.PrimitiveShortJdoEntities +
+demoapp.dom.types.primitive.shorts.jpa.PrimitiveShortJpaEntities +
+demoapp.dom.types.primitive.shorts.persistence.PrimitiveShortSeeding +
+****
+
+.Dependencies
****
com.h2database:h2:jar:<managed> +
org.apache.isis.extensions:isis-extensions-audittrail-persistence-jdo:jar:<managed> +
@@ -814,7 +1050,12 @@ Artifact: demo-web
Type: jar
Directory: /examples/demo/web
----
-|.Dependencies
+|.Components
+****
+demoapp.web._infra.utils.ThereCanBeOnlyOne +
+****
+
+.Dependencies
****
org.apache.isis.examples.apps:demo-domain:jar:<managed> +
org.apache.isis.extensions:isis-extensions-cors-impl:jar:<managed> +
@@ -832,7 +1073,12 @@ Artifact: demo-wicket-common
Type: jar
Directory: /examples/demo/wicket/common
----
-|.Dependencies
+|.Components
+****
+demoapp.webapp.wicket.common.ui.custom.WhereInTheWorldPanelFactory +
+****
+
+.Dependencies
****
org.apache.isis.examples.apps:demo-web:jar:${project.version} +
org.apache.isis.extensions:isis-extensions-fullcalendar-wicket-ui:jar:<managed> +
@@ -5730,12 +5976,12 @@ skinparam rectangle<<11>> {
FontColor #fffffe
BorderColor #2E6295
}
-skinparam rectangle<<23>> {
+skinparam rectangle<<12>> {
BackgroundColor #438dd5
FontColor #fffffe
BorderColor #2E6295
}
-skinparam rectangle<<12>> {
+skinparam rectangle<<23>> {
BackgroundColor #438dd5
FontColor #fffffe
BorderColor #2E6295
@@ -5820,12 +6066,12 @@ skinparam rectangle<<20>> {
FontColor #fffffe
BorderColor #2E6295
}
-skinparam rectangle<<21>> {
+skinparam rectangle<<10>> {
BackgroundColor #438dd5
FontColor #fffffe
BorderColor #2E6295
}
-skinparam rectangle<<10>> {
+skinparam rectangle<<21>> {
BackgroundColor #438dd5
FontColor #fffffe
BorderColor #2E6295
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/isis/testdomain/persistence/jpa/entitylifecycle/JpaNonGeneratedStringIdEntityLifecycleTest.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/isis/testdomain/persistence/jpa/entitylifecycle/JpaNonGeneratedStringIdEntityLifecycleTest.java
index f9405155ea..2cad44d6b7 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/isis/testdomain/persistence/jpa/entitylifecycle/JpaNonGeneratedStringIdEntityLifecycleTest.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/isis/testdomain/persistence/jpa/entitylifecycle/JpaNonGeneratedStringIdEntityLifecycleTest.java
@@ -90,8 +90,6 @@ class JpaNonGeneratedStringIdEntityLifecycleTest {
repository.persist(entity.getPojo());
- System.err.printf("entity %s%n", entity);
-
assertEquals(
EntityState.PERSISTABLE_ATTACHED,
MmEntityUtil.getEntityState(entity));
[isis] 02/02: ISIS-3167: revert a tiny refactoring step done too early
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit ba0310342c871b367710d23ba105ed1c75a88c1c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Sep 1 15:46:18 2022 +0200
ISIS-3167: revert a tiny refactoring step done too early
---
.../org/apache/isis/viewer/graphql/viewer/source/ObjectTypeFactory.java | 2 +-
.../org/apache/isis/viewer/graphql/viewer/source/QueryFieldFactory.java | 2 +-
.../org/apache/isis/incubator/viewer/vaadin/ui/binding/BindingsVaa.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/isis/viewer/graphql/viewer/source/ObjectTypeFactory.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/isis/viewer/graphql/viewer/source/ObjectTypeFactory.java
index 4f15234a8c..d0b7c46a3e 100644
--- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/isis/viewer/graphql/viewer/source/ObjectTypeFactory.java
+++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/isis/viewer/graphql/viewer/source/ObjectTypeFactory.java
@@ -414,7 +414,7 @@ public class ObjectTypeFactory {
Class<?> domainObjectInstanceClass = domainObjectInstance.getClass();
ObjectSpecification specification = specificationLoader.loadSpecification(domainObjectInstanceClass);
- ManagedObject owner = ManagedObject.adaptScalar(specification, domainObjectInstance);
+ ManagedObject owner = ManagedObject.of(specification, domainObjectInstance);
ManagedObject managedObject = otom.get(owner);
diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/isis/viewer/graphql/viewer/source/QueryFieldFactory.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/isis/viewer/graphql/viewer/source/QueryFieldFactory.java
index d800229253..b5b98ec116 100644
--- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/isis/viewer/graphql/viewer/source/QueryFieldFactory.java
+++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/isis/viewer/graphql/viewer/source/QueryFieldFactory.java
@@ -133,7 +133,7 @@ public class QueryFieldFactory {
Object argumentValue = arguments.get(oap.getId());
ObjectSpecification elementType = oap.getElementType();
- return ManagedObject.adaptScalar(elementType, argumentValue);
+ return ManagedObject.of(elementType, argumentValue);
}).collect(Can.toCan());
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/binding/BindingsVaa.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/binding/BindingsVaa.java
index 389d0063bc..5edee596fa 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/binding/BindingsVaa.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/binding/BindingsVaa.java
@@ -361,7 +361,7 @@ public final class BindingsVaa {
//SETTER
@Override
public void accept(@NonNull final Bindable<ManagedObject> target, final V fieldValue) {
- target.setValue(ManagedObject.adaptScalar(valueSpec, fieldValue));
+ target.setValue(ManagedObject.of(valueSpec, fieldValue));
}