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 2022/07/06 10:51:31 UTC
[isis] branch master updated: ISIS-3060: align names for all ObjectNamedFacet(s)
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 cae7990f08 ISIS-3060: align names for all ObjectNamedFacet(s)
cae7990f08 is described below
commit cae7990f081c458a850054de491ae1722e400d1a
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jul 6 12:51:23 2022 +0200
ISIS-3060: align names for all ObjectNamedFacet(s)
---
.../domainobjectlayout/DomainObjectLayoutFacetFactory.java | 4 ++--
... => ObjectDescribedFacetForDomainObjectLayoutAnnotation.java} | 9 ++++-----
...ml.java => ObjectDescribedFacetForDomainObjectLayoutXml.java} | 6 +++---
...java => ObjectNamedFacetForDomainObjectLayoutAnnotation.java} | 6 +++---
.../domainservicelayout/DomainServiceLayoutFacetFactory.java | 2 +-
...ava => ObjectNamedFacetForDomainServiceLayoutAnnotation.java} | 6 +++---
.../core/metamodel/services/grid/GridSystemServiceAbstract.java | 8 ++++----
.../object/domainobjectlayout/DomainObjectLayoutFactoryTest.java | 6 +++---
8 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
index 33f231c90c..8a4cdb5a29 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
@@ -67,11 +67,11 @@ extends FacetFactoryAbstract {
.create(domainObjectLayoutIfAny, facetHolder));
addFacetIfPresent(
- DescribedAsFacetForDomainObjectLayoutAnnotation
+ ObjectDescribedFacetForDomainObjectLayoutAnnotation
.create(domainObjectLayoutIfAny, facetHolder));
addFacetIfPresent(
- NamedFacetForDomainObjectLayoutAnnotation
+ ObjectNamedFacetForDomainObjectLayoutAnnotation
.create(domainObjectLayoutIfAny, facetHolder));
addFacetIfPresent(
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/ObjectDescribedFacetForDomainObjectLayoutAnnotation.java
similarity index 82%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectLayoutAnnotation.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/ObjectDescribedFacetForDomainObjectLayoutAnnotation.java
index 268d444d57..25db36a27f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/ObjectDescribedFacetForDomainObjectLayoutAnnotation.java
@@ -25,21 +25,20 @@ import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.described.ObjectDescribedFacetAbstract;
-
-public class DescribedAsFacetForDomainObjectLayoutAnnotation
+public class ObjectDescribedFacetForDomainObjectLayoutAnnotation
extends ObjectDescribedFacetAbstract {
- public static Optional<DescribedAsFacetForDomainObjectLayoutAnnotation> create(
+ public static Optional<ObjectDescribedFacetForDomainObjectLayoutAnnotation> create(
final Optional<DomainObjectLayout> domainObjectLayoutIfAny,
final FacetHolder holder) {
return domainObjectLayoutIfAny
.map(DomainObjectLayout::describedAs)
.filter(_Strings::isNotEmpty)
- .map(describedAs -> new DescribedAsFacetForDomainObjectLayoutAnnotation(describedAs, holder));
+ .map(describedAs -> new ObjectDescribedFacetForDomainObjectLayoutAnnotation(describedAs, holder));
}
- private DescribedAsFacetForDomainObjectLayoutAnnotation(
+ private ObjectDescribedFacetForDomainObjectLayoutAnnotation(
final String described,
final FacetHolder holder) {
super(described, holder);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectLayoutXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/ObjectDescribedFacetForDomainObjectLayoutXml.java
similarity index 89%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectLayoutXml.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/ObjectDescribedFacetForDomainObjectLayoutXml.java
index 47ac439d78..d34251e7a0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/ObjectDescribedFacetForDomainObjectLayoutXml.java
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.described.ObjectDescribedFacet;
import org.apache.isis.core.metamodel.facets.all.described.ObjectDescribedFacetAbstract;
-public class DescribedAsFacetForDomainObjectLayoutXml
+public class ObjectDescribedFacetForDomainObjectLayoutXml
extends ObjectDescribedFacetAbstract {
public static Optional<ObjectDescribedFacet> create(
@@ -37,11 +37,11 @@ extends ObjectDescribedFacetAbstract {
}
final String describedAs = _Strings.emptyToNull(domainObjectLayout.getDescribedAs());
return describedAs != null
- ? Optional.of(new DescribedAsFacetForDomainObjectLayoutXml(describedAs, holder))
+ ? Optional.of(new ObjectDescribedFacetForDomainObjectLayoutXml(describedAs, holder))
: Optional.empty();
}
- private DescribedAsFacetForDomainObjectLayoutXml(
+ private ObjectDescribedFacetForDomainObjectLayoutXml(
final String described,
final FacetHolder holder) {
super(described, holder);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/ObjectNamedFacetForDomainObjectLayoutAnnotation.java
similarity index 92%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectLayoutAnnotation.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/ObjectNamedFacetForDomainObjectLayoutAnnotation.java
index 4066caad84..3822e28418 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/ObjectNamedFacetForDomainObjectLayoutAnnotation.java
@@ -29,7 +29,7 @@ import org.apache.isis.core.metamodel.facets.all.named.ObjectNamedFacetAbstract;
import lombok.val;
-public class NamedFacetForDomainObjectLayoutAnnotation
+public class ObjectNamedFacetForDomainObjectLayoutAnnotation
extends ObjectNamedFacetAbstract {
public static Optional<ObjectNamedFacet> create(
@@ -56,12 +56,12 @@ extends ObjectNamedFacetAbstract {
}
return Optional.of(
- new NamedFacetForDomainObjectLayoutAnnotation(
+ new ObjectNamedFacetForDomainObjectLayoutAnnotation(
nounForms,
holder));
}
- private NamedFacetForDomainObjectLayoutAnnotation(
+ private ObjectNamedFacetForDomainObjectLayoutAnnotation(
final NounForms nounForms,
final FacetHolder holder) {
super(nounForms, holder);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java
index 2996b58baf..f7f3b84c73 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java
@@ -62,7 +62,7 @@ extends FacetFactoryAbstract {
new DomainServiceLayoutFacetAnnotation(facetHolder, menuBar));
addFacetIfPresent(
- NamedFacetForDomainServiceLayoutAnnotation
+ ObjectNamedFacetForDomainServiceLayoutAnnotation
.create(domainServiceLayoutIfAny, facetHolder));
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/NamedFacetForDomainServiceLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/ObjectNamedFacetForDomainServiceLayoutAnnotation.java
similarity index 90%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/NamedFacetForDomainServiceLayoutAnnotation.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/ObjectNamedFacetForDomainServiceLayoutAnnotation.java
index a3b279c538..0f5fd66cc1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/NamedFacetForDomainServiceLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/ObjectNamedFacetForDomainServiceLayoutAnnotation.java
@@ -27,7 +27,7 @@ import org.apache.isis.core.metamodel.facets.all.i8n.noun.NounForms;
import org.apache.isis.core.metamodel.facets.all.named.ObjectNamedFacet;
import org.apache.isis.core.metamodel.facets.all.named.ObjectNamedFacetAbstract;
-public class NamedFacetForDomainServiceLayoutAnnotation
+public class ObjectNamedFacetForDomainServiceLayoutAnnotation
extends ObjectNamedFacetAbstract {
public static Optional<ObjectNamedFacet> create(
@@ -40,12 +40,12 @@ extends ObjectNamedFacetAbstract {
.map(serviceNamed->NounForms
.builderSingular(serviceNamed)
.build())
- .map(nounForms->new NamedFacetForDomainServiceLayoutAnnotation(
+ .map(nounForms->new ObjectNamedFacetForDomainServiceLayoutAnnotation(
nounForms,
facetHolder));
}
- private NamedFacetForDomainServiceLayoutAnnotation(
+ private ObjectNamedFacetForDomainServiceLayoutAnnotation(
final NounForms nounForms,
final FacetHolder holder) {
super(nounForms, holder);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
index 6fbb537b3e..2ac5a96e5c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
@@ -61,7 +61,7 @@ import org.apache.isis.core.metamodel.facets.members.layout.order.LayoutOrderFac
import org.apache.isis.core.metamodel.facets.object.domainobjectlayout.BookmarkPolicyFacetForDomainObjectLayoutXml;
import org.apache.isis.core.metamodel.facets.object.domainobjectlayout.CssClassFaFacetForDomainObjectLayoutXml;
import org.apache.isis.core.metamodel.facets.object.domainobjectlayout.CssClassFacetForDomainObjectLayoutXml;
-import org.apache.isis.core.metamodel.facets.object.domainobjectlayout.DescribedAsFacetForDomainObjectLayoutXml;
+import org.apache.isis.core.metamodel.facets.object.domainobjectlayout.ObjectDescribedFacetForDomainObjectLayoutXml;
import org.apache.isis.core.metamodel.facets.object.domainobjectlayout.ObjectNamedFacetForDomainObjectLayoutXml;
import org.apache.isis.core.metamodel.facets.properties.propertylayout.CssClassFacetForPropertyLayoutXml;
import org.apache.isis.core.metamodel.facets.properties.propertylayout.HiddenFacetForPropertyLayoutXml;
@@ -175,9 +175,9 @@ implements GridSystemService<G> {
CssClassFaFacetForDomainObjectLayoutXml.create(domainObjectLayoutData, objectSpec),
objectSpec);
updateFacet(
- DescribedAsFacetForDomainObjectLayoutXml.type(),
- DescribedAsFacetForDomainObjectLayoutXml.class::isInstance,
- DescribedAsFacetForDomainObjectLayoutXml.create(domainObjectLayoutData, objectSpec),
+ ObjectDescribedFacetForDomainObjectLayoutXml.type(),
+ ObjectDescribedFacetForDomainObjectLayoutXml.class::isInstance,
+ ObjectDescribedFacetForDomainObjectLayoutXml.create(domainObjectLayoutData, objectSpec),
objectSpec);
updateFacet(
ObjectNamedFacetForDomainObjectLayoutXml.type(),
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
index f8fa0f5523..d5cf856f2e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
@@ -256,9 +256,9 @@ extends AbstractFacetFactoryJUnit4TestCase {
final Facet facet = facetHolder.getFacet(ObjectDescribedFacet.class);
assertNotNull(facet);
- assertTrue(facet instanceof DescribedAsFacetForDomainObjectLayoutAnnotation);
+ assertTrue(facet instanceof ObjectDescribedFacetForDomainObjectLayoutAnnotation);
- final DescribedAsFacetForDomainObjectLayoutAnnotation facetImpl = (DescribedAsFacetForDomainObjectLayoutAnnotation) facet;
+ final ObjectDescribedFacetForDomainObjectLayoutAnnotation facetImpl = (ObjectDescribedFacetForDomainObjectLayoutAnnotation) facet;
Assert.assertThat(facetImpl.text(), is("This is a description"));
expectNoMethodsRemoved();
@@ -303,7 +303,7 @@ extends AbstractFacetFactoryJUnit4TestCase {
val namedFacet = facetHolder.getFacet(ObjectNamedFacet.class);
assertNotNull(namedFacet);
- assertTrue(namedFacet instanceof NamedFacetForDomainObjectLayoutAnnotation);
+ assertTrue(namedFacet instanceof ObjectNamedFacetForDomainObjectLayoutAnnotation);
assertEquals("Name override", namedFacet.singular());