You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/04/12 17:15:19 UTC

[causeway] 03/03: Merge remote-tracking branch 'origin/master' into spring6

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 d9d03bfe65fa6eb11651418ed8c48a6b02f7d97a
Author: andi-huber <ah...@apache.org>
AuthorDate: Wed Apr 12 19:15:09 2023 +0200

    Merge remote-tracking branch 'origin/master' into spring6
---
 .../ActionAnnotationFacetFactoryTest_Hidden.java   | 74 ----------------------
 .../CollectionAnnotationFacetFactoryTest.java      | 54 ----------------
 .../PropertyAnnotationFacetFactoryTest.java        | 44 -------------
 3 files changed, 172 deletions(-)

diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Hidden.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Hidden.java
deleted file mode 100644
index 771f4b708a..0000000000
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Hidden.java
+++ /dev/null
@@ -1,74 +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;
-
-import org.junit.jupiter.api.Test;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import org.apache.causeway.applib.annotation.Action;
-import org.apache.causeway.applib.annotation.Where;
-import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.causeway.core.metamodel.facets.all.hide.HiddenFacet;
-
-import lombok.val;
-
-class ActionAnnotationFacetFactoryTest_Hidden
-extends ActionAnnotationFacetFactoryTest {
-
-    private void processHidden(
-            final ActionAnnotationFacetFactory facetFactory, final ProcessMethodContext processMethodContext) {
-
-        val actionIfAny = processMethodContext.synthesizeOnMethod(Action.class);
-        facetFactory.processHidden(processMethodContext, actionIfAny);
-    }
-
-    @Test
-    @Deprecated(forRemoval = true, since = "2.0.0-RC2")
-    void withAnnotation() {
-
-        class Customer {
-            @Action(hidden = Where.REFERENCES_PARENT)
-            public void someAction() {
-            }
-        }
-
-        // given
-        val cls = Customer.class;
-        actionMethod = findMethod(cls, "someAction");
-
-        // when
-        val processMethodContext = ProcessMethodContext
-                .forTesting(cls, null, actionMethod, mockMethodRemover, facetedMethod);
-        processHidden(facetFactory, processMethodContext);
-
-        // then
-        val hiddenFacet = facetedMethod.getFacet(HiddenFacet.class);
-        assertNotNull(hiddenFacet);
-        assertThat(hiddenFacet.where(), is(Where.REFERENCES_PARENT));
-
-        val hiddenFacetImpl = facetedMethod.getFacet(HiddenFacet.class);
-        assertNotNull(hiddenFacetImpl);
-        assertTrue(hiddenFacet == hiddenFacetImpl);
-    }
-
-}
\ No newline at end of file
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
index 5ce1cf6063..26c20d983b 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
@@ -26,24 +26,19 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
-import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.calls;
 
 import org.apache.causeway.applib.annotation.Collection;
-import org.apache.causeway.applib.annotation.Where;
 import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.CollectionSemantics;
 import org.apache.causeway.core.metamodel.commons.matchers.CausewayMatchers;
-import org.apache.causeway.core.metamodel.facetapi.Facet;
 import org.apache.causeway.core.metamodel.facets.AbstractFacetFactoryJupiterTestCase;
 import org.apache.causeway.core.metamodel.facets.FacetFactory;
 import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
 import org.apache.causeway.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.causeway.core.metamodel.facets.actcoll.typeof.TypeOfFacetFromFeature;
-import org.apache.causeway.core.metamodel.facets.all.hide.HiddenFacet;
-import org.apache.causeway.core.metamodel.facets.collections.collection.hidden.HiddenFacetForCollectionAnnotation;
 import org.apache.causeway.core.metamodel.facets.collections.collection.typeof.TypeOfFacetForCollectionAnnotation;
 import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
 
@@ -73,13 +68,6 @@ extends AbstractFacetFactoryJupiterTestCase {
         facetFactory.processModify(processMethodContext, collectionIfAny);
     }
 
-    private static void processHidden(
-            final CollectionAnnotationFacetFactory facetFactory, final FacetFactory.ProcessMethodContext processMethodContext) {
-        val collectionIfAny = processMethodContext.synthesizeOnMethod(Collection.class);
-        facetFactory.processHidden(processMethodContext, collectionIfAny);
-    }
-
-
     private static void processTypeOf(
             final CollectionAnnotationFacetFactory facetFactory, final FacetFactory.ProcessMethodContext processMethodContext) {
         val collectionIfAny = processMethodContext.synthesizeOnMethod(Collection.class);
@@ -98,48 +86,6 @@ extends AbstractFacetFactoryJupiterTestCase {
         facetFactory = null;
     }
 
-
-    @Deprecated(forRemoval = true, since = "2.0.0-RC2")
-    static class Hidden extends CollectionAnnotationFacetFactoryTest {
-
-        @Test
-        void withAnnotation() {
-
-            class Order {
-            }
-            class Customer {
-                @Collection(hidden = Where.REFERENCES_PARENT)
-                public List<Order> getOrders() {
-                    return null;
-                }
-
-                public void setOrders(final List<Order> orders) {
-                }
-            }
-
-            // given
-            final Class<?> cls = Customer.class;
-            collectionMethod = findMethod(Customer.class, "getOrders");
-
-            // when
-            final FacetFactory.ProcessMethodContext processMethodContext = ProcessMethodContext
-                    .forTesting(cls, null, collectionMethod, mockMethodRemover, facetedMethod);
-            processHidden(facetFactory, processMethodContext);
-
-            // then
-            final HiddenFacet hiddenFacet = facetedMethod.getFacet(HiddenFacet.class);
-            assertNotNull(hiddenFacet);
-            assertTrue(hiddenFacet instanceof HiddenFacetForCollectionAnnotation);
-            final HiddenFacetForCollectionAnnotation hiddenFacetImpl = (HiddenFacetForCollectionAnnotation) hiddenFacet;
-            assertThat(hiddenFacetImpl.where(), is(Where.REFERENCES_PARENT));
-
-            final Facet hiddenFacetForColl = facetedMethod.getFacet(HiddenFacet.class);
-            assertNotNull(hiddenFacetForColl);
-            assertTrue(hiddenFacet == hiddenFacetForColl);
-        }
-
-    }
-
     static class TypeOf extends CollectionAnnotationFacetFactoryTest {
 
 
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
index ab41ab31ac..3d8301503e 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
@@ -52,7 +52,6 @@ import org.apache.causeway.core.metamodel.facetapi.FacetUtil;
 import org.apache.causeway.core.metamodel.facets.AbstractFacetFactoryJupiterTestCase;
 import org.apache.causeway.core.metamodel.facets.FacetFactory;
 import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.causeway.core.metamodel.facets.all.hide.HiddenFacet;
 import org.apache.causeway.core.metamodel.facets.members.disabled.DisabledFacet;
 import org.apache.causeway.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
 import org.apache.causeway.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
@@ -62,7 +61,6 @@ import org.apache.causeway.core.metamodel.facets.propcoll.accessor.PropertyOrCol
 import org.apache.causeway.core.metamodel.facets.propcoll.memserexcl.SnapshotExcludeFacet;
 import org.apache.causeway.core.metamodel.facets.properties.property.disabled.DisabledFacetForPropertyAnnotation;
 import org.apache.causeway.core.metamodel.facets.properties.property.entitychangepublishing.EntityPropertyChangePublishingPolicyFacet;
-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.maxlength.MaxLengthFacetForPropertyAnnotation;
 import org.apache.causeway.core.metamodel.facets.properties.property.modify.PropertyClearFacetForDomainEventFromDefault;
@@ -105,12 +103,6 @@ class PropertyAnnotationFacetFactoryTest extends AbstractFacetFactoryJupiterTest
         facetFactory.processModify(processMethodContext, propertyIfAny);
     }
 
-    private static void processHidden(
-            final PropertyAnnotationFacetFactory facetFactory, final FacetFactory.ProcessMethodContext processMethodContext) {
-        val propertyIfAny = processMethodContext.synthesizeOnMethod(Property.class);
-        facetFactory.processHidden(processMethodContext, propertyIfAny);
-    }
-
     private static void processOptional(
             final PropertyAnnotationFacetFactory facetFactory, final FacetFactory.ProcessMethodContext processMethodContext) {
         val propertyIfAny = processMethodContext.synthesizeOnMethod(Property.class);
@@ -392,42 +384,6 @@ class PropertyAnnotationFacetFactoryTest extends AbstractFacetFactoryJupiterTest
         }
     }
 
-    public static class Hidden extends PropertyAnnotationFacetFactoryTest {
-
-        @Test
-        @Deprecated(forRemoval = true, since = "2.0.0-RC2")
-        public void withAnnotation() {
-
-            @SuppressWarnings("unused")
-            class Customer {
-                @Property(hidden = Where.REFERENCES_PARENT)
-                @Getter @Setter private String name;
-            }
-
-            // given
-            final Class<?> cls = Customer.class;
-            propertyMethod = findMethod(Customer.class, "getName");
-
-            // when
-            val processMethodContext = ProcessMethodContext
-                    .forTesting(cls, null,
-                    propertyMethod, mockMethodRemover, facetedMethod);
-            processHidden(facetFactory, processMethodContext);
-
-            // then
-            final HiddenFacet hiddenFacet = facetedMethod.getFacet(HiddenFacet.class);
-            assertNotNull(hiddenFacet);
-            assertTrue(hiddenFacet instanceof HiddenFacetForPropertyAnnotation);
-            final HiddenFacetForPropertyAnnotation hiddenFacetImpl = (HiddenFacetForPropertyAnnotation) hiddenFacet;
-            assertThat(hiddenFacetImpl.where(), is(Where.REFERENCES_PARENT));
-
-            final Facet hiddenFacetForProp = facetedMethod.getFacet(HiddenFacet.class);
-            assertNotNull(hiddenFacetForProp);
-            assertTrue(hiddenFacet == hiddenFacetForProp);
-        }
-
-    }
-
     @SuppressWarnings("unused")
     public static class Editing extends PropertyAnnotationFacetFactoryTest {