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 15:51:42 UTC
[isis] branch master updated: ISIS-2774: remove Type argument from
'disabled()'
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 95b9e7a ISIS-2774: remove Type argument from 'disabled()'
95b9e7a is described below
commit 95b9e7afac99e5f02b0a30490e11a687a7d4ad2d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Sep 1 17:51:26 2021 +0200
ISIS-2774: remove Type argument from 'disabled()'
---
.../facets/object/disabled/DisabledObjectFacetAbstract.java | 8 ++++----
.../object/disabled/method/DisabledObjectFacetViaMethod.java | 7 ++-----
.../disabled/method/DisabledObjectFacetViaMethodFactory.java | 5 +----
.../object/disabled/ObjectDisabledMethodFacetFactoryTest.java | 10 +++-------
.../ViewModelWithAnnotationOptionalUsingPrivateSupport.java | 3 +--
5 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/DisabledObjectFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/DisabledObjectFacetAbstract.java
index 0eeaa05..35a175b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/DisabledObjectFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/DisabledObjectFacetAbstract.java
@@ -19,7 +19,6 @@
package org.apache.isis.core.metamodel.facets.object.disabled;
-import org.apache.isis.applib.Identifier;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -41,10 +40,11 @@ implements DisabledObjectFacet {
@Override
public String disables(final UsabilityContext ic) {
final ManagedObject toDisable = ic.getTarget();
- final Identifier identifier = ic.getIdentifier();
- return toDisable != null ? disabledReason(toDisable, identifier) : null;
+ return toDisable != null
+ ? disabledReason(toDisable)
+ : null;
}
- protected abstract String disabledReason(ManagedObject toDisable, Identifier identifier);
+ protected abstract String disabledReason(ManagedObject toDisable);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethod.java
index 7dc3b13..76201f7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethod.java
@@ -22,8 +22,6 @@ package org.apache.isis.core.metamodel.facets.object.disabled.method;
import java.lang.reflect.Method;
import java.util.function.BiConsumer;
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.Identifier.Type;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.services.i18n.TranslationContext;
import org.apache.isis.commons.collections.Can;
@@ -59,10 +57,9 @@ implements ImperativeFacet {
}
@Override
- public String disabledReason(final ManagedObject owningAdapter, final Identifier identifier) {
+ public String disabledReason(final ManagedObject owningAdapter) {
val method = methods.getFirstOrFail();
- final Type type = identifier.getType();
- final Object returnValue = ManagedObjects.InvokeUtil.invoke(method, owningAdapter, type);
+ final Object returnValue = ManagedObjects.InvokeUtil.invoke(method, owningAdapter);
if(returnValue instanceof String) {
return (String) returnValue;
}
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 8aa3299..3a96223 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,7 +21,6 @@ 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;
@@ -54,8 +53,6 @@ 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) {
@@ -72,7 +69,7 @@ extends MethodPrefixBasedFacetFactoryAbstract {
.objectSupport(processClassContext.getIntrospectionPolicy()),
cls,
METHOD_NAME,
- PARAM_TYPES);
+ NO_ARG);
if (method == null) {
return;
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/disabled/ObjectDisabledMethodFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/disabled/ObjectDisabledMethodFacetFactoryTest.java
index 71c2651..8846f9a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/disabled/ObjectDisabledMethodFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/disabled/ObjectDisabledMethodFacetFactoryTest.java
@@ -21,8 +21,7 @@ package org.apache.isis.core.metamodel.facets.object.disabled;
import java.lang.reflect.Method;
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.Identifier.Type;
+import org.apache.isis.commons.internal._Constants;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
@@ -46,16 +45,13 @@ public class ObjectDisabledMethodFacetFactoryTest extends AbstractFacetFactoryTe
}
public void testDisabledMethodPickedUpAndMethodRemoved() {
- final Class<?>[] params = new Class<?>[1];
- params[0] = Identifier.Type.class;
-
class Customer {
@SuppressWarnings("unused")
- public String disabled(final Type type) {
+ public String disabled() {
return null;
}
}
- final Method disabledMethod = findMethod(Customer.class, "disabled", params);
+ final Method disabledMethod = findMethod(Customer.class, "disabled", _Constants.emptyClasses);
assertNotNull(disabledMethod);
final ProcessClassContext processClassContext = ProcessClassContext
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 63569fb..d0ba85e 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,7 +21,6 @@ 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;
@@ -88,7 +87,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(final Identifier.Type type) {
+ private String disabled() {
return "object disabled for testing purposes";
}