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 2019/01/11 10:16:50 UTC
[isis] 02/03: Merge branch 'master' into v2
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 2f3e4f8977e552a3cb61a87465e90b1b71fd487f
Merge: 8d31dc7 6dc4124
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 11 10:00:01 2019 +0000
Merge branch 'master' into v2
.../java/domainapp/dom/impl/HelloWorldObjects.java | 7 ++--
.../manifest/isis-non-changing.properties | 7 +++-
.../modules/simple/dom/impl/SimpleObjects.java | 45 ++++++++--------------
3 files changed, 25 insertions(+), 34 deletions(-)
diff --cc example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java
index f46a77a,4dd70f4..28e1e7d
--- a/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java
+++ b/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java
@@@ -20,19 -20,21 +20,21 @@@ package domainapp.dom.impl
import java.util.List;
-import org.datanucleus.query.typesafe.TypesafeQuery;
+import javax.jdo.JDOQLTypedQuery;
import org.apache.isis.applib.annotation.Action;
+ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.applib.annotation.Parameter;
-import org.apache.isis.applib.annotation.ParameterLayout;
+ import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.services.jdosupport.IsisJdoSupport;
+import org.apache.isis.applib.services.jdosupport.IsisJdoSupport_v3_2;
import org.apache.isis.applib.services.repository.RepositoryService;
+import domainapp.dom.types.Name;
+
@DomainService(
nature = NatureOfService.VIEW_MENU_ONLY,
objectType = "helloworld.HelloWorldObjects"
@@@ -40,17 -42,21 +42,17 @@@
public class HelloWorldObjects {
@Action(semantics = SemanticsOf.NON_IDEMPOTENT)
- @MemberOrder(sequence = "1")
+ @ActionLayout(promptStyle = PromptStyle.DIALOG_MODAL)
public HelloWorldObject create(
- @Parameter(maxLength = 40)
- @ParameterLayout(named = "Name")
- final String name) {
+ @Name final String name) {
return repositoryService.persist(new HelloWorldObject(name));
}
@Action(semantics = SemanticsOf.SAFE)
- @MemberOrder(sequence = "2")
+ @ActionLayout(promptStyle = PromptStyle.DIALOG_SIDEBAR)
public List<HelloWorldObject> findByName(
- @Parameter(maxLength = 40)
- @ParameterLayout(named = "Name")
- final String name) {
- TypesafeQuery<HelloWorldObject> q = isisJdoSupport.newTypesafeQuery(HelloWorldObject.class);
+ @Name final String name) {
+ JDOQLTypedQuery<HelloWorldObject> q = isisJdoSupport.newTypesafeQuery(HelloWorldObject.class);
final QHelloWorldObject cand = QHelloWorldObject.candidate();
q = q.filter(
cand.name.indexOf(q.stringParameter("name")).ne(-1)
@@@ -60,7 -66,7 +62,6 @@@
}
@Action(semantics = SemanticsOf.SAFE, restrictTo = RestrictTo.PROTOTYPING)
-- @MemberOrder(sequence = "3")
public List<HelloWorldObject> listAll() {
return repositoryService.allInstances(HelloWorldObject.class);
}
diff --cc example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java
index aca31d4,940997e..953317f
--- a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java
+++ b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java
@@@ -26,43 -26,34 +26,36 @@@ import org.apache.isis.applib.annotatio
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.BookmarkPolicy;
import org.apache.isis.applib.annotation.DomainService;
- import org.apache.isis.applib.annotation.DomainServiceLayout;
- import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.NatureOfService;
- import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
-import org.apache.isis.applib.services.jdosupport.IsisJdoSupport;
+import org.apache.isis.applib.events.domain.ActionDomainEvent;
+import org.apache.isis.applib.services.jdosupport.IsisJdoSupport_v3_2;
import org.apache.isis.applib.services.repository.RepositoryService;
+import domainapp.modules.simple.dom.types.Name;
+
@DomainService(
nature = NatureOfService.VIEW_MENU_ONLY,
- objectType = "simple.SimpleObjects",
- repositoryFor = SimpleObject.class
- )
- @DomainServiceLayout(
- menuOrder = "10"
+ objectType = "simple.SimpleObjects"
)
public class SimpleObjects {
-- @Action(semantics = SemanticsOf.SAFE)
-- @ActionLayout(bookmarking = BookmarkPolicy.AS_ROOT)
- @MemberOrder(sequence = "1")
-- public List<SimpleObject> listAll() {
-- return repositoryService.allInstances(SimpleObject.class);
++ public static class CreateDomainEvent extends ActionDomainEvent<SimpleObjects> {}
++ @Action(domainEvent = CreateDomainEvent.class)
++ @ActionLayout(promptStyle = PromptStyle.DIALOG_MODAL)
++ public SimpleObject create(
++ @Name final String name
++ ) {
++ return repositoryService.persist(new SimpleObject(name));
}
--
@Action(semantics = SemanticsOf.SAFE)
@ActionLayout(bookmarking = BookmarkPolicy.AS_ROOT, promptStyle = PromptStyle.DIALOG_SIDEBAR)
- @MemberOrder(sequence = "2")
public List<SimpleObject> findByName(
- @ParameterLayout(named="Name")
- final String name
+ @Name final String name
) {
- JDOQLTypedQuery<SimpleObject> q = isisJdoSupport.newTypesafeQuery(SimpleObject.class);
- TypesafeQuery<SimpleObject> q = isisJdoSupport.newTypesafeQuery(SimpleObject.class);
++ JDOQLTypedQuery<SimpleObject> q = isisJdoSupport.newTypesafeQuery(SimpleObject.class);
final QSimpleObject cand = QSimpleObject.candidate();
q = q.filter(
cand.name.indexOf(q.stringParameter("name")).ne(-1)
@@@ -71,20 -62,8 +64,8 @@@
.executeList();
}
- public static class CreateDomainEvent extends ActionDomainEvent<SimpleObjects> {}
- @Action(domainEvent = CreateDomainEvent.class)
- @ActionLayout(promptStyle = PromptStyle.DIALOG_MODAL)
- @MemberOrder(sequence = "3")
- public SimpleObject create(
- @Name final String name
- ) {
- return repositoryService.persist(new SimpleObject(name));
- }
-
-
- @Programmatic
public SimpleObject findByNameExact(final String name) {
- TypesafeQuery<SimpleObject> q = isisJdoSupport.newTypesafeQuery(SimpleObject.class);
+ JDOQLTypedQuery<SimpleObject> q = isisJdoSupport.newTypesafeQuery(SimpleObject.class);
final QSimpleObject cand = QSimpleObject.candidate();
q = q.filter(
cand.name.eq(q.stringParameter("name"))
@@@ -93,16 -72,23 +74,20 @@@
.executeUnique();
}
- @Programmatic
++ @Action(semantics = SemanticsOf.SAFE)
++ @ActionLayout(bookmarking = BookmarkPolicy.AS_ROOT)
++ public List<SimpleObject> listAll() {
++ return repositoryService.allInstances(SimpleObject.class);
++ }
++
public void ping() {
- TypesafeQuery<SimpleObject> q = isisJdoSupport.newTypesafeQuery(SimpleObject.class);
+ JDOQLTypedQuery<SimpleObject> q = isisJdoSupport.newTypesafeQuery(SimpleObject.class);
final QSimpleObject candidate = QSimpleObject.candidate();
q.range(0,2);
q.orderBy(candidate.name.asc());
q.executeList();
}
- public static class CreateDomainEvent extends ActionDomainEvent<SimpleObjects> {}
- @Action(domainEvent = CreateDomainEvent.class)
- @ActionLayout(promptStyle = PromptStyle.DIALOG_MODAL)
- public SimpleObject create(
- @ParameterLayout(named="Name")
- final String name) {
- return repositoryService.persist(new SimpleObject(name));
- }
--
@javax.inject.Inject
RepositoryService repositoryService;