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 2017/10/16 19:51:15 UTC
[isis] branch dev/2.0.0/ISIS-1742-remove-deprecations updated
(0fdeaf9 -> 65a8be9)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 0fdeaf9 ISIS-1742: fixes up compile issues resulting from removal of methods from DomainObjectContainer
new 79d2de8 ISIS-1742: removes AuditingService3 (use AuditerService instead). Updates .adoc
new b3044d7 ISIS-1742: rolls up BookmarkService2 to BookmarkService
new 5a799b0 ISIS-1742: rolls up ClassDiscoveryService2 into ClassDiscoveryService
new 15b0a93 ISIS-1742: rolls up MetaModelService2 and MetaModelService3 into MetaModelService supertype
new f0ae08d ISIS-1742: remove o.a.i.objectstore.applib.service.support.IsisJdoSupport
new 2209a8d ISIS-1742: moves JaxbServiceDefault from o.a.i.schema.services.jaxb to o.a.i.applib.services.jaxb
new 0dcb44d ISIS-1742: rolls ExceptionRecognizer2 up into ExceptionRecognizer
new 4827e16 ISIS-1742: moves the JDO-specific implementations of ExceptionRecognizer under o.a.i.applib.services.exceprecog.jdo. Also updates DomainObjectContainer to fully implement the (extended) ExceptionRecognizer interface.
new 65a8be9 ISIS-1742: splits out ExceptionRecognizer impl from DomainObjectContainerDefault into new ExceptionRecognizerDocDefault
The 9 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:
.../asciidoc/guides/rgant/_rgant-DomainObject.adoc | 3 +-
.../guides/rgant/_rgant-DomainObject_auditing.adoc | 3 +-
..._persistence-layer_AuditingServiceInternal.adoc | 22 ++--
...ce-layer_PersistenceSessionServiceInternal.adoc | 2 +-
...rgsvc_application-layer-api_CommandContext.adoc | 2 +-
...c_application-layer-api_InteractionContext.adoc | 3 +-
...rgsvc_application-layer-spi_CommandService.adoc | 7 +-
...vc_bootstrapping-spi_ClassDiscoveryService.adoc | 8 +-
.../guides/rgsvc/_rgsvc_integration-api.adoc | 2 +-
.../_rgsvc_integration-api_BookmarkService.adoc | 8 +-
.../main/asciidoc/guides/rgsvc/_rgsvc_intro.adoc | 3 +-
.../_rgsvc_metadata-api_MetamodelService.adoc | 6 +-
...rgsvc_persistence-layer-api_MetricsService.adoc | 3 +-
.../guides/rgsvc/_rgsvc_persistence-layer-spi.adoc | 12 +--
...rgsvc_persistence-layer-spi_AuditerService.adoc | 10 --
...gsvc_persistence-layer-spi_AuditingService.adoc | 86 ---------------
.../rgsvc/_rgsvc_presentation-layer-spi.adoc | 2 +-
...presentation-layer-spi_ExceptionRecognizer.adoc | 6 +-
...ailable-domain-services_framework-provided.adoc | 1 -
.../_ugfun_building-blocks_identifiers_oid.adoc | 2 +-
.../src/main/asciidoc/guides/ugsec/ugsec.adoc | 2 +-
.../apache/isis/applib/DomainObjectContainer.java | 4 +-
.../isis/applib/annotation/DomainObject.java | 4 +-
.../isis/applib/fixturescripts/FixtureScripts.java | 9 +-
.../applib/services/audit/AuditingService3.java | 55 ----------
.../applib/services/bookmark/BookmarkService.java | 38 ++++++-
.../applib/services/bookmark/BookmarkService2.java | 65 ------------
.../applib/services/bookmark/package-info.java | 2 +-
.../classdiscovery/ClassDiscoveryService.java | 7 +-
.../classdiscovery/ClassDiscoveryService2.java | 39 -------
.../ClassDiscoveryServiceUsingReflections.java | 14 +--
.../services/classdiscovery/package-info.java | 2 +-
.../services/exceprecog/ExceptionRecognizer.java | 59 +++++++++++
.../services/exceprecog/ExceptionRecognizer2.java | 86 ---------------
.../exceprecog/ExceptionRecognizerAbstract.java | 4 +-
.../exceprecog/ExceptionRecognizerComposite.java | 21 ++--
...eptionRecognizerCompositeForJdoObjectStore.java | 2 +-
...xceptionRecognizerForJDODataStoreException.java | 2 +-
...traintViolationForeignKeyNoActionException.java | 2 +-
...ionRecognizerForJDOObjectNotFoundException.java | 2 +-
...yConstraintViolationUniqueOrIndexException.java | 2 +-
.../services/jaxb/JaxbServiceDefault.java | 2 +-
.../services/metamodel/MetaModelService.java | 69 ++++++++++++
.../services/metamodel/MetaModelService2.java | 82 --------------
.../services/metamodel/MetaModelService3.java | 46 --------
.../applib/services/metamodel/package-info.java | 2 +-
.../services/session/SessionLoggingService.java | 6 +-
.../applib/service/DomainChangeJdoAbstract.java | 17 ++-
.../jdo/applib/service/support/IsisJdoSupport.java | 28 -----
.../jaxbadapters/PersistentEntityAdapter.java | 9 +-
.../ExceptionRecognizerCompositeTest.java | 5 +
...onRecognizerCompositeForJdoObjectStoreTest.java | 4 +-
...LIntegrityConstraintViolationExceptionTest.java | 4 +-
...ctionInvocationFacetForDomainEventAbstract.java | 8 +-
.../bookmarks/BookmarkServiceInternalDefault.java | 4 +-
.../container/DomainObjectContainerDefault.java | 58 +---------
.../container/ExceptionRecognizerDocDefault.java | 118 +++++++++++++++++++++
.../metamodel/MetaModelServiceDefault.java | 4 +-
.../PersistenceSessionServiceInternal.java | 4 +-
.../PersistenceSessionServiceInternalNoop.java | 4 +-
.../services/auditing/AuditingServiceInternal.java | 21 +---
.../PersistenceSessionServiceInternalDefault.java | 4 +-
.../system/persistence/PersistenceSession.java | 19 ++--
.../service/support/IsisJdoSupportImpl.java | 2 +-
todo-deprecation-list.txt | 69 +++++++-----
65 files changed, 435 insertions(+), 766 deletions(-)
delete mode 100644 adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_AuditingService.adoc
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditingService3.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService2.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/classdiscovery/ClassDiscoveryService2.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizer2.java
rename core/applib/src/main/java/org/apache/isis/{objectstore/jdo/applib/service/exceprecog => applib/services/exceprecog/jdo}/ExceptionRecognizerCompositeForJdoObjectStore.java (97%)
rename core/applib/src/main/java/org/apache/isis/{objectstore/jdo/applib/service/exceprecog => applib/services/exceprecog/jdo}/ExceptionRecognizerForJDODataStoreException.java (95%)
rename core/applib/src/main/java/org/apache/isis/{objectstore/jdo/applib/service/exceprecog => applib/services/exceprecog/jdo}/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java (95%)
rename core/applib/src/main/java/org/apache/isis/{objectstore/jdo/applib/service/exceprecog => applib/services/exceprecog/jdo}/ExceptionRecognizerForJDOObjectNotFoundException.java (95%)
rename core/applib/src/main/java/org/apache/isis/{objectstore/jdo/applib/service/exceprecog => applib/services/exceprecog/jdo}/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java (95%)
rename core/applib/src/main/java/org/apache/isis/{schema => applib}/services/jaxb/JaxbServiceDefault.java (97%)
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService2.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService3.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/support/IsisJdoSupport.java
rename core/applib/src/test/java/org/apache/isis/{objectstore/jdo/applib/service/exceprecog => applib/services/exceprecog/jdo}/ExceptionRecognizerCompositeForJdoObjectStoreTest.java (93%)
rename core/applib/src/test/java/org/apache/isis/{objectstore/jdo/applib/service/exceprecog => applib/services/exceprecog/jdo}/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java (92%)
create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/ExceptionRecognizerDocDefault.java
--
To stop receiving notification emails like this one, please contact
['"commits@isis.apache.org" <co...@isis.apache.org>'].
[isis] 07/09: ISIS-1742: rolls ExceptionRecognizer2 up into
ExceptionRecognizer
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0dcb44d092e27e2e848c1b67401f504bc20b6461
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 20:32:02 2017 +0100
ISIS-1742: rolls ExceptionRecognizer2 up into ExceptionRecognizer
---
.../rgsvc/_rgsvc_presentation-layer-spi.adoc | 2 +-
...presentation-layer-spi_ExceptionRecognizer.adoc | 6 +-
.../services/exceprecog/ExceptionRecognizer.java | 59 +++++++++++++++
.../services/exceprecog/ExceptionRecognizer2.java | 86 ----------------------
.../exceprecog/ExceptionRecognizerAbstract.java | 4 +-
.../exceprecog/ExceptionRecognizerComposite.java | 21 ++----
.../system/persistence/PersistenceSession.java | 13 ++--
todo-deprecation-list.txt | 9 +++
8 files changed, 87 insertions(+), 113 deletions(-)
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi.adoc
index 9edb262..dd73d1c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi.adoc
@@ -56,7 +56,7 @@ a configured `EmailService`
|xref:../rgsvc/rgsvc.adoc#_rgsvc_presentation-layer-spi_ExceptionRecognizer[`o.a.i.applib.` +
`services.exceprecog` +
-`ExceptionRecognizer2`]
+`ExceptionRecognizer`]
|Convert certain exceptions (eg foreign or unique key violation in the database) into a format that can be rendered to the end-user.
|`ExceptionRecognizer-` +
`CompositeFor-` +
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_ExceptionRecognizer.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_ExceptionRecognizer.adoc
index 2d2a1ee..b7bdfe3 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_ExceptionRecognizer.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_ExceptionRecognizer.adoc
@@ -20,7 +20,7 @@ The SPI defined by this service is:
[source,java]
----
-public interface ExceptionRecognizer2 ... {
+public interface ExceptionRecognizer ... {
public enum Category { // <1>
...
}
@@ -48,7 +48,7 @@ The categories are:
[source,java]
----
-public interface ExceptionRecognizer2 ... {
+public interface ExceptionRecognizer ... {
public enum Category {
CONSTRAINT_VIOLATION, // <1>
NOT_FOUND, // <2>
@@ -89,7 +89,7 @@ The framework provides two default implementations:
** `ExceptionRecognizerForJDODataStoreException`
-If you want to recognize and handle additional exceptions (for example to capture error messages specific to the JDBC driver you might be using), then create a fine-grained implementation of `ExceptionRecognizer2` for the particular error message (there are some convenience implementations of the interface that you can subclass from if required) and register in `isis.properties`.
+If you want to recognize and handle additional exceptions (for example to capture error messages specific to the JDBC driver you might be using), then create a fine-grained implementation of `ExceptionRecognizer` for the particular error message (there are some convenience implementations of the interface that you can subclass from if required) and register in `isis.properties`.
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizer.java b/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizer.java
index 258fa0e..53cb3ca 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizer.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizer.java
@@ -63,6 +63,13 @@ public interface ExceptionRecognizer {
@Programmatic
public String recognize(Throwable ex);
+ /**
+ * An extension to {@link #recognize(Throwable)} that allows recognized exceptions
+ * to be {@link org.apache.isis.applib.services.exceprecog.ExceptionRecognizer.Category categorize}d.
+ */
+ @Programmatic
+ Recognition recognize2(Throwable ex);
+
@Programmatic
@PostConstruct
public void init(Map<String, String> properties);
@@ -71,4 +78,56 @@ public interface ExceptionRecognizer {
@PreDestroy
public void shutdown();
+ enum Category {
+ /**
+ * A violation of some declarative constraint (eg uniqueness or referential integrity) was detected.
+ */
+ CONSTRAINT_VIOLATION,
+ /**
+ * The object to be acted upon cannot be found (404)
+ */
+ NOT_FOUND,
+ /**
+ * A concurrency exception, in other words some other user has changed this object.
+ */
+ CONCURRENCY,
+ /**
+ * Recognized, but for some other reason... 40x error
+ */
+ CLIENT_ERROR,
+ /**
+ * 50x error
+ */
+ SERVER_ERROR,
+ /**
+ * Recognized, but uncategorized (typically: a recognizer of the original ExceptionRecognizer API).
+ */
+ OTHER
+ }
+
+ class Recognition {
+
+ /**
+ * Returns a recognition of the specified type (assuming a non-null reason); else null.
+ */
+ public static Recognition of(final Category category, final String reason) {
+ return reason != null? new Recognition(category, reason): null;
+ }
+
+ private final Category category;
+ private final String reason;
+
+ public Recognition(final Category category, final String reason) {
+ this.category = category;
+ this.reason = reason;
+ }
+
+ public Category getCategory() {
+ return category;
+ }
+
+ public String getReason() {
+ return reason;
+ }
+ }
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizer2.java b/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizer2.java
deleted file mode 100644
index 2667014..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizer2.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * 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.services.exceprecog;
-
-import org.apache.isis.applib.annotation.Programmatic;
-
-/**
- * An extension of the {@link org.apache.isis.applib.services.exceprecog.ExceptionRecognizer} interface that
- * allows recognized exceptions to be {@link org.apache.isis.applib.services.exceprecog.ExceptionRecognizer2.Category categorize}d.
- */
-public interface ExceptionRecognizer2 extends ExceptionRecognizer {
-
-
- public enum Category {
- /**
- * A violation of some declarative constraint (eg uniqueness or referential integrity) was detected.
- */
- CONSTRAINT_VIOLATION,
- /**
- * The object to be acted upon cannot be found (404)
- */
- NOT_FOUND,
- /**
- * A concurrency exception, in other words some other user has changed this object.
- */
- CONCURRENCY,
- /**
- * Recognized, but for some other reason... 40x error
- */
- CLIENT_ERROR,
- /**
- * 50x error
- */
- SERVER_ERROR,
- /**
- * Recognized, but uncategorized (typically: a recognizer of the original ExceptionRecognizer API).
- */
- OTHER
- }
-
- public static class Recognition {
-
- /**
- * Returns a recognition of the specified type (assuming a non-null reason); else null.
- */
- public static Recognition of(final Category category, final String reason) {
- return reason != null? new Recognition(category, reason): null;
- }
-
- private final Category category;
- private final String reason;
-
- public Recognition(final Category category, final String reason) {
- this.category = category;
- this.reason = reason;
- }
-
- public Category getCategory() {
- return category;
- }
-
- public String getReason() {
- return reason;
- }
- }
-
- @Programmatic
- public Recognition recognize2(final Throwable ex);
-
-}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java b/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
index 34006db..43628bd 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
@@ -22,7 +22,7 @@ import java.util.List;
import java.util.Map;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import javax.inject.Inject;
+
import com.google.common.base.Function;
import com.google.common.base.Functions;
import com.google.common.base.Predicate;
@@ -43,7 +43,7 @@ import org.apache.isis.applib.services.i18n.TranslationService;
* If a messaging-parsing {@link Function} is provided through the constructor,
* then the message can be altered. Otherwise the exception's {@link Throwable#getMessage() message} is returned as-is.
*/
-public abstract class ExceptionRecognizerAbstract implements ExceptionRecognizer2 {
+public abstract class ExceptionRecognizerAbstract implements ExceptionRecognizer {
public static final Logger LOG = LoggerFactory.getLogger(ExceptionRecognizerAbstract.class);
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerComposite.java b/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerComposite.java
index b3d218e..f72829d 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerComposite.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerComposite.java
@@ -44,7 +44,7 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
* recognize various types of constraint violations. These are grouped together as a single
* set through the use of this class.
*/
-public class ExceptionRecognizerComposite implements ExceptionRecognizer2 {
+public class ExceptionRecognizerComposite implements ExceptionRecognizer {
private final List<ExceptionRecognizer> exceptionRecognizers = Lists.newArrayList();
@@ -89,25 +89,20 @@ public class ExceptionRecognizerComposite implements ExceptionRecognizer2 {
/**
- * Returns the non-<tt>null</tt> recognition of the first {@link #add(ExceptionRecognizer) add}ed
- * (that is also an {@link org.apache.isis.applib.services.exceprecog.ExceptionRecognizer2}).
+ * Returns the non-<tt>null</tt> recognition of the first {@link #add(ExceptionRecognizer) add}ed {@link org.apache.isis.applib.services.exceprecog.ExceptionRecognizer}.
*
* <p>
- * If none (as {@link org.apache.isis.applib.services.exceprecog.ExceptionRecognizer2}) recognize
- * the exception, then falls back to using {@link #recognize(Throwable)}, returning a
- * {@link org.apache.isis.applib.services.exceprecog.ExceptionRecognizer2.Recognition} with a
- * category of {@link org.apache.isis.applib.services.exceprecog.ExceptionRecognizer2.Category#CLIENT_ERROR}.
+ * If none recognize the exception, then falls back to using {@link #recognize(Throwable)}, returning a
+ * {@link org.apache.isis.applib.services.exceprecog.ExceptionRecognizer.Recognition} with a
+ * category of {@link org.apache.isis.applib.services.exceprecog.ExceptionRecognizer.Category#CLIENT_ERROR}.
* </p>
*/
@Programmatic
public final Recognition recognize2(final Throwable ex) {
for (final ExceptionRecognizer ers : exceptionRecognizers) {
- if(ers instanceof ExceptionRecognizer2) {
- final ExceptionRecognizer2 recognizer2 = (ExceptionRecognizer2) ers;
- final Recognition recognition = recognizer2.recognize2(ex);
- if(recognition != null) {
- return recognition;
- }
+ final Recognition recognition = ers.recognize2(ex);
+ if(recognition != null) {
+ return recognition;
}
}
// backward compatible so far as possible.
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
index ddb8d70..ce80c60 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
@@ -50,7 +50,6 @@ import org.apache.isis.applib.services.command.spi.CommandService;
import org.apache.isis.applib.services.eventbus.AbstractLifecycleEvent;
import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
-import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer2;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.applib.services.iactn.InteractionContext;
@@ -945,13 +944,11 @@ public class PersistenceSession implements
Class<ExceptionRecognizer> serviceClass = ExceptionRecognizer.class;
final List<ExceptionRecognizer> exceptionRecognizers = lookupServices(serviceClass);
for (ExceptionRecognizer exceptionRecognizer : exceptionRecognizers) {
- if(exceptionRecognizer instanceof ExceptionRecognizer2) {
- final ExceptionRecognizer2 recognizer = (ExceptionRecognizer2) exceptionRecognizer;
- final ExceptionRecognizer2.Recognition recognition = recognizer.recognize2(e);
- if(recognition != null) {
- if(recognition.getCategory() == ExceptionRecognizer2.Category.NOT_FOUND) {
- throw new ObjectNotFoundException(rootOid, e);
- }
+ final ExceptionRecognizer.Recognition recognition =
+ exceptionRecognizer.recognize2(e);
+ if(recognition != null) {
+ if(recognition.getCategory() == ExceptionRecognizer.Category.NOT_FOUND) {
+ throw new ObjectNotFoundException(rootOid, e);
}
}
}
diff --git a/todo-deprecation-list.txt b/todo-deprecation-list.txt
index 05ca6eb..2e233b6 100644
--- a/todo-deprecation-list.txt
+++ b/todo-deprecation-list.txt
@@ -150,6 +150,9 @@ org.apache.isis.applib.fixtures.switchuser
SwitchUserService.java
SwitchUserServiceAware.java
+
+
+
org.apache.isis.applib.services.command
Command.java - methods that pertain to the execution of the command and its completion (for that, use Interaction) [suggest we retain for now]
getCompletedAt()
@@ -413,6 +416,12 @@ org.apache.isis.applib.services.eventbus
PropertyChangedEvent.java - remove
PropertyInteractionEvent.java - remove
+
+org.apache.isis.applib.services.exceprecog
+
+ rolls ExceptionRecognizer2 up into ExceptionRecognizer
+
+
org.apache.isis.applib.services.metamodel
MetaModelService2.java and MetaModelService3 - pulled up to MetaModelService supertype
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 09/09: ISIS-1742: splits out ExceptionRecognizer impl from
DomainObjectContainerDefault into new ExceptionRecognizerDocDefault
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 65a8be9850e6ebc54123107ef89c8f590fd52100
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 20:48:30 2017 +0100
ISIS-1742: splits out ExceptionRecognizer impl from DomainObjectContainerDefault into new ExceptionRecognizerDocDefault
---
.../container/DomainObjectContainerDefault.java | 63 +----------
.../container/ExceptionRecognizerDocDefault.java | 118 +++++++++++++++++++++
2 files changed, 119 insertions(+), 62 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
index a89895e..48f669a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
@@ -51,8 +51,7 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
nature = NatureOfService.DOMAIN,
menuOrder = "" + Integer.MAX_VALUE
)
-public class DomainObjectContainerDefault
- implements DomainObjectContainer, ExceptionRecognizer {
+public class DomainObjectContainerDefault implements DomainObjectContainer {
//region > newViewModelInstance
@@ -221,63 +220,6 @@ public class DomainObjectContainerDefault
- //region > ExceptionRecognizer
-
- static class ExceptionRecognizerForConcurrencyException
- extends ExceptionRecognizerForType {
- public ExceptionRecognizerForConcurrencyException() {
- super(Category.CONCURRENCY, ConcurrencyException.class, prefix("Another user has just changed this data"));
- }
- }
- static class ExceptionRecognizerForRecoverableException extends ExceptionRecognizerForType {
- public ExceptionRecognizerForRecoverableException() {
- super(Category.CLIENT_ERROR, RecoverableException.class);
- }
- }
-
-
- private final ExceptionRecognizer recognizer =
- new ExceptionRecognizerComposite(
- new ExceptionRecognizerForConcurrencyException(),
- new ExceptionRecognizerForRecoverableException()
- );
-
- /**
- * Framework-provided implementation of {@link ExceptionRecognizer},
- * which will automatically recognize any {@link org.apache.isis.applib.RecoverableException}s or
- * any {@link ConcurrencyException}s.
- */
- @Programmatic
- @Override
- public String recognize(Throwable ex) {
- return recognizer.recognize(ex);
- }
-
- @Programmatic
- @Override
- public Recognition recognize2(final Throwable ex) {
- return recognizer.recognize2(ex);
- }
- //endregion
-
- //region > init, shutdown
-
- @Programmatic
- @PostConstruct
- @Override
- public void init(Map<String, String> properties) {
- serviceRegistry.injectServicesInto(recognizer);
- recognizer.init(properties);
- }
-
- @Programmatic
- @PreDestroy
- @Override
- public void shutdown() {
- recognizer.shutdown();
- }
-
- //endregion
//region > helpers
@@ -293,9 +235,6 @@ public class DomainObjectContainerDefault
SpecificationLoader specificationLoader;
@javax.inject.Inject
- ServiceRegistry serviceRegistry;
-
- @javax.inject.Inject
RepositoryService repositoryService;
@javax.inject.Inject
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/ExceptionRecognizerDocDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/ExceptionRecognizerDocDefault.java
new file mode 100644
index 0000000..c9db26b
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/ExceptionRecognizerDocDefault.java
@@ -0,0 +1,118 @@
+/*
+ * 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.metamodel.services.container;
+
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+
+import org.apache.isis.applib.DomainObjectContainer;
+import org.apache.isis.applib.PersistFailedException;
+import org.apache.isis.applib.RecoverableException;
+import org.apache.isis.applib.RepositoryException;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
+import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerComposite;
+import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerForType;
+import org.apache.isis.applib.services.registry.ServiceRegistry;
+import org.apache.isis.applib.services.repository.RepositoryService;
+import org.apache.isis.applib.services.wrapper.WrapperFactory;
+import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
+import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
+import org.apache.isis.core.metamodel.consent.InteractionResult;
+import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
+import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+
+@DomainService(
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
+)
+public class ExceptionRecognizerDocDefault
+ implements ExceptionRecognizer {
+
+
+ //region > init, shutdown
+
+ @Programmatic
+ @PostConstruct
+ @Override
+ public void init(Map<String, String> properties) {
+ serviceRegistry.injectServicesInto(recognizer);
+ recognizer.init(properties);
+ }
+
+ @Programmatic
+ @PreDestroy
+ @Override
+ public void shutdown() {
+ recognizer.shutdown();
+ }
+
+ //endregion
+
+ static class ExceptionRecognizerForConcurrencyException
+ extends ExceptionRecognizerForType {
+ public ExceptionRecognizerForConcurrencyException() {
+ super(Category.CONCURRENCY, ConcurrencyException.class, prefix("Another user has just changed this data"));
+ }
+ }
+ static class ExceptionRecognizerForRecoverableException extends ExceptionRecognizerForType {
+ public ExceptionRecognizerForRecoverableException() {
+ super(Category.CLIENT_ERROR, RecoverableException.class);
+ }
+ }
+
+
+ private final ExceptionRecognizer recognizer =
+ new ExceptionRecognizerComposite(
+ new ExceptionRecognizerForConcurrencyException(),
+ new ExceptionRecognizerForRecoverableException()
+ );
+
+ /**
+ * Framework-provided implementation of {@link ExceptionRecognizer},
+ * which will automatically recognize any {@link org.apache.isis.applib.RecoverableException}s or
+ * any {@link ConcurrencyException}s.
+ */
+ @Programmatic
+ @Override
+ public String recognize(Throwable ex) {
+ return recognizer.recognize(ex);
+ }
+
+ @Programmatic
+ @Override
+ public Recognition recognize2(final Throwable ex) {
+ return recognizer.recognize2(ex);
+ }
+
+
+
+ @javax.inject.Inject
+ ServiceRegistry serviceRegistry;
+
+}
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 03/09: ISIS-1742: rolls up ClassDiscoveryService2 into
ClassDiscoveryService
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 5a799b0ee8e53d06f8167911b757a381cf88aa75
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 20:03:17 2017 +0100
ISIS-1742: rolls up ClassDiscoveryService2 into ClassDiscoveryService
---
...vc_bootstrapping-spi_ClassDiscoveryService.adoc | 8 ++---
.../isis/applib/fixturescripts/FixtureScripts.java | 9 +----
.../classdiscovery/ClassDiscoveryService.java | 7 +---
.../classdiscovery/ClassDiscoveryService2.java | 39 ----------------------
.../ClassDiscoveryServiceUsingReflections.java | 14 +-------
.../services/classdiscovery/package-info.java | 2 +-
todo-deprecation-list.txt | 7 ++--
7 files changed, 12 insertions(+), 74 deletions(-)
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_bootstrapping-spi_ClassDiscoveryService.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_bootstrapping-spi_ClassDiscoveryService.adoc
index dede68e..cc1bc1c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_bootstrapping-spi_ClassDiscoveryService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_bootstrapping-spi_ClassDiscoveryService.adoc
@@ -1,12 +1,12 @@
[[_rgsvc_bootstrapping-spi_ClassDiscoveryService]]
-= `ClassDiscoveryService2`
+= `ClassDiscoveryService`
: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 [...]
:_basedir: ../../
:_imagesdir: images/
-The `ClassDiscoveryService2` service is used to automatically discover subclasses of any given type on the classpath.
+The `ClassDiscoveryService` service is used to automatically discover subclasses of any given type on the classpath.
The primary use case is to support "convention-over-configuration" designs that work with a minimum of configuration.
This service is used by the xref:../rgcms/rgcms.adoc#_rgcms_classes_super_FixtureScripts[`FixtureScripts`] service to automatically locate any xref:../rgcms/rgcms.adoc#_rgcms_classes_super_FixtureScript[`FixtureScript`] implementations.
@@ -19,7 +19,7 @@ The SPI defined by the service is:
[source,java]
----
-public interface ClassDiscoveryService2 {
+public interface ClassDiscoveryService {
@Programmatic
<T> Set<Class<? extends T>> findSubTypesOfClasses(Class<T> type, String packagePrefix);
@Deprecated
@@ -73,7 +73,7 @@ Other usages of the `ClassDiscoveryService` are likely to work in a similar way,
== Registering the Services
Assuming that the `configuration-and-annotation` services installer is configured (implicit if using the
-`AppManifest` to xref:../rgcms/rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the app]) then Apache Isis' core implementation of `ClassDiscoveryService2` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
+`AppManifest` to xref:../rgcms/rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the app]) then Apache Isis' core implementation of `ClassDiscoveryService` service is automatically registered and injected (it is annotated with `@DomainService`) so no further configuration is required.
To use an alternative implementation, use xref:../rgant/rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] (as explained
in the xref:../rgsvc/rgsvc.adoc#__rgsvc_intro_overriding-the-services[introduction] to this guide).
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScripts.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScripts.java
index 547bc2c..50b9708 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScripts.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScripts.java
@@ -43,12 +43,10 @@ import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.classdiscovery.ClassDiscoveryService;
-import org.apache.isis.applib.services.classdiscovery.ClassDiscoveryService2;
import org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault;
import org.apache.isis.applib.services.fixturespec.FixtureScriptsSpecification;
import org.apache.isis.applib.services.memento.MementoService;
import org.apache.isis.applib.services.memento.MementoService.Memento;
-import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.title.TitleService;
@@ -259,12 +257,7 @@ public abstract class FixtureScripts extends AbstractService {
}
private <T> Set<Class<? extends T>> findSubTypesOfClasses(Class<T> cls, final String packagePrefix) {
- if(classDiscoveryService instanceof ClassDiscoveryService2) {
- final ClassDiscoveryService2 classDiscoveryService2 = (ClassDiscoveryService2) classDiscoveryService;
- return classDiscoveryService2.findSubTypesOfClasses(cls, packagePrefix);
- } else {
- return classDiscoveryService.findSubTypesOfClasses(cls);
- }
+ return classDiscoveryService.findSubTypesOfClasses(cls, packagePrefix);
}
private FixtureScript newFixtureScript(final Class<? extends FixtureScript> fixtureScriptCls) {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/classdiscovery/ClassDiscoveryService.java b/core/applib/src/main/java/org/apache/isis/applib/services/classdiscovery/ClassDiscoveryService.java
index e3f8155..bcf434e 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/classdiscovery/ClassDiscoveryService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/classdiscovery/ClassDiscoveryService.java
@@ -34,11 +34,6 @@ import org.apache.isis.applib.annotation.Programmatic;
*/
public interface ClassDiscoveryService {
- /**
- * @deprecated - if an implementation of {@link ClassDiscoveryService2} is available then its equivalent {@link ClassDiscoveryService2#findSubTypesOfClasses(Class, String)} will be used instead.
- */
- @Deprecated
@Programmatic
- public <T> Set<Class<? extends T>> findSubTypesOfClasses(Class<T> type);
-
+ <T> Set<Class<? extends T>> findSubTypesOfClasses(Class<T> type, String packagePrefix);
}
\ No newline at end of file
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/classdiscovery/ClassDiscoveryService2.java b/core/applib/src/main/java/org/apache/isis/applib/services/classdiscovery/ClassDiscoveryService2.java
deleted file mode 100644
index 8857eb0..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/services/classdiscovery/ClassDiscoveryService2.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.services.classdiscovery;
-
-import java.util.Set;
-import org.apache.isis.applib.annotation.Programmatic;
-
-/**
- * This utility service supports the dynamic discovery of classes from the classpath. One service that uses this
- * is the <tt>FixtureScripts</tt> domain service.
- *
- * <p>
- * Because an implementation of this service (<tt>ClassDiscoveryServiceUsingReflections</tt> is annotated with
- * {@link org.apache.isis.applib.annotation.DomainService} and is implemented in the core applib, it is automatically
- * registered and available for use; no configuration is required.
- * </p>
- */
-public interface ClassDiscoveryService2 extends ClassDiscoveryService {
-
- @Programmatic
- public <T> Set<Class<? extends T>> findSubTypesOfClasses(Class<T> type, String packagePrefix);
-
-}
\ No newline at end of file
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/classdiscovery/ClassDiscoveryServiceUsingReflections.java b/core/applib/src/main/java/org/apache/isis/applib/services/classdiscovery/ClassDiscoveryServiceUsingReflections.java
index aec26ab..d1374d2 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/classdiscovery/ClassDiscoveryServiceUsingReflections.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/classdiscovery/ClassDiscoveryServiceUsingReflections.java
@@ -49,20 +49,8 @@ import org.apache.isis.applib.fixturescripts.FixtureScript;
)
public class ClassDiscoveryServiceUsingReflections
extends AbstractService
- implements ClassDiscoveryService2 {
+ implements ClassDiscoveryService {
- @Programmatic
- @Override
- public <T> Set<Class<? extends T>> findSubTypesOfClasses(Class<T> type) {
- Vfs.setDefaultURLTypes(getUrlTypes());
-
- final Reflections reflections = new Reflections(
- ClasspathHelper.forClassLoader(Thread.currentThread().getContextClassLoader()),
- ClasspathHelper.forClass(Object.class),
- new SubTypesScanner(false)
- );
- return reflections.getSubTypesOf(type);
- }
@Programmatic
@Override
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/classdiscovery/package-info.java b/core/applib/src/main/java/org/apache/isis/applib/services/classdiscovery/package-info.java
index e45cfd0..1f9a87b 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/classdiscovery/package-info.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/classdiscovery/package-info.java
@@ -18,7 +18,7 @@
*/
/**
- * The {@link org.apache.isis.applib.services.classdiscovery.ClassDiscoveryService2} service is used to automatically
+ * The {@link org.apache.isis.applib.services.classdiscovery.ClassDiscoveryService} service is used to automatically
* discover subclasses of any given type on the classpath. The primary use case is to support
* "convention-over-configuration" designs that work with a minimum of configuration.
*
diff --git a/todo-deprecation-list.txt b/todo-deprecation-list.txt
index 3f3cef4..d3061b6 100644
--- a/todo-deprecation-list.txt
+++ b/todo-deprecation-list.txt
@@ -12,8 +12,6 @@ org.apache.isis.applib.clock
Clock
-org.apache.isis.applib.services.classdiscovery
- ClassDiscoveryService.java , push down into ClassDiscoveryService2
org.apache.isis.applib.services.memento (19 usages found)
@@ -386,8 +384,11 @@ org.apache.isis.applib.services.background (10 usages found)
org.apache.isis.applib.services.bookmark (8 usages found)
- BookmarkService.java - deprecated methods, have overloads in BookmarkService2 subtype [suggest we retain these for now]
+ BookmarkService2.java - pull up its methods into BookmarkService supertype, and delete
+
+org.apache.isis.applib.services.classdiscovery
+ ClassDiscoveryService2.java , pull up its methods into ClassDiscoveryService supertype, and delete
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 04/09: ISIS-1742: rolls up MetaModelService2 and
MetaModelService3 into MetaModelService supertype
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 15b0a939bb2507a7e4a7657e402361522653d112
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 20:11:54 2017 +0100
ISIS-1742: rolls up MetaModelService2 and MetaModelService3 into MetaModelService supertype
---
.../_rgsvc_metadata-api_MetamodelService.adoc | 6 +-
.../apache/isis/applib/DomainObjectContainer.java | 4 +-
.../services/metamodel/MetaModelService.java | 69 ++++++++++++++++++
.../services/metamodel/MetaModelService2.java | 82 ----------------------
.../services/metamodel/MetaModelService3.java | 46 ------------
.../applib/services/metamodel/package-info.java | 2 +-
.../applib/service/DomainChangeJdoAbstract.java | 7 +-
...ctionInvocationFacetForDomainEventAbstract.java | 8 +--
.../metamodel/MetaModelServiceDefault.java | 4 +-
todo-deprecation-list.txt | 6 +-
10 files changed, 87 insertions(+), 147 deletions(-)
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api_MetamodelService.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api_MetamodelService.adoc
index 899da01..2cfb8ba 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api_MetamodelService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api_MetamodelService.adoc
@@ -1,12 +1,12 @@
[[_rgsvc_metadata-api_MetamodelService]]
-= `MetaModelService3`
+= `MetaModelService`
: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 [...]
:_basedir: ../../
:_imagesdir: images/
-The `MetaModelService3` service provides access to a number of aspects of Apache Isis' internal metamodel.
+The `MetaModelService` service provides access to a number of aspects of Apache Isis' internal metamodel.
== API
@@ -16,7 +16,7 @@ The API defined by the service is:
[source,java]
----
-public interface MetaModelService2 {
+public interface MetaModelService {
Class<?> fromObjectType(String objectType); // <1>
String toObjectType(Class<?> domainType); // <2>
void rebuild(Class<?> domainType); // <3>
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 1099cf0..2850c9f 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
@@ -22,7 +22,7 @@ package org.apache.isis.applib;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.message.MessageService;
-import org.apache.isis.applib.services.metamodel.MetaModelService3;
+import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.applib.services.user.UserService;
@@ -153,7 +153,7 @@ public interface DomainObjectContainer {
//region > isViewModel
/**
- * @deprecated - use {@link org.apache.isis.applib.services.metamodel.MetaModelService3#sortOf(Class, MetaModelService3.Mode)} instead.
+ * @deprecated - use {@link org.apache.isis.applib.services.metamodel.MetaModelService#sortOf(Class, MetaModelService.Mode)} instead.
*/
@Deprecated
@Programmatic
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java b/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
index c800307..3150f8e 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.services.bookmark.Bookmark;
/**
* This service provides a formal API into Isis' metamodel.
@@ -58,5 +59,73 @@ public interface MetaModelService {
@Programmatic
List<DomainMember> export();
+ /**
+ * @deprecated - use {@link #sortOf(Class, MetaModelService.Mode)}
+ */
+ @Deprecated
+ @Programmatic
+ Sort sortOf(Class<?> domainType);
+
+ /**
+ * @deprecated - use {@link #sortOf(Bookmark, MetaModelService.Mode)}
+ */
+ @Deprecated
+ @Programmatic
+ Sort sortOf(Bookmark bookmark);
+
+ @Programmatic
+ Sort sortOf(Class<?> domainType, Mode mode);
+
+ @Programmatic
+ Sort sortOf(Bookmark bookmark, Mode mode);
+
+ enum Sort {
+ VIEW_MODEL,
+ JDO_ENTITY,
+ DOMAIN_SERVICE,
+ MIXIN,
+ VALUE,
+ COLLECTION,
+ UNKNOWN;
+
+ public boolean isDomainService() {
+ return this == DOMAIN_SERVICE;
+ }
+
+ public boolean isMixin() {
+ return this == MIXIN;
+ }
+
+ public boolean isViewModel() {
+ return this == VIEW_MODEL;
+ }
+
+ public boolean isValue() {
+ return this == VALUE;
+ }
+
+ public boolean isCollection() {
+ return this == COLLECTION;
+ }
+
+ public boolean isJdoEntity() {
+ return this == JDO_ENTITY;
+ }
+
+ public boolean isUnknown() {
+ return this == UNKNOWN;
+ }
+
+ }
+ enum Mode {
+ /**
+ * If the {@link #sortOf(Class, Mode) sort of} object type is unknown, then throw an exception.
+ */
+ STRICT,
+ /**
+ * If the {@link #sortOf(Class, Mode) sort of} object type is unknown, then return {@link Sort#UNKNOWN}.
+ */
+ RELAXED
+ }
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService2.java b/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService2.java
deleted file mode 100644
index 1ffd3f9..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService2.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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.services.metamodel;
-
-import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.services.bookmark.Bookmark;
-
-/**
- * This service provides a formal API into Isis' metamodel.
- */
-public interface MetaModelService2 extends MetaModelService {
-
- enum Sort {
- VIEW_MODEL,
- JDO_ENTITY,
- DOMAIN_SERVICE,
- MIXIN,
- VALUE,
- COLLECTION,
- UNKNOWN;
-
- public boolean isDomainService() {
- return this == DOMAIN_SERVICE;
- }
-
- public boolean isMixin() {
- return this == MIXIN;
- }
-
- public boolean isViewModel() {
- return this == VIEW_MODEL;
- }
-
- public boolean isValue() {
- return this == VALUE;
- }
-
- public boolean isCollection() {
- return this == COLLECTION;
- }
-
- public boolean isJdoEntity() {
- return this == JDO_ENTITY;
- }
-
- public boolean isUnknown() {
- return this == UNKNOWN;
- }
-
- }
-
- /**
- * @deprecated - use {@link MetaModelService3#sortOf(Class, org.apache.isis.applib.services.metamodel.MetaModelService3.Mode)}
- */
- @Deprecated
- @Programmatic
- Sort sortOf(final Class<?> domainType);
-
- /**
- * @deprecated - use {@link MetaModelService3#sortOf(Bookmark, org.apache.isis.applib.services.metamodel.MetaModelService3.Mode)}
- */
- @Deprecated
- @Programmatic
- Sort sortOf(final Bookmark bookmark);
-
-}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService3.java b/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService3.java
deleted file mode 100644
index 008aad1..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService3.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.services.metamodel;
-
-import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.services.bookmark.Bookmark;
-
-/**
- * This service provides a formal API into Isis' metamodel.
- */
-public interface MetaModelService3 extends MetaModelService2 {
-
- enum Mode {
- /**
- * If the {@link #sortOf(Class, Mode) sort of} object type is unknown, then throw an exception.
- */
- STRICT,
- /**
- * If the {@link #sortOf(Class, Mode) sort of} object type is unknown, then return {@link Sort#UNKNOWN}.
- */
- RELAXED
- }
-
- @Programmatic
- Sort sortOf(final Class<?> domainType, final Mode mode);
-
- @Programmatic
- Sort sortOf(final Bookmark bookmark, final Mode mode);
-
-}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/package-info.java b/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/package-info.java
index 383759b..e1b86d7 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/package-info.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/package-info.java
@@ -18,7 +18,7 @@
*/
/**
- * The {@link org.apache.isis.applib.services.metamodel.MetaModelService3} service provides access to a number of
+ * The {@link org.apache.isis.applib.services.metamodel.MetaModelService} service provides access to a number of
* aspects of Apache Isis' internal metamodel.
*
* @see <a href="http://isis.apache.org/guides/rgsvc/rgsvc.html#_rgsvc_metadata-api_MetamodelService">Reference guide</a>
diff --git a/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/DomainChangeJdoAbstract.java b/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/DomainChangeJdoAbstract.java
index a41b1b3..61f0b74 100644
--- a/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/DomainChangeJdoAbstract.java
+++ b/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/DomainChangeJdoAbstract.java
@@ -38,8 +38,7 @@ import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.message.MessageService;
-import org.apache.isis.applib.services.metamodel.MetaModelService2;
-import org.apache.isis.applib.services.metamodel.MetaModelService3;
+import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.applib.services.publish.PublisherService;
import org.apache.isis.applib.util.ObjectContracts;
@@ -268,7 +267,7 @@ public abstract class DomainChangeJdoAbstract {
if (targetObject == null) {
return null;
}
- final MetaModelService2.Sort sortOfObject = metaModelService.sortOf(getTarget(), MetaModelService3.Mode.RELAXED);
+ final MetaModelService.Sort sortOfObject = metaModelService.sortOf(getTarget(), MetaModelService.Mode.RELAXED);
return !(sortOfObject.isViewModel() || sortOfObject.isJdoEntity())
? "Can only open view models or entities"
: null;
@@ -381,6 +380,6 @@ public abstract class DomainChangeJdoAbstract {
protected MessageService messageService;
@javax.inject.Inject
- protected MetaModelService3 metaModelService;
+ protected MetaModelService metaModelService;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
index 844a46e..020b553 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
@@ -46,7 +46,7 @@ import org.apache.isis.applib.services.eventbus.AbstractDomainEvent;
import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.applib.services.iactn.InteractionContext;
-import org.apache.isis.applib.services.metamodel.MetaModelService2;
+import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.applib.services.queryresultscache.QueryResultsCache;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.xactn.TransactionService;
@@ -450,7 +450,7 @@ public abstract class ActionInvocationFacetForDomainEventAbstract
}
final Class<?> domainType = resultAdapter.getSpecification().getCorrespondingClass();
- final MetaModelService2.Sort sort = getMetaModelService().sortOf(domainType);
+ final MetaModelService.Sort sort = getMetaModelService().sortOf(domainType);
switch (sort) {
case JDO_ENTITY:
final Object domainObject = resultAdapter.getObject();
@@ -470,8 +470,8 @@ public abstract class ActionInvocationFacetForDomainEventAbstract
}
}
- private MetaModelService2 getMetaModelService() {
- return servicesInjector.lookupServiceElseFail(MetaModelService2.class);
+ private MetaModelService getMetaModelService() {
+ return servicesInjector.lookupServiceElseFail(MetaModelService.class);
}
private TransactionService getTransactionService() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
index 66b9a4a..f89277c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
@@ -34,7 +34,7 @@ import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.grid.GridService;
import org.apache.isis.applib.services.metamodel.DomainMember;
-import org.apache.isis.applib.services.metamodel.MetaModelService3;
+import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -49,7 +49,7 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
nature = NatureOfService.DOMAIN,
menuOrder = "" + Integer.MAX_VALUE
)
-public class MetaModelServiceDefault implements MetaModelService3 {
+public class MetaModelServiceDefault implements MetaModelService {
@SuppressWarnings("unused")
private final static Logger LOG = LoggerFactory.getLogger(MetaModelServiceDefault.class);
diff --git a/todo-deprecation-list.txt b/todo-deprecation-list.txt
index d3061b6..5b77fbe 100644
--- a/todo-deprecation-list.txt
+++ b/todo-deprecation-list.txt
@@ -17,9 +17,6 @@ org.apache.isis.applib.clock
org.apache.isis.applib.services.memento (19 usages found)
MementoService.java - remove entire service (previously to support view models, but now @ViewModel and JAXB)
-org.apache.isis.applib.services.metamodel
- MetaModelService2.java - push down to subtype, retain overloads for now
-
@@ -417,6 +414,9 @@ org.apache.isis.applib.services.eventbus
PropertyChangedEvent.java - remove
PropertyInteractionEvent.java - remove
+org.apache.isis.applib.services.metamodel
+ MetaModelService2.java and MetaModelService3 - pulled up to MetaModelService supertype
+
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 05/09: ISIS-1742: remove
o.a.i.objectstore.applib.service.support.IsisJdoSupport
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f0ae08d302481c8512ed141f8f89ba87808bbd68
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 20:17:33 2017 +0100
ISIS-1742: remove o.a.i.objectstore.applib.service.support.IsisJdoSupport
---
.../jdo/applib/service/support/IsisJdoSupport.java | 28 ----------------------
.../service/support/IsisJdoSupportImpl.java | 2 +-
todo-deprecation-list.txt | 28 ++++++++++++++--------
3 files changed, 19 insertions(+), 39 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/support/IsisJdoSupport.java b/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/support/IsisJdoSupport.java
deleted file mode 100644
index 2d50ce6..0000000
--- a/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/support/IsisJdoSupport.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.objectstore.jdo.applib.service.support;
-
-/**
- * @deprecated - replaced by {@link org.apache.isis.applib.services.jdosupport.IsisJdoSupport}
- */
-@Deprecated
-public interface IsisJdoSupport extends org.apache.isis.applib.services.jdosupport.IsisJdoSupport {
-
-}
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
index 6470720..a9a2ac5 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
@@ -43,13 +43,13 @@ import org.apache.isis.applib.FatalException;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.services.jdosupport.IsisJdoSupport;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.persistence.ObjectPersistenceException;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.objectstore.jdo.applib.service.support.IsisJdoSupport;
/**
diff --git a/todo-deprecation-list.txt b/todo-deprecation-list.txt
index 5b77fbe..05ca6eb 100644
--- a/todo-deprecation-list.txt
+++ b/todo-deprecation-list.txt
@@ -24,13 +24,12 @@ org.apache.isis.core.objectstore.jdo.applib.annotations - remove package entirel
Auditable.java - use @DomainObject(audited=...) instead.
org.apache.isis.objectstore.jdo.applib
Auditable.java - use @DomainObject(audited=...) instead.
+
org.apache.isis.objectstore.jdo.applib.service
DomainChangeJdoAbstract.java - move to incode platform
JdoColumnLength.java - remove class (all constants defined in other classes)
- https://github.com/apache/isis/blob/rel/isis-1.15.1/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/JdoColumnLength.java
- Util.java - remove
-org.apache.isis.objectstore.jdo.applib.service.support
- IsisJdoSupport.java - replaced by org.apache.isis.applib.services.jdosupport.IsisJdoSupport
+
@@ -420,12 +419,6 @@ org.apache.isis.applib.services.metamodel
-org.apache.isis.viewer.restfulobjects.rendering.service.conmap.ContentMappingService
- - replaced by non-applib
-
-org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationServiceForRestfulObjects
- - unused
-
org.apache.isis.applib.services.publish - remove classes pertaining to original PublishingService (payload factories etc).
EventMetadata.java - remove class
EventType.java - remove class
@@ -476,4 +469,19 @@ org.apache.isis.applib
org.apache.isis.objectstore.jdo.applib.service
- deletes Util ... with no replacement
\ No newline at end of file
+ deletes Util ... with no replacement
+
+
+
+
+org.apache.isis.objectstore.jdo.applib.service.support
+ IsisJdoSupport.java - replaced by org.apache.isis.applib.services.jdosupport.IsisJdoSupport
+
+
+
+org.apache.isis.viewer.restfulobjects.rendering.service.conmap.ContentMappingService
+ - replaced by non-applib
+
+org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationServiceForRestfulObjects
+ - unused
+
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 02/09: ISIS-1742: rolls up BookmarkService2 to
BookmarkService
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit b3044d7db173ecb666ebf41ea5f5e3390e9a4349
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 19:52:43 2017 +0100
ISIS-1742: rolls up BookmarkService2 to BookmarkService
---
...ce-layer_PersistenceSessionServiceInternal.adoc | 2 +-
.../guides/rgsvc/_rgsvc_integration-api.adoc | 2 +-
.../_rgsvc_integration-api_BookmarkService.adoc | 8 +--
.../applib/services/bookmark/BookmarkService.java | 38 +++++++++++--
.../applib/services/bookmark/BookmarkService2.java | 65 ----------------------
.../applib/services/bookmark/package-info.java | 2 +-
.../applib/service/DomainChangeJdoAbstract.java | 6 +-
.../jaxbadapters/PersistentEntityAdapter.java | 9 +--
.../bookmarks/BookmarkServiceInternalDefault.java | 4 +-
.../PersistenceSessionServiceInternal.java | 4 +-
.../PersistenceSessionServiceInternalNoop.java | 4 +-
.../PersistenceSessionServiceInternalDefault.java | 4 +-
.../system/persistence/PersistenceSession.java | 6 +-
todo-deprecation-list.txt | 12 +++-
14 files changed, 66 insertions(+), 100 deletions(-)
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_persistence-layer_PersistenceSessionServiceInternal.adoc b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_persistence-layer_PersistenceSessionServiceInternal.adoc
index 0ca029b..560e56d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_persistence-layer_PersistenceSessionServiceInternal.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_persistence-layer_PersistenceSessionServiceInternal.adoc
@@ -64,7 +64,7 @@ public interface PersistenceSessionServiceInternal extends AdapterManager {
void resolve(Object parent);
@Deprecated
void resolve(Object parent, Object field);
- Object lookup(Bookmark bookmark, final BookmarkService2.FieldResetPolicy fieldResetPolicy);
+ Object lookup(Bookmark bookmark, final BookmarkService.FieldResetPolicy fieldResetPolicy);
Bookmark bookmarkFor(Object domainObject);
Bookmark bookmarkFor(Class<?> cls, String identifier);
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api.adoc
index a53aa09..25c15d4 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api.adoc
@@ -25,7 +25,7 @@ It also lists their corresponding implementation, either a default implementatio
|xref:../rgsvc/rgsvc.adoc#_rgsvc_integration-api_BookmarkService[`o.a.i.applib.` +
`services.bookmark` +
-`BookmarkService2`]
+`BookmarkService`]
|Convert object reference to a serializable "bookmark", and vice versa.
|`BookmarkServiceDefault` +
``o.a.i.core`` +
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api_BookmarkService.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api_BookmarkService.adoc
index e4f288c..76bb6c6 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api_BookmarkService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api_BookmarkService.adoc
@@ -1,11 +1,11 @@
[[_rgsvc_integration-api_BookmarkService]]
-= `BookmarkService2`
+= `BookmarkService`
: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 [...]
:_basedir: ../../
:_imagesdir: images/
-The `BookmarkService2` API provides the ability to obtain a serializable ``o.a.i.applib.bookmarks.Bookmark`` for any (persisted) domain object, and to lookup domain objects given a ``Bookmark``. This can then in turn be converted to and from a string.
+The `BookmarkService` API provides the ability to obtain a serializable ``o.a.i.applib.bookmarks.Bookmark`` for any (persisted) domain object, and to lookup domain objects given a ``Bookmark``. This can then in turn be converted to and from a string.
For example, a `Customer` object with:
@@ -35,11 +35,11 @@ However, the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s poly
== API & Implementation
-The API defined by `BookmarkService2` is:
+The API defined by `BookmarkService` is:
[source,java]
----
-public interface BookmarkService2 {
+public interface BookmarkService {
enum FieldResetPolicy { // <1>
RESET,
DONT_RESET
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java b/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
index 9aa89cf..7be74b2 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
@@ -32,21 +32,21 @@ import org.apache.isis.applib.annotation.Programmatic;
public interface BookmarkService {
/**
- * @deprecated - use {@link BookmarkService2#lookup(BookmarkHolder, BookmarkService2.FieldResetPolicy)} instead.
+ * @deprecated - use {@link BookmarkService#lookup(BookmarkHolder, BookmarkService.FieldResetPolicy)} instead.
*/
@Deprecated
@Programmatic
Object lookup(BookmarkHolder bookmarkHolder);
/**
- * @deprecated - use {@link BookmarkService2#lookup(Bookmark, BookmarkService2.FieldResetPolicy)} instead.
+ * @deprecated - use {@link BookmarkService#lookup(Bookmark, BookmarkService.FieldResetPolicy)} instead.
*/
@Deprecated
@Programmatic
Object lookup(Bookmark bookmark);
/**
- * @deprecated - use {@link BookmarkService2#lookup(Bookmark, BookmarkService2.FieldResetPolicy, Class)} instead.
+ * @deprecated - use {@link BookmarkService#lookup(Bookmark, BookmarkService.FieldResetPolicy, Class)} instead.
*/
@Deprecated
@Programmatic
@@ -57,5 +57,35 @@ public interface BookmarkService {
@Programmatic
Bookmark bookmarkFor(Class<?> cls, String identifier);
-
+
+ @Programmatic
+ Object lookup(BookmarkHolder bookmarkHolder, FieldResetPolicy fieldResetPolicy);
+
+ @Programmatic
+ Object lookup(Bookmark bookmark, FieldResetPolicy fieldResetPolicy);
+
+ /**
+ * As {@link #lookup(Bookmark, FieldResetPolicy)}, but downcasting to the specified type.
+ */
+ @Programmatic <T> T lookup(Bookmark bookmark, FieldResetPolicy fieldResetPolicy, Class<T> cls);
+
+ enum FieldResetPolicy {
+ /**
+ * Will cause all fields of an object to be re-initialized.
+ *
+ * If the object is unresolved then the object's missing data should be retrieved from the persistence
+ * mechanism and be used to set up the value objects and associations.
+ *
+ * If the object is a view model, then is ignored; the behaviour is as for {@link #DONT_RESET}
+ * @deprecated - retained for previous behaviour, but in most/all cases,
+ */
+ @Deprecated
+ RESET,
+ /**
+ * Required in order to recreate view models.
+ */
+ DONT_RESET
+ }
+
+
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService2.java b/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService2.java
deleted file mode 100644
index 5ae2297..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService2.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.services.bookmark;
-
-import org.apache.isis.applib.annotation.Programmatic;
-
-/**
- * This service enables a serializable "bookmark" to be created for an entity.
- *
- * <p>
- * Because an implementation of this service (<tt>BookmarkServiceDefault</tt>) is annotated with
- * {@link org.apache.isis.applib.annotation.DomainService} and is implemented in the core.metamodel, it is
- * automatically registered and available for use; no configuration is required.
- * </p>
- */
-public interface BookmarkService2 extends BookmarkService {
-
- enum FieldResetPolicy {
- /**
- * Will cause all fields of an object to be re-initialized.
- *
- * If the object is unresolved then the object's missing data should be retrieved from the persistence
- * mechanism and be used to set up the value objects and associations.
- *
- * If the object is a view model, then is ignored; the behaviour is as for {@link #DONT_RESET}
- * @deprecated - retained for previous behaviour, but in most/all cases,
- */
- @Deprecated
- RESET,
- /**
- * Required in order to recreate view models.
- */
- DONT_RESET
- }
-
- @Programmatic
- Object lookup(BookmarkHolder bookmarkHolder, FieldResetPolicy fieldResetPolicy);
-
- @Programmatic
- Object lookup(Bookmark bookmark, FieldResetPolicy fieldResetPolicy);
-
- /**
- * As {@link #lookup(Bookmark, FieldResetPolicy)}, but downcasting to the specified type.
- */
- @Programmatic
- <T> T lookup(Bookmark bookmark, FieldResetPolicy fieldResetPolicy, Class<T> cls);
-
-
-}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/package-info.java b/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/package-info.java
index d36bebf..9915bc7 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/package-info.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/package-info.java
@@ -18,7 +18,7 @@
*/
/**
- * The {@link org.apache.isis.applib.services.bookmark.BookmarkService2} API provides the ability to obtain a
+ * The {@link org.apache.isis.applib.services.bookmark.BookmarkService} API provides the ability to obtain a
* serializable {@link org.apache.isis.applib.services.bookmark.Bookmark} for any (persisted) domain object, and to
* lookup domain objects given a Bookmark. This can then in turn be converted to and from a string.
*
diff --git a/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/DomainChangeJdoAbstract.java b/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/DomainChangeJdoAbstract.java
index 19ed79d..a41b1b3 100644
--- a/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/DomainChangeJdoAbstract.java
+++ b/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/DomainChangeJdoAbstract.java
@@ -36,7 +36,7 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.applib.services.bookmark.BookmarkService2;
+import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.metamodel.MetaModelService2;
import org.apache.isis.applib.services.metamodel.MetaModelService3;
@@ -248,7 +248,7 @@ public abstract class DomainChangeJdoAbstract {
public Object openTargetObject() {
try {
return bookmarkService != null
- ? bookmarkService.lookup(getTarget(), BookmarkService2.FieldResetPolicy.DONT_RESET)
+ ? bookmarkService.lookup(getTarget(), BookmarkService.FieldResetPolicy.DONT_RESET)
: null;
} catch(RuntimeException ex) {
if(ex.getClass().getName().contains("ObjectNotFoundException")) {
@@ -375,7 +375,7 @@ public abstract class DomainChangeJdoAbstract {
// //////////////////////////////////////
@javax.inject.Inject
- protected BookmarkService2 bookmarkService;
+ protected BookmarkService bookmarkService;
@javax.inject.Inject
protected MessageService messageService;
diff --git a/core/applib/src/main/java/org/apache/isis/schema/utils/jaxbadapters/PersistentEntityAdapter.java b/core/applib/src/main/java/org/apache/isis/schema/utils/jaxbadapters/PersistentEntityAdapter.java
index 1b6a271..1a724a1 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/utils/jaxbadapters/PersistentEntityAdapter.java
+++ b/core/applib/src/main/java/org/apache/isis/schema/utils/jaxbadapters/PersistentEntityAdapter.java
@@ -16,12 +16,10 @@
*/
package org.apache.isis.schema.utils.jaxbadapters;
-import javax.inject.Inject;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkService;
-import org.apache.isis.applib.services.bookmark.BookmarkService2;
import org.apache.isis.schema.common.v1.OidDto;
public class PersistentEntityAdapter extends XmlAdapter<OidDto, Object> {
@@ -31,7 +29,7 @@ public class PersistentEntityAdapter extends XmlAdapter<OidDto, Object> {
final Bookmark bookmark = Bookmark.from(oidDto);
- return bookmarkService.lookup(bookmark, BookmarkService2.FieldResetPolicy.DONT_RESET);
+ return bookmarkService.lookup(bookmark, BookmarkService.FieldResetPolicy.DONT_RESET);
}
@Override
@@ -43,9 +41,6 @@ public class PersistentEntityAdapter extends XmlAdapter<OidDto, Object> {
return bookmark.toOidDto();
}
- private static String coalesce(final String first, final String second) {
- return first != null? first: second;
- }
protected BookmarkService getBookmarkService() {
@@ -53,5 +48,5 @@ public class PersistentEntityAdapter extends XmlAdapter<OidDto, Object> {
}
@javax.inject.Inject
- BookmarkService2 bookmarkService;
+ BookmarkService bookmarkService;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceInternalDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceInternalDefault.java
index eaf244e..14e0883 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceInternalDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceInternalDefault.java
@@ -30,7 +30,7 @@ import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkHolder;
-import org.apache.isis.applib.services.bookmark.BookmarkService2;
+import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.registry.ServiceRegistry2;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
@@ -48,7 +48,7 @@ import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
nature = NatureOfService.DOMAIN,
menuOrder = "" + Integer.MAX_VALUE
)
-public class BookmarkServiceInternalDefault implements BookmarkService2 {
+public class BookmarkServiceInternalDefault implements BookmarkService {
@Programmatic
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternal.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternal.java
index ff8f23a..04a1b42 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternal.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternal.java
@@ -21,7 +21,7 @@ import java.util.List;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.applib.services.bookmark.BookmarkService2;
+import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.xactn.Transaction;
import org.apache.isis.applib.services.xactn.TransactionState;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -78,7 +78,7 @@ public interface PersistenceSessionServiceInternal extends AdapterManager {
* @return
*/
@Programmatic
- Object lookup(Bookmark bookmark, final BookmarkService2.FieldResetPolicy fieldResetPolicy);
+ Object lookup(Bookmark bookmark, final BookmarkService.FieldResetPolicy fieldResetPolicy);
@Programmatic
Bookmark bookmarkFor(Object domainObject);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternalNoop.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternalNoop.java
index e46b6e2..7534369 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternalNoop.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternalNoop.java
@@ -24,7 +24,7 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.applib.services.bookmark.BookmarkService2;
+import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.xactn.Transaction;
import org.apache.isis.applib.services.xactn.TransactionState;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -86,7 +86,7 @@ public class PersistenceSessionServiceInternalNoop implements PersistenceSession
@Override
public Object lookup(
final Bookmark bookmark,
- final BookmarkService2.FieldResetPolicy fieldResetPolicy) {
+ final BookmarkService.FieldResetPolicy fieldResetPolicy) {
throw new UnsupportedOperationException("Not supported by this implementation of PersistenceSessionServiceInternal");
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
index 954b492..46fbc47 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
@@ -25,7 +25,7 @@ import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.applib.services.bookmark.BookmarkService2;
+import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.xactn.Transaction;
import org.apache.isis.applib.services.xactn.TransactionState;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -103,7 +103,7 @@ public class PersistenceSessionServiceInternalDefault implements PersistenceSess
@Override
public Object lookup(
final Bookmark bookmark,
- final BookmarkService2.FieldResetPolicy fieldResetPolicy) {
+ final BookmarkService.FieldResetPolicy fieldResetPolicy) {
return getPersistenceSession().lookup(bookmark, fieldResetPolicy);
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
index c218254..ddb8d70 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.applib.services.bookmark.BookmarkService2;
+import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.command.Command3;
@@ -2292,13 +2292,13 @@ public class PersistenceSession implements
public Object lookup(
final Bookmark bookmark,
- final BookmarkService2.FieldResetPolicy fieldResetPolicy) {
+ final BookmarkService.FieldResetPolicy fieldResetPolicy) {
RootOid oid = RootOid.create(bookmark);
final ObjectAdapter adapter = adapterFor(oid);
if(adapter == null) {
return null;
}
- if(fieldResetPolicy == BookmarkService2.FieldResetPolicy.RESET && !adapter.getSpecification().isViewModel()) {
+ if(fieldResetPolicy == BookmarkService.FieldResetPolicy.RESET && !adapter.getSpecification().isViewModel()) {
refreshRootInTransaction(adapter);
} else {
loadObjectInTransaction(oid);
diff --git a/todo-deprecation-list.txt b/todo-deprecation-list.txt
index 6ceb3ef..3f3cef4 100644
--- a/todo-deprecation-list.txt
+++ b/todo-deprecation-list.txt
@@ -12,9 +12,7 @@ org.apache.isis.applib.clock
Clock
-org.apache.isis.applib.services.bookmark (8 usages found)
- BookmarkService.java - deprecated methods, have overloads in BookmarkService2 subtype [suggest we retain these for now]
-org.apache.isis.applib.services.classdiscovery
+org.apache.isis.applib.services.classdiscovery
ClassDiscoveryService.java , push down into ClassDiscoveryService2
@@ -385,6 +383,14 @@ org.apache.isis.applib.services.background (10 usages found)
Remove support for legacy persisted commands (beginning "<memento>...")
+
+
+org.apache.isis.applib.services.bookmark (8 usages found)
+ BookmarkService.java - deprecated methods, have overloads in BookmarkService2 subtype [suggest we retain these for now]
+
+
+
+
org.apache.isis.applib.services.command.spi
CommandService.java
startTransaction(Command, UUID) - no longer required to do anything, so remove
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 06/09: ISIS-1742: moves JaxbServiceDefault from
o.a.i.schema.services.jaxb to o.a.i.applib.services.jaxb
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 2209a8dca8107b078994b3de36c8f5ce6c3033d8
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 20:20:25 2017 +0100
ISIS-1742: moves JaxbServiceDefault from o.a.i.schema.services.jaxb to o.a.i.applib.services.jaxb
---
.../isis/{schema => applib}/services/jaxb/JaxbServiceDefault.java | 2 +-
.../isis/objectstore/jdo/applib/service/DomainChangeJdoAbstract.java | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/schema/services/jaxb/JaxbServiceDefault.java b/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbServiceDefault.java
similarity index 97%
rename from core/applib/src/main/java/org/apache/isis/schema/services/jaxb/JaxbServiceDefault.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbServiceDefault.java
index 8e1beef..5cf3018 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/services/jaxb/JaxbServiceDefault.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbServiceDefault.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.schema.services.jaxb;
+package org.apache.isis.applib.services.jaxb;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
diff --git a/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/DomainChangeJdoAbstract.java b/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/DomainChangeJdoAbstract.java
index 61f0b74..2f0c0e1 100644
--- a/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/DomainChangeJdoAbstract.java
+++ b/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/DomainChangeJdoAbstract.java
@@ -68,9 +68,7 @@ public abstract class DomainChangeJdoAbstract {
COMMAND,
AUDIT_ENTRY,
/**
- * As per {@link PublishingService}.
- *
- * @deprecated - replaced by {@link #PUBLISHED_INTERACTION} (because {@link PublishingService} has been replaced by {@link PublisherService}).
+ * @deprecated - replaced by {@link #PUBLISHED_INTERACTION} (because <code>PublishingService</code> has been replaced by {@link PublisherService}).
*/
@Deprecated
PUBLISHED_EVENT,
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 08/09: ISIS-1742: moves the JDO-specific implementations of
ExceptionRecognizer under o.a.i.applib.services.exceprecog.jdo. Also
updates DomainObjectContainer to fully implement the (extended)
ExceptionRecognizer interface.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 4827e16b06593729b2621731fb31e95aca30542a
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 20:44:54 2017 +0100
ISIS-1742: moves the JDO-specific implementations of ExceptionRecognizer under o.a.i.applib.services.exceprecog.jdo. Also updates DomainObjectContainer to fully implement the (extended) ExceptionRecognizer interface.
---
.../jdo}/ExceptionRecognizerCompositeForJdoObjectStore.java | 2 +-
.../exceprecog/jdo}/ExceptionRecognizerForJDODataStoreException.java | 2 +-
...ptionIntegrityConstraintViolationForeignKeyNoActionException.java | 2 +-
.../jdo}/ExceptionRecognizerForJDOObjectNotFoundException.java | 2 +-
...izerForSQLIntegrityConstraintViolationUniqueOrIndexException.java | 2 +-
.../applib/services/exceprecog/ExceptionRecognizerCompositeTest.java | 5 +++++
.../jdo}/ExceptionRecognizerCompositeForJdoObjectStoreTest.java | 4 +++-
...ionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java | 4 +++-
.../metamodel/services/container/DomainObjectContainerDefault.java | 5 +++++
9 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java b/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerCompositeForJdoObjectStore.java
similarity index 97%
rename from core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerCompositeForJdoObjectStore.java
index bd94724..7536de5 100644
--- a/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerCompositeForJdoObjectStore.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.objectstore.jdo.applib.service.exceprecog;
+package org.apache.isis.applib.services.exceprecog.jdo;
import java.util.Map;
diff --git a/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/exceprecog/ExceptionRecognizerForJDODataStoreException.java b/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForJDODataStoreException.java
similarity index 95%
rename from core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/exceprecog/ExceptionRecognizerForJDODataStoreException.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForJDODataStoreException.java
index 93ddee9..b52fc16 100644
--- a/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/exceprecog/ExceptionRecognizerForJDODataStoreException.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForJDODataStoreException.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.objectstore.jdo.applib.service.exceprecog;
+package org.apache.isis.applib.services.exceprecog.jdo;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerForType;
diff --git a/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/exceprecog/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java b/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java
similarity index 95%
rename from core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/exceprecog/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java
index acf63ff..c9d4717 100644
--- a/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/exceprecog/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.objectstore.jdo.applib.service.exceprecog;
+package org.apache.isis.applib.services.exceprecog.jdo;
import javax.jdo.JDODataStoreException;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerForType;
diff --git a/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/exceprecog/ExceptionRecognizerForJDOObjectNotFoundException.java b/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForJDOObjectNotFoundException.java
similarity index 95%
rename from core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/exceprecog/ExceptionRecognizerForJDOObjectNotFoundException.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForJDOObjectNotFoundException.java
index 025371e..594fbac 100644
--- a/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/exceprecog/ExceptionRecognizerForJDOObjectNotFoundException.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForJDOObjectNotFoundException.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.objectstore.jdo.applib.service.exceprecog;
+package org.apache.isis.applib.services.exceprecog.jdo;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerForType;
diff --git a/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java b/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java
similarity index 95%
rename from core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java
index 9673b33..eee0462 100644
--- a/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.objectstore.jdo.applib.service.exceprecog;
+package org.apache.isis.applib.services.exceprecog.jdo;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerForType;
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java b/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java
index 68b9aff..455ce4a 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java
@@ -46,6 +46,11 @@ public class ExceptionRecognizerCompositeTest {
public String recognize(Throwable ex) {
return message;
}
+
+ @Override public Recognition recognize2(final Throwable ex) {
+ return Recognition.of(Category.OTHER, message);
+ }
+
@Override
public void init(Map<String, String> properties) {
}
diff --git a/core/applib/src/test/java/org/apache/isis/objectstore/jdo/applib/service/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java b/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
similarity index 93%
rename from core/applib/src/test/java/org/apache/isis/objectstore/jdo/applib/service/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
rename to core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
index 3078a4e..ae9973d 100644
--- a/core/applib/src/test/java/org/apache/isis/objectstore/jdo/applib/service/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.objectstore.jdo.applib.service.exceprecog;
+package org.apache.isis.applib.services.exceprecog.jdo;
import java.util.Collections;
@@ -25,6 +25,8 @@ import com.google.common.collect.ImmutableBiMap;
import org.junit.Before;
import org.junit.Test;
+import org.apache.isis.applib.services.exceprecog.jdo.ExceptionRecognizerCompositeForJdoObjectStore;
+
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
diff --git a/core/applib/src/test/java/org/apache/isis/objectstore/jdo/applib/service/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java b/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java
similarity index 92%
rename from core/applib/src/test/java/org/apache/isis/objectstore/jdo/applib/service/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java
rename to core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java
index 083d0f0..477eba2 100644
--- a/core/applib/src/test/java/org/apache/isis/objectstore/jdo/applib/service/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java
@@ -14,12 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.objectstore.jdo.applib.service.exceprecog;
+package org.apache.isis.applib.services.exceprecog.jdo;
import java.sql.SQLIntegrityConstraintViolationException;
import org.junit.Before;
import org.junit.Test;
+import org.apache.isis.applib.services.exceprecog.jdo.ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException;
+
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
index 907df32..a89895e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
@@ -253,6 +253,11 @@ public class DomainObjectContainerDefault
return recognizer.recognize(ex);
}
+ @Programmatic
+ @Override
+ public Recognition recognize2(final Throwable ex) {
+ return recognizer.recognize2(ex);
+ }
//endregion
//region > init, shutdown
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 01/09: ISIS-1742: removes AuditingService3 (use
AuditerService instead). Updates .adoc
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 79d2de8275693edabcc35d916208d2c17582f474
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 19:43:43 2017 +0100
ISIS-1742: removes AuditingService3 (use AuditerService instead). Updates .adoc
---
.../asciidoc/guides/rgant/_rgant-DomainObject.adoc | 3 +-
.../guides/rgant/_rgant-DomainObject_auditing.adoc | 3 +-
..._persistence-layer_AuditingServiceInternal.adoc | 22 ++----
...rgsvc_application-layer-api_CommandContext.adoc | 2 +-
...c_application-layer-api_InteractionContext.adoc | 3 +-
...rgsvc_application-layer-spi_CommandService.adoc | 7 +-
.../main/asciidoc/guides/rgsvc/_rgsvc_intro.adoc | 3 +-
...rgsvc_persistence-layer-api_MetricsService.adoc | 3 +-
.../guides/rgsvc/_rgsvc_persistence-layer-spi.adoc | 12 +--
...rgsvc_persistence-layer-spi_AuditerService.adoc | 10 ---
...gsvc_persistence-layer-spi_AuditingService.adoc | 86 ----------------------
...ailable-domain-services_framework-provided.adoc | 1 -
.../_ugfun_building-blocks_identifiers_oid.adoc | 2 +-
.../src/main/asciidoc/guides/ugsec/ugsec.adoc | 2 +-
.../isis/applib/annotation/DomainObject.java | 4 +-
.../applib/services/audit/AuditingService3.java | 55 --------------
.../services/session/SessionLoggingService.java | 6 +-
.../services/auditing/AuditingServiceInternal.java | 21 +-----
todo-deprecation-list.txt | 15 +---
19 files changed, 31 insertions(+), 229 deletions(-)
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject.adoc
index 99bc031..c9df160 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject.adoc
@@ -23,8 +23,7 @@ The table below summarizes the annotation's attributes.
|`AS_CONFIGURED`, `ENABLED`, `DISABLED` +
(`AS_CONFIGURED`)
|indicates whether each of the changed properties of an object should be submitted to the registered
-xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditingService[`AuditingService`] (deprecated) or (its replacement)
-xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`]
+xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`](s)
|xref:../rgant/rgant.adoc#_rgant-DomainObject_autoCompleteRepository[`autoCompleteRepository()`]
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_auditing.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_auditing.adoc
index f9610a8..2c2d464 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_auditing.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_auditing.adoc
@@ -6,8 +6,7 @@
The `auditing()` attribute indicates that if the object is modified, then each of its changed properties should be
-submitted to the xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditingService[`AuditingService`] (if one has been configured), or to
-any
+submitted to the registered xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`](s).
The default value for the attribute is `AS_CONFIGURED`, meaning that the
xref:../rgcfg/rgcfg.adoc#_rgcfg_configuring-core[configuration property] `isis.services.audit.objects` is used to determine the
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_persistence-layer_AuditingServiceInternal.adoc b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_persistence-layer_AuditingServiceInternal.adoc
index ca025c3..8809c21 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_persistence-layer_AuditingServiceInternal.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_persistence-layer_AuditingServiceInternal.adoc
@@ -5,17 +5,9 @@
:_imagesdir: images/
-The (internal) `AuditingServiceInternal` domain service acts as an internal facade to any
-configured xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditingService[`AuditingService`] and
-xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`] services. It is responsible for obtaining the details
-of all changes to domain objects within an interaction, and then to call the configured `AuditingService` to actually
-create audit entries of those changes.
+The (internal) `AuditingServiceInternal` domain service acts as an internal facade to any registered xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`] service(s).
+It is responsible for obtaining the details of all changes to domain objects within an interaction, and then to call the configured ``AuditerService``(s) to actually create audit entries of those changes.
-[NOTE]
-====
-xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditingService[`AuditingService`] is now deprecated, replaced by
-xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`].
-====
@@ -30,10 +22,9 @@ public class AuditingServiceInternal {
public void audit(); // <2>
}
----
-<1> minor performance optimization as to whether any auditing services are actually enabled; checks to see if
-any xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditingService[`AuditingService`] has been configured, also if any
-xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditService`] are enabled.
-<2> uses the xref:../rgfis/rgfis.adoc#_rgfis_persistence-layer_ChangedObjectsServiceInternal[`ChangedObjectsServiceInternal`] to obtain details of the changed properties, then call the configured xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditingService[`AuditingService`].
+<1> minor performance optimization as to whether any auditing services are actually enabled; checks to see if any
+xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`] are enabled.
+<2> uses the xref:../rgfis/rgfis.adoc#_rgfis_persistence-layer_ChangedObjectsServiceInternal[`ChangedObjectsServiceInternal`] to obtain details of the changed properties, then call the configured xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`](s).
The service implementation is `o.a.i.c.r.s.auditing.AuditingServiceInternal`.
@@ -49,6 +40,7 @@ so no further configuration is required.
== Related Classes
-The service delegates between the (internal) xref:../rgfis/rgfis.adoc#_rgfis_persistence-layer_ChangedObjectsServiceInternal[`ChangedObjectsServiceInternal`] domain service to the configured xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditingService[`AuditingService`]. If no such `AuditingService` is configured, this service is in effect a no-op.
+The service delegates between the (internal) xref:../rgfis/rgfis.adoc#_rgfis_persistence-layer_ChangedObjectsServiceInternal[`ChangedObjectsServiceInternal`] domain service to the configured xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`](s).
+If no such service(s) are configured, then _this_ service is in effect a no-op.
The (internal) xref:../rgfis/rgfis.adoc#_rgfis_persistence-layer_PublishingServiceInternal[`PublishingServiceInternal`] performs a similar function for the xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_PublisherService[`PublisherService`], also collating details of the changed objects from `ChangedObjectsServiceInternal`.
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_CommandContext.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_CommandContext.adoc
index ccc9a24..765fc02 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_CommandContext.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_CommandContext.adoc
@@ -17,7 +17,7 @@ In previous versions of the framework, persistent ``Command``s also supported a
* they enable profiling of the running application (which actions are invoked then most often, what is their response time)
* if a xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_PublisherService[`PublisherService`] is configured, they provide better traceability as the `Command` is also correlated with any published events, again through the unique `transactionId` GUID
-* if a xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_AuderService[`AuditerService`] or xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_AuditService[`AuditingService`] (the latter now deprecated) is configured, they provide better audit information, since the `Command` (the 'cause' of an action) can be correlated to the audit records (the "effect" of the action) through the `transactionId` GUID
+* if xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_AuditerService[`AuditerService`] service(s) are configured, they provide better audit information, since the `Command` (the 'cause' of an action) can be correlated to the audit records (the "effect" of the action) through the `transactionId` GUID
As of `1.13.0`, these other uses cases are now more fully supported through the
xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-api_InteractionContext[`InteractionContext`] service and persistent implementations of the ``Interaction`` object, eg as provided by the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s publishmq module.
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_InteractionContext.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_InteractionContext.adoc
index 55af30a..5e36933 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_InteractionContext.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_InteractionContext.adoc
@@ -25,8 +25,7 @@ It is possible for ``Interaction.Execution``s to be persisted; this is supported
* they enable profiling of the running application (which actions are invoked then most often, what is their response
time)
-* if auditing is configured (using either xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditingService[auditing] or
-xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`]), they provide better audit information, since the
+* if auditing is configured (using xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`]), they provide better audit information, since the
`Interaction.Execution` captures the 'cause' of an interaction and can be correlated to the audit records (the "effect"
of the interaction) by way of the xref:../rgcms/rgcms.adoc#_rgcms_classes_mixins_HasTransactionId[`transactionId`]
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-spi_CommandService.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-spi_CommandService.adoc
index aa34fef..c794d3c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-spi_CommandService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-spi_CommandService.adoc
@@ -20,8 +20,7 @@ In previous versions of the framework, persistent ``Command``s also supported a
* if xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_PublisherService[`PublisherService`] is configured, they provide
better traceability as the `Command` is also correlated with any published events, again through the unique
`transactionId` GUID
-* if xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_AuderService[`AuditerService`] or
-xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_AuditService[`AuditingService`] (latter deprecated) is configured, they provide better audit
+* if xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_AuditerService[`AuditerService`](s) are configured, they provide better audit
information, since the `Command` (the 'cause' of an action) can be correlated to the audit records (the "effect" of
the action) through the `transactionId` GUID
@@ -104,8 +103,8 @@ persisted. This is closely related to the xref:../rgsvc/rgsvc.adoc#_rgsvc_applic
The implementations of `CommandService` and `BackgroundCommandService` are intended to go together, so that persistent parent `Command`s can be associated with their child background `Command`s.
-The services provided by this module combines very well with the xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditingService[`AuditingService`].
-The `CommandService` captures the _cause_ of an interaction (an action was invoked, a property was edited), while the `AuditingService3` captures the _effect_ of that interaction in terms of changed state.
+The services provided by this module combines very well with the xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`].
+The `CommandService` captures the _cause_ of an interaction (an action was invoked, a property was edited), while the `AuditerService` captures the _effect_ of that interaction in terms of changed state.
You may also want to configure the xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_PublisherService[`PublisherService`].
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_intro.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_intro.adoc
index d6c4b16..407a933 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_intro.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_intro.adoc
@@ -224,8 +224,7 @@ xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-api_TransactionService[`Transa
====
* Also at the end of each transaction, details of all changed properties are passed to any registered
-xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`] or
-xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditingService[`AuditingService`] (the latter deprecated) by way of the (internal)
+xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`](s) by way of the (internal)
xref:../rgfis/rgfis.adoc#_rgfis_persistence-layer_AuditingServiceInternal[`AuditingServiceInternal`] domain service.
Implementations of xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`CommandService`] can use the `Command#getMemento()`
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-api_MetricsService.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-api_MetricsService.adoc
index b5345e6..5c742f1 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-api_MetricsService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-api_MetricsService.adoc
@@ -28,8 +28,7 @@ public interface MetricsService {
----
<1> The number of objects that have, so far in this request, been loaded from the database. Corresponds to the number of times that `javax.jdo.listener.LoadLifecycleListener#postLoad(InstanceLifecycleEvent)` is fired.
<2> The number of objects that have, so far in this request, been dirtied/will need updating in the database); a good measure of the footprint of the interaction. Corresponds to the number of times that `javax.jdo.listener.DirtyLifecycleListener#preDirty(InstanceLifecycleEvent)` callback is fired.
-<3> The number of individual properties of objects that were modified; a good measure of the amount of work being done in the interaction. Corresponds to the number of times that the xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditingService[`AuditingService`]'s (or
-xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`]'s) `audit(...)` method will be called as the transaction
+<3> The number of individual properties of objects that were modified; a good measure of the amount of work being done in the interaction. Corresponds to the number of times that the xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`]'s `audit(...)` method will be called as the transaction
completes.
The framework provides a default implementation of this API, namely `o.a.i.c.r.s.metrics.MetricsServiceDefault`.
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi.adoc
index 267a356..e41851d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi.adoc
@@ -24,7 +24,7 @@ It also lists their corresponding implementation, either a default implementatio
-|xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditingService[`o.a.i.applib.` +
+|xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`o.a.i.applib.` +
`services.audit` +
`AuditerService`]
|Create an audit record for every changed property of every changed object within a transaction.
@@ -36,15 +36,6 @@ also +
|
-|xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditingService[`o.a.i.applib.` +
-`services.audit` +
-`AuditingService3`]
-|(deprecated, replaced by xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`]); creates
-an audit record for every changed property of every changed object within a transaction.
-|
-|
-
-
|xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_PublisherService[`o.a.i.applib.` +
@@ -91,6 +82,5 @@ Where an implementation is available (on the classpath) then it is always regist
include::_rgsvc_persistence-layer-spi_AuditerService.adoc[leveloffset=+1]
-include::_rgsvc_persistence-layer-spi_AuditingService.adoc[leveloffset=+1]
include::_rgsvc_persistence-layer-spi_PublisherService.adoc[leveloffset=+1]
include::_rgsvc_persistence-layer-spi_UserRegistrationService.adoc[leveloffset=+1]
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_AuditerService.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_AuditerService.adoc
index 9daa73d..e1f7abd 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_AuditerService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_AuditerService.adoc
@@ -9,12 +9,6 @@
The `AuditerService` auditing service provides a simple mechanism to capture changes to data. It is called for each property that has changed on any domain object, as a set of pre- and post-values.
-[NOTE]
-====
-This service is intended to replace the now-deprecated xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditingService[`AuditingService3`].
-The difference between the two is that this service recognises that the `transactionId` is now (as of `1.13.0`)
-actually a request/interaction Id, and that an additional `sequence
-====
== SPI
@@ -124,7 +118,3 @@ of capturing the cause. As of `1.13.0`, ``Command``s are now primarily to captu
not the actual action invocation itself.
====
-The `AuditerService` is intended to replace the (now-deprecated)
-xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditingService3[`AuditingService3`], as the latter does not support the concept of multiple
-transactions within a single interaction.
-
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_AuditingService.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_AuditingService.adoc
deleted file mode 100644
index 76f204e..0000000
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_AuditingService.adoc
+++ /dev/null
@@ -1,86 +0,0 @@
-[[_rgsvc_persistence-layer-spi_AuditingService]]
-= `AuditingService3` (deprecated)
-: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 [...]
-:_basedir: ../../
-:_imagesdir: images/
-
-
-
-
-The `AuditingService3` auditing service provides a simple mechanism to capture changes to data. It is called for each property that has changed on any domain object, as a set of pre- and post-values.
-
-[NOTE]
-====
-This service is deprecated, replaced by xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`].
-====
-
-
-== SPI
-
-The SPI for the service is:
-
-[source,java]
-----
-public interface AuditingService3 {
-
- @Programmatic
- public void audit(
- final UUID transactionId, String targetClassName, final Bookmark target,
- String memberIdentifier, final String propertyName,
- final String preValue, final String postValue,
- final String user, final java.sql.Timestamp timestamp);
- }
-----
-
-The framework will call this for each and every domain object property that is modified within a transaction.
-
-
-
-== Implementation
-
-The most full-featured available implementation is the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s audit module. This creates an audit records for each changed property (ie every time that `AuditingService3#audit(...)` is called.
-The implementation is `org.isisaddons.module.audit.dom.AuditingService`.
-
-The module also provides:
-
-* `AuditingServiceMenu` service which provides actions to search for ``AuditEntry``s, underneath an 'Activity' menu on the secondary menu bar.
-
-* `AuditingServiceRepository` service to to search for persisted `AuditEntry``s.
-None of its actions are visible in the user interface (they are all `@Programmatic`).
-
-* `AuditingServiceContributions` which contrbutes collections to the xref:../rgcms/rgcms.adoc#_rgcms_classes_mixins_HasTransactionId[ `HasTransactionId`] interface.
-This will therefore display all audit entries that occurred in a given transaction, in other words whenever a command, a published event or another audit entry is displayed.
-
-
-
-If you just want to debug (writing to stderr), you can instead configure `o.a.i.applib.services.audit.AuditingService3$Stderr`
-
-
-
-== Usage
-
-The typical way to indicate that an object should be audited is to annotate it with the xref:../rgant/rgant.adoc#_rgant-DomainObject_auditing[`@DomainObject#auditing()`] annotation.
-
-
-
-
-== Registering the Services
-
-The (non-ASF) http://github.com/isisaddons/isis-module-audit[Isis addons' audit] module provides an implementation of
-this service (`AuditingService`), and also provides a number of related domain services (`AuditingServiceMenu`,
-`AuditingServiceRepository` and `AuditingServiceContributions`).
-
-Assuming that an `AppManifest` is being used to xref:../rgcms/rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the app])
-then this can be activated by updating the `pom.xml` and updating the `AppManifest#getModules()` method.
-
-If menu items or contributions are not required in the UI, these can be suppressed either using security or by
-implementing a xref:../ugbtb/ugbtb.adoc#_ugbtb_hints-and-tips_vetoing-visibility[vetoing subscriber].
-
-
-
-== Related Services
-
-This service has been deprecated and replaced by the equivalent
-xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`].
-
-
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_framework-provided.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_framework-provided.adoc
index 5dfc1e8..e90528e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_framework-provided.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_framework-provided.adoc
@@ -32,7 +32,6 @@ Commands/Interactions/Background/Auditing/Publishing/Profiling:
* xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-api_CommandContext[`CommandContext`] (SPI)
* xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`CommandService`] (SPI)
* xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-api_InteractionContext[`InteractionContext`] (SPI)
-* xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditingService[`AuditingService`] (SPI) (deprecated)
* xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`] (SPI)
* xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-api_BackgroundService[`BackgroundService`]
* xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_BackgroundCommandService[`BackgroundCommandService`] (SPI)
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_building-blocks_identifiers_oid.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_building-blocks_identifiers_oid.adoc
index 3f293ff..5ac01de 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_building-blocks_identifiers_oid.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_building-blocks_identifiers_oid.adoc
@@ -25,7 +25,7 @@ Some examples:
* the information within an OID could be converted into a barcode, and stamped onto a PDF form.
When the PDF is scanned by the mail room, the barcode could be read to attach the correspondence to the relevant domain object.
-* as a handle to any object in an audit record, as used by xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`] or xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditingService[`AuditingService`] (the latter deprecated);
+* as a handle to any object in an audit record, as used by xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`];
* similarly within implementations of xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`CommandService`] to persist `Command`
objects
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugsec/ugsec.adoc b/adocs/documentation/src/main/asciidoc/guides/ugsec/ugsec.adoc
index 9f1a12f..0fcd1a8 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugsec/ugsec.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugsec/ugsec.adoc
@@ -82,7 +82,7 @@ When ``Interaction``s are persisted (eg by way of (non-ASF) link:http://platform
traceability.
The (non-ASF) link:http://platform.incode.org[Incode Platform^]'s audit module provides an implementation of the `AuditerService`.
-For earlier versions of the framework the xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`CommandService`] can be used to capture actions, while the (deprecated) xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditingService[`AuditingService`] used to capture data modified.
+For xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`CommandService`] can be also be used to capture actions.
====
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
index 4d72bee..23fc34d 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
@@ -44,7 +44,7 @@ public @interface DomainObject {
* Whether the entity should be audited (note: does not apply to view models or other recreatable objects.
*
* <p>
- * Requires that an implementation of the {@link org.apache.isis.applib.services.audit.AuditingService3} is
+ * Requires that an implementation of the {@link org.apache.isis.applib.services.audit.AuditerService} is
* registered with the framework.
* </p>
*/
@@ -58,7 +58,7 @@ public @interface DomainObject {
* Whether changes to the object should be published.
*
* <p>
- * Requires that an implementation of the {@link org.apache.isis.applib.services.publish.PublishingService} is
+ * Requires that an implementation of the {@link org.apache.isis.applib.services.publish.PublisherService} is
* registered with the framework.
* </p>
*/
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditingService3.java b/core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditingService3.java
deleted file mode 100644
index fed10e8..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditingService3.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.services.audit;
-
-import java.sql.Timestamp;
-import java.util.UUID;
-
-import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.services.bookmark.Bookmark;
-
-/**
- * @deprecated - use {@link AuditerService} (to support multiple transactions within an interaction)
- */
-@Deprecated
-public interface AuditingService3 {
-
- @Programmatic
- public void audit(
- final UUID transactionId, String targetClassName, final Bookmark target,
- String memberIdentifier, final String propertyName,
- final String preValue, final String postValue,
- final String user, final java.sql.Timestamp timestamp);
-
-
- public static class Stderr implements AuditingService3 {
-
- @Programmatic
- @Override
- public void audit(
- final UUID transactionId, final String targetClassName, final Bookmark target,
- final String memberId, final String propertyName,
- final String preValue, final String postValue,
- final String user, final Timestamp timestamp) {
- String auditMessage = target.toString() + " by " + user + ", " + propertyName +": " + preValue + " -> " + postValue;
- System.err.println(auditMessage);
- }
- }
-
-}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/session/SessionLoggingService.java b/core/applib/src/main/java/org/apache/isis/applib/services/session/SessionLoggingService.java
index 84d137a..c86737c 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/session/SessionLoggingService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/session/SessionLoggingService.java
@@ -18,12 +18,12 @@
*/
package org.apache.isis.applib.services.session;
-import org.apache.isis.applib.annotation.Programmatic;
-
import java.util.Date;
+import org.apache.isis.applib.annotation.Programmatic;
+
/**
- * Similar to the {@link org.apache.isis.applib.services.audit.AuditingService3}, this defines an API to track
+ * Similar to the {@link org.apache.isis.applib.services.audit.AuditerService}, this defines an API to track
* the status of the current sessions ("users logged on") on the system.
*/
public interface SessionLoggingService {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/auditing/AuditingServiceInternal.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/auditing/AuditingServiceInternal.java
index 9cb8529..6fa118e 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/auditing/AuditingServiceInternal.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/auditing/AuditingServiceInternal.java
@@ -27,7 +27,6 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.audit.AuditerService;
-import org.apache.isis.applib.services.audit.AuditingService3;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.iactn.InteractionContext;
@@ -42,7 +41,7 @@ import org.apache.isis.core.runtime.services.changes.ChangedObjectsServiceIntern
import org.apache.isis.core.runtime.services.changes.PreAndPostValues;
/**
- * Wrapper around {@link org.apache.isis.applib.services.audit.AuditingService3}. Is a no-op if there is no injected service.
+ * Wrapper around {@link org.apache.isis.applib.services.audit.AuditerService}.
*/
@DomainService(
nature = NatureOfService.DOMAIN,
@@ -60,9 +59,6 @@ public class AuditingServiceInternal {
}
private boolean determineWhetherCanAudit() {
- if (auditingServiceIfAny != null) {
- return true;
- }
for (final AuditerService auditerService : auditerServices) {
if (auditerService.isEnabled()) {
return true;
@@ -114,11 +110,6 @@ public class AuditingServiceInternal {
final UUID transactionId = transaction.getTransactionId();
final int sequence = transaction.getSequence();
-
- if(auditingServiceIfAny != null) {
- auditingServiceIfAny
- .audit(transactionId, targetClass, target, memberId, propertyId, preValue, postValue, user, timestamp);
- }
for (AuditerService auditerService : auditerServices) {
if (auditerService.isEnabled()) {
auditerService
@@ -127,17 +118,11 @@ public class AuditingServiceInternal {
}
}
- /**
- * could be null if none has been registered.
- */
- @javax.inject.Inject
- private AuditingService3 auditingServiceIfAny;
-
@javax.inject.Inject
- private List<AuditerService> auditerServices;
+ List<AuditerService> auditerServices;
@javax.inject.Inject
- private ChangedObjectsServiceInternal changedObjectsServiceInternal;
+ ChangedObjectsServiceInternal changedObjectsServiceInternal;
@javax.inject.Inject
UserService userService;
diff --git a/todo-deprecation-list.txt b/todo-deprecation-list.txt
index 7a4e60a..6ceb3ef 100644
--- a/todo-deprecation-list.txt
+++ b/todo-deprecation-list.txt
@@ -7,22 +7,11 @@ TO REMOVE:
-org.apache.isis.applib
-
-
- DomainObjectContainer.java - entire class
-
-
-
-
org.apache.isis.applib.clock
Clock
-org.apache.isis.applib.services.audit (2 usages found)
- AuditingService3.java - remove entire service, use AuditerService instead
-
org.apache.isis.applib.services.bookmark (8 usages found)
BookmarkService.java - deprecated methods, have overloads in BookmarkService2 subtype [suggest we retain these for now]
org.apache.isis.applib.services.classdiscovery
@@ -384,6 +373,10 @@ org.apache.isis.applib.services.actinvoc
ActionInvocationContext.java -remove unused constructors
+org.apache.isis.applib.services.audit (2 usages found)
+ AuditingService3.java - remove entire service, use AuditerService instead
+
+
org.apache.isis.applib.services.background (10 usages found)
ActionInvocationMemento.java - remove entire class, use InteractionDto and CommandDto are used internally instead
BackgroundCommandService.java - remove methods using AIM, instead keep those using CommandDto (in BackgroundCommandService2)
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.