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/09 16:30:13 UTC
[isis] 02/10: ISIS-1742: removes @Disabled annotation and
supporting facets etc.
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 b0fdcf8b2127c416dbf25af8dcee697bf8ffb170
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 9 14:40:55 2017 +0100
ISIS-1742: removes @Disabled annotation and supporting facets etc.
---
.../apache/isis/applib/annotation/Disabled.java | 49 --------
.../action/ActionAnnotationFacetFactory.java | 22 ----
...DisabledFacetForDisabledAnnotationOnAction.java | 48 --------
.../CollectionAnnotationFacetFactory.java | 15 +--
...bledFacetForDisabledAnnotationOnCollection.java | 48 --------
.../property/PropertyAnnotationFacetFactory.java | 16 +--
...sabledFacetForDisabledAnnotationOnProperty.java | 45 -------
...DisabledAnnotationOnActionFacetFactoryTest.java | 137 ---------------------
...bledAnnotationOnCollectionFacetFactoryTest.java | 3 +-
...sabledAnnotationOnPropertyFacetFactoryTest.java | 4 +-
todo-deprecation-list.txt | 3 +-
11 files changed, 8 insertions(+), 382 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Disabled.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Disabled.java
deleted file mode 100644
index f438672..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Disabled.java
+++ /dev/null
@@ -1,49 +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.applib.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * @deprecated - see {@link Property#editing()} and {@link Collection#editing()}.
- */
-@Inherited
-@Target({ ElementType.METHOD })
-@Retention(RetentionPolicy.RUNTIME)
-@Deprecated
-public @interface Disabled {
-
-
- /**
- * @deprecated - see {@link Property#editing()} and {@link Collection#editing()}.
- */
- @Deprecated
- Where where() default Where.ANYWHERE;
-
- /**
- * @deprecated - see {@link Property#editingDisabledReason()} and {@link Collection#editingDisabledReason()}.
- */
- @Deprecated
- String reason() default "";
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
index fc5610b..2fc2453 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
@@ -23,7 +23,6 @@ import java.lang.reflect.Method;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.Bulk;
-import org.apache.isis.applib.annotation.Disabled;
import org.apache.isis.applib.annotation.Hidden;
import org.apache.isis.applib.services.HasTransactionId;
import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
@@ -40,7 +39,6 @@ import org.apache.isis.core.metamodel.facets.actions.action.bulk.BulkFacetForAct
import org.apache.isis.core.metamodel.facets.actions.action.bulk.BulkFacetForBulkAnnotation;
import org.apache.isis.core.metamodel.facets.actions.action.bulk.BulkFacetObjectOnly;
import org.apache.isis.core.metamodel.facets.actions.action.command.CommandFacetForActionAnnotation;
-import org.apache.isis.core.metamodel.facets.actions.action.disabled.DisabledFacetForDisabledAnnotationOnAction;
import org.apache.isis.core.metamodel.facets.actions.action.hidden.HiddenFacetForActionAnnotation;
import org.apache.isis.core.metamodel.facets.actions.action.hidden.HiddenFacetForHiddenAnnotationOnAction;
import org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionDomainEventFacetAbstract;
@@ -60,7 +58,6 @@ import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet;
import org.apache.isis.core.metamodel.facets.actions.publish.PublishedActionFacet;
import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
-import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacet;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.CollectionUtils;
@@ -73,7 +70,6 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract
private final MetaModelValidatorForDeprecatedAnnotation bulkValidator = new MetaModelValidatorForDeprecatedAnnotation(Bulk.class);
private final MetaModelValidatorForDeprecatedAnnotation hiddenValidator = new MetaModelValidatorForDeprecatedAnnotation(Hidden.class);
- private final MetaModelValidatorForDeprecatedAnnotation disabledValidator = new MetaModelValidatorForDeprecatedAnnotation(Disabled.class);
@@ -86,7 +82,6 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract
processInvocation(processMethodContext);
processHidden(processMethodContext);
- processDisabled(processMethodContext);
processRestrictTo(processMethodContext);
processSemantics(processMethodContext);
processBulk(processMethodContext);
@@ -187,21 +182,6 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract
FacetUtil.addFacet(facet);
}
- void processDisabled(final ProcessMethodContext processMethodContext) {
- final Method method = processMethodContext.getMethod();
- final FacetHolder holder = processMethodContext.getFacetHolder();
-
- // check for deprecated @Disabled
- final Disabled annotation = Annotations.getAnnotation(method, Disabled.class);
- DisabledFacet facet = disabledValidator
- .flagIfPresent(DisabledFacetForDisabledAnnotationOnAction.create(annotation, holder),
- processMethodContext);
-
- // there is no equivalent in @Action(...)
-
- FacetUtil.addFacet(facet);
- }
-
void processRestrictTo(final ProcessMethodContext processMethodContext) {
final Method method = processMethodContext.getMethod();
final FacetHolder holder = processMethodContext.getFacetHolder();
@@ -341,7 +321,6 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract
public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator, final IsisConfiguration configuration) {
metaModelValidator.add(bulkValidator);
metaModelValidator.add(hiddenValidator);
- metaModelValidator.add(disabledValidator);
}
// ///////////////////////////////////////////////////////////////
@@ -354,7 +333,6 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract
bulkValidator.setConfiguration(configuration);
hiddenValidator.setConfiguration(configuration);
- disabledValidator.setConfiguration(configuration);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/disabled/DisabledFacetForDisabledAnnotationOnAction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/disabled/DisabledFacetForDisabledAnnotationOnAction.java
deleted file mode 100644
index d66cbe7..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/disabled/DisabledFacetForDisabledAnnotationOnAction.java
+++ /dev/null
@@ -1,48 +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.action.disabled;
-
-import org.apache.isis.applib.annotation.Disabled;
-import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacet;
-import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacetAbstractImpl;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class DisabledFacetForDisabledAnnotationOnAction extends DisabledFacetAbstractImpl {
-
- public static DisabledFacet create(final Disabled annotation, final FacetHolder facetHolder) {
- return annotation != null
- ? new DisabledFacetForDisabledAnnotationOnAction(annotation.where(), annotation.reason(), facetHolder)
- : null;
- }
-
- private DisabledFacetForDisabledAnnotationOnAction(
- Where where,
- String reason,
- final FacetHolder holder) {
- super(where, reason, holder);
- }
-
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
index 766c4bf..58defd5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
@@ -25,7 +25,6 @@ import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
import org.apache.isis.applib.annotation.Collection;
-import org.apache.isis.applib.annotation.Disabled;
import org.apache.isis.applib.annotation.Hidden;
import org.apache.isis.applib.annotation.NotPersisted;
import org.apache.isis.applib.services.eventbus.CollectionDomainEvent;
@@ -42,7 +41,6 @@ import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetInferredF
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromGenerics;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
import org.apache.isis.core.metamodel.facets.collections.collection.disabled.DisabledFacetForCollectionAnnotation;
-import org.apache.isis.core.metamodel.facets.collections.collection.disabled.DisabledFacetForDisabledAnnotationOnCollection;
import org.apache.isis.core.metamodel.facets.collections.collection.hidden.HiddenFacetForCollectionAnnotation;
import org.apache.isis.core.metamodel.facets.collections.collection.hidden.HiddenFacetForHiddenAnnotationOnCollection;
import org.apache.isis.core.metamodel.facets.collections.collection.modify.CollectionAddToFacetForDomainEventFromAbstract;
@@ -71,7 +69,6 @@ import org.apache.isis.core.metamodel.util.EventUtil;
public class CollectionAnnotationFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation hiddenValidator = new MetaModelValidatorForDeprecatedAnnotation(Hidden.class);
- private final MetaModelValidatorForDeprecatedAnnotation disabledValidator = new MetaModelValidatorForDeprecatedAnnotation(Disabled.class);
private final MetaModelValidatorForDeprecatedAnnotation notPersistedValidator = new MetaModelValidatorForDeprecatedAnnotation(NotPersisted.class);
@@ -195,15 +192,9 @@ public class CollectionAnnotationFacetFactory extends FacetFactoryAbstract imple
final Method method = processMethodContext.getMethod();
final FacetHolder holder = processMethodContext.getFacetHolder();
- // check for deprecated @Disabled
- final Disabled annotation = Annotations.getAnnotation(method, Disabled.class);
- DisabledFacet facet = disabledValidator.flagIfPresent(DisabledFacetForDisabledAnnotationOnCollection.create(annotation, holder), processMethodContext);
-
- // else check for @Collection(editing=...)
+ // check for @Collection(editing=...)
final Collection collection = Annotations.getAnnotation(method, Collection.class);
- if(facet == null) {
- facet = DisabledFacetForCollectionAnnotation.create(collection, holder);
- }
+ DisabledFacet facet = DisabledFacetForCollectionAnnotation.create(collection, holder);
FacetUtil.addFacet(facet);
}
@@ -298,7 +289,6 @@ public class CollectionAnnotationFacetFactory extends FacetFactoryAbstract imple
public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator, final IsisConfiguration configuration) {
metaModelValidator.add(notPersistedValidator);
metaModelValidator.add(hiddenValidator);
- metaModelValidator.add(disabledValidator);
}
// //////////////////////////////////////
@@ -311,7 +301,6 @@ public class CollectionAnnotationFacetFactory extends FacetFactoryAbstract imple
notPersistedValidator.setConfiguration(configuration);
hiddenValidator.setConfiguration(configuration);
- disabledValidator.setConfiguration(configuration);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/disabled/DisabledFacetForDisabledAnnotationOnCollection.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/disabled/DisabledFacetForDisabledAnnotationOnCollection.java
deleted file mode 100644
index cbe8763..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/disabled/DisabledFacetForDisabledAnnotationOnCollection.java
+++ /dev/null
@@ -1,48 +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.collections.collection.disabled;
-
-import org.apache.isis.applib.annotation.Disabled;
-import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacet;
-import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacetAbstractImpl;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class DisabledFacetForDisabledAnnotationOnCollection extends DisabledFacetAbstractImpl {
-
- public static DisabledFacet create(final Disabled annotation, final FacetHolder facetHolder) {
- return annotation != null
- ? new DisabledFacetForDisabledAnnotationOnCollection(annotation.where(), annotation.reason(), facetHolder)
- : null;
- }
-
- private DisabledFacetForDisabledAnnotationOnCollection(
- Where where,
- String reason,
- final FacetHolder holder) {
- super(where, reason, holder);
- }
-
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
index e1aa811..5b0f930 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
@@ -23,7 +23,6 @@ import java.lang.reflect.Method;
import javax.annotation.Nullable;
-import org.apache.isis.applib.annotation.Disabled;
import org.apache.isis.applib.annotation.Hidden;
import org.apache.isis.applib.annotation.Mandatory;
import org.apache.isis.applib.annotation.MustSatisfy;
@@ -53,7 +52,6 @@ import org.apache.isis.core.metamodel.facets.objectvalue.regex.TitleFacetFormatt
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.property.command.CommandFacetForPropertyAnnotation;
-import org.apache.isis.core.metamodel.facets.properties.property.disabled.DisabledFacetForDisabledAnnotationOnProperty;
import org.apache.isis.core.metamodel.facets.properties.property.disabled.DisabledFacetForPropertyAnnotation;
import org.apache.isis.core.metamodel.facets.properties.property.fileaccept.FileAcceptFacetForPropertyAnnotation;
import org.apache.isis.core.metamodel.facets.properties.property.hidden.HiddenFacetForHiddenAnnotationOnProperty;
@@ -92,7 +90,6 @@ public class PropertyAnnotationFacetFactory extends FacetFactoryAbstract impleme
private final MetaModelValidatorForDeprecatedAnnotation optionalValidator = new MetaModelValidatorForDeprecatedAnnotation(Optional.class);
private final MetaModelValidatorForDeprecatedAnnotation mandatoryValidator = new MetaModelValidatorForDeprecatedAnnotation(Mandatory.class);
private final MetaModelValidatorForDeprecatedAnnotation hiddenValidator = new MetaModelValidatorForDeprecatedAnnotation(Hidden.class);
- private final MetaModelValidatorForDeprecatedAnnotation disabledValidator = new MetaModelValidatorForDeprecatedAnnotation(Disabled.class);
private final MetaModelValidatorForDeprecatedAnnotation mustSatisfyValidator = new MetaModelValidatorForDeprecatedAnnotation(MustSatisfy.class);
private final MetaModelValidatorForDeprecatedAnnotation notPersistedValidator = new MetaModelValidatorForDeprecatedAnnotation(NotPersisted.class);
private final MetaModelValidatorForConflictingOptionality conflictingOptionalityValidator = new MetaModelValidatorForConflictingOptionality();
@@ -223,16 +220,9 @@ public class PropertyAnnotationFacetFactory extends FacetFactoryAbstract impleme
final Method method = processMethodContext.getMethod();
final FacetHolder holder = processMethodContext.getFacetHolder();
- // check for deprecated @Disabled first
- final Disabled annotation = Annotations.getAnnotation(method, Disabled.class);
- final DisabledFacet disabledFacet = DisabledFacetForDisabledAnnotationOnProperty.create(annotation, holder);
- DisabledFacet facet = disabledValidator.flagIfPresent(disabledFacet, processMethodContext);
-
- // else search for @Property(editing=...)
+ // search for @Property(editing=...)
final Property property = Annotations.getAnnotation(method, Property.class);
- if(facet == null) {
- facet = DisabledFacetForPropertyAnnotation.create(property, holder);
- }
+ DisabledFacet facet = DisabledFacetForPropertyAnnotation.create(property, holder);
FacetUtil.addFacet(facet);
}
@@ -416,7 +406,6 @@ public class PropertyAnnotationFacetFactory extends FacetFactoryAbstract impleme
metaModelValidator.add(optionalValidator);
metaModelValidator.add(mandatoryValidator);
metaModelValidator.add(hiddenValidator);
- metaModelValidator.add(disabledValidator);
metaModelValidator.add(mustSatisfyValidator);
metaModelValidator.add(notPersistedValidator);
metaModelValidator.add(conflictingOptionalityValidator);
@@ -434,7 +423,6 @@ public class PropertyAnnotationFacetFactory extends FacetFactoryAbstract impleme
optionalValidator.setConfiguration(configuration);
mandatoryValidator.setConfiguration(configuration);
hiddenValidator.setConfiguration(configuration);
- disabledValidator.setConfiguration(configuration);
mustSatisfyValidator.setConfiguration(configuration);
notPersistedValidator.setConfiguration(configuration);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/disabled/DisabledFacetForDisabledAnnotationOnProperty.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/disabled/DisabledFacetForDisabledAnnotationOnProperty.java
deleted file mode 100644
index 8f9a76b..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/disabled/DisabledFacetForDisabledAnnotationOnProperty.java
+++ /dev/null
@@ -1,45 +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.property.disabled;
-
-import org.apache.isis.applib.annotation.Disabled;
-import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacet;
-import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacetAbstractImpl;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class DisabledFacetForDisabledAnnotationOnProperty extends DisabledFacetAbstractImpl {
-
- public static DisabledFacet create(final Disabled annotation, final FacetHolder facetHolder) {
- return annotation != null
- ? new DisabledFacetForDisabledAnnotationOnProperty(annotation.where(), annotation.reason(), facetHolder)
- : null;
- }
-
- private DisabledFacetForDisabledAnnotationOnProperty(final Where where, String reason, final FacetHolder holder) {
- super(where, reason, holder);
- }
-
-
-}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/DisabledAnnotationOnActionFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/DisabledAnnotationOnActionFacetFactoryTest.java
deleted file mode 100644
index 264ffb2..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/DisabledAnnotationOnActionFacetFactoryTest.java
+++ /dev/null
@@ -1,137 +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.action;
-
-import java.lang.reflect.Method;
-
-import org.apache.isis.applib.annotation.Disabled;
-import org.apache.isis.applib.annotation.Where;
-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.members.disabled.DisabledFacet;
-import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacetAbstract;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-public class DisabledAnnotationOnActionFacetFactoryTest extends AbstractFacetFactoryTest {
-
- private ActionAnnotationFacetFactory facetFactory;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
- facetFactory = new ActionAnnotationFacetFactory();
- }
-
- @Override
- protected void tearDown() throws Exception {
- facetFactory = null;
- super.tearDown();
- }
-
- public void testDisabledAnnotationPickedUpOnAction() {
- class Customer {
- @Disabled
- public void someAction() {
- }
- }
- final Method actionMethod = findMethod(Customer.class, "someAction");
-
- facetFactory.processDisabled(new ProcessMethodContext(Customer.class, null, actionMethod, methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(DisabledFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof DisabledFacetAbstract);
-
- assertNoMethodsRemoved();
- }
-
- public void testDisabledWhenAlwaysAnnotationPickedUpOn() {
- class Customer {
- @Disabled
- public void someAction() {
- }
- }
- final Method actionMethod = findMethod(Customer.class, "someAction");
-
- facetFactory.processDisabled(new ProcessMethodContext(Customer.class, null, actionMethod, methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(DisabledFacet.class);
- final DisabledFacetAbstract disabledFacetAbstract = (DisabledFacetAbstract) facet;
-
- final DisabledFacet disabledFacet = (DisabledFacet) facet;
- assertThat(disabledFacet.disabledReason(null), is("Always disabled"));
-
- }
-
- public void testDisabledWhenNeverAnnotationPickedUpOn() {
- class Customer {
- public void someAction() {
- }
- }
- final Method actionMethod = findMethod(Customer.class, "someAction");
-
- facetFactory.processDisabled(new ProcessMethodContext(Customer.class, null, actionMethod, methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(DisabledFacet.class);
- final DisabledFacetAbstract disabledFacetAbstract = (DisabledFacetAbstract) facet;
-
- assertNull(disabledFacetAbstract);
- }
-
-
- public void testDisabledWhereCollectionTableAnnotationPickedUpOn() {
- class Customer {
- @Disabled(where = Where.PARENTED_TABLES)
- public void someAction() {
- }
- }
- final Method actionMethod = findMethod(Customer.class, "someAction");
-
- facetFactory.processDisabled(new ProcessMethodContext(Customer.class, null, actionMethod, methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(DisabledFacet.class);
- final DisabledFacetAbstract disabledFacetAbstract = (DisabledFacetAbstract) facet;
-
- assertEquals(Where.PARENTED_TABLES, disabledFacetAbstract.where());
- }
-
-
- public void testDisabledWhereAnnotationPickedUpOn() {
- class Customer {
- @Disabled(where = Where.PARENTED_TABLES)
- public void someAction() {
- }
- }
- final Method actionMethod = findMethod(Customer.class, "someAction");
-
- facetFactory.processDisabled(new ProcessMethodContext(Customer.class, null, actionMethod, methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(DisabledFacet.class);
- final DisabledFacetAbstract disabledFacetAbstract = (DisabledFacetAbstract) facet;
-
- assertEquals(Where.PARENTED_TABLES, disabledFacetAbstract.where());
- }
-
-
-}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/DisabledAnnotationOnCollectionFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/DisabledAnnotationOnCollectionFacetFactoryTest.java
index b686e05..1cd3437 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/DisabledAnnotationOnCollectionFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/DisabledAnnotationOnCollectionFacetFactoryTest.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.collections.collection;
import java.lang.reflect.Method;
import java.util.Collection;
-import org.apache.isis.applib.annotation.Disabled;
+
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;
@@ -50,7 +50,6 @@ public class DisabledAnnotationOnCollectionFacetFactoryTest extends AbstractFace
public void testDisabledAnnotationPickedUpOnCollection() {
class Customer {
- @Disabled
public Collection<?> getOrders() {
return null;
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/DisabledAnnotationOnPropertyFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/DisabledAnnotationOnPropertyFacetFactoryTest.java
index 1dd9b0f..3862b09 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/DisabledAnnotationOnPropertyFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/DisabledAnnotationOnPropertyFacetFactoryTest.java
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.facets.properties.property;
import java.lang.reflect.Method;
-import org.apache.isis.applib.annotation.Disabled;
+
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;
@@ -49,7 +49,6 @@ public class DisabledAnnotationOnPropertyFacetFactoryTest extends AbstractFacetF
public void testDisabledAnnotationPickedUpOnProperty() {
class Customer {
- @Disabled
public int getNumberOfOrders() {
return 0;
}
@@ -70,7 +69,6 @@ public class DisabledAnnotationOnPropertyFacetFactoryTest extends AbstractFacetF
public void testDisabledAnnotationWithReason() {
class Customer {
- @Disabled(reason="Oh no you don't!")
public int getNumberOfOrders() {
return 0;
}
diff --git a/todo-deprecation-list.txt b/todo-deprecation-list.txt
index 78d49f9..7b04503 100644
--- a/todo-deprecation-list.txt
+++ b/todo-deprecation-list.txt
@@ -17,7 +17,6 @@ org.apache.isis.applib.annotation
- Disabled.java - entire annotation, use @Property(editingDisabledReason=...) instead
Hidden.java - entire annotation, use @Property(hidden=...), @Collection(hidden=...), @Action(hidden=...)
Ignore.java - entire annotation, use @Programmatic instead.
@@ -331,6 +330,8 @@ org.apache.isis.applib.annotation
Command.java - entire annotation, use @Action(command=...) instead
+ Disabled.java - entire annotation, use @Property(editingDisabledReason=...) instead
+
ActionSemantics.java - entire annotation, use @Action(semantics=...)
Idempotent.java - entire annotation, use @Action(semantics=...) instead.
QueryOnly.java - entire annotation, use @Action(semantics=...) instead.
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.