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/17 07:27:10 UTC
[isis] branch master updated: ISIS-2681: rename occurrences of
specId -> objectType
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 cff1360 ISIS-2681: rename occurrences of specId -> objectType
cff1360 is described below
commit cff1360fe82a5c582200d3c10771a7a4949603cf
Author: ahuber@apache.org <ah...@luna>
AuthorDate: Mon May 17 09:26:55 2021 +0200
ISIS-2681: rename occurrences of specId -> objectType
---
.../org/apache/isis/applib/id/LogicalType.java | 2 +-
.../facets/object/grid/GridFacetDefault.java | 8 +-
.../objectspecid/ObjectTypeMalformedValidator.java | 6 +-
...ObjectTypeFacetDerivedFromClassNameFactory.java | 4 +-
.../create/ObjectCreator_builtinHandlers.java | 214 ---------------------
.../spec/feature/OneToOneAssociation.java | 4 +-
.../specloader/SpecificationLoaderDefault.java | 2 +-
.../specloader/facetprocessor/FacetProcessor.java | 3 +-
.../specimpl/ObjectSpecificationAbstract.java | 6 +-
.../specloader/SpecificationCacheDefaultTest.java | 4 +-
.../model/menu/MenuUiModel_buildMenuItems.java | 4 +-
.../JsonValueEncoderTest_appendValueAndFormat.java | 52 ++---
.../JsonValueEncoderTest_asAdapter.java | 28 +--
.../linkandlabel/LinkAndLabelFactoryAbstract.java | 4 +-
.../ObjectAdapterMementoProviderAbstract.java | 2 +-
...tAdapterMementoProviderForValueChoicesTest.java | 4 +-
16 files changed, 66 insertions(+), 281 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 e555577..db0201c 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
@@ -141,7 +141,7 @@ implements
*
* <p>
* The {@link ObjectSpecification} can be retrieved using
- * {@link SpecificationLoader#lookupBySpecIdElseLoad(String)}} passing the logical-type-name as argument.
+ * {@link SpecificationLoader#specForLogicalTypeName(String)}} passing the logical-type-name as argument.
*
* @see ClassSubstitutorRegistry
* @see ObjectTypeFacet
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/grid/GridFacetDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/grid/GridFacetDefault.java
index 224d9a8..6f29705 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/grid/GridFacetDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/grid/GridFacetDefault.java
@@ -94,11 +94,11 @@ implements GridFacet {
if(!getSpecification().equals(objectAdapter.getSpecification())) {
throw _Exceptions.unrecoverableFormatted(
- "getGrid(adapter) was called passing an adapter (specId: %s), "
- + "for which this GridFacet (specId: %s) is not responsible; "
+ "getGrid(adapter) was called passing an adapter (type: %s), "
+ + "for which this GridFacet (type: %s) is not responsible; "
+ "indicates that some framework internals are wired up in a wrong way",
- objectAdapter.getSpecification().getLogicalTypeName(),
- getSpecification().getLogicalTypeName());
+ objectAdapter.getSpecification().getCorrespondingClass().getName(),
+ getSpecification().getCorrespondingClass().getName());
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectTypeMalformedValidator.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectTypeMalformedValidator.java
index cdaa5e8..63b541e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectTypeMalformedValidator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectTypeMalformedValidator.java
@@ -46,12 +46,12 @@ implements MetaModelRefiner {
return;
}
- val objectSpecIdFacet = spec.getFacet(ObjectTypeFacet.class);
- if(objectSpecIdFacet == null) {
+ val objectTypeFacet = spec.getFacet(ObjectTypeFacet.class);
+ if(objectTypeFacet == null) {
return;
}
- val logicalTypeName = objectSpecIdFacet.value();
+ val logicalTypeName = objectTypeFacet.value();
val nameParts = _Strings.splitThenStream(logicalTypeName, ".")
.collect(Can.toCan());
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectTypeFacetDerivedFromClassNameFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectTypeFacetDerivedFromClassNameFactory.java
index e75b840..0a1c0f8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectTypeFacetDerivedFromClassNameFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectTypeFacetDerivedFromClassNameFactory.java
@@ -117,8 +117,8 @@ implements MetaModelRefiner, ObjectTypeFacetFactory {
return;
}
- val objectSpecIdFacet = objectSpec.getFacet(ObjectTypeFacet.class);
- if(objectSpecIdFacet instanceof ObjectTypeFacetDerivedFromClassName) {
+ val objectTypeFacet = objectSpec.getFacet(ObjectTypeFacet.class);
+ if(objectTypeFacet instanceof ObjectTypeFacetDerivedFromClassName) {
ValidationFailure.raiseFormatted(
objectSpec,
"%s: the object type must be specified explicitly ('%s' config property). "
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/create/ObjectCreator_builtinHandlers.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/create/ObjectCreator_builtinHandlers.java
index 0fe4a42..b8a7667 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/create/ObjectCreator_builtinHandlers.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/create/ObjectCreator_builtinHandlers.java
@@ -163,218 +163,4 @@ final class ObjectCreator_builtinHandlers {
}
-
- // -- NULL GUARD
-
-// @Data
-// public static class GuardAgainstNull implements ObjectCreator.Handler {
-//
-// private MetaModelContext metaModelContext;
-//
-// @Override
-// public boolean isHandling(Request objectLoadRequest) {
-//
-// if(objectLoadRequest==null) {
-// return true;
-// }
-//
-// val spec = objectLoadRequest.getObjectSpecification();
-// if(spec == null) {
-// // eg "NONEXISTENT:123"
-// return true;
-// }
-//
-// return false;
-// }
-//
-// @Override
-// public ManagedObject handle(Request objectLoadRequest) {
-// return null; // yes null
-// }
-//
-// }
-
- // -- MANAGED BEANS
-
-// @Data
-// public static class LoadService implements ObjectCreator.Handler {
-//
-// private MetaModelContext metaModelContext;
-//
-// @Override
-// public boolean isHandling(Request objectLoadRequest) {
-//
-// val spec = objectLoadRequest.getObjectSpecification();
-// return spec.isManagedBean();
-// }
-//
-// @Override
-// public ManagedObject handle(Request objectLoadRequest) {
-//
-// val spec = objectLoadRequest.getObjectSpecification();
-// val beanName = spec.getSpecId().asString();
-//
-// val servicePojo = metaModelContext.getServiceRegistry()
-// .lookupRegisteredBeanById(beanName)
-// .map(ManagedBeanAdapter::getInstance)
-// .flatMap(Can::getFirst)
-// .orElseThrow(()->_Exceptions.noSuchElement(
-// "loader: %s loading beanName %s",
-// this.getClass().getName(), beanName));
-//
-// return ManagedObject.of(spec, servicePojo);
-// }
-//
-// }
-
- // -- VALUES
-
-// @Data
-// public static class CreateValueDefault implements ObjectCreator.Handler {
-//
-// private MetaModelContext metaModelContext;
-//
-// @Override
-// public boolean isHandling(Request objectLoadRequest) {
-//
-// val spec = objectLoadRequest.getObjectSpecification();
-// return spec.isValue();
-// }
-//
-// @Override
-// public ManagedObject handle(Request objectLoadRequest) {
-//
-// // cannot load a value
-//
-// val spec = objectLoadRequest.getObjectSpecification();
-// throw _Exceptions.illegalArgument(
-// "cannot load a value, loader: %s loading ObjectSpecification %s",
-// this.getClass().getName(), spec);
-// }
-//
-// }
-//
-// // -- VIEW MODELS
-//
-// @Data
-// public static class CreateViewModel implements ObjectCreator.Handler {
-//
-// private MetaModelContext metaModelContext;
-//
-// @Override
-// public boolean isHandling(Request objectLoadRequest) {
-//
-// val spec = objectLoadRequest.getObjectSpecification();
-// return spec.isViewModel();
-// }
-//
-// @Override
-// public ManagedObject handle(Request objectLoadRequest) {
-//
-// val spec = objectLoadRequest.getObjectSpecification();
-// val viewModelFacet = spec.getFacet(ViewModelFacet.class);
-// if(viewModelFacet == null) {
-// throw _Exceptions.illegalArgument(
-// "ObjectSpecification is missing a ViewModelFacet: %s", spec);
-// }
-//
-// val memento = objectLoadRequest.getObjectIdentifier();
-// final Object viewModelPojo;
-// if(viewModelFacet.getRecreationMechanism().isInitializes()) {
-// viewModelPojo = this.instantiateAndInjectServices(spec);
-// viewModelFacet.initialize(viewModelPojo, memento);
-// } else {
-// viewModelPojo = viewModelFacet.instantiate(spec.getCorrespondingClass(), memento);
-// }
-//
-// return ManagedObject.of(spec, viewModelPojo);
-// }
-//
-// private Object instantiateAndInjectServices(ObjectSpecification spec) {
-//
-// val type = spec.getCorrespondingClass();
-// if (type.isArray()) {
-// return Array.newInstance(type.getComponentType(), 0);
-// }
-//
-// if (Modifier.isAbstract(type.getModifiers())) {
-// throw _Exceptions.illegalArgument("Cannot create an instance of an abstract class '%s', "
-// + "creator: %s creating ObjectSpecification %s",
-// type, this.getClass().getName(), spec);
-// }
-//
-// final Object newInstance;
-// try {
-// newInstance = type.newInstance();
-// } catch (final IllegalAccessException | InstantiationException e) {
-// throw _Exceptions.illegalArgument("Failed to create instance of type '%s', "
-// + "creator: %s creating ObjectSpecification %s",
-// type, this.getClass().getName(), spec);
-// }
-//
-// metaModelContext.getServiceInjector().injectServicesInto(newInstance);
-// return newInstance;
-// }
-//
-// }
-//
-// // -- ENTITIES
-//
-// @Data
-// public static class CreateEntity implements ObjectCreator.Handler {
-//
-// private MetaModelContext metaModelContext;
-//
-// @Override
-// public boolean isHandling(Request objectLoadRequest) {
-//
-// val spec = objectLoadRequest.getObjectSpecification();
-// return spec.isEntity();
-// }
-//
-// @Override
-// public ManagedObject handle(Request objectLoadRequest) {
-//
-// val spec = objectLoadRequest.getObjectSpecification();
-// val entityFacet = spec.getFacet(EntityFacet.class);
-// if(entityFacet==null) {
-// throw _Exceptions.illegalArgument(
-// "ObjectSpecification is missing an EntityFacet: %s", spec);
-// }
-//
-// val identifier = objectLoadRequest.getObjectIdentifier();
-// val entityPojo = entityFacet.fetchByIdentifier(spec, identifier);
-//
-// metaModelContext.getServiceInjector().injectServicesInto(entityPojo);
-//
-// return ManagedObject.of(spec, entityPojo);
-// }
-//
-// }
-//
-// // -- UNKNOWN LOAD REQUEST
-//
-// @Data
-// public static class CreateOther implements ObjectCreator.Handler {
-//
-// private MetaModelContext metaModelContext;
-//
-// @Override
-// public boolean isHandling(Request objectLoadRequest) {
-// return true; // the last handler in the chain
-// }
-//
-// @Override
-// public ManagedObject handle(Request objectLoadRequest) {
-//
-// // unknown object load request
-//
-// throw _Exceptions.illegalArgument(
-// "unknown object create request, creator: %s creating from ObjectSpecification %s",
-// this.getClass().getName(), objectLoadRequest.getObjectSpecification());
-//
-// }
-//
-// }
-
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneAssociation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneAssociation.java
index 4d43f17..08a9fb2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneAssociation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneAssociation.java
@@ -63,9 +63,9 @@ public interface OneToOneAssociation extends ObjectAssociation, OneToOneFeature,
default String getCssClass(String prefix) {
- final String ownerSpecId = getOnType().getLogicalTypeName().replace(".", "-");
+ final String ownerObjectType = getOnType().getLogicalTypeName().replace(".", "-");
final String memberId = getIdentifier().getMemberName();
- return prefix + ownerSpecId + "-" + memberId;
+ return prefix + ownerObjectType + "-" + memberId;
}
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
index c4d5ab1..0ef398e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
@@ -455,7 +455,7 @@ public class SpecificationLoaderDefault implements SpecificationLoader {
// log.warn("Lookup for ObjectType '{}' failed, but found a matching fully qualified "
// + "class name to use instead. This warning is an indicator, that {} is not "
// + "discovered by Spring during bootstrapping of this application.",
-// objectSpecId.getSpecId(),
+// logicalType.getName(),
// cls.getName());
return LogicalType.fqcn(cls);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java
index cb17b0d..0163ebe 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java
@@ -255,8 +255,7 @@ public class FacetProcessor {
factoryListByFeatureType.get().getOrElseEmpty(FeatureType.OBJECT)
.forEach(facetFactory->{
if (facetFactory instanceof ObjectTypeFacetFactory) {
- val objectSpecIdFacetFactory = (ObjectTypeFacetFactory) facetFactory;
- facetFactories.add(objectSpecIdFacetFactory);
+ facetFactories.add((ObjectTypeFacetFactory) facetFactory);
}
});
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 e2fd9b8..338d761 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 objectSpecIdFacet = getFacet(ObjectTypeFacet.class);
- if(objectSpecIdFacet == null) {
+ val objectTypeFacet = getFacet(ObjectTypeFacet.class);
+ if(objectTypeFacet == null) {
throw new IllegalStateException("could not find an ObjectTypeFacet for " + this.getFullIdentifier());
}
- return LogicalType.eager(correspondingClass, objectSpecIdFacet.value());
+ return LogicalType.eager(correspondingClass, objectTypeFacet.value());
}
/**
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java
index f226a1e..ae54201 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java
@@ -51,7 +51,7 @@ public class SpecificationCacheDefaultTest {
private ObjectSpecification orderSpec;
private SpecificationCache<ObjectSpecification> specificationCache = new SpecificationCacheDefault<>();
- private LogicalTypeResolver specIdToClassResolver = new LogicalTypeResolverDefault();
+ private LogicalTypeResolver logicalTypeResolver = new LogicalTypeResolverDefault();
@Before
public void setUp() throws Exception {
@@ -109,7 +109,7 @@ public class SpecificationCacheDefaultTest {
@Test
public void getByObjectType_whenNotSet() {
- val type = specIdToClassResolver.lookup(cus.getLogicalTypeName());
+ val type = logicalTypeResolver.lookup(cus.getLogicalTypeName());
assertFalse(type.isPresent());
}
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel_buildMenuItems.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel_buildMenuItems.java
index c7020cb..204c911 100644
--- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel_buildMenuItems.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel_buildMenuItems.java
@@ -56,9 +56,9 @@ final class MenuUiModel_buildMenuItems {
itemsPerSectionCounter.reset();
for (val actionLayoutData : menuSection.getServiceActions()) {
- val serviceSpecId = actionLayoutData.getObjectType();
+ val serviceBeanName = actionLayoutData.getObjectType();
- val serviceAdapter = commonContext.lookupServiceAdapterById(serviceSpecId);
+ val serviceAdapter = commonContext.lookupServiceAdapterById(serviceBeanName);
if(serviceAdapter == null) {
// service not recognized, presumably the menu layout is out of sync with actual configured modules
continue;
diff --git a/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java
index 8f306d1..ccc14f2 100644
--- a/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java
+++ b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java
@@ -70,7 +70,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
@Test
public void whenString() {
- allowingObjectSpecToReturnSpecIdFor(String.class);
+ allowingLogicalTypeReturnObjectTypeFor(String.class);
allowingObjectAdapterToReturn("aString");
jsonValueEncoder.appendValueAndFormat(mockObjectAdapter, mockObjectSpec, representation, null, false);
@@ -83,7 +83,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
@Test
public void whenBooleanWrapper() {
- allowingObjectSpecToReturnSpecIdFor(Boolean.class);
+ allowingLogicalTypeReturnObjectTypeFor(Boolean.class);
allowingObjectAdapterToReturn(Boolean.TRUE);
jsonValueEncoder.appendValueAndFormat(mockObjectAdapter, mockObjectSpec, representation, null, false);
@@ -95,7 +95,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
@Test
public void whenBooleanPrimitive() {
- allowingObjectSpecToReturnSpecIdFor(boolean.class);
+ allowingLogicalTypeReturnObjectTypeFor(boolean.class);
allowingObjectAdapterToReturn(true);
jsonValueEncoder.appendValueAndFormat(mockObjectAdapter, mockObjectSpec, representation, null, false);
@@ -107,7 +107,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
@Test
public void whenByteWrapper() {
- allowingObjectSpecToReturnSpecIdFor(Byte.class);
+ allowingLogicalTypeReturnObjectTypeFor(Byte.class);
allowingObjectAdapterToReturn(Byte.valueOf((byte)123));
jsonValueEncoder.appendValueAndFormat(mockObjectAdapter, mockObjectSpec, representation, null, false);
@@ -120,7 +120,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
@Test
public void whenBytePrimitive() {
- allowingObjectSpecToReturnSpecIdFor(byte.class);
+ allowingLogicalTypeReturnObjectTypeFor(byte.class);
allowingObjectAdapterToReturn((byte)123);
jsonValueEncoder.appendValueAndFormat(mockObjectAdapter, mockObjectSpec, representation, null, false);
@@ -133,7 +133,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
@Test
public void whenShortWrapper() {
- allowingObjectSpecToReturnSpecIdFor(Short.class);
+ allowingLogicalTypeReturnObjectTypeFor(Short.class);
allowingObjectAdapterToReturn(Short.valueOf((short)12345));
jsonValueEncoder.appendValueAndFormat(mockObjectAdapter, mockObjectSpec, representation, null, false);
@@ -146,7 +146,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
@Test
public void whenShortPrimitive() {
- allowingObjectSpecToReturnSpecIdFor(short.class);
+ allowingLogicalTypeReturnObjectTypeFor(short.class);
allowingObjectAdapterToReturn((short)12345);
jsonValueEncoder.appendValueAndFormat(mockObjectAdapter, mockObjectSpec, representation, null, false);
@@ -159,7 +159,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
@Test
public void whenIntWrapper() {
- allowingObjectSpecToReturnSpecIdFor(Integer.class);
+ allowingLogicalTypeReturnObjectTypeFor(Integer.class);
allowingObjectAdapterToReturn(Integer.valueOf(12345678));
jsonValueEncoder.appendValueAndFormat(mockObjectAdapter, mockObjectSpec, representation, null, false);
@@ -172,7 +172,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
@Test
public void whenIntPrimitive() {
- allowingObjectSpecToReturnSpecIdFor(int.class);
+ allowingLogicalTypeReturnObjectTypeFor(int.class);
allowingObjectAdapterToReturn(12345678);
jsonValueEncoder.appendValueAndFormat(mockObjectAdapter, mockObjectSpec, representation, null, false);
@@ -185,7 +185,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
@Test
public void whenLongWrapper() {
- allowingObjectSpecToReturnSpecIdFor(Long.class);
+ allowingLogicalTypeReturnObjectTypeFor(Long.class);
allowingObjectAdapterToReturn(Long.valueOf(12345678901234L));
jsonValueEncoder.appendValueAndFormat(mockObjectAdapter, mockObjectSpec, representation, null, false);
@@ -198,7 +198,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
@Test
public void whenLongPrimitive() {
- allowingObjectSpecToReturnSpecIdFor(long.class);
+ allowingLogicalTypeReturnObjectTypeFor(long.class);
allowingObjectAdapterToReturn(12345678901234L);
jsonValueEncoder.appendValueAndFormat(mockObjectAdapter, mockObjectSpec, representation, null, false);
@@ -211,7 +211,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
@Test
public void whenFloatWrapper() {
- allowingObjectSpecToReturnSpecIdFor(Float.class);
+ allowingLogicalTypeReturnObjectTypeFor(Float.class);
allowingObjectAdapterToReturn(Float.valueOf((float)123.45));
jsonValueEncoder.appendValueAndFormat(mockObjectAdapter, mockObjectSpec, representation, null, false);
@@ -224,7 +224,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
@Test
public void whenFloatPrimitive() {
- allowingObjectSpecToReturnSpecIdFor(Float.class);
+ allowingLogicalTypeReturnObjectTypeFor(Float.class);
allowingObjectAdapterToReturn((float)123.45);
jsonValueEncoder.appendValueAndFormat(mockObjectAdapter, mockObjectSpec, representation, null, false);
@@ -237,7 +237,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
@Test
public void whenDoubleWrapper() {
- allowingObjectSpecToReturnSpecIdFor(Double.class);
+ allowingLogicalTypeReturnObjectTypeFor(Double.class);
allowingObjectAdapterToReturn(Double.valueOf(12345.6789));
jsonValueEncoder.appendValueAndFormat(mockObjectAdapter, mockObjectSpec, representation, null, false);
@@ -250,7 +250,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
@Test
public void whenDoublePrimitive() {
- allowingObjectSpecToReturnSpecIdFor(double.class);
+ allowingLogicalTypeReturnObjectTypeFor(double.class);
allowingObjectAdapterToReturn(12345.6789);
jsonValueEncoder.appendValueAndFormat(mockObjectAdapter, mockObjectSpec, representation, null, false);
@@ -263,7 +263,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
@Test
public void whenCharWrapper() {
- allowingObjectSpecToReturnSpecIdFor(Character.class);
+ allowingLogicalTypeReturnObjectTypeFor(Character.class);
allowingObjectAdapterToReturn(Character.valueOf('a'));
jsonValueEncoder.appendValueAndFormat(mockObjectAdapter, mockObjectSpec, representation, null, false);
@@ -276,7 +276,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
@Test
public void whenCharPrimitive() {
- allowingObjectSpecToReturnSpecIdFor(char.class);
+ allowingLogicalTypeReturnObjectTypeFor(char.class);
allowingObjectAdapterToReturn('a');
jsonValueEncoder.appendValueAndFormat(mockObjectAdapter, mockObjectSpec, representation, null, false);
@@ -289,7 +289,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
@Test
public void whenJavaUtilDate() {
- allowingObjectSpecToReturnSpecIdFor(java.util.Date.class);
+ allowingLogicalTypeReturnObjectTypeFor(java.util.Date.class);
allowingObjectAdapterToReturn(asDateTime("2014-04-25T12:34:45Z"));
jsonValueEncoder.appendValueAndFormat(mockObjectAdapter, mockObjectSpec, representation, null, false);
@@ -302,7 +302,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
@Test
public void whenJavaSqlDate() {
- allowingObjectSpecToReturnSpecIdFor(java.sql.Date.class);
+ allowingLogicalTypeReturnObjectTypeFor(java.sql.Date.class);
allowingObjectAdapterToReturn(asSqlDate("2014-04-25"));
jsonValueEncoder.appendValueAndFormat(mockObjectAdapter, mockObjectSpec, representation, null, false);
@@ -315,7 +315,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
@Test
public void whenJodaDateTime() {
- allowingObjectSpecToReturnSpecIdFor(org.joda.time.DateTime.class);
+ allowingLogicalTypeReturnObjectTypeFor(org.joda.time.DateTime.class);
allowingObjectAdapterToReturn(new org.joda.time.DateTime(asDateTime("2014-04-25T12:34:45Z")));
jsonValueEncoder.appendValueAndFormat(mockObjectAdapter, mockObjectSpec, representation, null, false);
@@ -328,7 +328,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
@Test
public void whenJodaLocalDateTime() {
- allowingObjectSpecToReturnSpecIdFor(org.joda.time.LocalDateTime.class);
+ allowingLogicalTypeReturnObjectTypeFor(org.joda.time.LocalDateTime.class);
allowingObjectAdapterToReturn(new org.joda.time.LocalDateTime(asDateTime("2014-04-25T12:34:45Z")));
jsonValueEncoder.appendValueAndFormat(mockObjectAdapter, mockObjectSpec, representation, null, false);
@@ -341,7 +341,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
@Test
public void whenJodaLocalDate() {
- allowingObjectSpecToReturnSpecIdFor(org.joda.time.LocalDate.class);
+ allowingLogicalTypeReturnObjectTypeFor(org.joda.time.LocalDate.class);
allowingObjectAdapterToReturn(new org.joda.time.LocalDate(2014,4,25));
jsonValueEncoder.appendValueAndFormat(mockObjectAdapter, mockObjectSpec, representation, null, false);
@@ -354,7 +354,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
@Test
public void whenJavaSqlTimestamp() {
- allowingObjectSpecToReturnSpecIdFor(java.sql.Timestamp.class);
+ allowingLogicalTypeReturnObjectTypeFor(java.sql.Timestamp.class);
final long time = asDateTime("2014-04-25T12:34:45Z").getTime();
allowingObjectAdapterToReturn(new Timestamp(time));
@@ -368,7 +368,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
@Test
public void whenBigInteger() {
- allowingObjectSpecToReturnSpecIdFor(BigInteger.class);
+ allowingLogicalTypeReturnObjectTypeFor(BigInteger.class);
allowingObjectAdapterToReturn(new BigInteger("12345678901234567890"));
jsonValueEncoder.appendValueAndFormat(mockObjectAdapter, mockObjectSpec, representation, "big-integer(22)", false);
@@ -382,7 +382,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
@Test
public void whenBigDecimal() {
- allowingObjectSpecToReturnSpecIdFor(BigDecimal.class);
+ allowingLogicalTypeReturnObjectTypeFor(BigDecimal.class);
allowingObjectAdapterToReturn(new BigDecimal("12345678901234567890.1234"));
jsonValueEncoder.appendValueAndFormat(mockObjectAdapter, mockObjectSpec, representation, "big-decimal(27,4)", false);
@@ -395,7 +395,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
}
- private void allowingObjectSpecToReturnSpecIdFor(final Class<?> cls) {
+ private void allowingLogicalTypeReturnObjectTypeFor(final Class<?> cls) {
context.checking(new Expectations() {
{
allowing(mockObjectSpec).getCorrespondingClass();
diff --git a/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java
index b0bdd8a..d3caf15 100644
--- a/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java
+++ b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java
@@ -124,7 +124,7 @@ public class JsonValueEncoderTest_asAdapter {
private void whenReprIsBoolean(final Class<?> correspondingClass) {
// given
allowingObjectSpecHas(EncodableFacet.class, mockEncodableFacet);
- allowingObjectSpecCorrespondingClassAndSpecIdIs(correspondingClass);
+ allowingObjectSpecCorrespondingClassAndObjectTypeIs(correspondingClass);
final boolean value = true;
representation = new JsonRepresentation(BooleanNode.valueOf(value));
context.checking(new Expectations() {
@@ -145,7 +145,7 @@ public class JsonValueEncoderTest_asAdapter {
public void whenObjectSpecIsBooleanButReprIsNot() throws Exception {
// given
allowingObjectSpecHas(EncodableFacet.class, mockEncodableFacet);
- allowingObjectSpecCorrespondingClassAndSpecIdIs(boolean.class);
+ allowingObjectSpecCorrespondingClassAndObjectTypeIs(boolean.class);
context.checking(new Expectations() {
{
@@ -171,7 +171,7 @@ public class JsonValueEncoderTest_asAdapter {
private void whenReprIsInteger(final Class<?> correspondingClass) {
// given
allowingObjectSpecHas(EncodableFacet.class, mockEncodableFacet);
- allowingObjectSpecCorrespondingClassAndSpecIdIs(correspondingClass);
+ allowingObjectSpecCorrespondingClassAndObjectTypeIs(correspondingClass);
final int value = 123;
representation = new JsonRepresentation(IntNode.valueOf(value));
context.checking(new Expectations() {
@@ -192,7 +192,7 @@ public class JsonValueEncoderTest_asAdapter {
public void whenObjectSpecIsIntegerButReprIsNot() throws Exception {
// given
allowingObjectSpecHas(EncodableFacet.class, mockEncodableFacet);
- allowingObjectSpecCorrespondingClassAndSpecIdIs(int.class);
+ allowingObjectSpecCorrespondingClassAndObjectTypeIs(int.class);
representation = JsonRepresentation.newMap("foo", "bar");
@@ -213,7 +213,7 @@ public class JsonValueEncoderTest_asAdapter {
private void whenReprIsLong(final Class<?> correspondingClass) {
// given
allowingObjectSpecHas(EncodableFacet.class, mockEncodableFacet);
- allowingObjectSpecCorrespondingClassAndSpecIdIs(correspondingClass);
+ allowingObjectSpecCorrespondingClassAndObjectTypeIs(correspondingClass);
final long value = 1234567890L;
representation = new JsonRepresentation(LongNode.valueOf(value));
context.checking(new Expectations() {
@@ -234,7 +234,7 @@ public class JsonValueEncoderTest_asAdapter {
public void whenObjectSpecIsLongButReprIsNot() throws Exception {
// given
allowingObjectSpecHas(EncodableFacet.class, mockEncodableFacet);
- allowingObjectSpecCorrespondingClassAndSpecIdIs(long.class);
+ allowingObjectSpecCorrespondingClassAndObjectTypeIs(long.class);
context.checking(new Expectations() {
{
@@ -260,7 +260,7 @@ public class JsonValueEncoderTest_asAdapter {
private void whenReprIsDouble(final Class<?> correspondingClass) {
// given
allowingObjectSpecHas(EncodableFacet.class, mockEncodableFacet);
- allowingObjectSpecCorrespondingClassAndSpecIdIs(correspondingClass);
+ allowingObjectSpecCorrespondingClassAndObjectTypeIs(correspondingClass);
final double value = 123.45;
representation = new JsonRepresentation(DoubleNode.valueOf(value));
context.checking(new Expectations() {
@@ -281,7 +281,7 @@ public class JsonValueEncoderTest_asAdapter {
public void whenObjectSpecIsDoubleButReprIsNot() throws Exception {
// given
allowingObjectSpecHas(EncodableFacet.class, mockEncodableFacet);
- allowingObjectSpecCorrespondingClassAndSpecIdIs(double.class);
+ allowingObjectSpecCorrespondingClassAndObjectTypeIs(double.class);
representation = JsonRepresentation.newMap("foo", "bar");
@@ -293,7 +293,7 @@ public class JsonValueEncoderTest_asAdapter {
public void whenReprIsBigInteger() throws Exception {
// given
allowingObjectSpecHas(EncodableFacet.class, mockEncodableFacet);
- allowingObjectSpecCorrespondingClassAndSpecIdIs(BigInteger.class);
+ allowingObjectSpecCorrespondingClassAndObjectTypeIs(BigInteger.class);
final BigInteger value = BigInteger.valueOf(123);
representation = new JsonRepresentation(BigIntegerNode.valueOf(value));
context.checking(new Expectations() {
@@ -314,7 +314,7 @@ public class JsonValueEncoderTest_asAdapter {
public void whenObjectSpecIsBigIntegerButReprIsNot() throws Exception {
// given
allowingObjectSpecHas(EncodableFacet.class, mockEncodableFacet);
- allowingObjectSpecCorrespondingClassAndSpecIdIs(BigInteger.class);
+ allowingObjectSpecCorrespondingClassAndObjectTypeIs(BigInteger.class);
representation = JsonRepresentation.newMap("foo", "bar");
@@ -326,7 +326,7 @@ public class JsonValueEncoderTest_asAdapter {
public void whenReprIsBigDecimal() throws Exception {
// given
allowingObjectSpecHas(EncodableFacet.class, mockEncodableFacet);
- allowingObjectSpecCorrespondingClassAndSpecIdIs(BigDecimal.class);
+ allowingObjectSpecCorrespondingClassAndObjectTypeIs(BigDecimal.class);
final BigDecimal value = new BigDecimal("123234234.45612312343535");
representation = new JsonRepresentation(DecimalNode.valueOf(value));
context.checking(new Expectations() {
@@ -347,7 +347,7 @@ public class JsonValueEncoderTest_asAdapter {
public void whenObjectSpecIsBigDecimalButReprIsNot() throws Exception {
// given
allowingObjectSpecHas(EncodableFacet.class, mockEncodableFacet);
- allowingObjectSpecCorrespondingClassAndSpecIdIs(BigDecimal.class);
+ allowingObjectSpecCorrespondingClassAndObjectTypeIs(BigDecimal.class);
representation = JsonRepresentation.newMap("foo", "bar");
@@ -359,7 +359,7 @@ public class JsonValueEncoderTest_asAdapter {
public void whenReprIsString() throws Exception {
// given
allowingObjectSpecHas(EncodableFacet.class, mockEncodableFacet);
- allowingObjectSpecCorrespondingClassAndSpecIdIs(String.class);
+ allowingObjectSpecCorrespondingClassAndObjectTypeIs(String.class);
representation = new JsonRepresentation(TextNode.valueOf("aString"));
context.checking(new Expectations() {
@@ -385,7 +385,7 @@ public class JsonValueEncoderTest_asAdapter {
});
}
- private void allowingObjectSpecCorrespondingClassAndSpecIdIs(final Class<?> result) {
+ private void allowingObjectSpecCorrespondingClassAndObjectTypeIs(final Class<?> result) {
context.checking(new Expectations() {
{
allowing(mockObjectSpec).getCorrespondingClass();
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/LinkAndLabelFactoryAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/LinkAndLabelFactoryAbstract.java
index 2688771..42c599f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/LinkAndLabelFactoryAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/LinkAndLabelFactoryAbstract.java
@@ -241,8 +241,8 @@ implements Serializable {
// intercept redirect request to sign-in page
Optional.ofNullable(actionModel.getObject())
.ifPresent(actionResultAdapter->{
- val actionResultSpecId = actionResultAdapter.getSpecification().getLogicalTypeName();
- if(LoginRedirect.OBJECT_TYPE.equals(actionResultSpecId)) {
+ val actionResultObjectType = actionResultAdapter.getSpecification().getLogicalTypeName();
+ if(LoginRedirect.OBJECT_TYPE.equals(actionResultObjectType)) {
val commonContext = targetEntityModel.getCommonContext();
val pageClassRegistry = commonContext.lookupServiceElseFail(PageClassRegistry.class);
val signInPage = pageClassRegistry.getPageClass(PageType.SIGN_IN);
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 3d51924..d338df5 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 objectSpecId
+ // TODO: this is a hack, really should push this deeper so that Encodeable OAMs also prefix themselves with their objectType
if(spec != null && spec.isEncodeable()) {
return logicalType.getLogicalTypeName() + ":" + choiceMemento.asString();
} else {
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
index 8efe0f9..07ee3fb 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
@@ -63,9 +63,9 @@ public class ObjectAdapterMementoProviderForValueChoicesTest {
@Before
public void setUp() throws Exception {
- final String fakeSpecId = "FAKE";
+ final String fakeObjectType = "FAKE";
- val fakeLocalType = LogicalType.lazy(getClass(), ()->fakeSpecId);
+ val fakeLocalType = LogicalType.lazy(getClass(), ()->fakeObjectType);
mockMemento1 = mock(fakeLocalType, "mockMemento1");
mockMemento2 = mock(fakeLocalType, "mockMemento2");