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/03/02 07:17:14 UTC
[isis] 06/11: ISIS-2553: using LogicalType instead of ObjectSpecId
(4th iteration)
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 a088d393df9aa0d5f25a854a26c2d29fba9997df
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Mar 1 19:49:53 2021 +0100
ISIS-2553: using LogicalType instead of ObjectSpecId (4th iteration)
---
.../object/objectspecid/ObjectSpecIdFacet.java | 3 +--
.../objectspecid/ObjectSpecIdFacetAbstract.java | 22 ++++++++--------------
.../ObjectSpecIdFacetOnStandaloneList.java | 3 +--
.../metamodel/MetaModelServiceDefault.java | 7 ++++---
.../specimpl/ObjectSpecificationAbstract.java | 2 +-
.../testspec/ObjectSpecificationStub.java | 2 +-
.../service/swagger/internal/Generation.java | 2 +-
7 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacet.java
index cd559d8..dad05a7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacet.java
@@ -19,7 +19,6 @@
package org.apache.isis.core.metamodel.facets.object.objectspecid;
-import org.apache.isis.applib.id.ObjectSpecId;
import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -28,6 +27,6 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
*/
public interface ObjectSpecIdFacet extends Facet {
- ObjectSpecId value();
+ String value();
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacetAbstract.java
index ad86b0d..f8e8f09 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacetAbstract.java
@@ -21,33 +21,26 @@ package org.apache.isis.core.metamodel.facets.object.objectspecid;
import java.util.Map;
-import org.apache.isis.applib.id.ObjectSpecId;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-public abstract class ObjectSpecIdFacetAbstract extends
-FacetAbstract implements ObjectSpecIdFacet {
+public abstract class ObjectSpecIdFacetAbstract
+extends FacetAbstract
+implements ObjectSpecIdFacet {
public static Class<? extends Facet> type() {
return ObjectSpecIdFacet.class;
}
- private final ObjectSpecId value;
+ private final String value;
public ObjectSpecIdFacetAbstract(final String value, final FacetHolder holder) {
this(value, holder, Derivation.NOT_DERIVED);
}
- public ObjectSpecIdFacetAbstract(
- final String value,
- final FacetHolder holder,
- final Derivation derivation) {
- this(ObjectSpecId.of(value), holder, derivation);
- }
-
protected ObjectSpecIdFacetAbstract(
- final ObjectSpecId value,
+ final String value,
final FacetHolder holder,
final Derivation derivation) {
super(ObjectSpecIdFacetAbstract.type(), holder, derivation);
@@ -55,11 +48,12 @@ FacetAbstract implements ObjectSpecIdFacet {
}
@Override
- public ObjectSpecId value() {
+ public String value() {
return value;
}
- @Override public void appendAttributesTo(final Map<String, Object> attributeMap) {
+ @Override
+ public void appendAttributesTo(final Map<String, Object> attributeMap) {
super.appendAttributesTo(attributeMap);
attributeMap.put("value", value);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetOnStandaloneList.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetOnStandaloneList.java
index e57718b..3534a55 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetOnStandaloneList.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetOnStandaloneList.java
@@ -19,13 +19,12 @@
package org.apache.isis.core.metamodel.facets.object.objectspecid.classname;
-import org.apache.isis.applib.id.ObjectSpecId;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacetAbstract;
public class ObjectSpecIdFacetOnStandaloneList extends ObjectSpecIdFacetAbstract {
- public ObjectSpecIdFacetOnStandaloneList(final ObjectSpecId value, final FacetHolder holder) {
+ public ObjectSpecIdFacetOnStandaloneList(final String value, final FacetHolder holder) {
super(value, holder, Derivation.NOT_DERIVED);
}
}
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 13826b0..918ffd8 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
@@ -71,7 +71,9 @@ public class MetaModelServiceDefault implements MetaModelService {
return null;
}
final ObjectSpecification objectSpecification = specificationLoader.lookupBySpecIdElseLoad(objectType);
- return objectSpecification != null? objectSpecification.getCorrespondingClass(): null;
+ return objectSpecification != null
+ ? objectSpecification.getCorrespondingClass()
+ : null;
}
@Override
@@ -81,8 +83,7 @@ public class MetaModelServiceDefault implements MetaModelService {
}
final ObjectSpecification objectSpecification = specificationLoader.loadSpecification(domainType);
final ObjectSpecIdFacet objectSpecIdFacet = objectSpecification.getFacet(ObjectSpecIdFacet.class);
- final ObjectSpecId objectSpecId = objectSpecIdFacet.value();
- return objectSpecId.asString();
+ return objectSpecIdFacet.value();
}
@Override
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 17bc46a..34ccc65 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
@@ -237,7 +237,7 @@ implements ObjectSpecification {
if(objectSpecIdFacet == null) {
throw new IllegalStateException("could not find an ObjectSpecIdFacet for " + this.getFullIdentifier());
}
- return LogicalType.eager(correspondingClass, objectSpecIdFacet.value().asString());
+ return LogicalType.eager(correspondingClass, objectSpecIdFacet.value());
}
/**
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
index c0f2881..2fefd9b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
@@ -132,7 +132,7 @@ implements ObjectSpecification {
@Override
public LogicalType getLogicalType() {
if(logicalType == null) {
- val logicalTypeName = getFacet(ObjectSpecIdFacet.class).value().asString();
+ val logicalTypeName = getFacet(ObjectSpecIdFacet.class).value();
logicalType = LogicalType.eager(correspondingClass, logicalTypeName);
}
return logicalType;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
index 5aca682..cf69371 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
@@ -761,7 +761,7 @@ class Generation {
}
static String objectTypeFor(final ObjectSpecification objectSpec) {
- return objectSpec.getFacet(ObjectSpecIdFacet.class).value().asString();
+ return objectSpec.getFacet(ObjectSpecIdFacet.class).value();
}
static StringProperty stringProperty() {