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/26 05:52:47 UTC
[isis] branch master updated: ISIS-2631: rename source occurrences
of 'objectType' (any remaining *.java)
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 6f09662 ISIS-2631: rename source occurrences of 'objectType' (any remaining *.java)
6f09662 is described below
commit 6f096626ee0895bd384edf949c10d1f5a798b117
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed May 26 07:52:36 2021 +0200
ISIS-2631: rename source occurrences of 'objectType' (any remaining
*.java)
---
.../isis/core/metamodel/facets/ObjectTypeFacetFactory.java | 2 +-
.../domainobject/DomainObjectAnnotationFacetFactory.java | 8 ++++----
.../ObjectTypeFacetDerivedFromClassNameFactory.java | 12 ++++++------
.../services/metamodel/MetaModelServiceDefault.java | 4 ++--
.../specloader/specimpl/ObjectSpecificationAbstract.java | 6 +++---
.../domainobject/ObjectTypeAnnotationFacetFactoryTest.java | 12 ++++++------
.../model/spiimpl/TableColumnVisibilityServiceForSecman.java | 6 +++---
.../viewer/wicket/pdfjs/applib/spi/PdfJsViewerAdvisor.java | 4 ++--
.../jdo/metamodel/beans/JdoBeanTypeClassifier.java | 2 +-
.../providers/ObjectAdapterMementoProviderAbstract.java | 2 +-
10 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ObjectTypeFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ObjectTypeFacetFactory.java
index 9a23adc..ba9327a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ObjectTypeFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ObjectTypeFacetFactory.java
@@ -22,7 +22,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
public interface ObjectTypeFacetFactory extends FacetFactory {
- // -- process objectType
+ // -- process logicalTypeName
public static class ProcessObjectTypeContext
extends AbstractProcessWithClsContext<FacetHolder> {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
index f5a1f64..1f8f2b2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
@@ -261,7 +261,7 @@ implements
val cls = processClassContext.getCls();
val facetHolder = processClassContext.getFacetHolder();
- // check from @DomainObject(objectType=...)
+ // check from @DomainObject(logicalTypeName=...)
val domainObjectIfAny = processClassContext.synthesizeOnType(DomainObject.class);
val facet = LogicalTypeFacetForDomainObjectAnnotation.create(domainObjectIfAny, cls, facetHolder);
@@ -496,11 +496,11 @@ implements
@Override
public void validate(ObjectSpecification objSpec) {
- // @DomainObject(objectType=...) must be unique among non-abstract types
+ // @DomainObject(logicalTypeName=...) must be unique among non-abstract types
// Eg. having an ApplicationUser interface and a concrete ApplicationUser (JDO)
- // that have the same @DomainObject(objectType=...) should be allowed.
+ // that have the same @DomainObject(logicalTypeName=...) should be allowed.
// A hard constraint that applies, is that there cannot be multiple bookmark-able
- // types that share the same @DomainObject(objectType=...).
+ // types that share the same @DomainObject(logicalTypeName=...).
// This must be guaranteed by MM validation.
// - see also LogicalTypeResolver.register(...)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/ObjectTypeFacetDerivedFromClassNameFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/ObjectTypeFacetDerivedFromClassNameFactory.java
index 0b8c025..2b3008e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/ObjectTypeFacetDerivedFromClassNameFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/ObjectTypeFacetDerivedFromClassNameFactory.java
@@ -72,8 +72,8 @@ implements MetaModelRefiner, ObjectTypeFacetFactory {
if(substitute.isNeverIntrospect()) {
return;
}
- val objectTypeFacet = createObjectTypeFacet(facetHolder, substitute.apply(cls));
- FacetUtil.addFacet(objectTypeFacet);
+ val logicalTypeFacet = createLogicalTypeFacet(facetHolder, substitute.apply(cls));
+ FacetUtil.addFacet(logicalTypeFacet);
}
@Override
@@ -81,7 +81,7 @@ implements MetaModelRefiner, ObjectTypeFacetFactory {
// now a no-op.
}
- private static LogicalTypeFacet createObjectTypeFacet(
+ private static LogicalTypeFacet createLogicalTypeFacet(
final FacetHolder facetHolder,
final Class<?> substitutedClass) {
@@ -120,15 +120,15 @@ implements MetaModelRefiner, ObjectTypeFacetFactory {
return;
}
- val objectTypeFacet = objectSpec.getFacet(LogicalTypeFacet.class);
- if(objectTypeFacet instanceof LogicalTypeFacetDerivedFromClassName) {
+ val logicalTypeFacet = objectSpec.getFacet(LogicalTypeFacet.class);
+ if(logicalTypeFacet instanceof LogicalTypeFacetDerivedFromClassName) {
ValidationFailure.raiseFormatted(
objectSpec,
"%s: the object type must be specified explicitly ('%s' config property). "
+ "Defaulting the object type from the package/class/package name can lead "
+ "to data migration issues for apps deployed to production (if the class is "
+ "subsequently refactored). "
- + "Use @Discriminator, @DomainObject(objectType=...) or "
+ + "Use @Discriminator, @DomainObject(logicalTypeName=...) or "
+ "@PersistenceCapable(schema=...) to specify explicitly.",
objectSpec.getFullIdentifier(),
"isis.core.meta-model.validator.explicit-object-type");
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
index 8c3863d..34a20c6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
@@ -69,8 +69,8 @@ public class MetaModelServiceDefault implements MetaModelService {
@Inject private GridService gridService;
@Override
- public Optional<LogicalType> lookupLogicalTypeByName(final @Nullable String objectType) {
- return specificationLoader.specForLogicalTypeName(objectType)
+ public Optional<LogicalType> lookupLogicalTypeByName(final @Nullable String logicalTypeName) {
+ return specificationLoader.specForLogicalTypeName(logicalTypeName)
.map(ObjectSpecification::getLogicalType);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index d24bc5f..5e8d161 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -222,11 +222,11 @@ implements ObjectSpecification {
}
private LogicalType lookupLogicalType() {
- val objectTypeFacet = getFacet(LogicalTypeFacet.class);
- if(objectTypeFacet == null) {
+ val logicalTypeFacet = getFacet(LogicalTypeFacet.class);
+ if(logicalTypeFacet == null) {
throw new IllegalStateException("could not find an ObjectTypeFacet for " + this.getFullIdentifier());
}
- return objectTypeFacet.getLogicalType();
+ return logicalTypeFacet.getLogicalType();
}
/**
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 30f3b06..181ee93 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
@@ -22,6 +22,11 @@ package org.apache.isis.core.metamodel.facets.object.domainobject;
import org.junit.Before;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.core.metamodel.facets.ObjectTypeFacetFactory.ProcessObjectTypeContext;
@@ -29,11 +34,6 @@ import org.apache.isis.core.metamodel.facets.object.domainobject.objectspecid.Lo
import org.apache.isis.core.metamodel.facets.object.logicaltype.LogicalTypeFacet;
import org.apache.isis.core.metamodel.methods.MethodByClassMap;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-
public class ObjectTypeAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
private DomainObjectAnnotationFacetFactory facetFactory;
@@ -44,7 +44,7 @@ public class ObjectTypeAnnotationFacetFactoryTest extends AbstractFacetFactoryJU
}
@Test
- public void objectTypeAnnotationPickedUpOnClass() {
+ public void logicalTypeNameAnnotationPickedUpOnClass() {
@DomainObject(logicalTypeName = "CUS")
class Customer {
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/spiimpl/TableColumnVisibilityServiceForSecman.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/spiimpl/TableColumnVisibilityServiceForSecman.java
index 9443584..d5267e5 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/spiimpl/TableColumnVisibilityServiceForSecman.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/spiimpl/TableColumnVisibilityServiceForSecman.java
@@ -35,11 +35,11 @@ public class TableColumnVisibilityServiceForSecman implements TableColumnVisibil
final boolean granted = specificationLoader.specForType(elementType)
.map(ObjectSpecification::getLogicalTypeName)
- .map(objectType->{
- val featureId = ApplicationFeatureId.newMember(objectType, memberId);
+ .map(logicalTypeName->{
+ val featureId = ApplicationFeatureId.newMember(logicalTypeName, memberId);
return permissionSet.evaluate(featureId, ApplicationPermissionMode.VIEWING).isGranted();
})
- .orElse(false); // do not grant if elementType has no objectType
+ .orElse(false); // do not grant if elementType has no logicalTypeName
return !granted;
diff --git a/extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/applib/spi/PdfJsViewerAdvisor.java b/extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/applib/spi/PdfJsViewerAdvisor.java
index f0c9e4d..305317c 100644
--- a/extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/applib/spi/PdfJsViewerAdvisor.java
+++ b/extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/applib/spi/PdfJsViewerAdvisor.java
@@ -56,11 +56,11 @@ public interface PdfJsViewerAdvisor {
private final String identifier;
public InstanceKey(
- final String objectType,
+ final String logicalTypeName,
final String identifier,
final String propertyId,
final String userName) {
- this.typeKey = new TypeKey(objectType, propertyId, userName);
+ this.typeKey = new TypeKey(logicalTypeName, propertyId, userName);
this.identifier = identifier;
}
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/beans/JdoBeanTypeClassifier.java b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/beans/JdoBeanTypeClassifier.java
index 846a97a..84edc36 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/beans/JdoBeanTypeClassifier.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/beans/JdoBeanTypeClassifier.java
@@ -61,7 +61,7 @@ public class JdoBeanTypeClassifier implements IsisBeanTypeClassifier {
logicalTypeName = LogicalTypeNameUtil.logicalTypeName(aDomainObject);
}
- // don't trample over the @DomainObject(objectType=..) if present
+ // don't trample over the @DomainObject(logicalTypeName=..) if present
if(_Strings.isEmpty(logicalTypeName)) {
val schema = persistenceCapableAnnot.get().schema();
if(_Strings.isNotEmpty(schema)) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
index d338df5..67eda57 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
@@ -95,7 +95,7 @@ extends ChoiceProvider<ObjectMemento> {
.orElse(null);
// support enums that are implementing an interface; only know this late in the day
- // TODO: this is a hack, really should push this deeper so that Encodeable OAMs also prefix themselves with their objectType
+ // TODO: this is a hack, really should push this deeper so that Encodeable OAMs also prefix themselves with their logicalTypeName
if(spec != null && spec.isEncodeable()) {
return logicalType.getLogicalTypeName() + ":" + choiceMemento.asString();
} else {