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 2021/06/17 10:56:47 UTC
[isis] branch ISIS-2478 updated (0b6848f -> aa36fbf)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch ISIS-2478
in repository https://gitbox.apache.org/repos/asf/isis.git.
discard 0b6848f ISIS-2478: updates Specification and subtypes so only declare @Programmatic methods
add a71d8dc ISIS-2746: fixes the order in which fixtures and seed services are called once MetamodelEvent (post build) is fired
add 16ff6a1 Merge pull request #613 from apache/ISIS-2746
new aa36fbf ISIS-2478: updates Specification and subtypes so only declare @Programmatic methods
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (0b6848f)
\
N -- N -- N refs/heads/ISIS-2478 (aa36fbf)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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:
.../ApplicationFeatureRepositoryDefault.java | 3 +++
.../dom/_infra/seed/SeedServiceAbstract.java | 3 +++
.../applib/seed/SeedSecurityModuleService.java | 18 ++++++++---------
.../services/InitialFixtureScriptsInstaller.java | 23 ++++++++++------------
4 files changed, 24 insertions(+), 23 deletions(-)
[isis] 01/01: ISIS-2478: updates Specification and subtypes so only
declare @Programmatic methods
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2478
in repository https://gitbox.apache.org/repos/asf/isis.git
commit aa36fbfea1ed4b884fb31e6e97997d3216706111
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jun 17 11:19:23 2021 +0100
ISIS-2478: updates Specification and subtypes so only declare @Programmatic methods
This allows them to be loaded into the metamodel and not trip up the stricter MM validation
---
.../main/java/org/apache/isis/applib/spec/AbstractSpecification.java | 4 ++++
.../main/java/org/apache/isis/applib/spec/AbstractSpecification2.java | 4 ++++
.../src/main/java/org/apache/isis/applib/spec/Specification.java | 3 +++
.../src/main/java/org/apache/isis/applib/spec/Specification2.java | 2 ++
.../src/main/java/org/apache/isis/applib/spec/SpecificationAnd.java | 2 ++
.../src/main/java/org/apache/isis/applib/spec/SpecificationNot.java | 3 +++
.../src/main/java/org/apache/isis/applib/spec/SpecificationOr.java | 2 ++
7 files changed, 20 insertions(+)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification.java b/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification.java
index 0f17000a..3c1911e 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification.java
@@ -19,6 +19,8 @@
package org.apache.isis.applib.spec;
+import org.apache.isis.applib.annotation.Programmatic;
+
import java.lang.reflect.Method;
/**
@@ -83,6 +85,7 @@ public abstract class AbstractSpecification<T> implements Specification {
* Checks not null and is correct type, and delegates to
* {@link #satisfiesSafely(Object)}.
*/
+ @Programmatic
@Override
@SuppressWarnings({ "unchecked" })
public final String satisfies(final Object obj) {
@@ -104,6 +107,7 @@ public abstract class AbstractSpecification<T> implements Specification {
* Subclasses should implement this. The item will already have been checked
* for the specific type and will never be null.
*/
+ @Programmatic
public abstract String satisfiesSafely(T obj);
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java b/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java
index 3a8fe6f..a3f067b 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java
@@ -21,6 +21,7 @@ package org.apache.isis.applib.spec;
import java.lang.reflect.Method;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.commons.internal.base._Casts;
@@ -82,6 +83,7 @@ public abstract class AbstractSpecification2<T> implements Specification2 {
this.typeChecking = typeChecking;
}
+ @Programmatic
@Override
public final String satisfies(final Object obj) {
// unused because satisfiesTranslatable will be called instead.
@@ -92,6 +94,7 @@ public abstract class AbstractSpecification2<T> implements Specification2 {
* Checks not null and is correct type, and delegates to
* {@link #satisfiesTranslatableSafely(Object)}.
*/
+ @Programmatic
@Override
public TranslatableString satisfiesTranslatable(final Object obj) {
if (obj == null) {
@@ -109,6 +112,7 @@ public abstract class AbstractSpecification2<T> implements Specification2 {
}
+ @Programmatic
public abstract TranslatableString satisfiesTranslatableSafely(T obj);
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/spec/Specification.java b/api/applib/src/main/java/org/apache/isis/applib/spec/Specification.java
index 5ff03f9..54c3758 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/spec/Specification.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/spec/Specification.java
@@ -19,6 +19,8 @@
package org.apache.isis.applib.spec;
+import org.apache.isis.applib.annotation.Programmatic;
+
/**
* An implementation of the <i>Specification</i> pattern, as described in Eric
* Evans' <i>Domain Driven Design</i>, p224.
@@ -31,6 +33,7 @@ public interface Specification {
* If <tt>null</tt> then satisfied, otherwise is reason why the
* specification is not satisfied.
*/
+ @Programmatic
String satisfies(Object obj);
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/spec/Specification2.java b/api/applib/src/main/java/org/apache/isis/applib/spec/Specification2.java
index 3974114..2b2c662 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/spec/Specification2.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/spec/Specification2.java
@@ -19,6 +19,7 @@
package org.apache.isis.applib.spec;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.i18n.TranslatableString;
/**
@@ -36,6 +37,7 @@ public interface Specification2 extends Specification {
/**
* If <tt>null</tt> then satisfied, otherwise is the reason (as a {@link TranslatableString} translatable string) as to why the specification is not satisfied.
*/
+ @Programmatic
TranslatableString satisfiesTranslatable(Object obj);
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationAnd.java b/api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationAnd.java
index f5ef871..4af68f6 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationAnd.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationAnd.java
@@ -19,6 +19,7 @@
package org.apache.isis.applib.spec;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.util.ReasonBuffer;
/**
@@ -52,6 +53,7 @@ public abstract class SpecificationAnd implements Specification {
this.specifications = specifications;
}
+ @Programmatic
@Override
public String satisfies(final Object obj) {
final ReasonBuffer buf = new ReasonBuffer();
diff --git a/api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationNot.java b/api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationNot.java
index f84035a..51ff56d 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationNot.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationNot.java
@@ -19,6 +19,8 @@
package org.apache.isis.applib.spec;
+import org.apache.isis.applib.annotation.Programmatic;
+
/**
* Adapter to make it easy to perform boolean algebra on {@link Specification}s.
*
@@ -53,6 +55,7 @@ public abstract class SpecificationNot implements Specification {
this.specification = specification;
}
+ @Programmatic
@Override
public String satisfies(final Object obj) {
final String satisfies = specification.satisfies(obj);
diff --git a/api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationOr.java b/api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationOr.java
index fe5fe80..13f9657 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationOr.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/spec/SpecificationOr.java
@@ -19,6 +19,7 @@
package org.apache.isis.applib.spec;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.util.ReasonBuffer;
/**
@@ -52,6 +53,7 @@ public abstract class SpecificationOr implements Specification {
this.specifications = specifications;
}
+ @Programmatic
@Override
public String satisfies(final Object obj) {
final ReasonBuffer buf = new ReasonBuffer();