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/31 05:41:52 UTC
[isis] branch dev/2.0.0/ISIS-1632-meta-annotations updated:
ISIS-1632: some minor simplifications to the simple app
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1632-meta-annotations
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/dev/2.0.0/ISIS-1632-meta-annotations by this push:
new e14b667 ISIS-1632: some minor simplifications to the simple app
e14b667 is described below
commit e14b6673d00796d7d9bf22f4cfb9269abc066d7e
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 31 05:41:42 2017 +0000
ISIS-1632: some minor simplifications to the simple app
---
.../modules/simple/dom/impl/SimpleObject.java | 23 +++++++++-------------
.../simple/dom/impl/SimpleObjectRepository.java | 2 +-
.../modules/simple/dom/impl/SimpleObject_Test.java | 2 +-
example/application/simpleapp/pom.xml | 6 +++---
4 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
index 8936f54..0e298c0 100644
--- a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
+++ b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
@@ -21,6 +21,8 @@ package domainapp.modules.simple.dom.impl;
import javax.jdo.annotations.IdentityType;
import javax.jdo.annotations.VersionStrategy;
+import com.google.common.collect.Ordering;
+
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.DomainObjectLayout;
@@ -31,10 +33,9 @@ import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.title.TitleService;
-import org.apache.isis.applib.util.ObjectContracts;
import domainapp.modules.simple.dom.types.Name;
-import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
@javax.jdo.annotations.PersistenceCapable(
identityType=IdentityType.DATASTORE,
@@ -55,35 +56,32 @@ import lombok.AccessLevel;
})
@javax.jdo.annotations.Unique(name="SimpleObject_name_UNQ", members = {"name"})
@DomainObject() // objectType inferred from @PersistenceCapable#schema
-@DomainObjectLayout() // trigger events etc.
-@lombok.Getter @lombok.Setter
-@lombok.RequiredArgsConstructor(staticName = "create")
+@DomainObjectLayout() // to trigger UI events
+@RequiredArgsConstructor
public class SimpleObject implements Comparable<SimpleObject> {
@javax.jdo.annotations.Column(allowsNull = "false", length = Name.MAX_LEN)
- @lombok.NonNull
+ @lombok.Getter @lombok.Setter @lombok.NonNull
@Title(prepend = "Object: ")
@Name private String name;
@javax.jdo.annotations.Column(allowsNull = "true", length = 4000)
+ @lombok.Getter @lombok.Setter
@Property(editing = Editing.ENABLED)
private String notes;
- //region > updateName (action)
@Action(semantics = SemanticsOf.IDEMPOTENT)
public SimpleObject updateName(
@Name final String name) {
setName(name);
return this;
}
-
public String default0UpdateName() {
return getName();
}
- //endregion
//region > delete (action)
@Action(semantics = SemanticsOf.NON_IDEMPOTENT_ARE_YOU_SURE)
@@ -98,26 +96,23 @@ public class SimpleObject implements Comparable<SimpleObject> {
//region > toString, compareTo
@Override
public String toString() {
- return ObjectContracts.toString(this, "name");
+ return getName();
}
@Override
public int compareTo(final SimpleObject other) {
- return ObjectContracts.compare(this, other, "name");
+ return Ordering.natural().onResultOf(SimpleObject::getName).compare(this, other);
}
//endregion
//region > injected services
@javax.inject.Inject
- @lombok.Getter(AccessLevel.NONE) @lombok.Setter(AccessLevel.NONE)
RepositoryService repositoryService;
@javax.inject.Inject
- @lombok.Getter(AccessLevel.NONE) @lombok.Setter(AccessLevel.NONE)
TitleService titleService;
@javax.inject.Inject
- @lombok.Getter(AccessLevel.NONE) @lombok.Setter(AccessLevel.NONE)
MessageService messageService;
//endregion
diff --git a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjectRepository.java b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjectRepository.java
index aaafaf5..b249f45 100644
--- a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjectRepository.java
+++ b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjectRepository.java
@@ -45,7 +45,7 @@ public class SimpleObjectRepository {
}
public SimpleObject create(final String name) {
- return repositoryService.persist(SimpleObject.create(name));
+ return repositoryService.persist(new SimpleObject(name));
}
@javax.inject.Inject
diff --git a/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObject_Test.java b/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObject_Test.java
index 132269b..d228676 100644
--- a/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObject_Test.java
+++ b/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObject_Test.java
@@ -27,7 +27,7 @@ public class SimpleObject_Test {
@Before
public void setUp() throws Exception {
- simpleObject = SimpleObject.create("Foobar");
+ simpleObject = new SimpleObject("Foobar");
}
public static class Name extends SimpleObject_Test {
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index e74d749..c488ee2 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -44,9 +44,9 @@
<lombok.version>1.16.18</lombok.version>
- <compiler-plugin.source>1.7</compiler-plugin.source>
- <compiler-plugin.target>1.7</compiler-plugin.target>
- <compiler-plugin.compilerArgument></compiler-plugin.compilerArgument>
+ <compiler-plugin.source>1.8</compiler-plugin.source>
+ <compiler-plugin.target>1.8</compiler-plugin.target>
+ <compiler-plugin.compilerArgument>-parameters</compiler-plugin.compilerArgument>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
--
To stop receiving notification emails like this one, please contact
['"commits@isis.apache.org" <co...@isis.apache.org>'].