You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/10/17 17:17:11 UTC
[isis] 02/02: ISIS-1742: removes "notInServiceMenu" prefix,
"name" prefix, "plural" prefix, "description", "optional", "alwaysHide",
"protect" prefixes.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 2c8ddaaff82f0248aedd471107c82b5c09c824f0
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 17 18:14:44 2017 +0100
ISIS-1742: removes "notInServiceMenu" prefix, "name" prefix, "plural" prefix, "description", "optional", "alwaysHide", "protect" prefixes.
---
.../metamodel/facets/MethodPrefixConstants.java | 10 --
.../method/NotInServiceMenuFacetViaMethod.java | 53 ---------
.../NotInServiceMenuFacetViaMethodFactory.java | 83 --------------
.../staticmethod/DescribedAsFacetStaticMethod.java | 53 ---------
.../DescribedAsFacetStaticMethodFactory.java | 119 --------------------
.../staticmethod/DisabledFacetForStaticMethod.java | 36 ------
.../DisabledFacetStaticMethodFacetFactory.java | 120 --------------------
.../staticmethod/HiddenFacetOnStaticMethod.java | 35 ------
.../HiddenFacetStaticMethodFactory.java | 121 --------------------
.../named/staticmethod/NamedFacetStaticMethod.java | 57 ----------
.../NamedFacetStaticMethodFactory.java | 122 ---------------------
.../named/staticmethod/NamedFacetStaticMethod.java | 35 ------
.../NamedFacetStaticMethodFactory.java | 81 --------------
.../plural/staticmethod/PluralFacetMethod.java | 35 ------
.../PluralFacetStaticMethodFactory.java | 81 --------------
.../MandatoryFacetOnPropertyStaticMethod.java | 40 -------
...andatoryFacetOnPropertyStaticMethodFactory.java | 112 -------------------
.../dflt/ProgrammingModelFacetsJava5.java | 19 ----
.../actions/ActionMethodsFacetFactoryTest.java | 120 --------------------
.../CollectionFieldMethodsFacetFactoryTest.java | 113 -------------------
.../ident/plural/PluralFacetMethodFactoryTest.java | 68 ------------
.../singular/SingularMethodFacetFactoryTest.java | 68 ------------
.../PropertyMethodsFacetFactoryTest.java | 110 -------------------
todo-deprecation-list.txt | 13 ++-
24 files changed, 8 insertions(+), 1696 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixConstants.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixConstants.java
index 9e112f4..87ef7dd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixConstants.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixConstants.java
@@ -28,19 +28,13 @@ public class MethodPrefixConstants {
public static final String ADD_TO_PREFIX = "addTo";
public static final String REMOVE_FROM_PREFIX = "removeFrom";
- public static final String NAME_PREFIX = "name";
- public static final String DESCRIPTION_PREFIX = "description";
- public static final String OPTIONAL_PREFIX = "optional";
-
public static final String DEFAULT_PREFIX = "default";
public static final String CHOICES_PREFIX = "choices";
public static final String AUTO_COMPLETE_PREFIX = "autoComplete";
public static final String HIDE_PREFIX = "hide";
- public static final String ALWAYS_HIDE_PREFIX = "alwaysHide";
public static final String DISABLE_PREFIX = "disable";
- public static final String PROTECT_PREFIX = "protect";
public static final String VALIDATE_PREFIX = "validate";
public static final String VALIDATE_ADD_TO_PREFIX = VALIDATE_PREFIX + ADD_TO_PREFIX;
@@ -48,9 +42,6 @@ public class MethodPrefixConstants {
public static final String VALIDATE_REMOVE_FROM_PREFIX = VALIDATE_PREFIX + REMOVE_FROM_PREFIX;
public static final String VALIDATE_REMOVE_FROM_PREFIX_2 = VALIDATE_PREFIX + StringExtensions.capitalize(REMOVE_FROM_PREFIX);
- public static final String FIELD_PREFIX = "field";
- public static final String ACTION_PREFIX = "action";
-
public static final String CREATED_PREFIX = "created";
public static final String LOADED_PREFIX = "loaded";
public static final String LOADING_PREFIX = "loading";
@@ -64,6 +55,5 @@ public class MethodPrefixConstants {
public static final String REMOVING_PREFIX = "removing";
public static final String UPDATED_PREFIX = "updated";
public static final String UPDATING_PREFIX = "updating";
- public static final String SINGULAR_NAME = "singularName";
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuFacetViaMethod.java
deleted file mode 100644
index 34d04be..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuFacetViaMethod.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.actions.notinservicemenu.method;
-
-import java.lang.reflect.Method;
-
-import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.interactions.VisibilityContext;
-import org.apache.isis.core.metamodel.facets.actions.notinservicemenu.NotInServiceMenuFacetAbstract;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class NotInServiceMenuFacetViaMethod extends NotInServiceMenuFacetAbstract {
-
- private final Method notInServiceMenuMethod;
-
- public NotInServiceMenuFacetViaMethod(final Method notInServiceMenuMethod, final FacetHolder holder) {
- super(holder);
- this.notInServiceMenuMethod = notInServiceMenuMethod;
- }
-
- @Override
- public String hides(final VisibilityContext<? extends VisibilityEvent> ic) {
- final ObjectAdapter owningAdapter = ic.getTarget();
- if (owningAdapter == null) {
- return null;
- }
- final Boolean currentlyHidden = (Boolean) ObjectAdapter.InvokeUtils.invoke(notInServiceMenuMethod, owningAdapter);
- return currentlyHidden.booleanValue() ? "notInServiceMenuXxx() method returning true" : null;
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuFacetViaMethodFactory.java
deleted file mode 100644
index 45bc66e..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuFacetViaMethodFactory.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.actions.notinservicemenu.method;
-
-import java.lang.reflect.Method;
-
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.lang.StringExtensions;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facetapi.FacetUtil;
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
-import org.apache.isis.core.metamodel.facets.MethodFinderUtils;
-import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.methodutils.MethodScope;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedMethodPrefix;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class NotInServiceMenuFacetViaMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner {
-
- public static final String NOT_IN_SERVICE_MENU_PREFIX = "notInServiceMenu";
-
- private final MetaModelValidatorForDeprecatedMethodPrefix validator = new MetaModelValidatorForDeprecatedMethodPrefix(NOT_IN_SERVICE_MENU_PREFIX);
-
- public NotInServiceMenuFacetViaMethodFactory() {
- super(FeatureType.ACTIONS_ONLY, OrphanValidation.VALIDATE);
- }
-
- @Override
- public void process(final ProcessMethodContext processMethodContext) {
- final Method getMethod = processMethodContext.getMethod();
- final String capitalizedName = StringExtensions.asJavaBaseNameStripAccessorPrefixIfRequired(getMethod.getName());
-
- final Class<?> cls = processMethodContext.getCls();
- final Method notInServiceMenuMethod = MethodFinderUtils.findMethod(cls, MethodScope.OBJECT,
- NOT_IN_SERVICE_MENU_PREFIX + capitalizedName, boolean.class, new Class[] {});
- if (notInServiceMenuMethod == null) {
- return;
- }
-
- processMethodContext.removeMethod(notInServiceMenuMethod);
-
- final FacetHolder facetedMethod = processMethodContext.getFacetHolder();
- final NotInServiceMenuFacetViaMethod facet = new NotInServiceMenuFacetViaMethod(notInServiceMenuMethod, facetedMethod);
- FacetUtil.addFacet(validator.flagIfPresent(facet, processMethodContext));
- }
-
- @Override
- public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator, final IsisConfiguration configuration) {
- metaModelValidator.add(validator);
- }
-
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- super.setServicesInjector(servicesInjector);
- IsisConfiguration configuration = servicesInjector.getConfigurationServiceInternal();
- validator.setConfiguration(configuration);
- }
-
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/describedas/staticmethod/DescribedAsFacetStaticMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/describedas/staticmethod/DescribedAsFacetStaticMethod.java
deleted file mode 100644
index 420c173..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/describedas/staticmethod/DescribedAsFacetStaticMethod.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.members.describedas.staticmethod;
-
-import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.ImperativeFacet;
-import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacetAbstract;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class DescribedAsFacetStaticMethod extends DescribedAsFacetAbstract implements ImperativeFacet {
-
- private final Method method;
-
- public DescribedAsFacetStaticMethod(final String value, final Method method, final FacetHolder holder) {
- super(value, holder);
- this.method = method;
- }
-
- @Override
- public List<Method> getMethods() {
- return Collections.singletonList(method);
- }
-
- @Override
- public Intent getIntent(final Method method) {
- return Intent.UI_HINT;
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/describedas/staticmethod/DescribedAsFacetStaticMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/describedas/staticmethod/DescribedAsFacetStaticMethodFactory.java
deleted file mode 100644
index 4c41579..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/describedas/staticmethod/DescribedAsFacetStaticMethodFactory.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.members.describedas.staticmethod;
-
-import java.lang.reflect.Method;
-
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.lang.MethodExtensions;
-import org.apache.isis.core.commons.lang.StringExtensions;
-import org.apache.isis.core.metamodel.exceptions.MetaModelException;
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facetapi.FacetUtil;
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
-import org.apache.isis.core.metamodel.facets.MethodFinderUtils;
-import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.MethodPrefixConstants;
-import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet;
-import org.apache.isis.core.metamodel.methodutils.MethodScope;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedMethodPrefix;
-
-/**
- * Sets up a {@link DescribedAsFacet} if a
- * {@value MethodPrefixConstants#DESCRIPTION_PREFIX}-prefixed method is present.
- *
- * @deprecated
- */
-@Deprecated
-public class DescribedAsFacetStaticMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner {
-
- private static final String[] PREFIXES = { MethodPrefixConstants.DESCRIPTION_PREFIX };
-
- private final MetaModelValidatorForDeprecatedMethodPrefix validator = new MetaModelValidatorForDeprecatedMethodPrefix(PREFIXES[0]);
-
- /**
- * Note that the {@link Facet}s registered are the generic ones from
- * noa-architecture (where they exist)
- */
- public DescribedAsFacetStaticMethodFactory() {
- super(FeatureType.MEMBERS, OrphanValidation.VALIDATE, PREFIXES);
- }
-
- // ///////////////////////////////////////////////////////
- // Actions
- // ///////////////////////////////////////////////////////
-
- @Override
- public void process(final ProcessMethodContext processMethodContext) {
- attachDescribedAsFacetIfDescriptionMethodIsFound(processMethodContext);
- }
-
- public void attachDescribedAsFacetIfDescriptionMethodIsFound(final ProcessMethodContext processMethodContext) {
-
- final Method method = processMethodContext.getMethod();
- final String capitalizedName = StringExtensions.asJavaBaseNameStripAccessorPrefixIfRequired(method.getName());
-
- final Class<?> cls = processMethodContext.getCls();
- final Method descriptionMethod = MethodFinderUtils.findMethod(cls, MethodScope.CLASS, MethodPrefixConstants.DESCRIPTION_PREFIX + capitalizedName, String.class, new Class[0]);
- if (descriptionMethod == null) {
- return;
- }
-
- processMethodContext.removeMethod(descriptionMethod);
- final String description = invokeDescriptionMethod(descriptionMethod);
-
- final FacetHolder facetedMethod = processMethodContext.getFacetHolder();
- final DescribedAsFacetStaticMethod facet = new DescribedAsFacetStaticMethod(description, descriptionMethod, facetedMethod);
- FacetUtil.addFacet(validator.flagIfPresent(facet, processMethodContext));
- }
-
- private static String invokeDescriptionMethod(final Method descriptionMethod) {
- String description = null;
- try {
- description = (String) MethodExtensions.invokeStatic(descriptionMethod);
- } catch (final ClassCastException ex) {
- // ignore
- }
- if (description == null) {
- throw new MetaModelException("method " + descriptionMethod + "must return a string");
- }
- return description;
- }
-
-
- @Override
- public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator, final IsisConfiguration configuration) {
- metaModelValidator.add(validator);
- }
-
-
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- super.setServicesInjector(servicesInjector);
- IsisConfiguration configuration = servicesInjector.getConfigurationServiceInternal();
- validator.setConfiguration(configuration);
- }
-
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/staticmethod/DisabledFacetForStaticMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/staticmethod/DisabledFacetForStaticMethod.java
deleted file mode 100644
index b9a8834..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/staticmethod/DisabledFacetForStaticMethod.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.members.disabled.staticmethod;
-
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacetAbstractAlwaysEverywhere;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class DisabledFacetForStaticMethod extends DisabledFacetAbstractAlwaysEverywhere {
-
- public DisabledFacetForStaticMethod(final FacetHolder holder) {
- super(holder);
- }
-
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/staticmethod/DisabledFacetStaticMethodFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/staticmethod/DisabledFacetStaticMethodFacetFactory.java
deleted file mode 100644
index 280cf8f..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/staticmethod/DisabledFacetStaticMethodFacetFactory.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.members.disabled.staticmethod;
-
-import java.lang.reflect.Method;
-
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.lang.MethodExtensions;
-import org.apache.isis.core.commons.lang.StringExtensions;
-import org.apache.isis.core.metamodel.exceptions.MetaModelException;
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facetapi.FacetUtil;
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
-import org.apache.isis.core.metamodel.facets.MethodFinderUtils;
-import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.MethodPrefixConstants;
-import org.apache.isis.core.metamodel.methodutils.MethodScope;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedMethodPrefix;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class DisabledFacetStaticMethodFacetFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner {
-
- private static final String[] PREFIXES = { MethodPrefixConstants.PROTECT_PREFIX };
-
- private final MetaModelValidatorForDeprecatedMethodPrefix validator = new MetaModelValidatorForDeprecatedMethodPrefix(PREFIXES[0]);
-
- /**
- * Note that the {@link Facet}s registered are the generic ones from
- * noa-architecture (where they exist)
- */
- public DisabledFacetStaticMethodFacetFactory() {
- super(FeatureType.MEMBERS, OrphanValidation.VALIDATE, PREFIXES);
- }
-
- // ///////////////////////////////////////////////////////
- // Actions
- // ///////////////////////////////////////////////////////
-
- @Override
- public void process(final ProcessMethodContext processMethodContext) {
- attachDisabledFacetIfProtectMethodIsFound(processMethodContext);
- }
-
- public void attachDisabledFacetIfProtectMethodIsFound(final ProcessMethodContext processMethodContext) {
-
- final Class<?>[] paramTypes = new Class[] {};
-
- final Class<?> type = processMethodContext.getCls();
- final Method method = processMethodContext.getMethod();
-
- final String capitalizedName = StringExtensions.asJavaBaseNameStripAccessorPrefixIfRequired(method.getName());
-
- final Method protectMethod = MethodFinderUtils.findMethodWithOrWithoutParameters(type, MethodScope.CLASS, MethodPrefixConstants.PROTECT_PREFIX + capitalizedName, boolean.class, paramTypes);
- if (protectMethod == null) {
- return;
- }
-
- processMethodContext.removeMethod(protectMethod);
-
- final Boolean protectMethodReturnValue = invokeProtectMethod(protectMethod);
- if (!protectMethodReturnValue.booleanValue()) {
- return;
- }
-
- final FacetHolder facetedMethod = processMethodContext.getFacetHolder();
- final DisabledFacetForStaticMethod facet = new DisabledFacetForStaticMethod(facetedMethod);
- FacetUtil.addFacet(validator.flagIfPresent(facet, processMethodContext));
- }
-
- private static Boolean invokeProtectMethod(final Method protectMethod) {
- Boolean protectMethodReturnValue = null;
- try {
- protectMethodReturnValue = (Boolean) MethodExtensions.invokeStatic(protectMethod);
- } catch (final ClassCastException ex) {
- // ignore
- }
- if (protectMethodReturnValue == null) {
- throw new MetaModelException("method " + protectMethod + "must return a boolean");
- }
- return protectMethodReturnValue;
- }
-
-
- @Override
- public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator, final IsisConfiguration configuration) {
- metaModelValidator.add(validator);
- }
-
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- super.setServicesInjector(servicesInjector);
- IsisConfiguration configuration = servicesInjector.getConfigurationServiceInternal();
- validator.setConfiguration(configuration);
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/staticmethod/HiddenFacetOnStaticMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/staticmethod/HiddenFacetOnStaticMethod.java
deleted file mode 100644
index a84c968..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/staticmethod/HiddenFacetOnStaticMethod.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.members.hidden.staticmethod;
-
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.members.hidden.HiddenFacetAbstractAlwaysEverywhere;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class HiddenFacetOnStaticMethod extends HiddenFacetAbstractAlwaysEverywhere {
-
- public HiddenFacetOnStaticMethod(final FacetHolder holder) {
- super(HiddenFacetOnStaticMethod.class, holder);
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/staticmethod/HiddenFacetStaticMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/staticmethod/HiddenFacetStaticMethodFactory.java
deleted file mode 100644
index 0caa16f..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/staticmethod/HiddenFacetStaticMethodFactory.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.members.hidden.staticmethod;
-
-import java.lang.reflect.Method;
-
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.lang.MethodExtensions;
-import org.apache.isis.core.commons.lang.StringExtensions;
-import org.apache.isis.core.metamodel.exceptions.MetaModelException;
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facetapi.FacetUtil;
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
-import org.apache.isis.core.metamodel.facets.MethodFinderUtils;
-import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.MethodPrefixConstants;
-import org.apache.isis.core.metamodel.methodutils.MethodScope;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedMethodPrefix;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class HiddenFacetStaticMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner {
-
- private static final String[] PREFIXES = { MethodPrefixConstants.ALWAYS_HIDE_PREFIX };
-
- private final MetaModelValidatorForDeprecatedMethodPrefix validator = new MetaModelValidatorForDeprecatedMethodPrefix(PREFIXES[0]);
-
- /**
- * Note that the {@link Facet}s registered are the generic ones from
- * noa-architecture (where they exist)
- */
- public HiddenFacetStaticMethodFactory() {
- super(FeatureType.MEMBERS, OrphanValidation.VALIDATE, PREFIXES);
- }
-
- // ///////////////////////////////////////////////////////
- // Actions
- // ///////////////////////////////////////////////////////
-
- @Override
- public void process(final ProcessMethodContext processMethodContext) {
- // alwaysHideXxx()
- attachHiddenFacetIfAlwaysHideMethodIsFound(processMethodContext);
-
- }
-
- public void attachHiddenFacetIfAlwaysHideMethodIsFound(final ProcessMethodContext processMethodContext) {
-
- final Class<?> type = processMethodContext.getCls();
- final Method method = processMethodContext.getMethod();
-
- final String capitalizedName = StringExtensions.asJavaBaseNameStripAccessorPrefixIfRequired(method.getName());
-
- final Method alwaysHideMethod = MethodFinderUtils.findMethod(type, MethodScope.CLASS, MethodPrefixConstants.ALWAYS_HIDE_PREFIX + capitalizedName, boolean.class, new Class[] {});
- if (alwaysHideMethod == null) {
- return;
- }
-
- processMethodContext.removeMethod(alwaysHideMethod);
- final Boolean alwaysHideMethodReturnValue = invokeAlwaysHideMethod(alwaysHideMethod);
- if (!alwaysHideMethodReturnValue.booleanValue()) {
- return;
- }
-
- final FacetHolder facetedMethod = processMethodContext.getFacetHolder();
- final HiddenFacetOnStaticMethod facet = new HiddenFacetOnStaticMethod(facetedMethod);
- FacetUtil.addFacet(validator.flagIfPresent(facet, processMethodContext));
- }
-
- private static Boolean invokeAlwaysHideMethod(final Method alwaysHideMethod) {
- Boolean alwaysHideMethodReturnValue = null;
- try {
- alwaysHideMethodReturnValue = (Boolean) MethodExtensions.invokeStatic(alwaysHideMethod);
- } catch (final ClassCastException ex) {
- // ignore
- }
- if (alwaysHideMethodReturnValue == null) {
- throw new MetaModelException("method " + alwaysHideMethod + "must return a boolean");
- }
- return alwaysHideMethodReturnValue;
- }
-
-
- @Override
- public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator, final IsisConfiguration configuration) {
- metaModelValidator.add(validator);
- }
-
-
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- super.setServicesInjector(servicesInjector);
- IsisConfiguration configuration = servicesInjector.getConfigurationServiceInternal();
- validator.setConfiguration(configuration);
- }
-
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/named/staticmethod/NamedFacetStaticMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/named/staticmethod/NamedFacetStaticMethod.java
deleted file mode 100644
index cfc7917..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/named/staticmethod/NamedFacetStaticMethod.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.members.named.staticmethod;
-
-import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.ImperativeFacet;
-import org.apache.isis.core.metamodel.facets.all.named.NamedFacetAbstract;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class NamedFacetStaticMethod extends NamedFacetAbstract implements ImperativeFacet {
-
- private final Method method;
-
- public NamedFacetStaticMethod(final String value, final Method method, final FacetHolder holder) {
- super(value, /*escaped*/ true, holder);
- this.method = method;
- }
-
- /**
- * Returns a singleton list of the {@link Method} provided in the
- * constructor.
- */
- @Override
- public List<Method> getMethods() {
- return Collections.singletonList(method);
- }
-
- @Override
- public Intent getIntent(final Method method) {
- return Intent.UI_HINT;
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/named/staticmethod/NamedFacetStaticMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/named/staticmethod/NamedFacetStaticMethodFactory.java
deleted file mode 100644
index 8f3f23b..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/named/staticmethod/NamedFacetStaticMethodFactory.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.members.named.staticmethod;
-
-import java.lang.reflect.Method;
-
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.lang.MethodExtensions;
-import org.apache.isis.core.commons.lang.StringExtensions;
-import org.apache.isis.core.metamodel.exceptions.MetaModelException;
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facetapi.FacetUtil;
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
-import org.apache.isis.core.metamodel.facets.MethodFinderUtils;
-import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.MethodPrefixConstants;
-import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
-import org.apache.isis.core.metamodel.methodutils.MethodScope;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedMethodPrefix;
-
-/**
- * Sets up a {@link NamedFacet} if a {@value MethodPrefixConstants#NAME_PREFIX}
- * -prefixed method is present.
- *
- * @deprecated
- */
-@Deprecated
-public class NamedFacetStaticMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner {
-
- private static final String[] PREFIXES = { MethodPrefixConstants.NAME_PREFIX };
-
- private final MetaModelValidatorForDeprecatedMethodPrefix validator = new MetaModelValidatorForDeprecatedMethodPrefix(PREFIXES[0]);
-
- /**
- * Note that the {@link Facet}s registered are the generic ones from
- * noa-architecture (where they exist)
- */
- public NamedFacetStaticMethodFactory() {
- super(FeatureType.MEMBERS, OrphanValidation.VALIDATE, PREFIXES);
- }
-
- // ///////////////////////////////////////////////////////
- // Actions
- // ///////////////////////////////////////////////////////
-
- @Override
- public void process(final ProcessMethodContext processMethodContext) {
-
- // namedXxx()
- attachNamedFacetIfNamedMethodIsFound(processMethodContext);
-
- }
-
- public void attachNamedFacetIfNamedMethodIsFound(final ProcessMethodContext processMethodContext) {
- final Method method = processMethodContext.getMethod();
- final String capitalizedName = StringExtensions.asJavaBaseNameStripAccessorPrefixIfRequired(method.getName());
-
- final Class<?> cls = processMethodContext.getCls();
- final Method nameMethod = MethodFinderUtils.findMethod(cls, MethodScope.CLASS, MethodPrefixConstants.NAME_PREFIX + capitalizedName, String.class, new Class[0]);
-
- if (nameMethod == null) {
- return;
- }
-
- processMethodContext.removeMethod(nameMethod);
- final String name = invokeNameMethod(nameMethod);
-
- final FacetHolder facetHolder = processMethodContext.getFacetHolder();
- final NamedFacetStaticMethod facet = new NamedFacetStaticMethod(name, nameMethod, facetHolder);
- FacetUtil.addFacet(validator.flagIfPresent(facet, processMethodContext));
- }
-
- private static String invokeNameMethod(final Method nameMethod) {
- String name = null;
- try {
- name = (String) MethodExtensions.invokeStatic(nameMethod);
- } catch (final ClassCastException e) {
- // ignore
- }
- if (name == null) {
- throw new MetaModelException("method " + nameMethod + "must return a string");
- }
- return name;
- }
-
-
- @Override
- public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator, final IsisConfiguration configuration) {
- metaModelValidator.add(validator);
- }
-
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- super.setServicesInjector(servicesInjector);
- IsisConfiguration configuration = servicesInjector.getConfigurationServiceInternal();
- validator.setConfiguration(configuration);
- }
-
-
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/named/staticmethod/NamedFacetStaticMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/named/staticmethod/NamedFacetStaticMethod.java
deleted file mode 100644
index f40195f..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/named/staticmethod/NamedFacetStaticMethod.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.object.named.staticmethod;
-
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.all.named.NamedFacetAbstract;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class NamedFacetStaticMethod extends NamedFacetAbstract {
-
- public NamedFacetStaticMethod(final String value, final FacetHolder holder) {
- super(value, /*escaped*/ true, holder);
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/named/staticmethod/NamedFacetStaticMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/named/staticmethod/NamedFacetStaticMethodFactory.java
deleted file mode 100644
index a8655ea..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/named/staticmethod/NamedFacetStaticMethodFactory.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.object.named.staticmethod;
-
-import java.lang.reflect.Method;
-
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.lang.MethodExtensions;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facetapi.FacetUtil;
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
-import org.apache.isis.core.metamodel.facets.MethodFinderUtils;
-import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.MethodPrefixConstants;
-import org.apache.isis.core.metamodel.methodutils.MethodScope;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedMethodPrefix;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class NamedFacetStaticMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner {
-
- private static final String[] PREFIXES = { MethodPrefixConstants.SINGULAR_NAME, };
-
- private final MetaModelValidatorForDeprecatedMethodPrefix validator = new MetaModelValidatorForDeprecatedMethodPrefix(PREFIXES[0]);
-
- public NamedFacetStaticMethodFactory() {
- super(FeatureType.OBJECTS_ONLY, OrphanValidation.VALIDATE, PREFIXES);
- }
-
- @Override
- public void process(final ProcessClassContext processClassContext) {
- final Class<?> cls = processClassContext.getCls();
- final FacetHolder facetHolder = processClassContext.getFacetHolder();
-
- final Method method = MethodFinderUtils.findMethod(cls, MethodScope.CLASS, MethodPrefixConstants.SINGULAR_NAME, String.class, NO_PARAMETERS_TYPES);
- if (method != null) {
- final String name = (String) MethodExtensions.invokeStatic(method);
- processClassContext.removeMethod(method);
- final NamedFacetStaticMethod facet = new NamedFacetStaticMethod(name, facetHolder);
- FacetUtil.addFacet(validator.flagIfPresent(facet));
- }
- }
-
-
- @Override
- public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator, final IsisConfiguration configuration) {
- metaModelValidator.add(validator);
- }
-
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- super.setServicesInjector(servicesInjector);
- IsisConfiguration configuration = servicesInjector.getConfigurationServiceInternal();
- validator.setConfiguration(configuration);
- }
-
-
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/staticmethod/PluralFacetMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/staticmethod/PluralFacetMethod.java
deleted file mode 100644
index 0ee38e8..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/staticmethod/PluralFacetMethod.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.object.plural.staticmethod;
-
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.object.plural.PluralFacetAbstract;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class PluralFacetMethod extends PluralFacetAbstract {
-
- public PluralFacetMethod(final String value, final FacetHolder holder) {
- super(value, holder);
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/staticmethod/PluralFacetStaticMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/staticmethod/PluralFacetStaticMethodFactory.java
deleted file mode 100644
index e6ff9b3..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/staticmethod/PluralFacetStaticMethodFactory.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.object.plural.staticmethod;
-
-import java.lang.reflect.Method;
-
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.lang.MethodExtensions;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facetapi.FacetUtil;
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
-import org.apache.isis.core.metamodel.facets.MethodFinderUtils;
-import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.methodutils.MethodScope;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedMethodPrefix;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class PluralFacetStaticMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner {
-
- private static final String PLURAL_NAME = "pluralName";
-
- private static final String[] PREFIXES = { PLURAL_NAME, };
-
- private final MetaModelValidatorForDeprecatedMethodPrefix validator = new MetaModelValidatorForDeprecatedMethodPrefix(PREFIXES[0]);
-
- public PluralFacetStaticMethodFactory() {
- super(FeatureType.OBJECTS_ONLY, OrphanValidation.VALIDATE, PREFIXES);
- }
-
- @Override
- public void process(final ProcessClassContext processClassContext) {
- final Class<?> type = processClassContext.getCls();
- final FacetHolder facetHolder = processClassContext.getFacetHolder();
-
- final Method method = MethodFinderUtils.findMethod(type, MethodScope.CLASS, PLURAL_NAME, String.class, NO_PARAMETERS_TYPES);
- if (method != null) {
- final String name = (String) MethodExtensions.invokeStatic(method);
- processClassContext.removeMethod(method);
- final PluralFacetMethod facet = new PluralFacetMethod(name, facetHolder);
- FacetUtil.addFacet(validator.flagIfPresent(facet));
- }
- }
-
-
- @Override
- public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator, final IsisConfiguration configuration) {
- metaModelValidator.add(validator);
- }
-
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- super.setServicesInjector(servicesInjector);
- IsisConfiguration configuration = servicesInjector.getConfigurationServiceInternal();
- validator.setConfiguration(configuration);
- }
-
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/mandatory/staticmethod/MandatoryFacetOnPropertyStaticMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/mandatory/staticmethod/MandatoryFacetOnPropertyStaticMethod.java
deleted file mode 100644
index 00eb577..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/mandatory/staticmethod/MandatoryFacetOnPropertyStaticMethod.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.properties.mandatory.staticmethod;
-
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFacetAbstract;
-
-/**
- * Derived by presence of an <tt>optionalXxx</tt> method.
- *
- * <p>
- * This implementation indicates that the {@link FacetHolder} is <i>not</i>
- * mandatory, as per {@link #isInvertedSemantics()}.
- *
- * @deprecated
- */
-@Deprecated
-public class MandatoryFacetOnPropertyStaticMethod extends MandatoryFacetAbstract {
-
- public MandatoryFacetOnPropertyStaticMethod(final FacetHolder holder) {
- super(holder, Semantics.OPTIONAL);
- }
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/mandatory/staticmethod/MandatoryFacetOnPropertyStaticMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/mandatory/staticmethod/MandatoryFacetOnPropertyStaticMethodFactory.java
deleted file mode 100644
index 1872818..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/mandatory/staticmethod/MandatoryFacetOnPropertyStaticMethodFactory.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.properties.mandatory.staticmethod;
-
-import java.lang.reflect.Method;
-
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.lang.MethodExtensions;
-import org.apache.isis.core.commons.lang.StringExtensions;
-import org.apache.isis.core.metamodel.exceptions.MetaModelException;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facetapi.FacetUtil;
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
-import org.apache.isis.core.metamodel.facets.MethodFinderUtils;
-import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.MethodPrefixConstants;
-import org.apache.isis.core.metamodel.methodutils.MethodScope;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedMethodPrefix;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class MandatoryFacetOnPropertyStaticMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner {
-
- private static final String[] PREFIXES = { MethodPrefixConstants.OPTIONAL_PREFIX };
-
- private final MetaModelValidatorForDeprecatedMethodPrefix validator = new MetaModelValidatorForDeprecatedMethodPrefix(PREFIXES[0]);
-
- public MandatoryFacetOnPropertyStaticMethodFactory() {
- super(FeatureType.PROPERTIES_ONLY, OrphanValidation.VALIDATE, PREFIXES);
- }
-
- @Override
- public void process(final ProcessMethodContext processMethodContext) {
-
- attachMandatoryFacetIfOptionalMethodIsFound(processMethodContext);
- }
-
- private void attachMandatoryFacetIfOptionalMethodIsFound(final ProcessMethodContext processMethodContext) {
- final Method method = processMethodContext.getMethod();
-
- final String capitalizedName = StringExtensions.asJavaBaseName(method.getName());
- final Class<?> returnType = method.getReturnType();
-
- final Class<?> cls = processMethodContext.getCls();
- final Method optionalMethod = MethodFinderUtils.findMethod(cls, MethodScope.CLASS, MethodPrefixConstants.OPTIONAL_PREFIX + capitalizedName, boolean.class, NO_PARAMETERS_TYPES);
- processMethodContext.removeMethod(optionalMethod);
-
- if (!indicatesOptional(optionalMethod)) {
- return;
- }
- if (returnType.isPrimitive()) {
- throw new MetaModelException(cls.getName() + "#" + capitalizedName + " cannot be an optional property as it is of a primitive type");
- }
- final FacetHolder property = processMethodContext.getFacetHolder();
- final MandatoryFacetOnPropertyStaticMethod facet = new MandatoryFacetOnPropertyStaticMethod(property);
- FacetUtil.addFacet(validator.flagIfPresent(facet, processMethodContext));
- }
-
- private static boolean indicatesOptional(final Method method) {
- if (method != null) {
- Boolean optionalMethodReturnValue = null;
- try {
- optionalMethodReturnValue = (Boolean) MethodExtensions.invoke(method, new Object[0]);
- } catch (final ClassCastException ex) {
- // ignore
- }
- if (optionalMethodReturnValue == null) {
- throw new MetaModelException("method " + method + " should return a boolean");
- }
- return optionalMethodReturnValue.booleanValue();
- }
- return false;
- }
-
-
- @Override
- public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator, final IsisConfiguration configuration) {
- metaModelValidator.add(validator);
- }
-
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- super.setServicesInjector(servicesInjector);
- IsisConfiguration configuration = servicesInjector.getConfigurationServiceInternal();
- validator.setConfiguration(configuration);
- }
-
-
-
-}
\ No newline at end of file
diff --git a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
index 43f4e60..4ac5d5e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
+++ b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
@@ -26,7 +26,6 @@ import org.apache.isis.core.metamodel.facets.actions.layout.ActionLayoutFacetFac
import org.apache.isis.core.metamodel.facets.actions.notcontributed.derived.NotContributedFacetDerivedFromDomainServiceFacetFactory;
import org.apache.isis.core.metamodel.facets.actions.notcontributed.derived.NotContributedFacetDerivedFromMixinFacetFactory;
import org.apache.isis.core.metamodel.facets.actions.notinservicemenu.derived.NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory;
-import org.apache.isis.core.metamodel.facets.actions.notinservicemenu.method.NotInServiceMenuFacetViaMethodFactory;
import org.apache.isis.core.metamodel.facets.actions.validate.method.ActionValidationFacetViaMethodFactory;
import org.apache.isis.core.metamodel.facets.all.i18n.TranslationFacetFactory;
import org.apache.isis.core.metamodel.facets.collections.accessor.CollectionAccessorFacetViaAccessorFactory;
@@ -43,14 +42,10 @@ import org.apache.isis.core.metamodel.facets.jaxb.JaxbXmlJavaTypeAdapterFacetFac
import org.apache.isis.core.metamodel.facets.members.cssclass.annotprop.CssClassFacetOnActionFromConfiguredRegexFactory;
import org.apache.isis.core.metamodel.facets.members.cssclassfa.annotprop.CssClassFaFacetOnMemberFactory;
import org.apache.isis.core.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberFactory;
-import org.apache.isis.core.metamodel.facets.members.describedas.staticmethod.DescribedAsFacetStaticMethodFactory;
import org.apache.isis.core.metamodel.facets.members.disabled.forsession.DisableForSessionFacetViaMethodFactory;
import org.apache.isis.core.metamodel.facets.members.disabled.method.DisableForContextFacetViaMethodFactory;
-import org.apache.isis.core.metamodel.facets.members.disabled.staticmethod.DisabledFacetStaticMethodFacetFactory;
import org.apache.isis.core.metamodel.facets.members.hidden.forsession.HideForSessionFacetViaMethodFactory;
import org.apache.isis.core.metamodel.facets.members.hidden.method.HideForContextFacetViaMethodFactory;
-import org.apache.isis.core.metamodel.facets.members.hidden.staticmethod.HiddenFacetStaticMethodFactory;
-import org.apache.isis.core.metamodel.facets.members.named.staticmethod.NamedFacetStaticMethodFactory;
import org.apache.isis.core.metamodel.facets.members.order.annotprop.MemberOrderFacetFactory;
import org.apache.isis.core.metamodel.facets.object.ViewModelSemanticCheckingFacetFactory;
import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.bookmarkable.BookmarkPolicyFacetFallbackFactory;
@@ -87,7 +82,6 @@ import org.apache.isis.core.metamodel.facets.object.mixin.MixinFacetForMixinAnno
import org.apache.isis.core.metamodel.facets.object.objectspecid.classname.ObjectSpecIdFacetDerivedFromClassNameFactory;
import org.apache.isis.core.metamodel.facets.object.objectvalidprops.impl.ObjectValidPropertiesFacetImplFactory;
import org.apache.isis.core.metamodel.facets.object.parseable.annotcfg.ParseableFacetAnnotationElseConfigurationFactory;
-import org.apache.isis.core.metamodel.facets.object.plural.staticmethod.PluralFacetStaticMethodFactory;
import org.apache.isis.core.metamodel.facets.object.recreatable.DisabledFacetOnCollectionDerivedFromViewModelFacetFactory;
import org.apache.isis.core.metamodel.facets.object.recreatable.DisabledFacetOnPropertyDerivedFromRecreatableObjectFacetFactory;
import org.apache.isis.core.metamodel.facets.object.recreatable.RecreatableObjectFacetFactory;
@@ -117,7 +111,6 @@ import org.apache.isis.core.metamodel.facets.properties.defaults.method.Property
import org.apache.isis.core.metamodel.facets.properties.disabled.fromimmutable.DisabledFacetOnPropertyDerivedFromImmutableFactory;
import org.apache.isis.core.metamodel.facets.properties.disabled.inferred.DisabledFacetOnPropertyInferredFactory;
import org.apache.isis.core.metamodel.facets.properties.mandatory.dflt.MandatoryFacetOnProperyDefaultFactory;
-import org.apache.isis.core.metamodel.facets.properties.mandatory.staticmethod.MandatoryFacetOnPropertyStaticMethodFactory;
import org.apache.isis.core.metamodel.facets.properties.property.PropertyAnnotationFacetFactory;
import org.apache.isis.core.metamodel.facets.properties.propertylayout.PropertyLayoutFacetFactory;
import org.apache.isis.core.metamodel.facets.properties.typicallen.fromtype.TypicalLengthFacetOnPropertyDerivedFromTypeFacetFactory;
@@ -222,8 +215,6 @@ public final class ProgrammingModelFacetsJava5 extends ProgrammingModelAbstract
addFactory(new PropertyAutoCompleteFacetMethodFactory());
addFactory(new PropertyDefaultFacetViaMethodFactory());
- addFactory(new MandatoryFacetOnPropertyStaticMethodFactory());
-
// collections
addFactory(new CollectionAccessorFacetViaAccessorFactory());
addFactory(new CollectionClearFacetFactory());
@@ -242,16 +233,11 @@ public final class ProgrammingModelFacetsJava5 extends ProgrammingModelAbstract
// members in general
- addFactory(new NamedFacetStaticMethodFactory());
-
- addFactory(new DescribedAsFacetStaticMethodFactory());
addFactory(new DisableForSessionFacetViaMethodFactory());
addFactory(new DisableForContextFacetViaMethodFactory());
- addFactory(new DisabledFacetStaticMethodFacetFactory());
addFactory(new HideForSessionFacetViaMethodFactory());
- addFactory(new HiddenFacetStaticMethodFactory());
addFactory(new HideForContextFacetViaMethodFactory());
addFactory(new CreatedCallbackFacetFactory());
@@ -264,9 +250,6 @@ public final class ProgrammingModelFacetsJava5 extends ProgrammingModelAbstract
addFactory(new ValidateObjectFacetMethodFactory());
addFactory(new ObjectValidPropertiesFacetImplFactory());
- addFactory(new PluralFacetStaticMethodFactory());
-
- addFactory(new org.apache.isis.core.metamodel.facets.object.named.staticmethod.NamedFacetStaticMethodFactory());
addFactory(new MemberOrderFacetFactory());
@@ -288,8 +271,6 @@ public final class ProgrammingModelFacetsJava5 extends ProgrammingModelAbstract
addFactory(new EncodableFacetAnnotationElseConfigurationFactory());
- addFactory(new NotInServiceMenuFacetViaMethodFactory());
-
addFactory(new NotContributedFacetDerivedFromDomainServiceFacetFactory());
addFactory(new NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory());
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
index 3831a72..ecbb40c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
@@ -46,23 +46,13 @@ import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet;
import org.apache.isis.core.metamodel.facets.actions.validate.ActionValidationFacet;
import org.apache.isis.core.metamodel.facets.actions.validate.method.ActionValidationFacetViaMethod;
import org.apache.isis.core.metamodel.facets.actions.validate.method.ActionValidationFacetViaMethodFactory;
-import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet;
-import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacetAbstract;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
-import org.apache.isis.core.metamodel.facets.all.named.NamedFacetAbstract;
-import org.apache.isis.core.metamodel.facets.members.describedas.staticmethod.DescribedAsFacetStaticMethodFactory;
-import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacet;
-import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacetAbstract;
import org.apache.isis.core.metamodel.facets.members.disabled.forsession.DisableForSessionFacet;
import org.apache.isis.core.metamodel.facets.members.disabled.forsession.DisableForSessionFacetViaMethod;
import org.apache.isis.core.metamodel.facets.members.disabled.forsession.DisableForSessionFacetViaMethodFactory;
-import org.apache.isis.core.metamodel.facets.members.disabled.staticmethod.DisabledFacetStaticMethodFacetFactory;
import org.apache.isis.core.metamodel.facets.members.hidden.forsession.HideForSessionFacet;
import org.apache.isis.core.metamodel.facets.members.hidden.forsession.HideForSessionFacetViaMethod;
import org.apache.isis.core.metamodel.facets.members.hidden.forsession.HideForSessionFacetViaMethodFactory;
-import org.apache.isis.core.metamodel.facets.members.hidden.staticmethod.HiddenFacetOnStaticMethod;
-import org.apache.isis.core.metamodel.facets.members.hidden.staticmethod.HiddenFacetStaticMethodFactory;
-import org.apache.isis.core.metamodel.facets.members.named.staticmethod.NamedFacetStaticMethodFactory;
import org.apache.isis.core.metamodel.facets.param.autocomplete.ActionParameterAutoCompleteFacet;
import org.apache.isis.core.metamodel.facets.param.autocomplete.method.ActionParameterAutoCompleteFacetViaMethod;
import org.apache.isis.core.metamodel.facets.param.autocomplete.method.ActionParameterAutoCompleteFacetViaMethodFactory;
@@ -419,116 +409,6 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
}
}
- public void testInstallsNamedFacetUsingNameMethodAndRemovesMethod() {
- final NamedFacetStaticMethodFactory facetFactory = new NamedFacetStaticMethodFactory();
-
- facetFactory.setServicesInjector(mockServicesInjector);
-
- // mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
- allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
-
- final Method actionMethod = findMethod(CustomerStatic.class, "someAction", new Class[] { int.class, Long.class });
- final Method nameMethod = findMethod(CustomerStatic.class, "nameSomeAction");
-
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, actionMethod, methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(NamedFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof NamedFacetAbstract);
- final NamedFacetAbstract namedFacetAbstract = (NamedFacetAbstract) facet;
- assertEquals("Another Name", namedFacetAbstract.value());
-
- assertTrue(methodRemover.getRemovedMethodMethodCalls().contains(nameMethod));
- }
-
- public void testInstallsDescribedAsFacetUsingDescriptionAndRemovesMethod() {
- final DescribedAsFacetStaticMethodFactory facetFactory = new DescribedAsFacetStaticMethodFactory();
-
- // mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
- allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
-
- final Method actionMethod = findMethod(CustomerStatic.class, "someAction", new Class[] { int.class, Long.class });
- final Method descriptionMethod = findMethod(CustomerStatic.class, "descriptionSomeAction");
-
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, actionMethod, methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(DescribedAsFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof DescribedAsFacetAbstract);
- final DescribedAsFacetAbstract describedAsFacetAbstract = (DescribedAsFacetAbstract) facet;
- assertEquals("Some old description", describedAsFacetAbstract.value());
-
- assertTrue(methodRemover.getRemovedMethodMethodCalls().contains(descriptionMethod));
- }
-
- public void testInstallsHiddenFacetUsingAlwaysHideAndRemovesMethod() {
- final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
-
- facetFactory.setServicesInjector(mockServicesInjector);
-
- final Method actionMethod = findMethod(CustomerStatic.class, "someAction", new Class[] { int.class, Long.class });
- final Method alwaysHideMethod = findMethod(CustomerStatic.class, "alwaysHideSomeAction", new Class[] {});
- // mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
- allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
-
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, actionMethod, methodRemover, facetedMethod));
-
- final HiddenFacetOnStaticMethod facet = facetedMethod.getFacet(HiddenFacetOnStaticMethod.class);
- assertNotNull(facet);
-
- assertTrue(methodRemover.getRemovedMethodMethodCalls().contains(alwaysHideMethod));
- }
-
- public void testInstallsHiddenFacetUsingAlwaysHideWhenNotAndRemovesMethod() {
- final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
-
- // mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
- allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
-
- final Method actionMethod = findMethod(CustomerStatic.class, "otherAction", new Class[] { int.class, Long.class });
- final Method alwaysHideMethod = findMethod(CustomerStatic.class, "alwaysHideOtherAction", new Class[] {});
-
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, actionMethod, methodRemover, facetedMethod));
-
- assertNull(facetedMethod.getFacet(HiddenFacetOnStaticMethod.class));
-
- assertTrue(methodRemover.getRemovedMethodMethodCalls().contains(alwaysHideMethod));
- }
-
- public void testInstallsDisabledFacetUsingProtectAndRemovesMethod() {
- final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
-
- facetFactory.setServicesInjector(mockServicesInjector);
-
- allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
-
- final Method actionMethod = findMethod(CustomerStatic.class, "someAction", new Class[] { int.class, Long.class });
- final Method protectMethod = findMethod(CustomerStatic.class, "protectSomeAction", new Class[] {});
-
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, actionMethod, methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(DisabledFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof DisabledFacetAbstract);
- final DisabledFacetAbstract disabledFacetAbstract = (DisabledFacetAbstract) facet;
-
- assertTrue(methodRemover.getRemovedMethodMethodCalls().contains(protectMethod));
- }
-
- public void testDoesNotInstallDisabledFacetUsingProtectWhenNotAndRemovesMethod() {
- final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
-
- allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
-
- final Method actionMethod = findMethod(CustomerStatic.class, "otherAction", new Class[] { int.class, Long.class });
- final Method protectMethod = findMethod(CustomerStatic.class, "protectOtherAction", new Class[] {});
-
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, actionMethod, methodRemover, facetedMethod));
-
- assertNull(facetedMethod.getFacet(DisabledFacet.class));
-
- assertTrue(methodRemover.getRemovedMethodMethodCalls().contains(protectMethod));
- }
public void testInstallsHiddenForSessionFacetAndRemovesMethod() {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
index 40cd72e..ab86689 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
@@ -31,8 +31,6 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
-import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet;
-import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.core.metamodel.facets.collections.accessor.CollectionAccessorFacetViaAccessor;
import org.apache.isis.core.metamodel.facets.collections.accessor.CollectionAccessorFacetViaAccessorFactory;
import org.apache.isis.core.metamodel.facets.collections.clear.CollectionClearFacetFactory;
@@ -51,21 +49,12 @@ import org.apache.isis.core.metamodel.facets.collections.validate.CollectionVali
import org.apache.isis.core.metamodel.facets.collections.validate.CollectionValidateAddToFacetViaMethod;
import org.apache.isis.core.metamodel.facets.collections.validate.CollectionValidateRemoveFromFacet;
import org.apache.isis.core.metamodel.facets.collections.validate.CollectionValidateRemoveFromFacetViaMethod;
-import org.apache.isis.core.metamodel.facets.members.describedas.staticmethod.DescribedAsFacetStaticMethod;
-import org.apache.isis.core.metamodel.facets.members.describedas.staticmethod.DescribedAsFacetStaticMethodFactory;
-import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacet;
-import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacetAbstractAlwaysEverywhere;
import org.apache.isis.core.metamodel.facets.members.disabled.forsession.DisableForSessionFacet;
import org.apache.isis.core.metamodel.facets.members.disabled.forsession.DisableForSessionFacetViaMethod;
import org.apache.isis.core.metamodel.facets.members.disabled.forsession.DisableForSessionFacetViaMethodFactory;
-import org.apache.isis.core.metamodel.facets.members.disabled.staticmethod.DisabledFacetStaticMethodFacetFactory;
import org.apache.isis.core.metamodel.facets.members.hidden.forsession.HideForSessionFacet;
import org.apache.isis.core.metamodel.facets.members.hidden.forsession.HideForSessionFacetViaMethod;
import org.apache.isis.core.metamodel.facets.members.hidden.forsession.HideForSessionFacetViaMethodFactory;
-import org.apache.isis.core.metamodel.facets.members.hidden.staticmethod.HiddenFacetOnStaticMethod;
-import org.apache.isis.core.metamodel.facets.members.hidden.staticmethod.HiddenFacetStaticMethodFactory;
-import org.apache.isis.core.metamodel.facets.members.named.staticmethod.NamedFacetStaticMethod;
-import org.apache.isis.core.metamodel.facets.members.named.staticmethod.NamedFacetStaticMethodFactory;
import org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
@@ -660,108 +649,6 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
}
}
- public void testInstallsNamedFacetUsingNameMethodAndRemovesMethod() {
- final NamedFacetStaticMethodFactory facetFactory = new NamedFacetStaticMethodFactory();
-
- facetFactory.setServicesInjector(stubServicesInjector);
-
- final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
- final Method nameMethod = findMethod(CustomerStatic.class, "nameOrders");
-
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, collectionAccessorMethod, methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(NamedFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof NamedFacetStaticMethod);
- final NamedFacetStaticMethod namedFacet = (NamedFacetStaticMethod) facet;
- assertEquals("Most Recent Orders", namedFacet.value());
-
- assertTrue(methodRemover.getRemovedMethodMethodCalls().contains(nameMethod));
- }
-
- public void testInstallsDescribedAsFacetUsingDescriptionAndRemovesMethod() {
- final DescribedAsFacetStaticMethodFactory facetFactory = new DescribedAsFacetStaticMethodFactory();
-
- facetFactory.setServicesInjector(stubServicesInjector);
-
- final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
- final Method descriptionMethod = findMethod(CustomerStatic.class, "descriptionOrders");
-
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, collectionAccessorMethod, methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(DescribedAsFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof DescribedAsFacetStaticMethod);
- final DescribedAsFacetStaticMethod describedAsFacet = (DescribedAsFacetStaticMethod) facet;
- assertEquals("Some old description", describedAsFacet.value());
-
- assertTrue(methodRemover.getRemovedMethodMethodCalls().contains(descriptionMethod));
- }
-
- public void testInstallsHiddenFacetUsingAlwaysHideAndRemovesMethod() {
- final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
-
- facetFactory.setServicesInjector(stubServicesInjector);
-
- final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
- final Method alwaysHideMethod = findMethod(CustomerStatic.class, "alwaysHideOrders");
-
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, collectionAccessorMethod, methodRemover, facetedMethod));
-
- final HiddenFacetOnStaticMethod facet = facetedMethod.getFacet(HiddenFacetOnStaticMethod.class);
- assertNotNull(facet);
-
- assertTrue(methodRemover.getRemovedMethodMethodCalls().contains(alwaysHideMethod));
- }
-
- public void testInstallsHiddenFacetUsingAlwaysHideWhenNotAndRemovesMethod() {
- final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
-
- facetFactory.setServicesInjector(stubServicesInjector);
-
- final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOtherOrders");
- final Method alwaysHideMethod = findMethod(CustomerStatic.class, "alwaysHideOtherOrders");
-
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, collectionAccessorMethod, methodRemover, facetedMethod));
-
- assertNull(facetedMethod.getFacet(HiddenFacetOnStaticMethod.class));
-
- assertTrue(methodRemover.getRemovedMethodMethodCalls().contains(alwaysHideMethod));
- }
-
- public void testInstallsDisabledFacetUsingProtectAndRemovesMethod() {
- final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
-
- facetFactory.setServicesInjector(stubServicesInjector);
-
- final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
- final Method protectMethod = findMethod(CustomerStatic.class, "protectOrders");
-
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, collectionAccessorMethod, methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(DisabledFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof DisabledFacetAbstractAlwaysEverywhere);
- final DisabledFacetAbstractAlwaysEverywhere disabledFacetAlways = (DisabledFacetAbstractAlwaysEverywhere) facet;
-
- assertTrue(methodRemover.getRemovedMethodMethodCalls().contains(protectMethod));
- }
-
- public void testDoesNotInstallDisabledFacetUsingProtectWhenNotAndRemovesMethod() {
- final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
-
- facetFactory.setServicesInjector(stubServicesInjector);
-
- final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOtherOrders");
- final Method protectMethod = findMethod(CustomerStatic.class, "protectOtherOrders");
-
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, collectionAccessorMethod, methodRemover, facetedMethod));
-
- assertNull(facetedMethod.getFacet(DisabledFacet.class));
-
- assertTrue(methodRemover.getRemovedMethodMethodCalls().contains(protectMethod));
- }
-
public void testInstallsHiddenForSessionFacetAndRemovesMethod() {
final HideForSessionFacetViaMethodFactory facetFactory = new HideForSessionFacetViaMethodFactory();
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/plural/PluralFacetMethodFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/plural/PluralFacetMethodFactoryTest.java
deleted file mode 100644
index 0fb9de7..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/plural/PluralFacetMethodFactoryTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.object.ident.plural;
-
-import java.lang.reflect.Method;
-
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
-import org.apache.isis.core.metamodel.facets.object.plural.PluralFacet;
-import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.core.metamodel.facets.object.plural.staticmethod.PluralFacetMethod;
-import org.apache.isis.core.metamodel.facets.object.plural.staticmethod.PluralFacetStaticMethodFactory;
-
-public class PluralFacetMethodFactoryTest extends AbstractFacetFactoryTest {
-
- private PluralFacetStaticMethodFactory facetFactory;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
- facetFactory = new PluralFacetStaticMethodFactory();
- }
-
- @Override
- protected void tearDown() throws Exception {
- facetFactory = null;
- super.tearDown();
- }
-
- public static class Customer {
- public static String pluralName() {
- return "Some plural name";
- }
- }
-
- public void testPluralNameMethodPickedUpOnClassAndMethodRemoved() {
- final Method pluralNameMethod = findMethod(Customer.class, "pluralName");
-
- facetFactory.process(new ProcessClassContext(Customer.class, methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(PluralFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof PluralFacetMethod);
- final PluralFacetMethod pluralFacet = (PluralFacetMethod) facet;
- assertEquals("Some plural name", pluralFacet.value());
-
- assertTrue(methodRemover.getRemovedMethodMethodCalls().contains(pluralNameMethod));
- }
-
-}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/singular/SingularMethodFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/singular/SingularMethodFacetFactoryTest.java
deleted file mode 100644
index df6e86a..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/singular/SingularMethodFacetFactoryTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.object.ident.singular;
-
-import java.lang.reflect.Method;
-
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
-import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
-import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.core.metamodel.facets.object.named.staticmethod.NamedFacetStaticMethod;
-import org.apache.isis.core.metamodel.facets.object.named.staticmethod.NamedFacetStaticMethodFactory;
-
-public class SingularMethodFacetFactoryTest extends AbstractFacetFactoryTest {
-
- private NamedFacetStaticMethodFactory facetFactory;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
- facetFactory = new NamedFacetStaticMethodFactory();
- }
-
- @Override
- protected void tearDown() throws Exception {
- facetFactory = null;
- super.tearDown();
- }
-
- public static class Customer {
- public static String singularName() {
- return "Some name";
- }
- }
-
- public void testSingularNameMethodPickedUpOnClassAndMethodRemoved() {
- final Method singularNameMethod = findMethod(Customer.class, "singularName");
-
- facetFactory.process(new ProcessClassContext(Customer.class, methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(NamedFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof NamedFacetStaticMethod);
- final NamedFacetStaticMethod namedFacetStaticMethod = (NamedFacetStaticMethod) facet;
- assertEquals("Some name", namedFacetStaticMethod.value());
-
- assertTrue(methodRemover.getRemovedMethodMethodCalls().contains(singularNameMethod));
- }
-
-}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java
index d03a1d5..5bc252d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java
@@ -27,29 +27,19 @@ import org.apache.isis.applib.security.UserMemento;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet;
-import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
-import org.apache.isis.core.metamodel.facets.members.describedas.staticmethod.DescribedAsFacetStaticMethod;
-import org.apache.isis.core.metamodel.facets.members.describedas.staticmethod.DescribedAsFacetStaticMethodFactory;
import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacet;
-import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacetAbstractAlwaysEverywhere;
import org.apache.isis.core.metamodel.facets.members.disabled.forsession.DisableForSessionFacet;
import org.apache.isis.core.metamodel.facets.members.disabled.forsession.DisableForSessionFacetViaMethod;
import org.apache.isis.core.metamodel.facets.members.disabled.forsession.DisableForSessionFacetViaMethodFactory;
import org.apache.isis.core.metamodel.facets.members.disabled.method.DisableForContextFacet;
import org.apache.isis.core.metamodel.facets.members.disabled.method.DisableForContextFacetViaMethod;
import org.apache.isis.core.metamodel.facets.members.disabled.method.DisableForContextFacetViaMethodFactory;
-import org.apache.isis.core.metamodel.facets.members.disabled.staticmethod.DisabledFacetStaticMethodFacetFactory;
import org.apache.isis.core.metamodel.facets.members.hidden.forsession.HideForSessionFacet;
import org.apache.isis.core.metamodel.facets.members.hidden.forsession.HideForSessionFacetViaMethod;
import org.apache.isis.core.metamodel.facets.members.hidden.forsession.HideForSessionFacetViaMethodFactory;
import org.apache.isis.core.metamodel.facets.members.hidden.method.HideForContextFacet;
import org.apache.isis.core.metamodel.facets.members.hidden.method.HideForContextFacetViaMethod;
import org.apache.isis.core.metamodel.facets.members.hidden.method.HideForContextFacetViaMethodFactory;
-import org.apache.isis.core.metamodel.facets.members.hidden.staticmethod.HiddenFacetOnStaticMethod;
-import org.apache.isis.core.metamodel.facets.members.hidden.staticmethod.HiddenFacetStaticMethodFactory;
-import org.apache.isis.core.metamodel.facets.members.named.staticmethod.NamedFacetStaticMethod;
-import org.apache.isis.core.metamodel.facets.members.named.staticmethod.NamedFacetStaticMethodFactory;
import org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
import org.apache.isis.core.metamodel.facets.propcoll.notpersisted.NotPersistedFacet;
import org.apache.isis.core.metamodel.facets.properties.accessor.PropertyAccessorFacetViaAccessor;
@@ -754,107 +744,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
}
}
- public void testInstallsNamedFacetUsingNameMethodAndRemovesMethod() {
- final NamedFacetStaticMethodFactory facetFactory = new NamedFacetStaticMethodFactory();
- facetFactory.setServicesInjector(stubServicesInjector);
-
- final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
- final Method nameMethod = findMethod(CustomerStatic.class, "nameFirstName");
-
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, propertyAccessorMethod, methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(NamedFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof NamedFacetStaticMethod);
- final NamedFacetStaticMethod namedFacet = (NamedFacetStaticMethod) facet;
- assertEquals("Given name", namedFacet.value());
-
- assertTrue(methodRemover.getRemovedMethodMethodCalls().contains(nameMethod));
- }
-
- public void testInstallsDescribedAsFacetUsingDescriptionAndRemovesMethod() {
- final DescribedAsFacetStaticMethodFactory facetFactory = new DescribedAsFacetStaticMethodFactory();
-
- facetFactory.setServicesInjector(stubServicesInjector);
-
- final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
- final Method descriptionMethod = findMethod(CustomerStatic.class, "descriptionFirstName");
-
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, propertyAccessorMethod, methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(DescribedAsFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof DescribedAsFacetStaticMethod);
- final DescribedAsFacetStaticMethod describedAsFacet = (DescribedAsFacetStaticMethod) facet;
- assertEquals("Some old description", describedAsFacet.value());
-
- assertTrue(methodRemover.getRemovedMethodMethodCalls().contains(descriptionMethod));
- }
-
- public void testInstallsHiddenFacetUsingAlwaysHideAndRemovesMethod() {
- final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
-
- facetFactory.setServicesInjector(stubServicesInjector);
-
- final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
- final Method propertyAlwaysHideMethod = findMethod(CustomerStatic.class, "alwaysHideFirstName");
-
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, propertyAccessorMethod, methodRemover, facetedMethod));
-
- final HiddenFacetOnStaticMethod facet = facetedMethod.getFacet(HiddenFacetOnStaticMethod.class);
- assertNotNull(facet);
-
- assertTrue(methodRemover.getRemovedMethodMethodCalls().contains(propertyAlwaysHideMethod));
- }
-
- public void testInstallsHiddenFacetUsingAlwaysHideWhenNotAndRemovesMethod() {
- final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
-
- facetFactory.setServicesInjector(stubServicesInjector);
-
- final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getLastName");
- final Method propertyAlwaysHideMethod = findMethod(CustomerStatic.class, "alwaysHideLastName");
-
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, propertyAccessorMethod, methodRemover, facetedMethod));
-
- assertNull(facetedMethod.getFacet(HiddenFacetOnStaticMethod.class));
-
- assertTrue(methodRemover.getRemovedMethodMethodCalls().contains(propertyAlwaysHideMethod));
- }
-
- public void testInstallsDisabledFacetUsingProtectAndRemovesMethod() {
- final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
-
- facetFactory.setServicesInjector(stubServicesInjector);
-
- final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
- final Method propertyProtectMethod = findMethod(CustomerStatic.class, "protectFirstName");
-
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, propertyAccessorMethod, methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(DisabledFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof DisabledFacetAbstractAlwaysEverywhere);
-
- assertTrue(methodRemover.getRemovedMethodMethodCalls().contains(propertyProtectMethod));
- }
-
- public void testDoesNotInstallDisabledFacetUsingProtectWhenNotAndRemovesMethod() {
- final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
-
- facetFactory.setServicesInjector(stubServicesInjector);
-
- final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getLastName");
- final Method propertyProtectMethod = findMethod(CustomerStatic.class, "protectLastName");
-
- facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, propertyAccessorMethod, methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(DisabledFacet.class);
- assertNull(facet);
-
- assertTrue(methodRemover.getRemovedMethodMethodCalls().contains(propertyProtectMethod));
- }
public void testInstallsHiddenForSessionFacetAndRemovesMethod() {
final HideForSessionFacetViaMethodFactory facetFactory = new HideForSessionFacetViaMethodFactory();
diff --git a/todo-deprecation-list.txt b/todo-deprecation-list.txt
index 580fb80..0ee1f34 100644
--- a/todo-deprecation-list.txt
+++ b/todo-deprecation-list.txt
@@ -29,7 +29,6 @@ Also propose:
remove support for contributed services (use mixins instead)
- remove support for "notInServiceMenu" prefix
Also for 2.0.0, new features/deprecations:
@@ -64,9 +63,6 @@ ObjectFixtureService
inline paraname8 from incode platform
-remove named static method
-remove plural static method
-
PublishingServiceInternalDefault
@@ -87,7 +83,6 @@ not thread-safe:
}
-? deprecate When enum ?
~~~
@@ -494,3 +489,11 @@ org.apache.isis.viewer.restfulobjects.rendering.service.conmap.ContentMappingSer
org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationServiceForRestfulObjects
- unused
+
+removed support for "notInServiceMenu" prefix
+removed named static method
+removed plural static method
+removed "alwaysHide" static
+removed "protect" static
+removed "description" static
+removed "optional" (if static)
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.