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/09/29 06:25:44 UTC
[isis-app-demo] 04/23: renames SimpleObject to PetOwner
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git
commit 42671ef1186b36a18fde34d32f3a24e66854bd22
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 06:40:02 2021 +0100
renames SimpleObject to PetOwner
---
README.adoc | 2 +-
.../{SimpleObject_Test.java => PetOwner_Test.java} | 8 ++++----
.../modules/simple/dom/so/SimpleObjects_Test.java | 10 ++++-----
...ject_IntegTest.java => PetOwner_IntegTest.java} | 24 +++++++++++-----------
.../integtests/tests/SimpleObjects_IntegTest.java | 8 ++++----
.../domainapp/modules/simple/SimpleModule.java | 4 ++--
.../dom/so/{SimpleObject.java => PetOwner.java} | 22 ++++++++++----------
.../simple/dom/so/SimpleObjectRepository.java | 6 +++---
.../modules/simple/dom/so/SimpleObjects.java | 22 ++++++++++----------
.../simple/fixture/SimpleObjectBuilder.java | 6 +++---
.../simple/fixture/SimpleObject_persona.java | 8 ++++----
.../webapp/integtests/smoke/Smoke_IntegTest.java | 8 ++++----
.../services/homepage/HomePageViewModel.java | 4 ++--
.../webapp/custom/restapi/CustomController.java | 6 +++---
.../domainapp/webapp/quartz/job/SampleJob.java | 8 ++++----
15 files changed, 73 insertions(+), 73 deletions(-)
diff --git a/README.adoc b/README.adoc
index 47808f9..f17e6d0 100644
--- a/README.adoc
+++ b/README.adoc
@@ -83,7 +83,7 @@ The following table explains the contents of each of the directories:
|Description
|`module-simple`
-|Holds the "simple" module, consisting of the `SimpleObject` entity and supporting services.
+|Holds the "simple" module, consisting of the `PetOwner` entity and supporting services.
It also contains module-specific unit- and integration tests.
[TIP]
diff --git a/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObject_Test.java b/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/PetOwner_Test.java
similarity index 94%
rename from module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObject_Test.java
rename to module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/PetOwner_Test.java
index 922b077..efcec71 100644
--- a/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObject_Test.java
+++ b/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/PetOwner_Test.java
@@ -16,17 +16,17 @@ import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.title.TitleService;
@ExtendWith(MockitoExtension.class)
-class SimpleObject_Test {
+class PetOwner_Test {
@Mock TitleService mockTitleService;
@Mock MessageService mockMessageService;
@Mock RepositoryService mockRepositoryService;
- SimpleObject object;
+ PetOwner object;
@BeforeEach
public void setUp() throws Exception {
- object = SimpleObject.withName("Foo");
+ object = PetOwner.withName("Foo");
object.titleService = mockTitleService;
object.messageService = mockMessageService;
object.repositoryService = mockRepositoryService;
@@ -68,4 +68,4 @@ class SimpleObject_Test {
verify(mockRepositoryService).removeAndFlush(object);
}
}
-}
\ No newline at end of file
+}
diff --git a/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java b/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java
index 88eaeb0..3807963 100644
--- a/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java
+++ b/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java
@@ -45,11 +45,11 @@ class SimpleObjects_Test {
// expect
when(mockRepositoryService.persist(
- argThat((ArgumentMatcher<SimpleObject>) simpleObject -> Objects.equals(simpleObject.getName(), someName)))
- ).then((Answer<SimpleObject>) invocation -> invocation.getArgument(0));
+ argThat((ArgumentMatcher<PetOwner>) simpleObject -> Objects.equals(simpleObject.getName(), someName)))
+ ).then((Answer<PetOwner>) invocation -> invocation.getArgument(0));
// when
- final SimpleObject obj = objects.create(someName);
+ final PetOwner obj = objects.create(someName);
// then
assertThat(obj).isNotNull();
@@ -64,14 +64,14 @@ class SimpleObjects_Test {
void happyCase() {
// given
- final List<SimpleObject> all = new ArrayList<>();
+ final List<PetOwner> all = new ArrayList<>();
// expecting
when(mockSimpleObjectRepository.findAll())
.thenReturn(all);
// when
- final List<SimpleObject> list = objects.listAll();
+ final List<PetOwner> list = objects.listAll();
// then
assertThat(list).isEqualTo(all);
diff --git a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwner_IntegTest.java
similarity index 67%
rename from module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
rename to module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwner_IntegTest.java
index 761bb86..7fab3b6 100644
--- a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
+++ b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwner_IntegTest.java
@@ -11,32 +11,32 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.isis.applib.services.wrapper.DisabledException;
import org.apache.isis.applib.services.wrapper.InvalidException;
-import domainapp.modules.simple.dom.so.SimpleObject;
+import domainapp.modules.simple.dom.so.PetOwner;
import domainapp.modules.simple.fixture.SimpleObject_persona;
import domainapp.modules.simple.integtests.SimpleModuleIntegTestAbstract;
@Transactional
-public class SimpleObject_IntegTest extends SimpleModuleIntegTestAbstract {
+public class PetOwner_IntegTest extends SimpleModuleIntegTestAbstract {
- SimpleObject simpleObject;
+ PetOwner petOwner;
@BeforeEach
public void setUp() {
// given
- simpleObject = fixtureScripts.runPersona(SimpleObject_persona.FOO);
+ petOwner = fixtureScripts.runPersona(SimpleObject_persona.FOO);
}
@Nested
- public static class name extends SimpleObject_IntegTest {
+ public static class name extends PetOwner_IntegTest {
@Test
public void accessible() {
// when
- final String name = wrap(simpleObject).getName();
+ final String name = wrap(petOwner).getName();
// then
- assertThat(name).isEqualTo(simpleObject.getName());
+ assertThat(name).isEqualTo(petOwner.getName());
}
@Test
@@ -46,25 +46,25 @@ public class SimpleObject_IntegTest extends SimpleModuleIntegTestAbstract {
assertThrows(DisabledException.class, ()->{
// when
- wrap(simpleObject).setName("new name");
+ wrap(petOwner).setName("new name");
});
}
}
@Nested
- public static class updateName extends SimpleObject_IntegTest {
+ public static class updateName extends PetOwner_IntegTest {
@Test
public void can_be_updated_directly() {
// when
- wrap(simpleObject).updateName("new name");
+ wrap(petOwner).updateName("new name");
transactionService.flushTransaction();
// then
- assertThat(wrap(simpleObject).getName()).isEqualTo("new name");
+ assertThat(wrap(petOwner).getName()).isEqualTo("new name");
}
@Test
@@ -74,7 +74,7 @@ public class SimpleObject_IntegTest extends SimpleModuleIntegTestAbstract {
InvalidException cause = assertThrows(InvalidException.class, ()->{
// when
- wrap(simpleObject).updateName("new name!");
+ wrap(petOwner).updateName("new name!");
});
// then
diff --git a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
index fdd26c2..fa1bf86 100644
--- a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
+++ b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
@@ -15,7 +15,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.isis.testing.unittestsupport.applib.matchers.ThrowableMatchers;
-import domainapp.modules.simple.dom.so.SimpleObject;
+import domainapp.modules.simple.dom.so.PetOwner;
import domainapp.modules.simple.dom.so.SimpleObjects;
import domainapp.modules.simple.fixture.SimpleObject_persona;
import domainapp.modules.simple.integtests.SimpleModuleIntegTestAbstract;
@@ -37,7 +37,7 @@ public class SimpleObjects_IntegTest extends SimpleModuleIntegTestAbstract {
transactionService.flushTransaction();
// when
- final List<SimpleObject> all = wrap(menu).listAll();
+ final List<PetOwner> all = wrap(menu).listAll();
// then
assertThat(all).hasSize(SimpleObject_persona.values().length);
@@ -47,7 +47,7 @@ public class SimpleObjects_IntegTest extends SimpleModuleIntegTestAbstract {
public void whenNone() {
// when
- final List<SimpleObject> all = wrap(menu).listAll();
+ final List<PetOwner> all = wrap(menu).listAll();
// then
assertThat(all).hasSize(0);
@@ -63,7 +63,7 @@ public class SimpleObjects_IntegTest extends SimpleModuleIntegTestAbstract {
wrap(menu).create("Faz");
// then
- final List<SimpleObject> all = wrap(menu).listAll();
+ final List<PetOwner> all = wrap(menu).listAll();
assertThat(all).hasSize(1);
}
diff --git a/module-pets/src/main/java/domainapp/modules/simple/SimpleModule.java b/module-pets/src/main/java/domainapp/modules/simple/SimpleModule.java
index e547259..20f66be 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/SimpleModule.java
+++ b/module-pets/src/main/java/domainapp/modules/simple/SimpleModule.java
@@ -8,7 +8,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixtures;
-import domainapp.modules.simple.dom.so.SimpleObject;
+import domainapp.modules.simple.dom.so.PetOwner;
@Configuration
@ComponentScan
@@ -21,7 +21,7 @@ public class SimpleModule implements ModuleWithFixtures {
return new FixtureScript() {
@Override
protected void execute(ExecutionContext executionContext) {
- repositoryService.removeAll(SimpleObject.class);
+ repositoryService.removeAll(PetOwner.class);
}
};
}
diff --git a/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java b/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.java
similarity index 86%
rename from module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
rename to module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.java
index 094b99b..fb2d8c3 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
+++ b/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.java
@@ -43,21 +43,21 @@ import domainapp.modules.simple.types.Notes;
)
@javax.persistence.NamedQueries({
@javax.persistence.NamedQuery(
- name = SimpleObject.NAMED_QUERY__FIND_BY_NAME_LIKE,
+ name = PetOwner.NAMED_QUERY__FIND_BY_NAME_LIKE,
query = "SELECT so " +
- "FROM SimpleObject so " +
+ "FROM PetOwner so " +
"WHERE so.name LIKE :name"
)
})
@javax.persistence.EntityListeners(IsisEntityListener.class)
-@DomainObject(logicalTypeName = "simple.SimpleObject", entityChangePublishing = Publishing.ENABLED)
+@DomainObject(logicalTypeName = "simple.PetOwner", entityChangePublishing = Publishing.ENABLED)
@DomainObjectLayout()
@NoArgsConstructor(access = AccessLevel.PUBLIC)
@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
@ToString(onlyExplicitlyIncluded = true)
-public class SimpleObject implements Comparable<SimpleObject> {
+public class PetOwner implements Comparable<PetOwner> {
- static final String NAMED_QUERY__FIND_BY_NAME_LIKE = "SimpleObject.findByNameLike";
+ static final String NAMED_QUERY__FIND_BY_NAME_LIKE = "PetOwner.findByNameLike";
@javax.persistence.Id
@javax.persistence.GeneratedValue(strategy = javax.persistence.GenerationType.AUTO)
@@ -70,8 +70,8 @@ public class SimpleObject implements Comparable<SimpleObject> {
@Getter @Setter
private long version;
- public static SimpleObject withName(String name) {
- val simpleObject = new SimpleObject();
+ public static PetOwner withName(String name) {
+ val simpleObject = new PetOwner();
simpleObject.setName(name);
return simpleObject;
}
@@ -99,7 +99,7 @@ public class SimpleObject implements Comparable<SimpleObject> {
@Action(semantics = IDEMPOTENT, commandPublishing = Publishing.ENABLED, executionPublishing = Publishing.ENABLED)
@ActionLayout(associateWith = "name", promptStyle = PromptStyle.INLINE)
- public SimpleObject updateName(
+ public PetOwner updateName(
@Name final String name) {
setName(name);
return this;
@@ -129,11 +129,11 @@ public class SimpleObject implements Comparable<SimpleObject> {
- private final static Comparator<SimpleObject> comparator =
- Comparator.comparing(SimpleObject::getName);
+ private final static Comparator<PetOwner> comparator =
+ Comparator.comparing(PetOwner::getName);
@Override
- public int compareTo(final SimpleObject other) {
+ public int compareTo(final PetOwner other) {
return comparator.compare(this, other);
}
diff --git a/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObjectRepository.java b/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObjectRepository.java
index 77d34a1..c0b7fe7 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObjectRepository.java
+++ b/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObjectRepository.java
@@ -4,10 +4,10 @@ import java.util.List;
import org.springframework.data.jpa.repository.JpaRepository;
-public interface SimpleObjectRepository extends JpaRepository<SimpleObject, Long> {
+public interface SimpleObjectRepository extends JpaRepository<PetOwner, Long> {
- List<SimpleObject> findByNameContaining(final String name);
+ List<PetOwner> findByNameContaining(final String name);
- SimpleObject findByName(final String name);
+ PetOwner findByName(final String name);
}
diff --git a/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java b/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java
index 218d00b..f1b7770 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java
+++ b/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java
@@ -35,25 +35,25 @@ public class SimpleObjects {
@Action(semantics = SemanticsOf.NON_IDEMPOTENT)
@ActionLayout(promptStyle = PromptStyle.DIALOG_SIDEBAR)
- public SimpleObject create(
+ public PetOwner create(
@Name final String name) {
- return repositoryService.persist(SimpleObject.withName(name));
+ return repositoryService.persist(PetOwner.withName(name));
}
@Action(semantics = SemanticsOf.NON_IDEMPOTENT)
@ActionLayout(promptStyle = PromptStyle.DIALOG_SIDEBAR)
- public List<SimpleObject> findByNameLike(
+ public List<PetOwner> findByNameLike(
@Name final String name) {
return repositoryService.allMatches(
- Query.named(SimpleObject.class, SimpleObject.NAMED_QUERY__FIND_BY_NAME_LIKE)
+ Query.named(PetOwner.class, PetOwner.NAMED_QUERY__FIND_BY_NAME_LIKE)
.withParameter("name", "%" + name + "%"));
}
@Action(semantics = SemanticsOf.SAFE)
@ActionLayout(bookmarking = BookmarkPolicy.AS_ROOT, promptStyle = PromptStyle.DIALOG_SIDEBAR)
- public List<SimpleObject> findByName(
+ public List<PetOwner> findByName(
@Name final String name
) {
return simpleObjectRepository.findByNameContaining(name);
@@ -61,7 +61,7 @@ public class SimpleObjects {
@Programmatic
- public SimpleObject findByNameExact(final String name) {
+ public PetOwner findByNameExact(final String name) {
return simpleObjectRepository.findByName(name);
}
@@ -69,7 +69,7 @@ public class SimpleObjects {
@Action(semantics = SemanticsOf.SAFE)
@ActionLayout(bookmarking = BookmarkPolicy.AS_ROOT)
- public List<SimpleObject> listAll() {
+ public List<PetOwner> listAll() {
return simpleObjectRepository.findAll();
}
@@ -78,11 +78,11 @@ public class SimpleObjects {
@Programmatic
public void ping() {
- jpaSupportService.getEntityManager(SimpleObject.class)
+ jpaSupportService.getEntityManager(PetOwner.class)
.ifSuccess(entityManager -> {
- final TypedQuery<SimpleObject> q = entityManager.createQuery(
- "SELECT p FROM SimpleObject p ORDER BY p.name",
- SimpleObject.class)
+ final TypedQuery<PetOwner> q = entityManager.createQuery(
+ "SELECT p FROM PetOwner p ORDER BY p.name",
+ PetOwner.class)
.setMaxResults(1);
q.getResultList();
});
diff --git a/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java b/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java
index 80223be..be7d65c 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java
+++ b/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java
@@ -4,20 +4,20 @@ import javax.inject.Inject;
import org.apache.isis.testing.fixtures.applib.personas.BuilderScriptWithResult;
-import domainapp.modules.simple.dom.so.SimpleObject;
+import domainapp.modules.simple.dom.so.PetOwner;
import domainapp.modules.simple.dom.so.SimpleObjects;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
@Accessors(chain = true)
-public class SimpleObjectBuilder extends BuilderScriptWithResult<SimpleObject> {
+public class SimpleObjectBuilder extends BuilderScriptWithResult<PetOwner> {
@Getter @Setter
private String name;
@Override
- protected SimpleObject buildResult(final ExecutionContext ec) {
+ protected PetOwner buildResult(final ExecutionContext ec) {
checkParam("name", ec, String.class);
diff --git a/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java b/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java
index 41a5aec..e1ebb5b 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java
+++ b/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java
@@ -5,13 +5,13 @@ import org.apache.isis.testing.fixtures.applib.personas.PersonaWithBuilderScript
import org.apache.isis.testing.fixtures.applib.personas.PersonaWithFinder;
import org.apache.isis.testing.fixtures.applib.setup.PersonaEnumPersistAll;
-import domainapp.modules.simple.dom.so.SimpleObject;
+import domainapp.modules.simple.dom.so.PetOwner;
import domainapp.modules.simple.dom.so.SimpleObjects;
import lombok.AllArgsConstructor;
@AllArgsConstructor
public enum SimpleObject_persona
-implements PersonaWithBuilderScript<SimpleObjectBuilder>, PersonaWithFinder<SimpleObject> {
+implements PersonaWithBuilderScript<SimpleObjectBuilder>, PersonaWithFinder<PetOwner> {
FOO("Foo"),
BAR("Bar"),
@@ -32,13 +32,13 @@ implements PersonaWithBuilderScript<SimpleObjectBuilder>, PersonaWithFinder<Simp
}
@Override
- public SimpleObject findUsing(final ServiceRegistry serviceRegistry) {
+ public PetOwner findUsing(final ServiceRegistry serviceRegistry) {
SimpleObjects simpleObjects = serviceRegistry.lookupService(SimpleObjects.class).orElse(null);
return simpleObjects.findByNameExact(name);
}
public static class PersistAll
- extends PersonaEnumPersistAll<SimpleObject_persona, SimpleObject> {
+ extends PersonaEnumPersistAll<SimpleObject_persona, PetOwner> {
public PersistAll() {
super(SimpleObject_persona.class);
diff --git a/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java b/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java
index f8c5b56..6aea04a 100644
--- a/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java
+++ b/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java
@@ -13,8 +13,8 @@ import org.apache.isis.applib.services.xactn.TransactionService;
import static org.assertj.core.api.Assertions.assertThat;
+import domainapp.modules.simple.dom.so.PetOwner;
import domainapp.webapp.integtests.WebAppIntegTestAbstract;
-import domainapp.modules.simple.dom.so.SimpleObject;
import domainapp.modules.simple.dom.so.SimpleObjects;
@Transactional
@@ -27,14 +27,14 @@ class Smoke_IntegTest extends WebAppIntegTestAbstract {
void happy_case() {
// when
- List<SimpleObject> all = wrap(menu).listAll();
+ List<PetOwner> all = wrap(menu).listAll();
// then
assertThat(all).isEmpty();
// when
- final SimpleObject fred = wrap(menu).create("Fred");
+ final PetOwner fred = wrap(menu).create("Fred");
transactionService.flushTransaction();
// then
@@ -44,7 +44,7 @@ class Smoke_IntegTest extends WebAppIntegTestAbstract {
// when
- final SimpleObject bill = wrap(menu).create("Bill");
+ final PetOwner bill = wrap(menu).create("Bill");
transactionService.flushTransaction();
// then
diff --git a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
index bfb4dca..6cbc1c8 100644
--- a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
+++ b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
@@ -9,7 +9,7 @@ import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.annotation.HomePage;
import org.apache.isis.applib.annotation.Nature;
-import domainapp.modules.simple.dom.so.SimpleObject;
+import domainapp.modules.simple.dom.so.PetOwner;
import domainapp.modules.simple.dom.so.SimpleObjects;
@DomainObject(
@@ -24,7 +24,7 @@ public class HomePageViewModel {
return getObjects().size() + " objects";
}
- public List<SimpleObject> getObjects() {
+ public List<PetOwner> getObjects() {
return simpleObjects.listAll();
}
diff --git a/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java b/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
index 33c2ee5..ec16251 100644
--- a/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
+++ b/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
@@ -17,7 +17,7 @@ import org.apache.isis.applib.services.xactn.TransactionalProcessor;
import lombok.RequiredArgsConstructor;
-import domainapp.modules.simple.dom.so.SimpleObject;
+import domainapp.modules.simple.dom.so.PetOwner;
import domainapp.modules.simple.dom.so.SimpleObjects;
@RestController
@@ -29,9 +29,9 @@ class CustomController {
private final SimpleObjects simpleObjects;
@GetMapping("/custom/simpleObjects")
- List<SimpleObject> all() {
+ List<PetOwner> all() {
return call("sven", simpleObjects::listAll)
- .orElse(Collections.<SimpleObject>emptyList());
+ .orElse(Collections.<PetOwner>emptyList());
}
private <T> Optional<T> call(
diff --git a/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java b/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
index d112ae9..4249d81 100644
--- a/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
+++ b/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
@@ -20,7 +20,7 @@ import org.apache.isis.applib.services.xactn.TransactionalProcessor;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
-import domainapp.modules.simple.dom.so.SimpleObject;
+import domainapp.modules.simple.dom.so.PetOwner;
import domainapp.modules.simple.dom.so.SimpleObjects;
@Component
@@ -34,13 +34,13 @@ public class SampleJob implements Job {
@Override
public void execute(JobExecutionContext context) throws JobExecutionException {
- final List<SimpleObject> all = all();
+ final List<PetOwner> all = all();
log.info("{} objects in the database", all.size());
}
- List<SimpleObject> all() {
+ List<PetOwner> all() {
return call("sven", simpleObjects::listAll)
- .orElse(Collections.<SimpleObject>emptyList());
+ .orElse(Collections.<PetOwner>emptyList());
}
private <T> Optional<T> call(