This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch spring6 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 6dff79790fd75895a86b803b614d72bc19374643 Author: andi-huber <[email protected]> AuthorDate: Wed Apr 12 19:13:43 2023 +0200 CAUSEWAY-3424: remove Action/Collection/Property#hidden --- .../apache/causeway/applib/annotation/Action.java | 2 +- .../causeway/applib/annotation/Collection.java | 10 ---- .../causeway/applib/annotation/Property.java | 10 ---- .../action/ActionAnnotationFacetFactory.java | 11 ----- .../hidden/HiddenFacetForActionAnnotation.java | 55 ---------------------- .../CollectionAnnotationFacetFactory.java | 13 ----- .../hidden/HiddenFacetForCollectionAnnotation.java | 54 --------------------- .../property/PropertyAnnotationFacetFactory.java | 16 ++----- .../hidden/HiddenFacetForPropertyAnnotation.java | 55 ---------------------- 9 files changed, 4 insertions(+), 222 deletions(-) diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Action.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Action.java index 6add510f77..4a979e0a8e 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Action.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Action.java @@ -158,7 +158,7 @@ public @interface Action { * @deprecated use {@link ActionLayout#hidden()} instead */ @Deprecated(forRemoval = true, since = "2.0.0-RC2") - Where hidden() + Where hidden2() default Where.NOT_SPECIFIED; /** diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Collection.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Collection.java index 2e5591d8ea..5f8837dcb6 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Collection.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Collection.java @@ -81,16 +81,6 @@ public @interface Collection { Class<? extends CollectionDomainEvent<?,?>> domainEvent() default CollectionDomainEvent.Default.class; - /** - * Indicates when the collection is not visible to the user. - * - * @see CollectionLayout#hidden() - * @deprecated use CollectionLayout#hidden() instead - */ - @Deprecated(forRemoval = true, since = "2.0.0-RC2") - Where hidden() - default Where.NOT_SPECIFIED; - /** * The type-of the elements held within the collection. * diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Property.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Property.java index d74c650f33..29406ea4f9 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Property.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Property.java @@ -183,16 +183,6 @@ public @interface Property { String fileAccept() default ""; - /** - * Indicates where the property is not visible to the user. - * - * @see PropertyLayout#hidden() - * @deprecated use {@link PropertyLayout#hidden()} instead - */ - @Deprecated(forRemoval = true, since = "2.0.0-RC2") - Where hidden() - default Where.NOT_SPECIFIED; - /** * The maximum entry length of a field. * diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java index ed1116c4da..02b1fbc925 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java @@ -32,7 +32,6 @@ import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract; import org.apache.causeway.core.metamodel.facets.actcoll.typeof.TypeOfFacet; import org.apache.causeway.core.metamodel.facets.actions.action.choicesfrom.ChoicesFromFacetForActionAnnotation; import org.apache.causeway.core.metamodel.facets.actions.action.explicit.ActionExplicitFacetForActionAnnotation; -import org.apache.causeway.core.metamodel.facets.actions.action.hidden.HiddenFacetForActionAnnotation; import org.apache.causeway.core.metamodel.facets.actions.action.invocation.ActionDomainEventFacetAbstract; import org.apache.causeway.core.metamodel.facets.actions.action.invocation.ActionDomainEventFacetDefault; import org.apache.causeway.core.metamodel.facets.actions.action.invocation.ActionDomainEventFacetForActionAnnotation; @@ -71,7 +70,6 @@ extends FacetFactoryAbstract { processExplicit(processMethodContext, actionIfAny); processInvocation(processMethodContext, actionIfAny); - processHidden(processMethodContext, actionIfAny); processRestrictTo(processMethodContext, actionIfAny); processSemantics(processMethodContext, actionIfAny); @@ -168,15 +166,6 @@ extends FacetFactoryAbstract { return actionDomainEventType; } - void processHidden(final ProcessMethodContext processMethodContext, final Optional<Action> actionIfAny) { - val facetedMethod = processMethodContext.getFacetHolder(); - - // search for @Action(hidden=...) - addFacetIfPresent( - HiddenFacetForActionAnnotation - .create(actionIfAny, facetedMethod)); - } - void processRestrictTo(final ProcessMethodContext processMethodContext, final Optional<Action> actionIfAny) { val facetedMethod = processMethodContext.getFacetHolder(); diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/hidden/HiddenFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/hidden/HiddenFacetForActionAnnotation.java deleted file mode 100644 index e5b1ec5b37..0000000000 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/hidden/HiddenFacetForActionAnnotation.java +++ /dev/null @@ -1,55 +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.causeway.core.metamodel.facets.actions.action.hidden; - -import java.util.Optional; - -import org.apache.causeway.applib.annotation.Action; -import org.apache.causeway.applib.annotation.Where; -import org.apache.causeway.core.metamodel.facetapi.FacetHolder; -import org.apache.causeway.core.metamodel.facets.members.hidden.HiddenFacetAbstract; -import org.apache.causeway.core.metamodel.object.ManagedObject; - -@Deprecated(forRemoval = true, since = "2.0.0-RC2") -public class HiddenFacetForActionAnnotation -extends HiddenFacetAbstract { - - public static Optional<HiddenFacetForActionAnnotation> create( - final Optional<Action> actionsIfAny, - final FacetHolder holder) { - - return actionsIfAny - .map(Action::hidden) - .filter(where -> where != null && where != Where.NOT_SPECIFIED) - .map(where -> new HiddenFacetForActionAnnotation(where, holder)); - } - - private HiddenFacetForActionAnnotation(final Where where, final FacetHolder holder) { - super(where, holder); - } - - @Override - public String hiddenReason(final ManagedObject targetAdapter, final Where whereContext) { - if(!where().includes(whereContext)) { - return null; - } - return "Hidden on " + where().getFriendlyName(); - } - -} diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java index 8bcc7249ba..b92637af81 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java @@ -33,7 +33,6 @@ import org.apache.causeway.core.metamodel.facets.actcoll.typeof.TypeOfFacet; import org.apache.causeway.core.metamodel.facets.actions.contributing.ContributingFacet.Contributing; import org.apache.causeway.core.metamodel.facets.actions.contributing.ContributingFacetAbstract; import org.apache.causeway.core.metamodel.facets.actions.semantics.ActionSemanticsFacetAbstract; -import org.apache.causeway.core.metamodel.facets.collections.collection.hidden.HiddenFacetForCollectionAnnotation; import org.apache.causeway.core.metamodel.facets.collections.collection.modify.CollectionDomainEventFacetAbstract; import org.apache.causeway.core.metamodel.facets.collections.collection.modify.CollectionDomainEventFacetDefault; import org.apache.causeway.core.metamodel.facets.collections.collection.modify.CollectionDomainEventFacetForCollectionAnnotation; @@ -66,7 +65,6 @@ extends FacetFactoryAbstract { inferIntentWhenOnTypeLevel(processMethodContext, collectionIfAny); processModify(processMethodContext, collectionIfAny); - processHidden(processMethodContext, collectionIfAny); processTypeOf(processMethodContext, collectionIfAny); } @@ -145,17 +143,6 @@ extends FacetFactoryAbstract { return collectionDomainEventType; } - - void processHidden(final ProcessMethodContext processMethodContext, final Optional<Collection> collectionIfAny) { - val holder = processMethodContext.getFacetHolder(); - - // check for @Collection(hidden=...) - addFacetIfPresent( - HiddenFacetForCollectionAnnotation - .create(collectionIfAny, holder)); - } - - void processTypeOf(final ProcessMethodContext processMethodContext, final Optional<Collection> collectionIfAny) { val cls = processMethodContext.getCls(); diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/collection/hidden/HiddenFacetForCollectionAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/collection/hidden/HiddenFacetForCollectionAnnotation.java deleted file mode 100644 index 0b00c5c046..0000000000 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/collection/hidden/HiddenFacetForCollectionAnnotation.java +++ /dev/null @@ -1,54 +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.causeway.core.metamodel.facets.collections.collection.hidden; - -import java.util.Optional; - -import org.apache.causeway.applib.annotation.Collection; -import org.apache.causeway.applib.annotation.Where; -import org.apache.causeway.core.metamodel.facetapi.FacetHolder; -import org.apache.causeway.core.metamodel.facets.members.hidden.HiddenFacetAbstract; -import org.apache.causeway.core.metamodel.object.ManagedObject; - -@Deprecated(forRemoval = true, since = "2.0.0-RC2") -public class HiddenFacetForCollectionAnnotation extends HiddenFacetAbstract { - - public static Optional<HiddenFacetForCollectionAnnotation> create( - final Optional<Collection> collectionIfAny, - final FacetHolder holder) { - - return collectionIfAny - .map(Collection::hidden) - .filter(where -> where != null && where != Where.NOT_SPECIFIED) - .map(where -> new HiddenFacetForCollectionAnnotation(where, holder)); - } - - private HiddenFacetForCollectionAnnotation(final Where where, final FacetHolder holder) { - super(where, holder); - } - - @Override - public String hiddenReason(final ManagedObject targetAdapter, final Where whereContext) { - if(!where().includes(whereContext)) { - return null; - } - return "Hidden on " + where().getFriendlyName(); - } - -} diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java index 40ec2ae550..839d212395 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java @@ -20,6 +20,9 @@ package org.apache.causeway.core.metamodel.facets.properties.property; import java.util.Optional; +import jakarta.inject.Inject; +import jakarta.validation.constraints.Pattern; + import org.apache.causeway.applib.annotation.Property; import org.apache.causeway.applib.annotation.SemanticsOf; import org.apache.causeway.applib.events.domain.PropertyDomainEvent; @@ -38,7 +41,6 @@ import org.apache.causeway.core.metamodel.facets.properties.projection.Projectin import org.apache.causeway.core.metamodel.facets.properties.property.disabled.DisabledFacetForPropertyAnnotation; import org.apache.causeway.core.metamodel.facets.properties.property.entitychangepublishing.EntityPropertyChangePublishingPolicyFacetForPropertyAnnotation; import org.apache.causeway.core.metamodel.facets.properties.property.fileaccept.FileAcceptFacetForPropertyAnnotation; -import org.apache.causeway.core.metamodel.facets.properties.property.hidden.HiddenFacetForPropertyAnnotation; import org.apache.causeway.core.metamodel.facets.properties.property.mandatory.MandatoryFacetForPropertyAnnotation; import org.apache.causeway.core.metamodel.facets.properties.property.mandatory.MandatoryFacetInvertedByNullableAnnotationOnProperty; import org.apache.causeway.core.metamodel.facets.properties.property.maxlength.MaxLengthFacetForPropertyAnnotation; @@ -60,8 +62,6 @@ import org.apache.causeway.core.metamodel.specloader.validator.MetaModelValidato import org.apache.causeway.core.metamodel.specloader.validator.MetaModelValidatorForConflictingOptionality; import org.apache.causeway.core.metamodel.util.EventUtil; -import jakarta.inject.Inject; -import jakarta.validation.constraints.Pattern; import lombok.val; public class PropertyAnnotationFacetFactory @@ -84,7 +84,6 @@ extends FacetFactoryAbstract { inferIntentWhenOnTypeLevel(processMethodContext, propertyIfAny); processModify(processMethodContext, propertyIfAny); - processHidden(processMethodContext, propertyIfAny); processEditing(processMethodContext, propertyIfAny); processCommandPublishing(processMethodContext, propertyIfAny); processProjecting(processMethodContext, propertyIfAny); @@ -207,15 +206,6 @@ extends FacetFactoryAbstract { return propertyDomainEventType; } - void processHidden(final ProcessMethodContext processMethodContext, final Optional<Property> propertyIfAny) { - val facetHolder = processMethodContext.getFacetHolder(); - - // search for @Property(hidden=...) - addFacetIfPresent( - HiddenFacetForPropertyAnnotation - .create(propertyIfAny, facetHolder)); - } - void processEditing(final ProcessMethodContext processMethodContext, final Optional<Property> propertyIfAny) { val facetHolder = processMethodContext.getFacetHolder(); diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/hidden/HiddenFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/hidden/HiddenFacetForPropertyAnnotation.java deleted file mode 100644 index fb6b9f5cdb..0000000000 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/hidden/HiddenFacetForPropertyAnnotation.java +++ /dev/null @@ -1,55 +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.causeway.core.metamodel.facets.properties.property.hidden; - -import java.util.Optional; - -import org.apache.causeway.applib.annotation.Property; -import org.apache.causeway.applib.annotation.Where; -import org.apache.causeway.core.metamodel.facetapi.FacetHolder; -import org.apache.causeway.core.metamodel.facets.members.hidden.HiddenFacetAbstract; -import org.apache.causeway.core.metamodel.object.ManagedObject; - -@Deprecated(forRemoval = true, since = "2.0.0-RC2") -public class HiddenFacetForPropertyAnnotation -extends HiddenFacetAbstract { - - public static Optional<HiddenFacetForPropertyAnnotation> create( - final Optional<Property> propertyIfAny, - final FacetHolder holder) { - - return propertyIfAny - .map(Property::hidden) - .filter(where -> where != null && where != Where.NOT_SPECIFIED) - .map(where -> new HiddenFacetForPropertyAnnotation(where, holder)); - } - - private HiddenFacetForPropertyAnnotation(final Where where, final FacetHolder holder) { - super(where, holder); - } - - @Override - public String hiddenReason(final ManagedObject targetAdapter, final Where whereContext) { - if(!where().includes(whereContext)) { - return null; - } - return "Hidden on " + where().getFriendlyName(); - } - -}
