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 2016/04/10 14:53:53 UTC

[1/3] isis git commit: ISIS-1364: Improve Asciidoc and Javadoc for migrating from DomainObjectContainer#persist() to RepositoryService#persist()

Repository: isis
Updated Branches:
  refs/heads/master 6fa29b50d -> 6b2b0a174


ISIS-1364: Improve Asciidoc and Javadoc for migrating from DomainObjectContainer#persist() to RepositoryService#persist()


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/5e0df139
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5e0df139
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5e0df139

Branch: refs/heads/master
Commit: 5e0df139d411230f3b001fbeecb4e239007ea9e6
Parents: 5160d32
Author: Oscar Bou <os...@apache.org>
Authored: Sun Apr 10 13:40:03 2016 +0200
Committer: Oscar Bou <os...@apache.org>
Committed: Sun Apr 10 13:40:03 2016 +0200

----------------------------------------------------------------------
 .../src/main/asciidoc/_migration-notes_1.11.0-to-1.12.0.adoc     | 2 ++
 .../_rgsvc_api_DomainObjectContainer_object-persistence-api.adoc | 4 ++--
 .../main/java/org/apache/isis/applib/DomainObjectContainer.java  | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/5e0df139/adocs/documentation/src/main/asciidoc/_migration-notes_1.11.0-to-1.12.0.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/_migration-notes_1.11.0-to-1.12.0.adoc b/adocs/documentation/src/main/asciidoc/_migration-notes_1.11.0-to-1.12.0.adoc
index 9fd6dc9..811e5cd 100644
--- a/adocs/documentation/src/main/asciidoc/_migration-notes_1.11.0-to-1.12.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/_migration-notes_1.11.0-to-1.12.0.adoc
@@ -75,6 +75,8 @@ xref:rgsvc.adoc#_rgsvc_api_MessageService[`MessageService`].
 The `DomainObjectContainer` service will continue to be supported until Apache Isis v2.0.0, but in the meantime, consider
 changing existing application code to use these new domain services.
 
+Please note that when migrating from _rgsvc_api_DomainObjectContainer_object-persistence-api.adoc#_rgsvc_api_DomainObjectContainer_object-persistence-api[`DomainObjectContainer#persist()`] to xref:_rgsvc_api_RepositoryService.adoc.adoc#_rgsvc_api_RepositoryService[`RepositoryService#persist()`], no exception will be thrown if the Domain Object is already persisted, so the behavior of xref:_rgsvc_api_RepositoryService.adoc#_rgsvc_api_RepositoryService[`RepositoryService#persist()`] will be the same as that of _rgsvc_api_DomainObjectContainer_object-persistence-api.adoc#_rgsvc_api_DomainObjectContainer_object-persistence-api[`DomainObjectContainer#persistIfNotAlready()`].
+
 
 
 == Removal of the `self-host` profile

http://git-wip-us.apache.org/repos/asf/isis/blob/5e0df139/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_DomainObjectContainer_object-persistence-api.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_DomainObjectContainer_object-persistence-api.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_DomainObjectContainer_object-persistence-api.adoc
index d520916..6257b81 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_DomainObjectContainer_object-persistence-api.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_DomainObjectContainer_object-persistence-api.adoc
@@ -30,9 +30,9 @@ public interface DomainObjectContainer {
     ...
 }
 ----
-<1> test whether a particular domain object is persistent or not
+<1> test whether a particular domain object is persistent or not.
 <2> test whether a particular domain object is a view model or not.  Note that this includes any domain objects annotated with xref:rgant.adoc#_rgant-DomainObject_nature[`@DomainObject#nature=Nature.EXTERNAL_ENTITY)`] or xref:rgant.adoc#_rgant-DomainObject_nature[`@DomainObject#nature=Nature.INMEMORY_ENTITY`]
-<3> persist a transient object.  Note though that this will throw an exception if the object is already persistent; this can happen if JDO/DataNucleus's link:http://www.datanucleus.org/products/accessplatform_4_0/jdo/orm/cascading.html[persistence-by-reachability] is in effect.  For this reason it is generally better to use:
+<3> persist a transient object.  Note though that this will throw an exception if the object is already persistent; this can happen if JDO/DataNucleus's link:http://www.datanucleus.org/products/accessplatform_4_0/jdo/orm/cascading.html[persistence-by-reachability] is in effect.  For this reason it is generally better to use: "persistIfNotAlready". Please, also note that this method has been deprecated. When moving to xref:rgsvc_api_RepositoryService.adoc#_rgsvc_api_RepositoryService[`RepositoryService#persist()`] take into account that its behavior is identical to <4>, being a no-op if the object is persistent, instead of throwing an exception.
 <4> persist an object but only if know to not have been persistent.  But if the object is persistent, is a no-op
 <5> remove (ie DELETE) a persistent object.  For similar reasons to the persistence, it is generally better to use:
 <6> remove (ie DELETE) an object only if known to be persistent.  But if the object has already been deleted, then is a no-op.

http://git-wip-us.apache.org/repos/asf/isis/blob/5e0df139/core/applib/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/DomainObjectContainer.java b/core/applib/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
index 3b09970..720846b 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
@@ -284,7 +284,7 @@ public interface DomainObjectContainer {
     boolean isPersistent(Object domainObject);
 
     /**
-     * @deprecated - use {@link org.apache.isis.applib.services.repository.RepositoryService#persist(Object)} instead.
+     * @deprecated - use {@link org.apache.isis.applib.services.repository.RepositoryService#persist(Object)} instead. Please note that {@link org.apache.isis.applib.services.repository.RepositoryService#persist(Object)} will not throw an exception if the Domain Object is already persistent, so the implementation will be the same as that of {@link org.apache.isis.applib.services.repository.RepositoryService#persistIfNotAlready(Object)} (or the equivalent, deprecated {@link org.apache.isis.applib.DomainObjectContainer#persistIfNotAlready(Object)}) instead.
      */
     @Deprecated
     @Programmatic


[2/3] isis git commit: Merge branch 'ISIS-1364-2nd' of https://github.com/oscarbou/isis into ISIS-1364_pr-41

Posted by da...@apache.org.
Merge branch 'ISIS-1364-2nd' of https://github.com/oscarbou/isis into ISIS-1364_pr-41


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/eccd5b7f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/eccd5b7f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/eccd5b7f

Branch: refs/heads/master
Commit: eccd5b7fc284b61da0acc1449d86ce61dd578036
Parents: 6fa29b5 5e0df13
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Apr 10 13:49:29 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun Apr 10 13:49:29 2016 +0100

----------------------------------------------------------------------
 .../src/main/asciidoc/_migration-notes_1.11.0-to-1.12.0.adoc     | 2 ++
 .../_rgsvc_api_DomainObjectContainer_object-persistence-api.adoc | 4 ++--
 .../main/java/org/apache/isis/applib/DomainObjectContainer.java  | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------



[3/3] isis git commit: ISIS-1364: updating docs and javadoc for migration

Posted by da...@apache.org.
ISIS-1364: updating docs and javadoc for migration

... for using RepositoryService#persist(...)

Merge branch 'ISIS-1364_pr-41'


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/6b2b0a17
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/6b2b0a17
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/6b2b0a17

Branch: refs/heads/master
Commit: 6b2b0a17439525fd45c14da59775cb37cbd94f17
Parents: 6fa29b5 eccd5b7
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Apr 10 13:53:02 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun Apr 10 13:53:02 2016 +0100

----------------------------------------------------------------------
 .../src/main/asciidoc/_migration-notes_1.11.0-to-1.12.0.adoc     | 2 ++
 .../_rgsvc_api_DomainObjectContainer_object-persistence-api.adoc | 4 ++--
 .../main/java/org/apache/isis/applib/DomainObjectContainer.java  | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------