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 2021/05/25 18:52:18 UTC
[isis] branch master updated: ISIS-2631: batch rename uses of
objectType in framework annotations
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
The following commit(s) were added to refs/heads/master by this push:
new d6ac38e ISIS-2631: batch rename uses of objectType in framework annotations
d6ac38e is described below
commit d6ac38ea0754c8613250b8a011375c6df8f3c7e2
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue May 25 20:52:03 2021 +0200
ISIS-2631: batch rename uses of objectType in framework annotations
---
.../src/main/java/org/apache/isis/applib/id/LogicalType.java | 2 +-
.../domainobject/DomainObjectAnnotationFacetFactoryTest.java | 2 +-
.../domainobject/ObjectTypeAnnotationFacetFactoryTest.java | 2 +-
.../demoapp/demomodule/dom/PdfJsDemoObjectWithBlobMenu.java | 2 +-
.../apache/isis/testdomain/interact/CommandArgumentTest.java | 10 +++++-----
.../org/apache/isis/testdomain/jdo/JdoInventoryResource.java | 2 +-
.../java/org/apache/isis/testdomain/jdo/entities/JdoBook.java | 2 +-
.../org/apache/isis/testdomain/jdo/entities/JdoInventory.java | 2 +-
.../org/apache/isis/testdomain/jdo/entities/JdoProduct.java | 2 +-
.../apache/isis/testdomain/jdo/entities/JdoProductComment.java | 2 +-
.../org/apache/isis/testdomain/jpa/JpaInventoryResource.java | 2 +-
.../java/org/apache/isis/testdomain/jpa/entities/JpaBook.java | 2 +-
.../org/apache/isis/testdomain/jpa/entities/JpaInventory.java | 2 +-
.../org/apache/isis/testdomain/jpa/entities/JpaProduct.java | 2 +-
.../apache/isis/testdomain/jpa/entities/JpaProductComment.java | 2 +-
.../org/apache/isis/testdomain/jpa/springdata/Employee.java | 2 +-
.../apache/isis/testdomain/jpa/springdata/EmployeeManager.java | 2 +-
.../apache/isis/testdomain/model/actnsemantics/BlobDemo.java | 2 +-
.../isis/testdomain/model/actnsemantics/BlobDemoMenu.java | 2 +-
.../isis/testdomain/model/bad/InvalidLogicalTypeNameClash.java | 4 ++--
.../apache/isis/testdomain/model/good/ElementTypeConcrete.java | 2 +-
.../org/apache/isis/testdomain/model/good/ProperInterface.java | 2 +-
.../apache/isis/testdomain/model/good/ProperInterface2.java | 2 +-
.../isis/testdomain/model/interaction/InteractionDemo.java | 4 ++--
.../isis/testdomain/model/interaction/InteractionNpmDemo.java | 2 +-
.../org/apache/isis/testdomain/model/layout/LayoutDemo.java | 2 +-
.../java/org/apache/isis/testdomain/rospec/RoSpecSampler.java | 2 +-
.../dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java | 2 +-
.../dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java | 2 +-
.../dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java | 2 +-
.../dom/pivot/ExcelPivotByCategoryAndSubcategory.java | 2 +-
.../dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java | 2 +-
.../excelupload/ExcelUploadRowHandler4ToDoItem.java | 2 +-
.../excelupload/ExcelUploadServiceForDemoToDoItem.java | 2 +-
.../fixturescripts/DemoFixture_extending_ExcelFixture2.java | 2 +-
.../fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java | 2 +-
.../demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java | 2 +-
37 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/id/LogicalType.java b/api/applib/src/main/java/org/apache/isis/applib/id/LogicalType.java
index fbfc229..bdc7b17 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/id/LogicalType.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/id/LogicalType.java
@@ -131,7 +131,7 @@ implements
/**
* Returns the logical-type-name (unique amongst non-abstract classes), as per the
- * {@link ObjectTypeFacet}.
+ * {@link LogicalTypeFacet}.
*
* <p>
* This will typically be the value of the {@link DomainObject#logicalTypeName()} annotation attribute.
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index e869b8e..618cc09 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -533,7 +533,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
public static class ObjectType extends DomainObjectAnnotationFacetFactoryTest {
- @DomainObject(objectType = "CUS")
+ @DomainObject(logicalTypeName = "CUS")
class CustomerWithDomainObjectAndObjectTypeSet {
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ObjectTypeAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ObjectTypeAnnotationFacetFactoryTest.java
index 6b90f8b..30f3b06 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ObjectTypeAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ObjectTypeAnnotationFacetFactoryTest.java
@@ -46,7 +46,7 @@ public class ObjectTypeAnnotationFacetFactoryTest extends AbstractFacetFactoryJU
@Test
public void objectTypeAnnotationPickedUpOnClass() {
- @DomainObject(objectType = "CUS")
+ @DomainObject(logicalTypeName = "CUS")
class Customer {
}
diff --git a/extensions/vw/pdfjs/fixtures/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/dom/PdfJsDemoObjectWithBlobMenu.java b/extensions/vw/pdfjs/fixtures/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/dom/PdfJsDemoObjectWithBlobMenu.java
index de6a8fe..c6e8449 100644
--- a/extensions/vw/pdfjs/fixtures/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/dom/PdfJsDemoObjectWithBlobMenu.java
+++ b/extensions/vw/pdfjs/fixtures/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/dom/PdfJsDemoObjectWithBlobMenu.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.services.repository.RepositoryService;
@DomainService(
nature = NatureOfService.VIEW_MENU_ONLY,
- objectType = "wktPdfJsFixture.PdfJsDemoObjectWithBlobMenu"
+ logicalTypeName = "wktPdfJsFixture.PdfJsDemoObjectWithBlobMenu"
)
@DomainServiceLayout(
named = "Demo",
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/isis/testdomain/interact/CommandArgumentTest.java b/regressiontests/stable-interact/src/test/java/org/apache/isis/testdomain/interact/CommandArgumentTest.java
index aaa2a7b..43340b5 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/isis/testdomain/interact/CommandArgumentTest.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/isis/testdomain/interact/CommandArgumentTest.java
@@ -18,9 +18,6 @@
*/
package org.apache.isis.testdomain.interact;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.ExecutionException;
@@ -36,6 +33,9 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
@@ -68,7 +68,7 @@ class CommandArgumentTest extends InteractionTestAbstract {
@XmlRootElement(name = "root")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
- @DomainObject(nature=Nature.VIEW_MODEL, objectType="regressiontests.CommandResult")
+ @DomainObject(nature=Nature.VIEW_MODEL, logicalTypeName="regressiontests.CommandResult")
@NoArgsConstructor
@AllArgsConstructor(staticName = "of")
public static class CommandResult {
@@ -82,7 +82,7 @@ class CommandArgumentTest extends InteractionTestAbstract {
@XmlRootElement(name = "root")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
- @DomainObject(nature=Nature.VIEW_MODEL, objectType="regressiontests.CommandArgDemo")
+ @DomainObject(nature=Nature.VIEW_MODEL, logicalTypeName="regressiontests.CommandArgDemo")
public static class CommandArgDemo {
@Action
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/JdoInventoryResource.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/JdoInventoryResource.java
index 7211d1c..409d41f 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/JdoInventoryResource.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/JdoInventoryResource.java
@@ -41,7 +41,7 @@ import lombok.val;
@DomainService(
nature = NatureOfService.REST,
- objectType = "testdomain.jdo.InventoryResource")
+ logicalTypeName = "testdomain.jdo.InventoryResource")
public class JdoInventoryResource {
@Inject private RepositoryService repository;
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoBook.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoBook.java
index b0658b1..0293680 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoBook.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoBook.java
@@ -42,7 +42,7 @@ import lombok.extern.log4j.Log4j2;
//@Inheritance(strategy=InheritanceStrategy.SUPERCLASS_TABLE)
@Discriminator(value="Book")
@DomainObject(
- objectType = "testdomain.jdo.Book",
+ logicalTypeName = "testdomain.jdo.Book",
entityChangePublishing = Publishing.ENABLED)
@javax.jdo.annotations.Uniques({
@javax.jdo.annotations.Unique(
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoInventory.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoInventory.java
index bd3d513..7479ea5 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoInventory.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoInventory.java
@@ -42,7 +42,7 @@ import lombok.ToString;
@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, column="id")
@Version(strategy= VersionStrategy.DATE_TIME, column="version")
@DomainObject(
- objectType = "testdomain.jdo.Inventory",
+ logicalTypeName = "testdomain.jdo.Inventory",
entityChangePublishing = Publishing.ENABLED)
@NoArgsConstructor @AllArgsConstructor(staticName = "of") @ToString
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoProduct.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoProduct.java
index 41ee184..6119ed7 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoProduct.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoProduct.java
@@ -51,7 +51,7 @@ import lombok.ToString;
strategy=javax.jdo.annotations.IdGeneratorStrategy.INCREMENT,
column="id")
@DomainObject(
- objectType = "testdomain.jdo.Product"
+ logicalTypeName = "testdomain.jdo.Product"
)
@NoArgsConstructor(access = AccessLevel.PROTECTED)
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoProductComment.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoProductComment.java
index 7868c23..811119e 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoProductComment.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoProductComment.java
@@ -35,7 +35,7 @@ import lombok.Setter;
@PersistenceCapable
@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, column="id")
@DomainObject(
- objectType = "testdomain.jdo.ProductComment")
+ logicalTypeName = "testdomain.jdo.ProductComment")
public class JdoProductComment implements OnUpdatedByAndAt {
@Property @Column(allowsNull = "false")
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/JpaInventoryResource.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/JpaInventoryResource.java
index 1fcb2f0..8406ba4 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/JpaInventoryResource.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/JpaInventoryResource.java
@@ -41,7 +41,7 @@ import lombok.val;
@DomainService(
nature = NatureOfService.REST,
- objectType = "testdomain.jpa.InventoryResource")
+ logicalTypeName = "testdomain.jpa.InventoryResource")
public class JpaInventoryResource {
@Inject private RepositoryService repository;
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaBook.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaBook.java
index 2d58b78..e17a36f 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaBook.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaBook.java
@@ -44,7 +44,7 @@ import lombok.extern.log4j.Log4j2;
@EntityListeners(JpaEntityInjectionPointResolver.class)
@DiscriminatorValue("Book")
@DomainObject(
- objectType = "testdomain.jpa.Book",
+ logicalTypeName = "testdomain.jpa.Book",
entityChangePublishing = Publishing.ENABLED)
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@ToString(callSuper = true)
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaInventory.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaInventory.java
index 574f3bb..006d659 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaInventory.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaInventory.java
@@ -41,7 +41,7 @@ import lombok.ToString;
@Entity
@DomainObject(
- objectType = "testdomain.jdo.Inventory",
+ logicalTypeName = "testdomain.jdo.Inventory",
entityChangePublishing = Publishing.ENABLED)
@NamedQuery(
name = "JpaInventory.findAffordableProducts",
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaProduct.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaProduct.java
index ff398e2..405e522 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaProduct.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaProduct.java
@@ -53,7 +53,7 @@ import lombok.ToString;
name="product_type",
discriminatorType = DiscriminatorType.STRING)
@DomainObject(
- objectType = "testdomain.jpa.Product")
+ logicalTypeName = "testdomain.jpa.Product")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@AllArgsConstructor(access = AccessLevel.PROTECTED)
@ToString
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaProductComment.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaProductComment.java
index 988befe..df5d4dd 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaProductComment.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaProductComment.java
@@ -37,7 +37,7 @@ import lombok.Setter;
@Entity
@DomainObject(
- objectType = "testdomain.jpa.ProductComment")
+ logicalTypeName = "testdomain.jpa.ProductComment")
public class JpaProductComment implements OnUpdatedByAndAt {
@Id
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/Employee.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/Employee.java
index 228e2ef..bb4ef35 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/Employee.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/Employee.java
@@ -32,7 +32,7 @@ import lombok.Setter;
import lombok.ToString;
@Entity
-@DomainObject(objectType = "testdomain.jpa.springdata.Employee")
+@DomainObject(logicalTypeName = "testdomain.jpa.springdata.Employee")
@Getter @Setter @ToString @EqualsAndHashCode
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class Employee {
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/EmployeeManager.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/EmployeeManager.java
index 7e4cb8b..14ccace 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/EmployeeManager.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/EmployeeManager.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
-@DomainObject(nature=Nature.VIEW_MODEL, objectType = "testdomain.jpa.springdata.EmployeeManager")
+@DomainObject(nature=Nature.VIEW_MODEL, logicalTypeName = "testdomain.jpa.springdata.EmployeeManager")
public class EmployeeManager {
@Inject private EmployeeRepository employeeRepo;
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/actnsemantics/BlobDemo.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/actnsemantics/BlobDemo.java
index 7f1e9ba..9ff60ee 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/actnsemantics/BlobDemo.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/actnsemantics/BlobDemo.java
@@ -43,7 +43,7 @@ import lombok.extern.log4j.Log4j2;
@XmlRootElement(name = "BlobDemo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
-@DomainObject(nature=Nature.VIEW_MODEL, objectType="regressiontests.BlobDemo")
+@DomainObject(nature=Nature.VIEW_MODEL, logicalTypeName="regressiontests.BlobDemo")
@Log4j2
public class BlobDemo {
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/actnsemantics/BlobDemoMenu.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/actnsemantics/BlobDemoMenu.java
index 7315876..b0851b1 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/actnsemantics/BlobDemoMenu.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/actnsemantics/BlobDemoMenu.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.services.factory.FactoryService;
import lombok.val;
-@DomainService(nature=NatureOfService.VIEW, objectType = "regressiontests.BlobDemoMenu")
+@DomainService(nature=NatureOfService.VIEW, logicalTypeName = "regressiontests.BlobDemoMenu")
@DomainObjectLayout(named="Blob Demo Menu")
public class BlobDemoMenu {
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/bad/InvalidLogicalTypeNameClash.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/bad/InvalidLogicalTypeNameClash.java
index 8d45245..eaf24e4 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/bad/InvalidLogicalTypeNameClash.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/bad/InvalidLogicalTypeNameClash.java
@@ -26,7 +26,7 @@ public class InvalidLogicalTypeNameClash {
// logical type name clash: should fail validation
@DomainObject(nature = Nature.VIEW_MODEL,
- objectType = "isis.testdomain.InvalidLogicalTypeNameClash")
+ logicalTypeName = "isis.testdomain.InvalidLogicalTypeNameClash")
public static class VariantA {
@Action
@@ -38,7 +38,7 @@ public class InvalidLogicalTypeNameClash {
// logical type name clash: should fail validation
@DomainObject(nature = Nature.VIEW_MODEL,
- objectType = "isis.testdomain.InvalidLogicalTypeNameClash")
+ logicalTypeName = "isis.testdomain.InvalidLogicalTypeNameClash")
public static class VariantB {
@Action
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ElementTypeConcrete.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ElementTypeConcrete.java
index 914a3b1..7e46ed7 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ElementTypeConcrete.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ElementTypeConcrete.java
@@ -20,7 +20,7 @@ package org.apache.isis.testdomain.model.good;
import org.apache.isis.applib.annotation.DomainObject;
-@DomainObject(objectType = "isis.testdomain.ElementTypeConcrete")
+@DomainObject(logicalTypeName = "isis.testdomain.ElementTypeConcrete")
public class ElementTypeConcrete
extends ElementTypeAbstract
implements ElementTypeInterface {
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperInterface.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperInterface.java
index 733546c..bb286eb 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperInterface.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperInterface.java
@@ -21,7 +21,7 @@ package org.apache.isis.testdomain.model.good;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Property;
-@DomainObject(objectType = "isis.testdomain.ProperInterface")
+@DomainObject(logicalTypeName = "isis.testdomain.ProperInterface")
public interface ProperInterface {
// -- read/write exemplar
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperInterface2.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperInterface2.java
index 635b8c2..3ec85df 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperInterface2.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperInterface2.java
@@ -21,7 +21,7 @@ package org.apache.isis.testdomain.model.good;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Property;
-@DomainObject(objectType = "isis.testdomain.ProperInterface2")
+@DomainObject(logicalTypeName = "isis.testdomain.ProperInterface2")
public interface ProperInterface2
extends ProperInterface {
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionDemo.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionDemo.java
index 0185f57..29416b6 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionDemo.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionDemo.java
@@ -28,10 +28,10 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.LabelPosition;
+import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
@@ -43,7 +43,7 @@ import lombok.Setter;
@XmlRootElement(name = "InteractionDemo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
-@DomainObject(nature=Nature.VIEW_MODEL, objectType="regressiontests.InteractionDemo", editing=Editing.ENABLED)
+@DomainObject(nature=Nature.VIEW_MODEL, logicalTypeName="regressiontests.InteractionDemo", editing=Editing.ENABLED)
public class InteractionDemo {
@Property(
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionNpmDemo.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionNpmDemo.java
index e20c89a..9afe283 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionNpmDemo.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionNpmDemo.java
@@ -34,7 +34,7 @@ import org.apache.isis.applib.annotation.Nature;
@XmlRootElement(name = "InteractionNpmDemo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
-@DomainObject(nature=Nature.VIEW_MODEL, objectType="regressiontests.InteractionNpmDemo", editing=Editing.ENABLED)
+@DomainObject(nature=Nature.VIEW_MODEL, logicalTypeName="regressiontests.InteractionNpmDemo", editing=Editing.ENABLED)
public class InteractionNpmDemo {
}
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/layout/LayoutDemo.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/layout/LayoutDemo.java
index 71a4e41..ec72849 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/layout/LayoutDemo.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/layout/LayoutDemo.java
@@ -36,7 +36,7 @@ import lombok.Setter;
@XmlRootElement(name = "LayoutDemo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
-@DomainObject(nature=Nature.VIEW_MODEL, objectType="regressiontests.LayoutDemo", editing=Editing.ENABLED)
+@DomainObject(nature=Nature.VIEW_MODEL, logicalTypeName="regressiontests.LayoutDemo", editing=Editing.ENABLED)
public class LayoutDemo {
@Property
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/rospec/RoSpecSampler.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/rospec/RoSpecSampler.java
index c1e2d3b..e89f2d2 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/rospec/RoSpecSampler.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/rospec/RoSpecSampler.java
@@ -29,7 +29,7 @@ import org.apache.isis.commons.internal.collections._Lists;
@DomainService(
nature = NatureOfService.REST,
- objectType = "testdomain.RoSpecSampler")
+ logicalTypeName = "testdomain.RoSpecSampler")
public class RoSpecSampler {
// -- VOID
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
index 55c2d42..25b8729 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
@@ -51,7 +51,7 @@ import lombok.Setter;
@DomainObject(
nature = Nature.VIEW_MODEL,
- objectType = "libExcelFixture.BulkUpdateLineItemForDemoToDoItem"
+ logicalTypeName = "libExcelFixture.BulkUpdateLineItemForDemoToDoItem"
)
@DomainObjectLayout(
named = "Bulk update line item",
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
index 39c3473..46f8c4d 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
@@ -60,7 +60,7 @@ import lombok.val;
@DomainObject(
nature = Nature.VIEW_MODEL,
- objectType = "libExcelFixture.BulkUpdateManagerForDemoToDoItem"
+ logicalTypeName = "libExcelFixture.BulkUpdateManagerForDemoToDoItem"
)
@DomainObjectLayout(
named ="Import/export manager",
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
index d478e74..708fff7 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
@@ -37,7 +37,7 @@ import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcateg
@DomainService(
nature = NatureOfService.VIEW,
- objectType = "libExcelFixture.BulkUpdateMenuForDemoToDoItem"
+ logicalTypeName = "libExcelFixture.BulkUpdateMenuForDemoToDoItem"
)
@DomainServiceLayout(named = "Excel")
public class BulkUpdateMenuForDemoToDoItem {
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
index 1f4939d..6ff33e7 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
@@ -33,7 +33,7 @@ import lombok.Getter;
import lombok.Setter;
@DomainObject(
- objectType = "libExcelFixture.ExcelPivotByCategoryAndSubcategory",
+ logicalTypeName = "libExcelFixture.ExcelPivotByCategoryAndSubcategory",
nature = Nature.VIEW_MODEL
)
public class ExcelPivotByCategoryAndSubcategory {
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
index eac1286..aaedd91 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
@@ -35,7 +35,7 @@ import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDem
@DomainService(
nature = NatureOfService.VIEW,
- objectType = "libExcelFixture.ExcelPivotByCategoryAndSubcategoryMenu"
+ logicalTypeName = "libExcelFixture.ExcelPivotByCategoryAndSubcategoryMenu"
)
@DomainServiceLayout(
named = "Excel"
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
index d880992..59549bb 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
@@ -47,7 +47,7 @@ import lombok.Getter;
import lombok.Setter;
@DomainObject(
- objectType = "libExcelFixture.ExcelUploadRowHandler4ToDoItem",
+ logicalTypeName = "libExcelFixture.ExcelUploadRowHandler4ToDoItem",
nature = Nature.VIEW_MODEL
)
@XmlRootElement(name = "BulkUpdateLineItemForDemoToDoItem")
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
index 39fdce2..5304014 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
@@ -37,7 +37,7 @@ import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
@DomainService(
nature = NatureOfService.VIEW,
- objectType = "libExcelFixture.ExcelUploadServiceForDemoToDoItem"
+ logicalTypeName = "libExcelFixture.ExcelUploadServiceForDemoToDoItem"
)
@DomainServiceLayout(
menuBar = DomainServiceLayout.MenuBar.SECONDARY,
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
index 2a8047b..d7ee3ea 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
@@ -29,7 +29,7 @@ import lombok.Getter;
import lombok.Setter;
@DomainObject(
- objectType = "isis.sub.excel.DemoFixture_extending_ExcelFixture2"
+ logicalTypeName = "isis.sub.excel.DemoFixture_extending_ExcelFixture2"
)
public class DemoFixture_extending_ExcelFixture2 extends ExcelFixture2 {
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java
index 27cf1f6..f2bae54 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java
@@ -44,7 +44,7 @@ import org.apache.isis.applib.services.user.UserService;
@DomainService(
nature = NatureOfService.VIEW,
- objectType = "libExcelFixture.ExcelDemoToDoItemMenu"
+ logicalTypeName = "libExcelFixture.ExcelDemoToDoItemMenu"
)
public class ExcelDemoToDoItemMenu {
diff --git a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java
index 634daa6..e30ef6f 100644
--- a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java
+++ b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java
@@ -35,7 +35,7 @@ import lombok.val;
@DomainService(
nature = NatureOfService.VIEW,
- objectType = "libFakeDataFixture.FakeDataDemoObjectWithAllMenu"
+ logicalTypeName = "libFakeDataFixture.FakeDataDemoObjectWithAllMenu"
)
@DomainServiceLayout(named = "Demo")
public class FakeDataDemoObjectWithAllMenu {