You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/09/24 11:24:35 UTC
[isis] branch master updated: ISIS-2033: rename jdo's
MetricsServiceDefault -> MetricsServiceForJdo
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 274c70c ISIS-2033: rename jdo's MetricsServiceDefault -> MetricsServiceForJdo
274c70c is described below
commit 274c70c295fb7d09e49ae334b29660933babf7b6
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Sep 24 13:24:20 2020 +0200
ISIS-2033: rename jdo's MetricsServiceDefault -> MetricsServiceForJdo
JPA support needs a variant of this one
---
antora/components/system/modules/ROOT/pages/about.adoc | 2 +-
.../src/main/adoc/modules/applib-svc/pages/MetricsService.adoc | 5 ++++-
.../core/config/presets/DebugTransactionScopedServices.properties | 2 +-
.../client/kroviz/snapshots/simpleapp1_16_0/RESTFUL_DOMAIN_TYPES.kt | 2 +-
.../isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java | 4 ++--
.../{MetricsServiceDefault.java => MetricsServiceForJdo.java} | 4 ++--
.../isis/testdomain/bootstrapping/builtin-domain-services.list | 2 +-
.../apache/isis/testdomain/bootstrapping/builtin-requestscoped.list | 2 +-
8 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/antora/components/system/modules/ROOT/pages/about.adoc b/antora/components/system/modules/ROOT/pages/about.adoc
index 877de75..cfb1ab4 100644
--- a/antora/components/system/modules/ROOT/pages/about.adoc
+++ b/antora/components/system/modules/ROOT/pages/about.adoc
@@ -1007,7 +1007,7 @@ _Components_
* org.apache.isis.persistence.jdo.datanucleus5.exceprecog.ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException
* org.apache.isis.persistence.jdo.datanucleus5.jdosupport.IsisJdoSupportDN5
* org.apache.isis.persistence.jdo.datanucleus5.metamodel.JdoProgrammingModelPlugin
-* org.apache.isis.persistence.jdo.datanucleus5.metrics.MetricsServiceDefault
+* org.apache.isis.persistence.jdo.datanucleus5.metrics.MetricsServiceForJdo
* org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisPlatformTransactionManagerForJdo
* org.apache.isis.persistence.jdo.datanucleus5.persistence.PersistenceSessionFactory5
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/MetricsService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/MetricsService.adoc
index c477bdc..a71db8b 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/MetricsService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/MetricsService.adoc
@@ -25,7 +25,10 @@ include::refguide:applib-svc:example$services/metrics/MetricsService.java[tags="
== Implementation
-The framework provides a default implementation of this API, namely `o.a.i.c.r.s.metrics.MetricsServiceDefault`.
+The framework provides persistence layer specific implementations of this API:
+
+- `o.a.i.**.MetricsServiceForJdo`
+- `o.a.i.**.MetricsServiceForJpa`
diff --git a/core/config/src/main/java/org/apache/isis/core/config/presets/DebugTransactionScopedServices.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/DebugTransactionScopedServices.properties
index fdddb7d..a110b1c 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/presets/DebugTransactionScopedServices.properties
+++ b/core/config/src/main/java/org/apache/isis/core/config/presets/DebugTransactionScopedServices.properties
@@ -16,6 +16,6 @@
# under the License.
# -- framework internal transaction scoped --
-logging.level.org.apache.isis.persistence.jdo.datanucleus5.metrics.MetricsServiceDefault = DEBUG
+logging.level.org.apache.isis.persistence.jdo.datanucleus5.metrics.MetricsServiceForJdo = DEBUG
logging.level.org.apache.isis.core.runtimeservices.queryresultscache.QueryResultsCacheDefault = DEBUG
logging.level.org.apache.isis.core.runtime.persistence.transaction.ChangedObjectsService = DEBUG
diff --git a/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/snapshots/simpleapp1_16_0/RESTFUL_DOMAIN_TYPES.kt b/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/snapshots/simpleapp1_16_0/RESTFUL_DOMAIN_TYPES.kt
index fcdd21e..84a0585 100644
--- a/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/snapshots/simpleapp1_16_0/RESTFUL_DOMAIN_TYPES.kt
+++ b/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/snapshots/simpleapp1_16_0/RESTFUL_DOMAIN_TYPES.kt
@@ -1014,7 +1014,7 @@ object RESTFUL_DOMAIN_TYPES : Response() {
"type" : "application/json;profile=\"urn:org.restfulobjects:repr-types/domain-type\""
}, {
"rel" : "urn:org.restfulobjects:rels/domain-type",
- "href" : "http://localhost:8080/restful/domain-types/org.apache.isis.core.runtime.services.metrics.MetricsServiceDefault",
+ "href" : "http://localhost:8080/restful/domain-types/org.apache.isis.persistence.jdo.datanucleus5.metrics.MetricsServiceForJdo",
"method" : "GET",
"type" : "application/json;profile=\"urn:org.restfulobjects:repr-types/domain-type\""
}, {
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java
index 746546f..e4a3b43 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java
@@ -41,7 +41,7 @@ import org.apache.isis.persistence.jdo.datanucleus5.jdosupport.mixins.Persistabl
import org.apache.isis.persistence.jdo.datanucleus5.jdosupport.mixins.Persistable_downloadJdoMetadata;
import org.apache.isis.persistence.jdo.datanucleus5.metamodel.JdoMetamodelMenu;
import org.apache.isis.persistence.jdo.datanucleus5.metamodel.JdoProgrammingModelPlugin;
-import org.apache.isis.persistence.jdo.datanucleus5.metrics.MetricsServiceDefault;
+import org.apache.isis.persistence.jdo.datanucleus5.metrics.MetricsServiceForJdo;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisPlatformTransactionManagerForJdo;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.PersistenceSessionFactory5;
@@ -64,7 +64,7 @@ import org.apache.isis.persistence.jdo.datanucleus5.persistence.PersistenceSessi
IsisJdoSupportDN5.class,
IsisPlatformTransactionManagerForJdo.class,
JdoPersistenceLifecycleService.class,
- MetricsServiceDefault.class,
+ MetricsServiceForJdo.class,
PersistenceSessionFactory5.class,
JdoMetamodelMenu.class,
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metrics/MetricsServiceDefault.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metrics/MetricsServiceForJdo.java
similarity index 97%
rename from persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metrics/MetricsServiceDefault.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metrics/MetricsServiceForJdo.java
index ccebb12..061c4a2 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metrics/MetricsServiceDefault.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metrics/MetricsServiceForJdo.java
@@ -38,13 +38,13 @@ import org.apache.isis.applib.services.metrics.MetricsService;
import org.apache.isis.core.runtime.persistence.transaction.ChangedObjectsService;
@Service
-@Named("isisJdoDn5.MetricsServiceDefault")
+@Named("isisJdoDn5.MetricsServiceForJdo")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
@IsisInteractionScope
//@Log4j2
-public class MetricsServiceDefault
+public class MetricsServiceForJdo
implements MetricsService, InstanceLifecycleListener, LoadLifecycleListener, TransactionScopeListener {
@Inject private javax.inject.Provider<ChangedObjectsService> changedObjectsProvider;
diff --git a/regressiontests/stable/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list b/regressiontests/stable/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list
index df3e175..9e9ad9d 100644
--- a/regressiontests/stable/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list
+++ b/regressiontests/stable/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list
@@ -11,7 +11,7 @@ org.apache.isis.core.runtimeservices.urlencoding.UrlEncodingServiceWithCompressi
org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts
ServiceRegistryDefault
UserServiceDefault$SudoServiceSpi
-org.apache.isis.persistence.jdo.datanucleus5.metrics.MetricsServiceDefault
+org.apache.isis.persistence.jdo.datanucleus5.metrics.MetricsServiceForJdo
org.apache.isis.core.runtimeservices.command.CommandDtoServiceInternalDefault
org.apache.isis.core.runtimeservices.confmenu.ConfigurationViewServiceDefault
org.apache.isis.core.runtimeservices.email.EmailServiceDefault
diff --git a/regressiontests/stable/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-requestscoped.list b/regressiontests/stable/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-requestscoped.list
index 113f958..de6cd8d 100644
--- a/regressiontests/stable/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-requestscoped.list
+++ b/regressiontests/stable/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-requestscoped.list
@@ -2,6 +2,6 @@ org.apache.isis.applib.services.iactn.InteractionContext
org.apache.isis.applib.services.queryresultscache.QueryResultsCacheInternal
org.apache.isis.applib.services.scratchpad.Scratchpad
org.apache.isis.core.runtimeservices.changes.ChangedObjectsServiceInternal
-org.apache.isis.core.runtimeservices.metrics.MetricsServiceDefault
+org.apache.isis.core.runtimeservices.metrics.MetricsServiceForJdo
PublisherDispatchServiceDefault
org.apache.isis.objectstore.jdo.datanucleus.service.support.TimestampService
\ No newline at end of file