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:50 UTC
[isis-app-demo] 10/23: renames SimpleObjects to PetOwners
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 0bfe93796395d3fe1e66ce5316d8c716f9ca3fbe
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 06:53:47 2021 +0100
renames SimpleObjects to PetOwners
---
.../dom/so/{SimpleObjects_Test.java => PetOwners_Test.java} | 6 +++---
.../{SimpleObjects_IntegTest.java => PetOwners_IntegTest.java} | 10 +++++-----
.../simple/dom/so/{SimpleObjects.java => PetOwners.java} | 4 ++--
.../domainapp/modules/simple/fixture/SimpleObjectBuilder.java | 7 ++++---
.../domainapp/modules/simple/fixture/SimpleObject_persona.java | 7 ++++---
.../domainapp/webapp/integtests/smoke/Smoke_IntegTest.java | 4 ++--
.../application/services/health/HealthCheckServiceImpl.java | 10 +++++-----
.../application/services/homepage/HomePageViewModel.java | 6 +++---
.../java/domainapp/webapp/custom/restapi/CustomController.java | 6 +++---
.../src/main/java/domainapp/webapp/quartz/job/SampleJob.java | 6 +++---
10 files changed, 34 insertions(+), 32 deletions(-)
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/PetOwners_Test.java
similarity index 92%
rename from module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java
rename to module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/PetOwners_Test.java
index 3807963..a18d82c 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/PetOwners_Test.java
@@ -21,17 +21,17 @@ import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.persistence.jpa.applib.services.JpaSupportService;
@ExtendWith(MockitoExtension.class)
-class SimpleObjects_Test {
+class PetOwners_Test {
@Mock RepositoryService mockRepositoryService;
@Mock JpaSupportService mockJpaSupportService;
@Mock SimpleObjectRepository mockSimpleObjectRepository;
- SimpleObjects objects;
+ PetOwners objects;
@BeforeEach
public void setUp() {
- objects = new SimpleObjects(mockRepositoryService, mockJpaSupportService, mockSimpleObjectRepository);
+ objects = new PetOwners(mockRepositoryService, mockJpaSupportService, mockSimpleObjectRepository);
}
@Nested
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/PetOwners_IntegTest.java
similarity index 88%
rename from module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
rename to module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwners_IntegTest.java
index fa1bf86..0c15972 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/PetOwners_IntegTest.java
@@ -16,18 +16,18 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.isis.testing.unittestsupport.applib.matchers.ThrowableMatchers;
import domainapp.modules.simple.dom.so.PetOwner;
-import domainapp.modules.simple.dom.so.SimpleObjects;
+import domainapp.modules.simple.dom.so.PetOwners;
import domainapp.modules.simple.fixture.SimpleObject_persona;
import domainapp.modules.simple.integtests.SimpleModuleIntegTestAbstract;
@Transactional
-public class SimpleObjects_IntegTest extends SimpleModuleIntegTestAbstract {
+public class PetOwners_IntegTest extends SimpleModuleIntegTestAbstract {
@Inject
- SimpleObjects menu;
+ PetOwners menu;
@Nested
- public static class listAll extends SimpleObjects_IntegTest {
+ public static class listAll extends PetOwners_IntegTest {
@Test
public void happyCase() {
@@ -55,7 +55,7 @@ public class SimpleObjects_IntegTest extends SimpleModuleIntegTestAbstract {
}
@Nested
- public static class create extends SimpleObjects_IntegTest {
+ public static class create extends PetOwners_IntegTest {
@Test
public void happyCase() {
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/PetOwners.java
similarity index 97%
rename from module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java
rename to module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwners.java
index f1b7770..a8d44be 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/PetOwners.java
@@ -22,11 +22,11 @@ import domainapp.modules.simple.types.Name;
@DomainService(
nature = NatureOfService.VIEW,
- logicalTypeName = "simple.SimpleObjects"
+ logicalTypeName = "simple.PetOwners"
)
@javax.annotation.Priority(PriorityPrecedence.EARLY)
@lombok.RequiredArgsConstructor(onConstructor_ = {@Inject} )
-public class SimpleObjects {
+public class PetOwners {
final RepositoryService repositoryService;
final JpaSupportService jpaSupportService;
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 be7d65c..dcf5c94 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
@@ -5,7 +5,8 @@ import javax.inject.Inject;
import org.apache.isis.testing.fixtures.applib.personas.BuilderScriptWithResult;
import domainapp.modules.simple.dom.so.PetOwner;
-import domainapp.modules.simple.dom.so.SimpleObjects;
+import domainapp.modules.simple.dom.so.PetOwners;
+
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
@@ -21,11 +22,11 @@ public class SimpleObjectBuilder extends BuilderScriptWithResult<PetOwner> {
checkParam("name", ec, String.class);
- return wrap(simpleObjects).create(name);
+ return wrap(petOwners).create(name);
}
// -- DEPENDENCIES
- @Inject SimpleObjects simpleObjects;
+ @Inject PetOwners petOwners;
}
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 e1ebb5b..f385997 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
@@ -6,7 +6,8 @@ import org.apache.isis.testing.fixtures.applib.personas.PersonaWithFinder;
import org.apache.isis.testing.fixtures.applib.setup.PersonaEnumPersistAll;
import domainapp.modules.simple.dom.so.PetOwner;
-import domainapp.modules.simple.dom.so.SimpleObjects;
+import domainapp.modules.simple.dom.so.PetOwners;
+
import lombok.AllArgsConstructor;
@AllArgsConstructor
@@ -33,8 +34,8 @@ implements PersonaWithBuilderScript<SimpleObjectBuilder>, PersonaWithFinder<PetO
@Override
public PetOwner findUsing(final ServiceRegistry serviceRegistry) {
- SimpleObjects simpleObjects = serviceRegistry.lookupService(SimpleObjects.class).orElse(null);
- return simpleObjects.findByNameExact(name);
+ PetOwners petOwners = serviceRegistry.lookupService(PetOwners.class).orElse(null);
+ return petOwners.findByNameExact(name);
}
public static class PersistAll
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 6aea04a..2d5a057 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
@@ -15,12 +15,12 @@ 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.SimpleObjects;
+import domainapp.modules.simple.dom.so.PetOwners;
@Transactional
class Smoke_IntegTest extends WebAppIntegTestAbstract {
- @Inject SimpleObjects menu;
+ @Inject PetOwners menu;
@Inject TransactionService transactionService;
@Test
diff --git a/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java b/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
index 4f16352..6ae3bed 100644
--- a/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
+++ b/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
@@ -8,23 +8,23 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.services.health.Health;
import org.apache.isis.applib.services.health.HealthCheckService;
-import domainapp.modules.simple.dom.so.SimpleObjects;
+import domainapp.modules.simple.dom.so.PetOwners;
@Service
@Named("domainapp.HealthCheckServiceImpl")
public class HealthCheckServiceImpl implements HealthCheckService {
- private final SimpleObjects simpleObjects;
+ private final PetOwners petOwners;
@Inject
- public HealthCheckServiceImpl(SimpleObjects simpleObjects) {
- this.simpleObjects = simpleObjects;
+ public HealthCheckServiceImpl(PetOwners petOwners) {
+ this.petOwners = petOwners;
}
@Override
public Health check() {
try {
- simpleObjects.ping();
+ petOwners.ping();
return Health.ok();
} catch (Exception ex) {
return Health.error(ex);
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 6cbc1c8..4963f86 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
@@ -10,7 +10,7 @@ import org.apache.isis.applib.annotation.HomePage;
import org.apache.isis.applib.annotation.Nature;
import domainapp.modules.simple.dom.so.PetOwner;
-import domainapp.modules.simple.dom.so.SimpleObjects;
+import domainapp.modules.simple.dom.so.PetOwners;
@DomainObject(
nature = Nature.VIEW_MODEL,
@@ -25,8 +25,8 @@ public class HomePageViewModel {
}
public List<PetOwner> getObjects() {
- return simpleObjects.listAll();
+ return petOwners.listAll();
}
- @Inject SimpleObjects simpleObjects;
+ @Inject PetOwners petOwners;
}
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 ec16251..a43598b 100644
--- a/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
+++ b/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
@@ -18,7 +18,7 @@ import org.apache.isis.applib.services.xactn.TransactionalProcessor;
import lombok.RequiredArgsConstructor;
import domainapp.modules.simple.dom.so.PetOwner;
-import domainapp.modules.simple.dom.so.SimpleObjects;
+import domainapp.modules.simple.dom.so.PetOwners;
@RestController
@RequiredArgsConstructor(onConstructor_ = {@Inject})
@@ -26,11 +26,11 @@ class CustomController {
private final InteractionService interactionService;
private final TransactionalProcessor transactionalProcessor;
- private final SimpleObjects simpleObjects;
+ private final PetOwners petOwners;
@GetMapping("/custom/simpleObjects")
List<PetOwner> all() {
- return call("sven", simpleObjects::listAll)
+ return call("sven", petOwners::listAll)
.orElse(Collections.<PetOwner>emptyList());
}
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 4249d81..b7adf92 100644
--- a/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
+++ b/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
@@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import domainapp.modules.simple.dom.so.PetOwner;
-import domainapp.modules.simple.dom.so.SimpleObjects;
+import domainapp.modules.simple.dom.so.PetOwners;
@Component
@RequiredArgsConstructor(onConstructor_ = {@Inject})
@@ -30,7 +30,7 @@ public class SampleJob implements Job {
private final InteractionService interactionService;
private final TransactionalProcessor transactionalProcessor;
- private final SimpleObjects simpleObjects;
+ private final PetOwners petOwners;
@Override
public void execute(JobExecutionContext context) throws JobExecutionException {
@@ -39,7 +39,7 @@ public class SampleJob implements Job {
}
List<PetOwner> all() {
- return call("sven", simpleObjects::listAll)
+ return call("sven", petOwners::listAll)
.orElse(Collections.<PetOwner>emptyList());
}