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/09/01 10:32:11 UTC
[isis] branch master updated: ISIS-2774: fixes prev. commit
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 d70ac34 ISIS-2774: fixes prev. commit
d70ac34 is described below
commit d70ac34cfabb6a46a66109e0f78a76023824378a
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Sep 1 12:32:01 2021 +0200
ISIS-2774: fixes prev. commit
requires disabled() to have an argument of type Identifier.Type
---
.../method/DisabledObjectFacetViaMethodFactory.java | 5 ++++-
.../hidden/ObjectHiddenMethodFacetFactoryTest.java | 20 --------------------
...delWithAnnotationOptionalUsingPrivateSupport.java | 3 ++-
3 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethodFactory.java
index 8f91beb..d9e7be4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethodFactory.java
@@ -21,6 +21,7 @@ package org.apache.isis.core.metamodel.facets.object.disabled.method;
import javax.inject.Inject;
+import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.i18n.TranslationContext;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.metamodel.context.MetaModelContext;
@@ -53,6 +54,8 @@ public class DisabledObjectFacetViaMethodFactory
extends MethodPrefixBasedFacetFactoryAbstract {
private static final String METHOD_NAME = MethodLiteralConstants.DISABLED;
+ private static final Class<?>[] PARAM_TYPES = new Class<?>[] {Identifier.Type.class};
+
@Inject
public DisabledObjectFacetViaMethodFactory(final MetaModelContext mmc) {
@@ -69,7 +72,7 @@ extends MethodPrefixBasedFacetFactoryAbstract {
.objectSupport(processClassContext.getIntrospectionPolicy()),
cls,
METHOD_NAME,
- NO_ARG);
+ PARAM_TYPES);
if (method == null) {
return;
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/hidden/ObjectHiddenMethodFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/hidden/ObjectHiddenMethodFacetFactoryTest.java
index 14e0690..6227f66 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/hidden/ObjectHiddenMethodFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/hidden/ObjectHiddenMethodFacetFactoryTest.java
@@ -64,24 +64,4 @@ public class ObjectHiddenMethodFacetFactoryTest extends AbstractFacetFactoryTest
assertTrue(methodRemover.getRemovedMethodMethodCalls().contains(hiddenMethod));
}
- public void testHiddenMethodPickedUpAndMethodRemovedBooleanClass() {
- class Customer {
- @SuppressWarnings("unused")
- public Boolean hidden() {
- return true;
- }
- }
- final Method hiddenMethod = findMethod(Customer.class, "hidden");
-
- final ProcessClassContext processClassContext = ProcessClassContext
- .forTesting(Customer.class, methodRemover, facetHolder);
- facetFactory.process(processClassContext);
-
- final Facet facet = facetHolder.getFacet(HiddenObjectFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof HiddenObjectFacetViaMethod);
-
- assertTrue(methodRemover.getRemovedMethodMethodCalls().contains(hiddenMethod));
- }
-
}
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ViewModelWithAnnotationOptionalUsingPrivateSupport.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ViewModelWithAnnotationOptionalUsingPrivateSupport.java
index d0ba85e..63569fb 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ViewModelWithAnnotationOptionalUsingPrivateSupport.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ViewModelWithAnnotationOptionalUsingPrivateSupport.java
@@ -21,6 +21,7 @@ package org.apache.isis.testdomain.model.good;
import java.io.Serializable;
import java.util.List;
+import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.DomainObject;
@@ -87,7 +88,7 @@ implements Serializable {
// allowed to be private since 2.0.0-M7
@MemberSupport//FIXME[ISIS-2774] be more specific, don't allow @MemberSupport
- private String disabled() {
+ private String disabled(final Identifier.Type type) {
return "object disabled for testing purposes";
}