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 2022/08/26 15:32:22 UTC
[isis] 01/01: ISIS-3185: no longer implement ModuleWithFixtures
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-3185
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 9908f6fb60253718877f8d05b470780f6516a3d6
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Aug 26 16:32:11 2022 +0100
ISIS-3185: no longer implement ModuleWithFixtures
---
.../applib/IsisModuleExtCommandLogApplib.java | 3 +--
.../jdo/IsisModuleExtCommandLogPersistenceJdo.java | 7 ++++---
.../jpa/IsisModuleExtCommandLogPersistenceJpa.java | 9 ++++++---
.../applib/IsisModuleExtExecutionOutboxApplib.java | 3 +--
.../IsisModuleExtExecutionOutboxPersistenceJdo.java | 7 ++++---
.../IsisModuleExtExecutionOutboxPersistenceJpa.java | 9 ++++++---
.../IsisModuleExtExecutionRepublisherApplib.java | 3 +--
.../jdo/IsisModuleExtAuditTrailPersistenceJdo.java | 9 ++++++---
.../jpa/IsisModuleExtAuditTrailPersistenceJpa.java | 9 ++++++---
.../jdo/IsisModuleExtSecmanPersistenceJdo.java | 20 ++++++++++++++++++++
.../jpa/IsisModuleExtSecmanPersistenceJpa.java | 9 ++++++---
.../jdo/IsisModuleExtSessionLogPersistenceJdo.java | 9 ++++++---
.../jpa/IsisModuleExtSessionLogPersistenceJpa.java | 9 ++++++---
13 files changed, 73 insertions(+), 33 deletions(-)
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/IsisModuleExtCommandLogApplib.java b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/IsisModuleExtCommandLogApplib.java
index 8f17b7ca8a..9a3af7594e 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/IsisModuleExtCommandLogApplib.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/IsisModuleExtCommandLogApplib.java
@@ -50,8 +50,7 @@ import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixtures;
CommandSubscriberForCommandLog.class,
CommandLogEntry.TableColumnOrderDefault.class,
})
-public class IsisModuleExtCommandLogApplib
-implements ModuleWithFixtures {
+public class IsisModuleExtCommandLogApplib {
public static final String NAMESPACE = "isis.ext.commandLog";
public static final String SCHEMA = "isisExtCommandLog";
diff --git a/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/IsisModuleExtCommandLogPersistenceJdo.java b/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/IsisModuleExtCommandLogPersistenceJdo.java
index 896bee5736..049d3c74eb 100644
--- a/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/IsisModuleExtCommandLogPersistenceJdo.java
+++ b/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/IsisModuleExtCommandLogPersistenceJdo.java
@@ -26,6 +26,7 @@ import org.apache.isis.extensions.commandlog.jdo.dom.CommandLogEntry;
import org.apache.isis.extensions.commandlog.jdo.dom.CommandLogEntryRepository;
import org.apache.isis.persistence.jdo.datanucleus.IsisModulePersistenceJdoDatanucleus;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixtures;
import org.apache.isis.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAbstract;
/**
@@ -49,10 +50,10 @@ public class IsisModuleExtCommandLogPersistenceJdo {
public static final String SCHEMA = IsisModuleExtCommandLogApplib.SCHEMA;
/**
- * For tests that need to delete the command table first.
- * Should be run in the @BeforeEach of the test.
+ * Note that this is <i>NOT</i> an implementation of the {@link ModuleWithFixtures#getTeardownFixture()} API;
+ * but is provided to allow manual teardown if required.
*/
- public FixtureScript getTeardownFixtureWillDelete() {
+ public FixtureScript teardownFixture() {
return new TeardownFixtureJdoAbstract() {
@Override
protected void execute(final ExecutionContext executionContext) {
diff --git a/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/isis/extensions/commandlog/jpa/IsisModuleExtCommandLogPersistenceJpa.java b/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/isis/extensions/commandlog/jpa/IsisModuleExtCommandLogPersistenceJpa.java
index 7a0d197a7a..ce9ab7499e 100644
--- a/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/isis/extensions/commandlog/jpa/IsisModuleExtCommandLogPersistenceJpa.java
+++ b/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/isis/extensions/commandlog/jpa/IsisModuleExtCommandLogPersistenceJpa.java
@@ -52,13 +52,16 @@ import org.apache.isis.testing.fixtures.applib.teardown.jpa.TeardownFixtureJpaAb
@EntityScan(basePackageClasses = {
CommandLogEntry.class
})
-public class IsisModuleExtCommandLogPersistenceJpa implements ModuleWithFixtures {
+public class IsisModuleExtCommandLogPersistenceJpa {
public static final String NAMESPACE = IsisModuleExtCommandLogApplib.NAMESPACE;
public static final String SCHEMA = IsisModuleExtCommandLogApplib.SCHEMA;
- @Override
- public FixtureScript getTeardownFixture() {
+ /**
+ * Note that this is <i>NOT</i> an implementation of the {@link ModuleWithFixtures#getTeardownFixture()} API;
+ * but is provided to allow manual teardown if required.
+ */
+ public FixtureScript teardownFixture() {
return new TeardownFixtureJpaAbstract() {
@Override
protected void execute(final ExecutionContext executionContext) {
diff --git a/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/IsisModuleExtExecutionOutboxApplib.java b/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/IsisModuleExtExecutionOutboxApplib.java
index 17a66bf40c..2e96abc423 100644
--- a/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/IsisModuleExtExecutionOutboxApplib.java
+++ b/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/IsisModuleExtExecutionOutboxApplib.java
@@ -40,8 +40,7 @@ import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixtures;
ExecutionOutboxEntry.TableColumnOrderDefault.class,
ContentMappingServiceForOutboxEvents.class
})
-public class IsisModuleExtExecutionOutboxApplib
-implements ModuleWithFixtures {
+public class IsisModuleExtExecutionOutboxApplib {
public static final String NAMESPACE = "isis.ext.executionOutbox";
public static final String SCHEMA = "isisExtExecutionOutbox";
diff --git a/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/isis/extensions/executionoutbox/jdo/IsisModuleExtExecutionOutboxPersistenceJdo.java b/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/isis/extensions/executionoutbox/jdo/IsisModuleExtExecutionOutboxPersistenceJdo.java
index a27348c297..7e3fd4ca9b 100644
--- a/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/isis/extensions/executionoutbox/jdo/IsisModuleExtExecutionOutboxPersistenceJdo.java
+++ b/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/isis/extensions/executionoutbox/jdo/IsisModuleExtExecutionOutboxPersistenceJdo.java
@@ -27,6 +27,7 @@ import org.apache.isis.extensions.executionoutbox.jdo.dom.ExecutionOutboxEntryPK
import org.apache.isis.extensions.executionoutbox.jdo.dom.ExecutionOutboxEntryRepository;
import org.apache.isis.persistence.jdo.datanucleus.IsisModulePersistenceJdoDatanucleus;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixtures;
import org.apache.isis.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAbstract;
/**
@@ -51,10 +52,10 @@ public class IsisModuleExtExecutionOutboxPersistenceJdo {
public static final String SCHEMA = IsisModuleExtExecutionOutboxApplib.SCHEMA;
/**
- * For tests that need to delete the command table first.
- * Should be run in the @BeforeEach of the test.
+ * Note that this is <i>NOT</i> an implementation of the {@link ModuleWithFixtures#getTeardownFixture()} API;
+ * but is provided to allow manual teardown if required.
*/
- public FixtureScript getTeardownFixtureWillDelete() {
+ public FixtureScript teardownFixture() {
return new TeardownFixtureJdoAbstract() {
@Override
protected void execute(final ExecutionContext executionContext) {
diff --git a/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/isis/extensions/executionoutbox/jpa/IsisModuleExtExecutionOutboxPersistenceJpa.java b/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/isis/extensions/executionoutbox/jpa/IsisModuleExtExecutionOutboxPersistenceJpa.java
index 3899fdd8ed..f5e975305c 100644
--- a/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/isis/extensions/executionoutbox/jpa/IsisModuleExtExecutionOutboxPersistenceJpa.java
+++ b/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/isis/extensions/executionoutbox/jpa/IsisModuleExtExecutionOutboxPersistenceJpa.java
@@ -52,13 +52,16 @@ import org.apache.isis.testing.fixtures.applib.teardown.jpa.TeardownFixtureJpaAb
@EntityScan(basePackageClasses = {
ExecutionOutboxEntry.class
})
-public class IsisModuleExtExecutionOutboxPersistenceJpa implements ModuleWithFixtures {
+public class IsisModuleExtExecutionOutboxPersistenceJpa {
public static final String NAMESPACE = IsisModuleExtExecutionOutboxApplib.NAMESPACE;
public static final String SCHEMA = IsisModuleExtExecutionOutboxApplib.SCHEMA;
- @Override
- public FixtureScript getTeardownFixture() {
+ /**
+ * Note that this is <i>NOT</i> an implementation of the {@link ModuleWithFixtures#getTeardownFixture()} API;
+ * but is provided to allow manual teardown if required.
+ */
+ public FixtureScript teardownFixture() {
return new TeardownFixtureJpaAbstract() {
@Override
protected void execute(final ExecutionContext executionContext) {
diff --git a/extensions/core/executionrepublisher/applib/src/main/java/org/apache/isis/extensions/executionrepublisher/applib/IsisModuleExtExecutionRepublisherApplib.java b/extensions/core/executionrepublisher/applib/src/main/java/org/apache/isis/extensions/executionrepublisher/applib/IsisModuleExtExecutionRepublisherApplib.java
index 75fc2a2170..044316c5dc 100644
--- a/extensions/core/executionrepublisher/applib/src/main/java/org/apache/isis/extensions/executionrepublisher/applib/IsisModuleExtExecutionRepublisherApplib.java
+++ b/extensions/core/executionrepublisher/applib/src/main/java/org/apache/isis/extensions/executionrepublisher/applib/IsisModuleExtExecutionRepublisherApplib.java
@@ -31,8 +31,7 @@ import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixtures;
ExecutionSubscriberForExecutionOutbox.class,
ExecutionOutboxEntry.TableColumnOrderDefault.class,
})
-public class IsisModuleExtExecutionRepublisherApplib
-implements ModuleWithFixtures {
+public class IsisModuleExtExecutionRepublisherApplib {
public static final String NAMESPACE = "isis.ext.executionRepublisher";
diff --git a/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/extensions/audittrail/jdo/IsisModuleExtAuditTrailPersistenceJdo.java b/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/extensions/audittrail/jdo/IsisModuleExtAuditTrailPersistenceJdo.java
index 2a0a7be5ab..6c7ca1b542 100644
--- a/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/extensions/audittrail/jdo/IsisModuleExtAuditTrailPersistenceJdo.java
+++ b/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/extensions/audittrail/jdo/IsisModuleExtAuditTrailPersistenceJdo.java
@@ -46,10 +46,13 @@ import org.apache.isis.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAb
// entities, eager meta-model introspection
AuditTrailEntry.class,
})
-public class IsisModuleExtAuditTrailPersistenceJdo implements ModuleWithFixtures {
+public class IsisModuleExtAuditTrailPersistenceJdo {
- @Override
- public FixtureScript getTeardownFixture() {
+ /**
+ * Note that this is <i>NOT</i> an implementation of the {@link ModuleWithFixtures#getTeardownFixture()} API;
+ * but is provided to allow manual teardown if required.
+ */
+ public FixtureScript teardownFixture() {
return new TeardownFixtureJdoAbstract() {
@Override
protected void execute(final ExecutionContext executionContext) {
diff --git a/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/isis/extensions/audittrail/jpa/IsisModuleExtAuditTrailPersistenceJpa.java b/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/isis/extensions/audittrail/jpa/IsisModuleExtAuditTrailPersistenceJpa.java
index f03db9141a..a8ad4e43d7 100644
--- a/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/isis/extensions/audittrail/jpa/IsisModuleExtAuditTrailPersistenceJpa.java
+++ b/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/isis/extensions/audittrail/jpa/IsisModuleExtAuditTrailPersistenceJpa.java
@@ -48,10 +48,13 @@ import org.apache.isis.testing.fixtures.applib.teardown.jpa.TeardownFixtureJpaAb
AuditTrailEntry.class,
})
@EntityScan(basePackageClasses = {AuditTrailEntry.class})
-public class IsisModuleExtAuditTrailPersistenceJpa implements ModuleWithFixtures {
+public class IsisModuleExtAuditTrailPersistenceJpa {
- @Override
- public FixtureScript getTeardownFixture() {
+ /**
+ * Note that this is <i>NOT</i> an implementation of the {@link ModuleWithFixtures#getTeardownFixture()} API;
+ * but is provided to allow manual teardown if required.
+ */
+ public FixtureScript teardownFixture() {
return new TeardownFixtureJpaAbstract() {
@Override
protected void execute(final ExecutionContext executionContext) {
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/IsisModuleExtSecmanPersistenceJdo.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/IsisModuleExtSecmanPersistenceJdo.java
index acc528086a..27341d3405 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/IsisModuleExtSecmanPersistenceJdo.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/IsisModuleExtSecmanPersistenceJdo.java
@@ -32,6 +32,10 @@ import org.apache.isis.extensions.secman.jdo.user.dom.ApplicationUser;
import org.apache.isis.extensions.secman.jdo.user.dom.ApplicationUserRepository;
import org.apache.isis.extensions.secman.jdo.util.RegexReplacer;
import org.apache.isis.persistence.jdo.datanucleus.IsisModulePersistenceJdoDatanucleus;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixtures;
+import org.apache.isis.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAbstract;
+import org.apache.isis.testing.fixtures.applib.teardown.jpa.TeardownFixtureJpaAbstract;
/**
* @since 2.0 {@index}
@@ -58,4 +62,20 @@ import org.apache.isis.persistence.jdo.datanucleus.IsisModulePersistenceJdoDatan
})
public class IsisModuleExtSecmanPersistenceJdo {
+ /**
+ * Note that this is <i>NOT</i> an implementation of the {@link ModuleWithFixtures#getTeardownFixture()} API;
+ * but is provided to allow manual teardown if required.
+ */
+ public FixtureScript teardownFixture() {
+ return new TeardownFixtureJdoAbstract() {
+ @Override
+ protected void execute(final ExecutionContext executionContext) {
+ deleteFrom(ApplicationPermission.class);
+ deleteFrom(ApplicationUser.class);
+ deleteFrom(ApplicationRole.class);
+ deleteFrom(ApplicationTenancy.class);
+ }
+ };
+ }
+
}
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/IsisModuleExtSecmanPersistenceJpa.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/IsisModuleExtSecmanPersistenceJpa.java
index 35ccd1ffc8..6038dd7b87 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/IsisModuleExtSecmanPersistenceJpa.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/IsisModuleExtSecmanPersistenceJpa.java
@@ -68,10 +68,13 @@ import org.apache.isis.testing.fixtures.applib.teardown.jpa.TeardownFixtureJpaAb
ApplicationTenancy.class,
ApplicationUser.class,
})
-public class IsisModuleExtSecmanPersistenceJpa implements ModuleWithFixtures {
+public class IsisModuleExtSecmanPersistenceJpa {
- @Override
- public FixtureScript getTeardownFixture() {
+ /**
+ * Note that this is <i>NOT</i> an implementation of the {@link ModuleWithFixtures#getTeardownFixture()} API;
+ * but is provided to allow manual teardown if required.
+ */
+ public FixtureScript teardownFixture() {
return new TeardownFixtureJpaAbstract() {
@Override
protected void execute(final ExecutionContext executionContext) {
diff --git a/extensions/security/sessionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/sessionlog/jdo/IsisModuleExtSessionLogPersistenceJdo.java b/extensions/security/sessionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/sessionlog/jdo/IsisModuleExtSessionLogPersistenceJdo.java
index ccc3c24e45..cf86e6ea70 100644
--- a/extensions/security/sessionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/sessionlog/jdo/IsisModuleExtSessionLogPersistenceJdo.java
+++ b/extensions/security/sessionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/sessionlog/jdo/IsisModuleExtSessionLogPersistenceJdo.java
@@ -46,10 +46,13 @@ import org.apache.isis.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAb
// entities, eager meta-model introspection
SessionLogEntry.class,
})
-public class IsisModuleExtSessionLogPersistenceJdo implements ModuleWithFixtures {
+public class IsisModuleExtSessionLogPersistenceJdo {
- @Override
- public FixtureScript getTeardownFixture() {
+ /**
+ * Note that this is <i>NOT</i> an implementation of the {@link ModuleWithFixtures#getTeardownFixture()} API;
+ * but is provided to allow manual teardown if required.
+ */
+ public FixtureScript teardownFixture() {
return new TeardownFixtureJdoAbstract() {
@Override
protected void execute(final ExecutionContext executionContext) {
diff --git a/extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/isis/extensions/sessionlog/jpa/IsisModuleExtSessionLogPersistenceJpa.java b/extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/isis/extensions/sessionlog/jpa/IsisModuleExtSessionLogPersistenceJpa.java
index 2140b863ac..e2ee3849fd 100644
--- a/extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/isis/extensions/sessionlog/jpa/IsisModuleExtSessionLogPersistenceJpa.java
+++ b/extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/isis/extensions/sessionlog/jpa/IsisModuleExtSessionLogPersistenceJpa.java
@@ -52,10 +52,13 @@ import org.apache.isis.testing.fixtures.applib.teardown.jpa.TeardownFixtureJpaAb
@EntityScan(basePackageClasses = {
SessionLogEntry.class,
})
-public class IsisModuleExtSessionLogPersistenceJpa implements ModuleWithFixtures {
+public class IsisModuleExtSessionLogPersistenceJpa {
- @Override
- public FixtureScript getTeardownFixture() {
+ /**
+ * Note that this is <i>NOT</i> an implementation of the {@link ModuleWithFixtures#getTeardownFixture()} API;
+ * but is provided to allow manual teardown if required.
+ */
+ public FixtureScript teardownFixture() {
return new TeardownFixtureJpaAbstract() {
@Override
protected void execute(final ExecutionContext executionContext) {