You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/02/20 04:44:19 UTC
[isis] 02/02: ISIS-2294: rename existing JDO entities to Jdo...
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 7ae02dccac31fae7e51b9c824f408c8965d9b4a2
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Feb 20 05:44:04 2020 +0100
ISIS-2294: rename existing JDO entities to Jdo...
---
.../testdomain/jdo/{Book.java => JdoBook.java} | 8 ++---
.../jdo/{BookDto.java => JdoBookDto.java} | 18 +++++-----
.../jdo/{Inventory.java => JdoInventory.java} | 4 +--
...entoryManager.java => JdoInventoryManager.java} | 8 ++---
...toryResource.java => JdoInventoryResource.java} | 38 +++++++++++-----------
.../jdo/{Product.java => JdoProduct.java} | 4 +--
...{ProductComment.java => JdoProductComment.java} | 4 +--
.../isis/testdomain/jdo/JdoTestDomainPersona.java | 18 +++++-----
.../org/apache/isis/testdomain/jdo/package.jdo | 6 ++--
.../testdomain/util/rest/RestEndpointService.java | 26 +++++++--------
.../testdomain/auditing/AuditerServiceTest.java | 12 +++----
.../bootstrapping/JdoBootstrappingTest.java | 22 ++++++-------
.../JdoBootstrappingTest_usingFixtures.java | 4 +--
.../commandexecution/WrapperAsyncTest.java | 20 ++++++------
.../commandexecution/WrapperSyncTest.java | 12 +++----
.../DomainModelTest_usingGoodDomain.java | 4 +--
.../publishing/PublisherServiceTest.java | 12 +++----
.../isis/testdomain/rest/RestServiceTest.java | 4 +--
.../testdomain/timestamping/TimestampingTest.java | 8 ++---
.../transactions/TransactionRollbackTest.java | 10 +++---
...TransactionRollbackTest_usingTransactional.java | 8 ++---
21 files changed, 125 insertions(+), 125 deletions(-)
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/Book.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoBook.java
similarity index 93%
rename from examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/Book.java
rename to examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoBook.java
index 74ac494..9e7bb1c 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/Book.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoBook.java
@@ -38,14 +38,14 @@ import lombok.ToString;
@Discriminator(value="Book")
@DomainObject(publishing=Publishing.ENABLED, auditing = Auditing.ENABLED)
@ToString(callSuper = true)
-public class Book extends Product {
+public class JdoBook extends JdoProduct {
@Override
public String title() {
return toString();
}
- public static Book of(
+ public static JdoBook of(
String name,
String description,
double price,
@@ -53,7 +53,7 @@ public class Book extends Product {
String isbn,
String publisher) {
- return new Book(name, description, price, author, isbn, publisher);
+ return new JdoBook(name, description, price, author, isbn, publisher);
}
@Property
@@ -70,7 +70,7 @@ public class Book extends Product {
// -- CONSTRUCTOR
- private Book(
+ private JdoBook(
String name,
String description,
double price,
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/BookDto.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoBookDto.java
similarity index 77%
rename from examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/BookDto.java
rename to examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoBookDto.java
index 66b1d1e..fa5337a 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/BookDto.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoBookDto.java
@@ -23,7 +23,7 @@ import lombok.NoArgsConstructor;
@XmlRootElement(name = "book")
@XmlAccessorType(XmlAccessType.PROPERTY)
@Data @Builder @NoArgsConstructor @AllArgsConstructor
-public class BookDto {
+public class JdoBookDto {
private String name;
private String description;
@@ -33,8 +33,8 @@ public class BookDto {
private String isbn;
private String publisher;
- public static BookDto from(Book book) {
- return BookDto.builder()
+ public static JdoBookDto from(JdoBook book) {
+ return JdoBookDto.builder()
.author(book.getAuthor())
.description(book.getDescription())
.isbn(book.getIsbn())
@@ -44,13 +44,13 @@ public class BookDto {
.build();
}
- public Book toBook() {
- return Book.of(this.getName(), this.getDescription(), this.getPrice(),
+ public JdoBook toBook() {
+ return JdoBook.of(this.getName(), this.getDescription(), this.getPrice(),
this.getAuthor(), this.getIsbn(), this.getPublisher());
}
public String encode() throws JAXBException {
- JAXBContext jaxbContext = JAXBContext.newInstance(BookDto.class);
+ JAXBContext jaxbContext = JAXBContext.newInstance(JdoBookDto.class);
Marshaller jaxbMarshaller = jaxbContext.createMarshaller();
StringWriter sw = new StringWriter();
@@ -62,12 +62,12 @@ public class BookDto {
return encoded;
}
- public static BookDto decode(String encoded) throws JAXBException {
+ public static JdoBookDto decode(String encoded) throws JAXBException {
String bookXml = _Strings.convert(encoded, _Bytes.ofCompressedUrlBase64, StandardCharsets.UTF_8);
- JAXBContext jaxbContext = JAXBContext.newInstance(BookDto.class);
+ JAXBContext jaxbContext = JAXBContext.newInstance(JdoBookDto.class);
Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();
- BookDto bookDto = (BookDto) jaxbUnmarshaller.unmarshal(new StringReader(bookXml));
+ JdoBookDto bookDto = (JdoBookDto) jaxbUnmarshaller.unmarshal(new StringReader(bookXml));
return bookDto;
}
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/Inventory.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoInventory.java
similarity index 97%
rename from examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/Inventory.java
rename to examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoInventory.java
index d702ae4..42a5a1e 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/Inventory.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoInventory.java
@@ -45,7 +45,7 @@ import lombok.ToString;
@DomainObject(auditing = Auditing.ENABLED)
@DomainObjectLayout() // causes UI events to be triggered
@NoArgsConstructor @AllArgsConstructor(staticName = "of") @ToString
-public class Inventory {
+public class JdoInventory {
public String title() {
return toString();
@@ -57,5 +57,5 @@ public class Inventory {
@Property
@Getter @Setter @Column(allowsNull = "true")
- private Set<Product> products;
+ private Set<JdoProduct> products;
}
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/InventoryManager.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoInventoryManager.java
similarity index 87%
rename from examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/InventoryManager.java
rename to examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoInventoryManager.java
index 855d787..2715675 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/InventoryManager.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoInventoryManager.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.domain.DomainObjectList.ActionDomainEvent;
import org.apache.isis.applib.services.repository.RepositoryService;
@ViewModel
-public class InventoryManager {
+public class JdoInventoryManager {
@Inject private RepositoryService repository;
@@ -37,7 +37,7 @@ public class InventoryManager {
public static class UpdateProductPriceEvent extends ActionDomainEvent {}
@Action(domainEvent = UpdateProductPriceEvent.class)
- public Product updateProductPrice(Product product, double newPrice) {
+ public JdoProduct updateProductPrice(JdoProduct product, double newPrice) {
product.setPrice(newPrice);
return product;
}
@@ -50,8 +50,8 @@ public class InventoryManager {
}
@Action
- public List<Product> listAllProducts() {
- return repository.allInstances(Product.class);
+ public List<JdoProduct> listAllProducts() {
+ return repository.allInstances(JdoProduct.class);
}
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/InventoryResource.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoInventoryResource.java
similarity index 74%
rename from examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/InventoryResource.java
rename to examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoInventoryResource.java
index 501932a..156c7de 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/InventoryResource.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoInventoryResource.java
@@ -40,48 +40,48 @@ import lombok.val;
@DomainService(
nature = NatureOfService.REST,
objectType = "testdomain.InventoryResource")
-public class InventoryResource {
+public class JdoInventoryResource {
@Inject private RepositoryService repository;
@Action
- public List<Product> listProducts() {
- return repository.allInstances(Product.class);
+ public List<JdoProduct> listProducts() {
+ return repository.allInstances(JdoProduct.class);
}
@Action
- public List<Book> listBooks() {
- return repository.allInstances(Book.class);
+ public List<JdoBook> listBooks() {
+ return repository.allInstances(JdoBook.class);
}
@Action
- public Book recommendedBookOfTheWeek() {
+ public JdoBook recommendedBookOfTheWeek() {
// for this test we do not care if we generate duplicates
- val book = Book.of("Book of the week", "An awesome Book", 12, "Author", "ISBN", "Publisher");
+ val book = JdoBook.of("Book of the week", "An awesome Book", 12, "Author", "ISBN", "Publisher");
return repository.persist(book);
}
@Action
- public List<Book> multipleBooks(
+ public List<JdoBook> multipleBooks(
@ParameterLayout(named = "")
int nrOfBooks
) {
- val books = _Lists.<Book>newArrayList();
+ val books = _Lists.<JdoBook>newArrayList();
// for this test we do not care if we generate duplicates
for(int i=0; i<nrOfBooks; ++i) {
- val book = Book.of("MultipleBooksTest", "An awesome Book["+i+"]", 12, "Author", "ISBN", "Publisher");
+ val book = JdoBook.of("MultipleBooksTest", "An awesome Book["+i+"]", 12, "Author", "ISBN", "Publisher");
books.add(repository.persist(book));
}
return books;
}
@Action //TODO improve the REST client such that the param can be of type Book
- public Book storeBook(String newBook) throws JAXBException {
- Book book = BookDto.decode(newBook).toBook();
+ public JdoBook storeBook(String newBook) throws JAXBException {
+ JdoBook book = JdoBookDto.decode(newBook).toBook();
return repository.persist(book);
}
@@ -105,26 +105,26 @@ public class InventoryResource {
}
@Action
- public BookDto recommendedBookOfTheWeekAsDto() {
+ public JdoBookDto recommendedBookOfTheWeekAsDto() {
// for this test we do not care if we generate duplicates
- val book = Book.of("Book of the week", "An awesome Book", 12, "Author", "ISBN", "Publisher");
- return BookDto.from(book);
+ val book = JdoBook.of("Book of the week", "An awesome Book", 12, "Author", "ISBN", "Publisher");
+ return JdoBookDto.from(book);
}
@Action
- public List<BookDto> multipleBooksAsDto(
+ public List<JdoBookDto> multipleBooksAsDto(
@ParameterLayout(named = "")
int nrOfBooks
) {
- val books = _Lists.<BookDto>newArrayList();
+ val books = _Lists.<JdoBookDto>newArrayList();
// for this test we do not care if we generate duplicates
for(int i=0; i<nrOfBooks; ++i) {
- val book = Book.of("MultipleBooksTest", "An awesome Book["+i+"]", 12, "Author", "ISBN", "Publisher");
- books.add(BookDto.from(book));
+ val book = JdoBook.of("MultipleBooksTest", "An awesome Book["+i+"]", 12, "Author", "ISBN", "Publisher");
+ books.add(JdoBookDto.from(book));
}
return books;
}
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/Product.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoProduct.java
similarity index 97%
rename from examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/Product.java
rename to examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoProduct.java
index 1626fda..fd226a4 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/Product.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoProduct.java
@@ -49,7 +49,7 @@ import lombok.ToString;
column="id")
@DomainObject
@AllArgsConstructor(access = AccessLevel.PROTECTED) @ToString
-public class Product {
+public class JdoProduct {
public String title() {
return toString();
@@ -74,6 +74,6 @@ public class Product {
@Collection
@Persistent(mappedBy="product") @Column(allowsNull = "true")
@Getter @Setter
- private List<ProductComment> comments;
+ private List<JdoProductComment> comments;
}
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/ProductComment.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoProductComment.java
similarity index 94%
rename from examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/ProductComment.java
rename to examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoProductComment.java
index 07f5735..a585915 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/ProductComment.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoProductComment.java
@@ -35,10 +35,10 @@ import lombok.Setter;
@PersistenceCapable
@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, column="id")
@DomainObject
-public class ProductComment implements Timestampable {
+public class JdoProductComment implements Timestampable {
@Property @Column(allowsNull = "false")
- @Getter @Setter private Product product;
+ @Getter @Setter private JdoProduct product;
@Property
@Getter @Setter private String comment;
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoTestDomainPersona.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoTestDomainPersona.java
index d127221..8e5dd39 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoTestDomainPersona.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoTestDomainPersona.java
@@ -48,13 +48,13 @@ implements PersonaWithBuilderScript<BuilderScriptAbstract<?>> {
@Override
protected void execute(ExecutionContext ec) {
- repository.allInstances(Inventory.class)
+ repository.allInstances(JdoInventory.class)
.forEach(repository::remove);
- repository.allInstances(Book.class)
+ repository.allInstances(JdoBook.class)
.forEach(repository::remove);
- repository.allInstances(Product.class)
+ repository.allInstances(JdoProduct.class)
.forEach(repository::remove);
}
@@ -67,19 +67,19 @@ implements PersonaWithBuilderScript<BuilderScriptAbstract<?>> {
InventoryWith1Book {
@Override
- public BuilderScriptWithResult<Inventory> builder() {
- return new BuilderScriptWithResult<Inventory>() {
+ public BuilderScriptWithResult<JdoInventory> builder() {
+ return new BuilderScriptWithResult<JdoInventory>() {
@Override
- protected Inventory buildResult(ExecutionContext ec) {
+ protected JdoInventory buildResult(ExecutionContext ec) {
- val products = new HashSet<Product>();
+ val products = new HashSet<JdoProduct>();
- products.add(Book.of(
+ products.add(JdoBook.of(
"Sample Book", "A sample book for testing.", 99.,
"Sample Author", "Sample ISBN", "Sample Publisher"));
- val inventory = Inventory.of("Sample Inventory", products);
+ val inventory = JdoInventory.of("Sample Inventory", products);
repository.persist(inventory);
return inventory;
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/package.jdo b/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/package.jdo
index 4beb492..1ebee1e 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/package.jdo
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/package.jdo
@@ -5,9 +5,9 @@
version="3.1">
<package name="org.apache.isis.testdomain.jdo">
- <class name="Product" />
- <class name="Book" />
- <class name="Inventory" />
+ <class name="JdoProduct" />
+ <class name="JdoBook" />
+ <class name="JdoInventory" />
</package>
</jdo>
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/util/rest/RestEndpointService.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/util/rest/RestEndpointService.java
index cc33e61..f9677ea 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/util/rest/RestEndpointService.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/util/rest/RestEndpointService.java
@@ -34,8 +34,8 @@ import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
import org.apache.isis.extensions.restclient.ResponseDigest;
import org.apache.isis.extensions.restclient.RestfulClient;
import org.apache.isis.extensions.restclient.RestfulClientConfig;
-import org.apache.isis.testdomain.jdo.Book;
-import org.apache.isis.testdomain.jdo.BookDto;
+import org.apache.isis.testdomain.jdo.JdoBook;
+import org.apache.isis.testdomain.jdo.JdoBookDto;
import org.apache.isis.testdomain.ldap.LdapConstants;
import lombok.val;
@@ -94,7 +94,7 @@ public class RestEndpointService {
// -- ENDPOINTS
- public ResponseDigest<Book> getRecommendedBookOfTheWeek(RestfulClient client) {
+ public ResponseDigest<JdoBook> getRecommendedBookOfTheWeek(RestfulClient client) {
Invocation.Builder request = client.request(
"services/testdomain.InventoryResource/actions/recommendedBookOfTheWeek/invoke",
SuppressionType.ALL);
@@ -103,12 +103,12 @@ public class RestEndpointService {
.build();
val response = request.post(args);
- val digest = client.digest(response, Book.class);
+ val digest = client.digest(response, JdoBook.class);
return digest;
}
- public ResponseDigest<Book> getMultipleBooks(RestfulClient client) throws JAXBException {
+ public ResponseDigest<JdoBook> getMultipleBooks(RestfulClient client) throws JAXBException {
Invocation.Builder request = client.request(
"services/testdomain.InventoryResource/actions/multipleBooks/invoke",
@@ -119,28 +119,28 @@ public class RestEndpointService {
.build();
val response = request.post(args);
- val digest = client.digestList(response, Book.class, new GenericType<List<Book>>() {});
+ val digest = client.digestList(response, JdoBook.class, new GenericType<List<JdoBook>>() {});
return digest;
}
- public ResponseDigest<Book> storeBook(RestfulClient client, Book newBook) throws JAXBException {
+ public ResponseDigest<JdoBook> storeBook(RestfulClient client, JdoBook newBook) throws JAXBException {
val request = client.request(
"services/testdomain.InventoryResource/actions/storeBook/invoke",
SuppressionType.ALL);
val args = client.arguments()
- .addActionParameter("newBook", BookDto.from(newBook).encode())
+ .addActionParameter("newBook", JdoBookDto.from(newBook).encode())
.build();
val response = request.post(args);
- val digest = client.digest(response, Book.class);
+ val digest = client.digest(response, JdoBook.class);
return digest;
}
- public ResponseDigest<BookDto> getRecommendedBookOfTheWeekAsDto(RestfulClient client) {
+ public ResponseDigest<JdoBookDto> getRecommendedBookOfTheWeekAsDto(RestfulClient client) {
Invocation.Builder request = client.request(
"services/testdomain.InventoryResource/actions/recommendedBookOfTheWeekAsDto/invoke",
SuppressionType.ALL);
@@ -149,12 +149,12 @@ public class RestEndpointService {
.build();
val response = request.post(args);
- val digest = client.digest(response, BookDto.class);
+ val digest = client.digest(response, JdoBookDto.class);
return digest;
}
- public ResponseDigest<BookDto> getMultipleBooksAsDto(RestfulClient client) throws JAXBException {
+ public ResponseDigest<JdoBookDto> getMultipleBooksAsDto(RestfulClient client) throws JAXBException {
Invocation.Builder request = client.request(
"services/testdomain.InventoryResource/actions/multipleBooksAsDto/invoke",
@@ -165,7 +165,7 @@ public class RestEndpointService {
.build();
val response = request.post(args);
- val digest = client.digestList(response, BookDto.class, new GenericType<List<BookDto>>() {});
+ val digest = client.digestList(response, JdoBookDto.class, new GenericType<List<JdoBookDto>>() {});
return digest;
}
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
index 37b1b18..ac5f958 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
@@ -46,7 +46,7 @@ import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
-import org.apache.isis.testdomain.jdo.Book;
+import org.apache.isis.testdomain.jdo.JdoBook;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testdomain.util.kv.KVStoreForTesting;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
@@ -97,7 +97,7 @@ class AuditerServiceTest {
void auditerService_shouldBeAwareOfInventoryChanges() {
// given
- val books = repository.allInstances(Book.class);
+ val books = repository.allInstances(JdoBook.class);
assertEquals(1, books.size());
val book = books.listIterator().next();
@@ -126,14 +126,14 @@ class AuditerServiceTest {
throws InterruptedException, ExecutionException, TimeoutException {
// given
- val books = repository.allInstances(Book.class);
+ val books = repository.allInstances(JdoBook.class);
assertEquals(1, books.size());
val book = books.listIterator().next();
kvStore.clear(AuditerServiceForTesting.class);
// when - running within its own background task
val future = wrapper.async(book, ExecutionMode.SKIP_RULES) // don't enforce rules for this test
- .run(Book::setName, "Book #2");
+ .run(JdoBook::setName, "Book #2");
future.get(1000, TimeUnit.SECONDS);
@@ -147,7 +147,7 @@ class AuditerServiceTest {
throws InterruptedException, ExecutionException, TimeoutException {
// given
- val books = repository.allInstances(Book.class);
+ val books = repository.allInstances(JdoBook.class);
assertEquals(1, books.size());
val book = books.listIterator().next();
kvStore.clear(AuditerServiceForTesting.class);
@@ -156,7 +156,7 @@ class AuditerServiceTest {
assertThrows(DisabledException.class, ()->{
val future = wrapper.async(book, ExecutionMode.EXECUTE)
- .run(Book::setName, "Book #2");
+ .run(JdoBook::setName, "Book #2");
future.get(1000, TimeUnit.SECONDS);
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java
index f21d6bc..ea7ccb1 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java
@@ -42,9 +42,9 @@ import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
-import org.apache.isis.testdomain.jdo.Book;
-import org.apache.isis.testdomain.jdo.Inventory;
-import org.apache.isis.testdomain.jdo.Product;
+import org.apache.isis.testdomain.jdo.JdoBook;
+import org.apache.isis.testdomain.jdo.JdoInventory;
+import org.apache.isis.testdomain.jdo.JdoProduct;
import lombok.val;
@@ -77,21 +77,21 @@ class JdoBootstrappingTest {
void cleanUp() {
- repository.allInstances(Inventory.class).forEach(repository::remove);
- repository.allInstances(Book.class).forEach(repository::remove);
- repository.allInstances(Product.class).forEach(repository::remove);
+ repository.allInstances(JdoInventory.class).forEach(repository::remove);
+ repository.allInstances(JdoBook.class).forEach(repository::remove);
+ repository.allInstances(JdoProduct.class).forEach(repository::remove);
System.out.println("!!! CLEANUP DONE");
}
void setUp() {
// setup sample Inventory
- Set<Product> products = new HashSet<>();
+ Set<JdoProduct> products = new HashSet<>();
- products.add(Book.of("Sample Book", "A sample book for testing.", 99., "Sample Author", "Sample ISBN",
+ products.add(JdoBook.of("Sample Book", "A sample book for testing.", 99., "Sample Author", "Sample ISBN",
"Sample Publisher"));
- val inventory = Inventory.of("Sample Inventory", products);
+ val inventory = JdoInventory.of("Sample Inventory", products);
repository.persist(inventory);
System.out.println("!!! SETUP DONE");
@@ -103,7 +103,7 @@ class JdoBootstrappingTest {
// given - expected pre condition: no inventories
cleanUp();
- assertEquals(0, repository.allInstances(Inventory.class).size());
+ assertEquals(0, repository.allInstances(JdoInventory.class).size());
System.out.println("!!! VERIFY CLEANUP DONE");
// when
@@ -112,7 +112,7 @@ class JdoBootstrappingTest {
// then - expected post condition: ONE inventory
- val inventories = repository.allInstances(Inventory.class);
+ val inventories = repository.allInstances(JdoInventory.class);
assertEquals(1, inventories.size());
val inventory = inventories.get(0);
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
index 4bfc8b9..9f05bc8 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
-import org.apache.isis.testdomain.jdo.Inventory;
+import org.apache.isis.testdomain.jdo.JdoInventory;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
@@ -67,7 +67,7 @@ class JdoBootstrappingTest_usingFixtures {
@Test
void sampleInventoryShouldBeSetUp() {
- val inventories = repository.allInstances(Inventory.class);
+ val inventories = repository.allInstances(JdoInventory.class);
assertEquals(1, inventories.size());
val inventory = inventories.get(0);
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java
index 0e540f0..92f99d9 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java
@@ -48,9 +48,9 @@ import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
-import org.apache.isis.testdomain.jdo.InventoryManager;
+import org.apache.isis.testdomain.jdo.JdoInventoryManager;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
-import org.apache.isis.testdomain.jdo.Product;
+import org.apache.isis.testdomain.jdo.JdoProduct;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import lombok.Getter;
@@ -92,8 +92,8 @@ class WrapperAsyncTest {
@Test @Tag("Incubating")
void testWrapper_waitingOnDomainEvent() throws InterruptedException, ExecutionException {
- val inventoryManager = facoryService.viewModel(InventoryManager.class);
- val product = repository.allInstances(Product.class).get(0);
+ val inventoryManager = facoryService.viewModel(JdoInventoryManager.class);
+ val product = repository.allInstances(JdoProduct.class).get(0);
assertEquals(99d, product.getPrice(), 1E-6);
@@ -112,16 +112,16 @@ class WrapperAsyncTest {
@Test @Tag("Incubating")
void testWrapper_async_waitingOnDomainEvent() throws InterruptedException, ExecutionException {
- val inventoryManager = facoryService.viewModel(InventoryManager.class);
- val product = repository.allInstances(Product.class).get(0);
+ val inventoryManager = facoryService.viewModel(JdoInventoryManager.class);
+ val product = repository.allInstances(JdoProduct.class).get(0);
assertEquals(99d, product.getPrice(), 1E-6);
actionDomainEventListener.prepareLatch();
- Future<Product> invocationResult = wrapper.async(inventoryManager)
+ Future<JdoProduct> invocationResult = wrapper.async(inventoryManager)
.withExecutor(Executors.newCachedThreadPool()) // use of custom executor (optional)
- .call(InventoryManager::updateProductPrice, product, 123d);
+ .call(JdoInventoryManager::updateProductPrice, product, 123d);
//XXX type-safety should prevent this snippet from being compiled!
// Future<String> invocationResult2 = wrapper.async(inventoryManager)
@@ -147,8 +147,8 @@ class WrapperAsyncTest {
@Getter private CountDownLatch countDownLatch;
- @EventListener(InventoryManager.UpdateProductPriceEvent.class)
- public void onDomainEvent(InventoryManager.UpdateProductPriceEvent event) {
+ @EventListener(JdoInventoryManager.UpdateProductPriceEvent.class)
+ public void onDomainEvent(JdoInventoryManager.UpdateProductPriceEvent event) {
if(event.getEventPhase()==Phase.EXECUTED) {
log.info("UpdateProductPriceEvent received.");
countDownLatch.countDown();
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperSyncTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperSyncTest.java
index badf7e4..68e73cc 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperSyncTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperSyncTest.java
@@ -37,10 +37,10 @@ import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
-import org.apache.isis.testdomain.jdo.Book;
-import org.apache.isis.testdomain.jdo.InventoryManager;
+import org.apache.isis.testdomain.jdo.JdoBook;
+import org.apache.isis.testdomain.jdo.JdoInventoryManager;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
-import org.apache.isis.testdomain.jdo.Product;
+import org.apache.isis.testdomain.jdo.JdoProduct;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import lombok.val;
@@ -72,15 +72,15 @@ class WrapperSyncTest {
@Test @Tag("Incubating")
void testWrapper_waitingOnDomainEvent() throws InterruptedException, ExecutionException {
- val inventoryManager = facoryService.viewModel(InventoryManager.class);
- val product = repository.allInstances(Product.class).get(0);
+ val inventoryManager = facoryService.viewModel(JdoInventoryManager.class);
+ val product = repository.allInstances(JdoProduct.class).get(0);
assertEquals(99d, product.getPrice(), 1E-6);
val products = wrapper.wrap(inventoryManager).listAllProducts();
assertEquals(1, products.size());
- assertEquals(Book.class, products.get(0).getClass());
+ assertEquals(JdoBook.class, products.get(0).getClass());
}
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
index 4fbd2eb..292be2d 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
@@ -38,7 +38,7 @@ import org.apache.isis.core.metamodel.specloader.specimpl.IntrospectionState;
import org.apache.isis.schema.metamodel.v2.DomainClassDto;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
-import org.apache.isis.testdomain.jdo.Product;
+import org.apache.isis.testdomain.jdo.JdoProduct;
import org.apache.isis.testdomain.model.good.Configuration_usingValidDomain;
import org.apache.isis.testdomain.model.good.ProperMemberSupport;
import org.apache.isis.testing.integtestsupport.applib.validate.DomainModelValidator;
@@ -158,7 +158,7 @@ class DomainModelTest_usingGoodDomain {
@Test
void pluginProvidedMixins_shouldBePickedUp() {
- val holderSpec = specificationLoader.loadSpecification(Product.class);
+ val holderSpec = specificationLoader.loadSpecification(JdoProduct.class);
val mx_datanucleusIdLong = holderSpec.getAssociationElseFail("datanucleusIdLong"); // plugged in mixin
assertNotNull(mx_datanucleusIdLong);
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
index 4a413fc..709812c 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
@@ -49,7 +49,7 @@ import org.apache.isis.core.metamodel.services.publishing.PublisherDispatchServi
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
-import org.apache.isis.testdomain.jdo.Book;
+import org.apache.isis.testdomain.jdo.JdoBook;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testdomain.util.kv.KVStoreForTesting;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
@@ -101,7 +101,7 @@ class PublisherServiceTest {
void publisherService_shouldBeAwareOfInventoryChanges() {
// given
- val book = repository.allInstances(Book.class).listIterator().next();
+ val book = repository.allInstances(JdoBook.class).listIterator().next();
kvStore.clear(PublisherServiceForTesting.class);
val latch = kvStore.latch(PublisherServiceForTesting.class);
@@ -139,13 +139,13 @@ class PublisherServiceTest {
throws InterruptedException, ExecutionException, TimeoutException {
// given
- val book = repository.allInstances(Book.class).listIterator().next();
+ val book = repository.allInstances(JdoBook.class).listIterator().next();
kvStore.clear(PublisherServiceForTesting.class);
val latch = kvStore.latch(PublisherServiceForTesting.class);
// when - running within its own background task
val future = wrapper.async(book, ExecutionMode.SKIP_RULES) // don't enforce rules for this test
- .run(Book::setName, "Book #2");
+ .run(JdoBook::setName, "Book #2");
future.get(10, TimeUnit.SECONDS);
@@ -168,14 +168,14 @@ class PublisherServiceTest {
throws InterruptedException, ExecutionException, TimeoutException {
// given
- val book = repository.allInstances(Book.class).listIterator().next();
+ val book = repository.allInstances(JdoBook.class).listIterator().next();
kvStore.clear(PublisherServiceForTesting.class);
// when - running within its own background task
assertThrows(DisabledException.class, ()->{
val future = wrapper.async(book, ExecutionMode.EXECUTE)
- .run(Book::setName, "Book #2");
+ .run(JdoBook::setName, "Book #2");
future.get(10, TimeUnit.SECONDS);
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
index 0d2e9b5..67751f9 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
@@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
-import org.apache.isis.testdomain.jdo.Book;
+import org.apache.isis.testdomain.jdo.JdoBook;
import org.apache.isis.testdomain.util.rest.RestEndpointService;
import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleViewerRestfulObjectsJaxrsResteasy4;
@@ -84,7 +84,7 @@ class RestServiceTest {
val useRequestDebugLogging = false;
val restfulClient = restService.newClient(useRequestDebugLogging);
- val newBook = Book.of("REST Book", "A sample REST book for testing.", 77.,
+ val newBook = JdoBook.of("REST Book", "A sample REST book for testing.", 77.,
"REST Author", "REST ISBN", "REST Publisher");
val digest = restService.storeBook(restfulClient, newBook);
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java
index 3072b70..9ee9090 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java
@@ -31,8 +31,8 @@ import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
-import org.apache.isis.testdomain.jdo.Product;
-import org.apache.isis.testdomain.jdo.ProductComment;
+import org.apache.isis.testdomain.jdo.JdoProduct;
+import org.apache.isis.testdomain.jdo.JdoProductComment;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import lombok.val;
@@ -65,10 +65,10 @@ class TimestampingTest {
@Test
void updatedByAt_shouldBeFilledInByTheTimestampingService() {
- val product = repository.allInstances(Product.class).listIterator().next();
+ val product = repository.allInstances(JdoProduct.class).listIterator().next();
assertNotNull(product);
- val comment = new ProductComment();
+ val comment = new JdoProductComment();
comment.setProduct(product);
comment.setComment("Awesome Book!");
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
index 3674a77..8c9a4ae 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
@@ -34,7 +34,7 @@ import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
-import org.apache.isis.testdomain.jdo.Book;
+import org.apache.isis.testdomain.jdo.JdoBook;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
@@ -61,7 +61,7 @@ class TransactionRollbackTest {
void happyCaseTx_shouldCommit() {
// expected pre condition
- assertEquals(0, repository.allInstances(Book.class).size());
+ assertEquals(0, repository.allInstances(JdoBook.class).size());
transactionService.executeWithinTransaction(()->{
@@ -70,7 +70,7 @@ class TransactionRollbackTest {
});
// expected post condition
- assertEquals(1, repository.allInstances(Book.class).size());
+ assertEquals(1, repository.allInstances(JdoBook.class).size());
}
@@ -78,7 +78,7 @@ class TransactionRollbackTest {
void whenExceptionWithinTx_shouldRollback() {
// expected pre condition
- assertEquals(0, repository.allInstances(Book.class).size());
+ assertEquals(0, repository.allInstances(JdoBook.class).size());
assertThrows(RuntimeException.class, ()->{
@@ -93,7 +93,7 @@ class TransactionRollbackTest {
});
// expected post condition
- assertEquals(0, repository.allInstances(Book.class).size());
+ assertEquals(0, repository.allInstances(JdoBook.class).size());
}
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
index 7ad5ab9..ced76f0 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
-import org.apache.isis.testdomain.jdo.Book;
+import org.apache.isis.testdomain.jdo.JdoBook;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
@@ -67,12 +67,12 @@ class TransactionRollbackTest_usingTransactional {
void happyCaseTx_shouldCommit() {
// expected pre condition
- assertEquals(0, repository.allInstances(Book.class).size());
+ assertEquals(0, repository.allInstances(JdoBook.class).size());
fixtureScripts.runPersona(JdoTestDomainPersona.InventoryWith1Book);
// expected post condition
- assertEquals(1, repository.allInstances(Book.class).size());
+ assertEquals(1, repository.allInstances(JdoBook.class).size());
}
@@ -80,7 +80,7 @@ class TransactionRollbackTest_usingTransactional {
void previousTest_shouldHaveBeenRolledBack() {
// expected condition
- assertEquals(0, repository.allInstances(Book.class).size());
+ assertEquals(0, repository.allInstances(JdoBook.class).size());
}
}